VA: log NUMA node of allocated rank(s)

1 files changed, 22 insertions, 14 deletions

diff --git a/VA/dimes-hetsim-nmc.sh b/VA/dimes-hetsim-nmc.sh
index 97aef94..3d94fba 100755
--- a/VA/dimes-hetsim-nmc.sh
+++ b/VA/dimes-hetsim-nmc.sh
@@ -3,10 +3,11 @@
 mkdir -p log/$(hostname) baselines/cpu/log/$(hostname)
 fn=log/$(hostname)/$(date +%Y%m%d)
 
-# upstream uses 167772160 * int32 == 1.25 GiB for DPU version
+# upstream uses 167772160 * 2 * int32 == 2.5 GiB input and 1.25 GiB output for DPU version
 
 run_benchmark_nmc() {
-	eval "$@"
+	local "$@"
+	sudo limit_ranks_to_numa_node ${numa_rank}
 	if make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets} BL=10 WITH_ALLOC_OVERHEAD=1 WITH_LOAD_OVERHEAD=1 WITH_FREE_OVERHEAD=1; then
 		bin/host_code -w 0 -e 100 -i ${input_size} -x 1
 	fi
@@ -15,19 +16,22 @@ run_benchmark_nmc() {
 
 export -f run_benchmark_nmc
 
-run_benchmark_baseline() {
-	eval "$@"
-	./va -i ${input_size} -a ${ram} -b ${ram} -c ${cpu} -t $nr_threads -w 0 -e 40
-	return $?
-}
+(
 
-export -f run_benchmark_baseline
+echo "NMC single-node operation (1/2)" >&2
 
-(
+parallel -j1 --eta --joblog ${fn}.1.joblog --resume --header : \
+	run_benchmark_nmc nr_dpus={nr_dpus} nr_tasklets=16 input_size={input_size} numa_rank={numa_rank} \
+	::: numa_rank 0 1 \
+	::: nr_dpus 64 128 256 512 768 1024 \
+	::: input_size 167772160
+
+echo "NMC multi-node operation (2/2)" >&2
 
-parallel -j1 --eta --joblog ${fn}.joblog --resume --header : \
-	run_benchmark_nmc nr_dpus={nr_dpus} nr_tasklets=16 input_size={input_size} \
-	::: nr_dpus 64 128 256 512 768 1024 1536 2048 2304 \
+parallel -j1 --eta --joblog ${fn}.2.joblog --resume --header : \
+	run_benchmark_nmc nr_dpus={nr_dpus} nr_tasklets=16 input_size={input_size} numa_rank={numa_rank} \
+	::: numa_rank -1 \
+	::: nr_dpus 1536 2048 2304 \
 	::: input_size 167772160
 
 ) > ${fn}.txt
@@ -39,15 +43,19 @@ make -B NUMA=1
 
 (
 
+echo "CPU single-node operation (1/2)" >&2
+
 parallel -j1 --eta --joblog ${fn}.1.joblog --resume --header : \
-	run_benchmark_baseline nr_threads={nr_threads} input_size={input_size} ram={ram} cpu={cpu} \
+	./va -i {input_size} -a {ram} -b {ram} -c {cpu} -t {nr_threads} -w 0 -e 40 \
 	::: ram 0 1 \
 	::: cpu 0 1 \
 	::: nr_threads 1 2 4 8 12 16 32 \
 	::: input_size 167772160
 
+echo "CPU multi-node operation (1/2)" >&2
+
 parallel -j1 --eta --joblog ${fn}.2.joblog --resume --header : \
-	run_benchmark_baseline nr_threads={nr_threads} input_size={input_size} ram={ram} cpu={cpu} \
+	./va -i {input_size} -a {ram} -b {ram} -c {cpu} -t {nr_threads} -w 0 -e 40 \
 	::: ram any \
 	::: cpu -1 \
 	::: nr_threads 48 64 \