BS: updates and comments

5 files changed, 33 insertions, 18 deletions

diff --git a/BS/Makefile b/BS/Makefile
index f6b5106..fae815c 100644
--- a/BS/Makefile
+++ b/BS/Makefile
@@ -3,14 +3,9 @@ NR_TASKLETS ?= 16
 PROBLEM_SIZE ?= 8192 # original 2, wtf
 
 COMMON_INCLUDES := support
-HOST_TARGET := bin/bs_host
-DPU_TARGET := bin/bs_dpu
-
 HOST_SOURCES := $(wildcard host/*.c)
 DPU_SOURCES := $(wildcard dpu/*.c)
 
-.PHONY: all clean test
-
 COMMON_FLAGS := -Wall -Wextra  -g -I${COMMON_INCLUDES}
 HOST_FLAGS := ${COMMON_FLAGS} -std=c11 -O3 `dpu-pkg-config --cflags --libs dpu` -DNR_TASKLETS=${NR_TASKLETS} -DNR_DPUS=${NR_DPUS} -DPROBLEM_SIZE=${PROBLEM_SIZE}
 DPU_FLAGS := ${COMMON_FLAGS} -O2 -DNR_TASKLETS=${NR_TASKLETS}
@@ -21,19 +16,21 @@ ifdef verbose
 	QUIET =
 endif
 
-all: ${HOST_TARGET} ${DPU_TARGET}
+all: bin/bs_host bin/bs_dpu
 
 bin:
 	${QUIET}mkdir -p bin
 
-${HOST_TARGET}: ${HOST_SOURCES} ${COMMON_INCLUDES} bin
+bin/bs_host: ${HOST_SOURCES} ${COMMON_INCLUDES} bin
 	${QUIET}${CC} -o $@ ${HOST_SOURCES} ${HOST_FLAGS}
 
-${DPU_TARGET}: ${DPU_SOURCES} ${COMMON_INCLUDES} bin
+bin/bs_dpu: ${DPU_SOURCES} ${COMMON_INCLUDES} bin
 	${QUIET}dpu-upmem-dpurte-clang ${DPU_FLAGS} -o $@ ${DPU_SOURCES}
 
 clean:
 	${QUIET}rm -rf bin
 
 test: all
-	${HOST_TARGET} -i 262144
+	bin/bs_host -i 262144
+
+.PHONY: all clean test
diff --git a/BS/baselines/cpu/run.sh b/BS/baselines/cpu/run.sh
index 80c596c..33d5966 100755
--- a/BS/baselines/cpu/run.sh
+++ b/BS/baselines/cpu/run.sh
@@ -2,16 +2,24 @@
 
 set -e
 
+HOST="$(hostname)"
+
+echo $HOST
+
+(
 echo "prim-benchmarks BS CPU (dfatool edition)"
 echo "Started at $(date)"
 echo "Revision $(git describe --always)"
 
-make
+make -B verbose=1
 
-for nr_threads in 1 2 4 6 8 12 16 20 24 32; do
-	for vs in 262144 524288 1048576 2097152; do
+for nr_threads in 88 64 44 32 24 20 1 2 4 6 8 12 16; do
+	#for vs in 262144 524288 1048576 2097152; do
+	# NMC also uses 262144 elements
+	for vs in 262144; do
 		for i in `seq 1 20`; do
 			OMP_NUM_THREADS=${nr_threads} timeout --foreground -k 1m 30m ./bs_omp ${vs} 16777216 || true
 		done
 	done
 done
+) | tee "${HOST}-explore.txt"
diff --git a/BS/run-paper-strong-full.sh b/BS/run-paper-strong-full.sh
index 3617ffe..a5195f9 100755
--- a/BS/run-paper-strong-full.sh
+++ b/BS/run-paper-strong-full.sh
@@ -8,6 +8,8 @@ set -e
 # -e: number of timed iterations
 # -i; ignored, always uses 262144 elements
 
+(
+
 echo "prim-benchmarks BS strong-full (dfatool edition)"
 echo "Started at $(date)"
 echo "Revision $(git describe --always)"
@@ -15,8 +17,9 @@ echo "Revision $(git describe --always)"
 for nr_dpus in 256 512 1024 2048; do
 	for nr_tasklets in 1 2 4 8 16; do
 		echo
-		if make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets} BL=10; then
+		if make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets} BL=10 verbose=1; then
 			timeout --foreground -k 1m 30m bin/bs_host -w 0 -e 100 -i 16777216 || true
 		fi
 	done
-done | tee log-paper-strong-full.txt
+done
+) | tee log-paper-strong-full.txt
diff --git a/BS/run-paper-strong-rank.sh b/BS/run-paper-strong-rank.sh
index 4a97a04..5634ffe 100755
--- a/BS/run-paper-strong-rank.sh
+++ b/BS/run-paper-strong-rank.sh
@@ -8,6 +8,8 @@ set -e
 # -e: number of timed iterations
 # -i; ignored, always uses 262144 elements
 
+(
+
 echo "prim-benchmarks BS strong-rank (dfatool edition)"
 echo "Started at $(date)"
 echo "Revision $(git describe --always)"
@@ -16,8 +18,9 @@ echo "Revision $(git describe --always)"
 for nr_dpus in 256 512 1 4 16 64; do
 	for nr_tasklets in 1 2 4 8 16; do
 		echo
-		if make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets} BL=10; then
+		if make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets} BL=10 verbose=1; then
 			timeout --foreground -k 1m 30m bin/bs_host -w 0 -e 100 -i 262144 || true
 		fi
 	done
-done | tee log-paper-strong-rank.txt
+done
+) | tee log-paper-strong-rank.txt
diff --git a/BS/run-paper-weak.sh b/BS/run-paper-weak.sh
index 678ee1c..f845e30 100755
--- a/BS/run-paper-weak.sh
+++ b/BS/run-paper-weak.sh
@@ -7,6 +7,9 @@ set -e
 # -w: number of un-timed warmup iterations
 # -e: number of timed iterations
 # -i; ignored, always uses 262144 elements
+# ... so the weak rank script might be bogus
+
+(
 
 echo "prim-benchmarks BS weak (dfatool edition)"
 echo "Started at $(date)"
@@ -16,9 +19,10 @@ echo "Revision $(git describe --always)"
 for nr_dpus in 256 512 1 4 16 64; do
 	for nr_tasklets in 1 2 4 8 16; do
 		echo
-		if make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets} BL=10; then
+		if make -B NR_DPUS=${nr_dpus} NR_TASKLETS=${nr_tasklets} BL=10 verbose=1; then
 			i=$(( nr_dpus * 262144 ))
 			timeout --foreground -k 1m 30m bin/bs_host -w 0 -e 100 -i $i || true
 		fi
 	done
-done | tee log-paper-weak.txt
+done
+) | tee log-paper-weak.txt