Changeset 6adeb5f for doc/theses/mike_brooks_MMath/benchmarks/list/Makefile

Timestamp:

Apr 10, 2023, 9:25:28 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

a1b41e3

Parents:

372b6d3 (diff), a085470 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• doc/theses/mike_brooks_MMath/benchmarks/list/Makefile (modified) (4 diffs)

doc/theses/mike_brooks_MMath/benchmarks/list/Makefile

@@ -1 +1 @@
 # For correctness, see test-correctness.sh.
 # For performance:
-#       pushd ~/cfax
-#       . ~/setcfa build-fast
-#       popd
-#       make perfprogs CFA=$cfa -j8 MODE=performance
-#       make results-latest.csv -j4 RUN_DURATION_SEC=5 RUN_NUM_REPS=5 RUN_DATA_SIZE_MODE=common5
-#   cp results-latest.csv results-baseline.csv
-#       make results-latest.csv -j4 OP_MOVEMENTS=stack OP_POLARITIES=insfirst OP_ACCESSORS=allhead RUN_DURATION_SEC=5 RUN_NUM_REPS=5 RUN_DATA_SIZE_MODE=thorough
-#   cp results-latest.csv results-sizing.csv
+# pushd ~/cfax
+# . ~/setcfa build-fast
+# popd
+# make perfprogs CFA=$cfa -j8 MODE=performance
+# make results-latest.csv RUN_DURATION_SEC=5 RUN_NUM_REPS=5 RUN_DATA_SIZE_MODE=common5
+# cp results-latest.csv results-baseline.csv
+# make results-latest.csv OP_MOVEMENTS=stack OP_POLARITIES=insfirst OP_ACCESSORS=allhead RUN_DURATION_SEC=5 RUN_NUM_REPS=5 RUN_DATA_SIZE_MODE=thorough
+# cp results-latest.csv results-sizing.csv
 
 CFA = cfa
@@ -19 +19 @@
 RUN_DATA_SIZE_MODE=none
 RUN_DURATION_SEC=5
+RUN_TASKSET_CPULIST=6
 
 ifeq "$(MODE)" "performance"
-PERFFLAGS_CFA = -nodebug -O3
+PERFFLAGS_CFA = -DNDEBUG -O3 -nodebug
 PERFFLAGS_CC  = -DNDEBUG -O3
 else ifeq "$(MODE)" "correctness"
-PERFFLAGS_CFA = -debug -O0 -g
-PERFFLAGS_CC = -O0 -g
+PERFFLAGS_CFA = -O0 -g -debug
+PERFFLAGS_CC  = -O0 -g
 else
 $(error Bad MODE ($(MODE)); should be performance or correctness)
@@ -31 +32 @@
 
 PERFFLAGS_CXX = $(PERFFLAGS_CC)
-PERFFLAGS_UXX = $(PERFFLAGS_CC)
+PERFFLAGS_UXX = $(PERFFLAGS_CFA)
+
+CFLAGS=$(PERFFLAGS_CC) $(EXTRA_COMP_FLAGS)
 
 SHELL = /usr/bin/bash
@@ -204 +207 @@
 %.1csv : NUMNODES=$(call proj,-,$(SIZING),1)
 %.1csv : CHECKDONE=$(call proj,-,$(SIZING),2)
-%.1csv : RUN_ARGS=$(if $(filter none,$(SIZING)),,$(RUN_DURATION_SEC) $(CHECKDONE) $(NUMNODES))
 %.1csv : REP_ID=$(subst run,,$(call proj,--,$(LAUNCH),2))
+%.1csv : RUN_ARGS=$(if $(filter none,$(SIZING)),,$(RUN_DURATION_SEC) $(CHECKDONE) $(NUMNODES) -1 $(REP_ID))  # use REP_ID as seed
 %.1csv : REP_TIME=$(shell date '+%F %H:%M:%S')
 %.1csv : perfprogs FORCE
-        ./perfexp--$(CORE) $(RUN_ARGS) | xargs -n 1 printf '%s,%s,%s,%s\n' "$(REP_TIME)" "$(REP_ID)" "$(RUN_ARGS)" | tee $@
+        taskset --cpu-list $(RUN_TASKSET_CPULIST) ./perfexp--$(CORE) $(RUN_ARGS) | xargs -n 1 printf '%s,%s,%s,%s\n' "$(REP_TIME)" "$(REP_ID)" "$(RUN_ARGS)" | tee $@