make evaluation modes selectable

eval-muhq-ma.sh

@@ -22,8 +22,6 @@ if [ -d "$OUT" ]; then
 	mv "$OUT" "$OUT"-"$ctime"
 fi
 
-mkdir -p "${OUT}"/{latency,throughput}
-
 NUMA_ARGS=--measure-cmd="numactl --cpunodebind=netdev:10gbe-card-p1 /usr/bin/time -o {BENCHDIR}/server_stats.{RUN}.txt -v"
 
 COMMON_ARGS=(--ssh-port "${SSH_PORT}" --host "${HOST}" --perf-energy)
@@ -40,10 +38,14 @@ COMMON_ARGS_LATENCY=(${COMMON_ARGS[@]} --data-dir ${OUT}/latency \
 echo "muhq's MA io eval"
 echo 'Writing results to' "$OUT"
 echo 'arguments:' "${COMMON_ARGS[@]}"
+
+## Baseline measurements
+eval_throughput() {
+	echo "Measuring throughput"
 	echo 'throughput-arguments:' "${COMMON_ARGS_THROUGHPUT[@]}"
-echo 'latency-arguments:' "${COMMON_ARGS_LATENCY[@]}"
 
-# Baseline measurements
+	mkdir -p "${OUT}"/throughput
+
 	./eval.py "${COMMON_ARGS_THROUGHPUT[@]}" -f vanilla vanilla-200us -- emper
 
 	# No sleep measurements
@@ -104,9 +106,16 @@ echo 'latency-arguments:' "${COMMON_ARGS_LATENCY[@]}"
 		#io-notification-waitfree-no-comp-lockless \
 		#io-notification-waitfree-no-comp-lockless-0us-1ms \
 		#-- emper
+}
 
-# Latency evaluation
-./eval.py "${COMMON_ARGS_LATENCY[@]}" -f vanilla-200us vanilla-0us-1ms no-sleep-0us-1ms \
+eval_latency() {
+## Latency evaluation
+	echo "Measuring latency"
+	echo 'latency-arguments:' "${COMMON_ARGS_LATENCY[@]}"
+
+	mkdir -p "${OUT}"/latency
+
+	./eval.py "${COMMON_ARGS_LATENCY[@]}" -f {no-sleep,vanilla}-{200us,0us-1ms} \
 		-- emper go-200us tokio-200us
 
 	./eval.py "${COMMON_ARGS_LATENCY[@]}" -f \
@@ -114,3 +123,7 @@ echo 'latency-arguments:' "${COMMON_ARGS_LATENCY[@]}"
 		io-stealing-{pipe,waitfd}-no-comp-{200us,0us-1ms} \
 		io-notification-{,waitfree-}waitfd-no-comp-{200us,0us-1ms} \
 		-- emper
+}
+
+[[ "${EVAL_THROUGHPUT:=true}" != "false" ]] && eval_throughput
+[[ "${EVAL_LATENCY:=true}" != "false" ]] && eval_latency