Changeset b3976bf for benchmark

Timestamp:

Aug 12, 2019, 11:05:36 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

dee1f89

Parents:

cc4218f (diff), 4f5a8a2 (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

Location:

benchmark

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (5 diffs)
• baselines/calc.py (added)
• baselines/x64/compile.csv (added)
• baselines/x64/ctxswitch.csv (added)
• baselines/x64/mutex.csv (added)
• baselines/x64/signal.csv (added)
• baselines/x86/compile.csv (added)
• baselines/x86/ctxswitch.csv (added)
• baselines/x86/mutex.csv (added)
• baselines/x86/signal.csv (added)

benchmark/Makefile.am

@@ -52 +52 @@
 # NEED AT LEAST 4 DATA VALUES FOR BENCHMARKS BECAUSE THE MAX AND MIN VALUES ARE REMOVED
 repeats  = 5 # 31 for benchmarks
+arch     = x64
 skipcompile = no
 TIME_FORMAT = "%E"
@@ -100 +101 @@
 @DOifskipcompile@
         @+make compile.csv
+        @-+make compile.diff.csv
 @DOendif@
         @+make ctxswitch.csv
+        @-+make ctxswitch.diff.csv
         @+make mutex.csv
+        @-+make mutex.diff.csv
         @+make signal.csv
+        @-+make signal.diff.csv
 @DOifskipcompile@
-        @cat compile.csv
+        cat compile.csv
+        -cat compile.diff.csv
 @DOendif@
-        @cat ctxswitch.csv
-        @cat mutex.csv
-        @cat signal.csv
+        cat ctxswitch.csv
+        -cat ctxswitch.diff.csv
+        cat mutex.csv
+        -cat mutex.diff.csv
+        cat signal.csv
+        -cat signal.diff.csv
 
 compile.csv:
@@ -143 +152 @@
         @+make waitfor-cfa2.runquiet >> $@
         @$(srcdir)/fixcsv.sh $@
+
+%.diff.csv: %.csv
+        @test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
+        @$(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
+
 
 ## =========================================================================================================

benchmark/Makefile.in

@@ -231 +231 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
+DEMANGLER = @DEMANGLER@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
@@ -256 +257 @@
 LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
 LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
+LIBDEMANGLE = @LIBDEMANGLE@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -398 +400 @@
 # NEED AT LEAST 4 DATA VALUES FOR BENCHMARKS BECAUSE THE MAX AND MIN VALUES ARE REMOVED
 repeats = 5 # 31 for benchmarks
+arch = x64
 skipcompile = no
 TIME_FORMAT = "%E"
@@ -762 +765 @@
 @DOifskipcompile@
         @+make compile.csv
+        @-+make compile.diff.csv
 @DOendif@
         @+make ctxswitch.csv
+        @-+make ctxswitch.diff.csv
         @+make mutex.csv
+        @-+make mutex.diff.csv
         @+make signal.csv
+        @-+make signal.diff.csv
 @DOifskipcompile@
-        @cat compile.csv
+        cat compile.csv
+        -cat compile.diff.csv
 @DOendif@
-        @cat ctxswitch.csv
-        @cat mutex.csv
-        @cat signal.csv
+        cat ctxswitch.csv
+        -cat ctxswitch.diff.csv
+        cat mutex.csv
+        -cat mutex.diff.csv
+        cat signal.csv
+        -cat signal.diff.csv
 
 compile.csv:
@@ -806 +817 @@
         @$(srcdir)/fixcsv.sh $@
 
+%.diff.csv: %.csv
+        @test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
+        @$(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
+
 loop$(EXEEXT):
         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c