diff --git a/tests/benchmarks/configs/loopback.conf b/tests/benchmarks/configs/loopback.conf index 98049d1ef..15001dd1f 100644 --- a/tests/benchmarks/configs/loopback.conf +++ b/tests/benchmarks/configs/loopback.conf @@ -1,5 +1,6 @@ source_node = { type = "loopback", queuelen = 8192, + samplelen = ${NUM_VALUE}, mode = "polling" } diff --git a/tests/benchmarks/configs/shmem.conf b/tests/benchmarks/configs/shmem.conf index 5d5b6e040..76d09d27b 100644 --- a/tests/benchmarks/configs/shmem.conf +++ b/tests/benchmarks/configs/shmem.conf @@ -8,27 +8,30 @@ source_node = { signals = { count = ${NUM_VALUE}, type = "float" - } - name = "/shmem_node", - }, - - out = { - name = "/shmem_node" - }, -} - -target_node = { - type = "shmem", - - in = { - signals = { - count = ${NUM_VALUE}, - type = "float" - } - name = "/shmem_node", + }, + name = "/shmem_node_2" }, out = { name = "/shmem_node" } +}, + +target_node = { + type = "shmem", + queuelen = 8192, + polling = true, + vectorize = 1, + + in = { + signals = { + count = ${NUM_VALUE}, + type = "float" + }, + name = "/shmem_node" + }, + + out = { + name = "/shmem_node_2" + } } diff --git a/tests/benchmarks/configs/socket.conf b/tests/benchmarks/configs/socket.conf new file mode 100644 index 000000000..db02bcde8 --- /dev/null +++ b/tests/benchmarks/configs/socket.conf @@ -0,0 +1,36 @@ +source_node = { + type = "socket", + + builtin = false, + + layer = "udp", + format = "csv", + + in = { + address = "127.0.0.1:12000" + }, + + out = { + address = "127.0.0.1:12001" + } +}, + +target_node = { + type = "socket", + + builtin = false, + + layer = "udp", + format = "csv", + + in = { + signals = { + count = ${NUM_VALUE}, + type = "float" + }, + address = "127.0.0.1:12001" + }, + out = { + address = "127.0.0.1:12000" + } +} diff --git a/tests/benchmarks/run-benchmark.sh b/tests/benchmarks/run-benchmark.sh index 24161206e..9e37d0ae0 100755 --- a/tests/benchmarks/run-benchmark.sh +++ b/tests/benchmarks/run-benchmark.sh @@ -27,7 +27,7 @@ # ${NUM_VALUES}, ${RATE_SAMPLES}, and ${IB_MODES} may be a list. -NUM_VALUES=(1) +NUM_VALUES=(8) RATE_SAMPLES=(10) TIME_TO_RUN=5 IB_MODES=("RC") @@ -114,46 +114,12 @@ echo ${CONFIG_FILES[1]} for NODETYPE in "${NODETYPES[@]}" do - ###################################### - # SPECIAL CASES FOR SOME NODES ####### - ###################################### - - # Some nodes require special treatment: - # * loopback node: target_node is identical to source_node - # * infiniband node: one node must be executed in a namespace - - # loopback - if [ "${NODETYPE}" == "loopback" ]; then - TARGET_NODE='source_node' - else - TARGET_NODE='target_node' - fi - - # infiniband - if [ "${NODETYPE}" == "infiniband" ]; then - NAMESPACE_CMD='ip netns exec namespace0' - else - NAMESPACE_CMD='' - fi ###################################### # CREATE PATH CONFIG FILES ########### ###################################### # Set target and source config file, which is the same for both runs -cat > ${CONFIG_TARGET} < ${CONFIG_SOURCE} < ${CONFIG_TARGET} < ${CONFIG_TARGET} <> ${CONFIG} <