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

Timestamp:

May 1, 2023, 4:19:09 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c083c3d

Parents:

a50fdfb (diff), 985b624 (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:

resolved merge conflicts

File:

• doc/theses/mike_brooks_MMath/benchmarks/list/Makefile (modified) (5 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 RUNARGS=5 RUN_NUM_REPS=5
-
+# 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
@@ -12 +14 @@
 UXX =  ~/u++/u++-7.0.0/bin/u++
 
-MODE = performance
-RUNARGS=
+MODE=performance
+EXTRA_COMP_FLAGS=
+RUN_NUM_REPS=3
+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)
@@ -26 +32 @@
 
 PERFFLAGS_CXX = $(PERFFLAGS_CC)
-PERFFLAGS_UXX = $(PERFFLAGS_CC)
+PERFFLAGS_UXX = $(PERFFLAGS_CFA)
+
+CFLAGS=$(PERFFLAGS_CC) $(EXTRA_COMP_FLAGS)
 
 SHELL = /usr/bin/bash
@@ -101 +109 @@
 perfexp--%     driver--%.o     : COMPILER=NO-COMPILER-FOR-$(FX_COARSE)
 
+# Without this %.d rule, ordinary make runs have noise about the recipe for driver--%.o being ill-formed when called on a *.d.
+# https://stackoverflow.com/questions/3714041/why-does-this-makefile-execute-a-target-on-make-clean
+# Whatever you -include gets called as a target first.
+# One such example is driver--upp-upp--stack-insfirst-allhead.d
+# Without this %.d rule, `make make driver--upp-upp--stack-insfirst-allhead.d` leads to the rule for driver--%.o firing.
+# Though my dumb human eyes don't see the pattern as matching.
+%.d:
+        @touch $@
+
 perfexp--% : driver--%.o observation.o
-        $(COMPILER) $^ -o $@
+        $(COMPILER) $(EXTRA_COMP_FLAGS) $^ -o $@
 
 driver--%.o : driver.c
-        $(COMPILER) -c $< $(OP_DEFINES) -include op-$(OP).h -include fx-$(FX).h -o $@ -MMD 
-
-
-
-
-RUN_NUM_REPS=3
+        $(COMPILER) $(EXTRA_COMP_FLAGS) -c $< $(OP_DEFINES) -include op-$(OP).h -include fx-$(FX).h -o $@ -MMD 
+
+sayhi:
+        echo $(PERFPROGS)
+
+
+ifeq "$(RUN_DATA_SIZE_MODE)" "common5"
+RUN_DATA_SIZES=\
+  7-1000000 \
+  71-100000 \
+  809-10000 \
+  9051-1000 \
+  72421-100
+else ifeq "$(RUN_DATA_SIZE_MODE)" "thorough"
+RUN_DATA_SIZES=\
+  7-1000000 \
+  11-100000 \
+  13-100000 \
+  19-100000 \
+  29-100000 \
+  37-100000 \
+  53-100000 \
+  71-100000 \
+  101-10000 \
+  149-10000 \
+  211-10000 \
+  283-10000 \
+  401-10000 \
+  569-10000 \
+  809-10000 \
+  1151-1000 \
+  1601-1000 \
+  2267-1000 \
+  3203-1000 \
+  4547-1000 \
+  6473-1000 \
+  9051-1000 \
+  12809-100 \
+  18119-100 \
+  25601-100 \
+  36209-100 \
+  51203-100 \
+  72421-100 \
+  102407-10 \
+  144817-10 \
+  204803-10 \
+  289637-10 \
+  409609-10 \
+  579263-10 \
+  819229-10 \
+  1158613-1 \
+  1638431-1 \
+  2317057-1 \
+  3276803-1 \
+  4634111-1 \
+  6553621-1 \
+  9268211-1
+else ifeq "$(RUN_DATA_SIZE_MODE)" "manual"
+ifeq "$(RUN_DATA_SIZES)" ""
+$(error RUN_DATA_SIZE_MODE is manual but RUN_DATA_SIZES not given)
+endif
+else ifeq "$(RUN_DATA_SIZE_MODE)" "none"
+# Assume user manages RUN_ARGS; empty RUN_ARGS just means run with compiled-in defaults
+RUN_DATA_SIZES=none
+else
+$(error Bad RUN_DATA_SIZE_MODE ($(RUN_DATA_SIZE_MODE)); should be common5, thorough or manual)
+endif
+
 RUN_REP_IDS=$(shell echo {1..$(RUN_NUM_REPS)})              # 1 2 3
 RUN_REP_EXTS=$(call cross3,,run,$(RUN_REP_IDS),.1csv)       # run1.1csv run2.1cav run3.1csv
 
-RESULT1S=$(call cross,.,$(CORES),$(RUN_REP_EXTS))   # lq-tailq--stack-inslast-allhead.run2.1csv
+RUN_LAUNCHES=$(call cross,--,$(RUN_DATA_SIZES),$(RUN_REP_EXTS))
+
+
+
+RESULT1S=$(call cross,.,$(CORES),$(RUN_LAUNCHES))   # lq-tailq--stack-inslast-allhead.run2.1csv
+
 
 RESULT1S_SHUFD=$(shell shuf -e $(RESULT1S))
 
 %.1csv : CORE=$(basename $(basename $@))
-%.1csv : REP_ID=$(subst .run,,$(suffix $(basename $@)))
+%.1csv : LAUNCH=$(subst .,,$(suffix $(basename $@)))
+%.1csv : SIZING=$(call proj,--,$(LAUNCH),1)
+%.1csv : NUMNODES=$(call proj,-,$(SIZING),1)
+%.1csv : CHECKDONE=$(call proj,-,$(SIZING),2)
+%.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) $(RUNARGS) | xargs -n 1 printf '%s,%s,%s\n' "$(REP_TIME)" "$(REP_ID)" | 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 $@
+
 
 BATCHTIME=$(shell date '+%F--%H-%M-%S')
@@ -146 +236 @@
 .PRECIOUS: result--%.1csv driver--%.o perfexp--% %.o
 
-
 -include *.d