@@ -9,7 +9,7 @@ REPEATS=3
99
1010# === OUTPUT ===
1111OUT_FILE=" output/scalability_results.csv"
12- echo " Variant,Procs,Run,RealTime(s),UserTime(s),SysTime(s) " > $OUT_FILE
12+ echo " Variant,Procs,Run,Metric,Value,Unit " > " $OUT_FILE "
1313
1414# === MAIN LOOP ===
1515for VARIANT in " ${VARIANTS[@]} " ; do
@@ -19,23 +19,27 @@ for VARIANT in "${VARIANTS[@]}"; do
1919 if [[ " $VARIANT " == " serial" ]]; then
2020 echo " Serial run (1 proc only)..."
2121 for (( R= 1 ; R<= "$REPEATS "; R++ )) ; do
22- /usr/bin/time -f " $VARIANT ,1, $R ,%e,%U,%S " -a -o " $OUT_FILE " \
22+ perf stat -x, -o perf_out.tmp -- \
2323 ./build-" $VARIANT " /modules/cli/cli solve \
2424 -c example-files/lotka_volterra_cuqdyn_config.xml \
2525 -s example-files/lotka_volterra_ess_" $VARIANT " _config.xml \
2626 -d example-files/lotka_volterra_paper_data.txt \
2727 -o output/
28+
29+ awk -F, -v v=" $VARIANT " -v r=" $R " ' NF >= 3 { print v ",1," r "," $3 "," $1 "," $2 }' perf_out.tmp >> " $OUT_FILE "
2830 done
2931 else
3032 for PROCS in " ${PROCS_LIST[@]} " ; do
3133 echo " Running with $PROCS processes..."
3234 for (( R= 1 ; R<= "$REPEATS "; R++ )) ; do
33- /usr/bin/time -f " $VARIANT , $PROCS , $R ,%e,%U,%S " -a -o " $OUT_FILE " \
35+ perf stat -x, -o perf_out.tmp -- \
3436 mpirun -np " $PROCS " ./build-" $VARIANT " /modules/cli/cli solve \
3537 -c example-files/lotka_volterra_cuqdyn_config.xml \
3638 -s example-files/lotka_volterra_ess_" $VARIANT " _config.xml \
3739 -d example-files/lotka_volterra_paper_data.txt \
3840 -o output/
41+
42+ awk -F, -v v=" $VARIANT " -v p=" $PROCS " -v r=" $R " ' NF >= 3 { print v "," p "," r "," $3 "," $1 "," $2 }' perf_out.tmp >> " $OUT_FILE "
3943 done
4044 done
4145 fi
0 commit comments