Changes in / [bd72f517:2410424]

Location:

doc/theses/mike_brooks_MMath/benchmarks/string

Files:

• Makefile (modified) (5 diffs)
• make-flamegraph.sh (modified) (2 diffs)
• process-allocn-attrib.py (deleted)
• prog-allocn.cfa (modified) (1 diff)
• prog-passbyval.cfa (modified) (1 diff)
• prog.cfa (modified) (1 diff)

doc/theses/mike_brooks_MMath/benchmarks/string/Makefile

@@ -1 @@
-# Usage
-# $cfabuild/driver/cfa -nodebug -quiet -c -x c /dev/null && rm null.o || echo Need to fix \$cfabuild
-# make CFABUILD=$cfabuild -j8                                                                                                                                                                                                           # compile
-# make measurement  CFA_APILEVELS=ll OPERATIONS='pta peq pbv'                             CORPORI='corpus-100-*-1.txt corpus-1-*-1.txt' # append-pbv
-# make measurement2 CFA_APILEVELS=ll OPERATIONS='pall' PLATFORMS=cfa CFA_SHARINGS=share   CORPORI='corpus-1-*-1.txt'                                            # allocate-speed-cfa
-# make measurement2 CFA_APILEVELS=ll OPERATIONS='pall' PLATFORMS=stl CFA_EXPANSIONS=-1.0  CORPORI='corpus-1-*-1.txt'                                            # allocate-speed-stl
-# make measurement3 CFA_APILEVELS=ll OPERATIONS='pall' PLATFORMS=cfa CFA_SHARINGS=share   CORPORI='corpus-1-*-1.txt'                                            # allocate-space-cfa
-# make measurement3 CFA_APILEVELS=ll OPERATIONS='pall' PLATFORMS=stl CFA_EXPANSIONS=-1.0  CORPORI='corpus-1-*-1.txt'                                            # allocate-space-stl
-# make measurement4 CFA_APILEVELS=ll OPERATIONS='pall' PLATFORMS=cfa CFA_EXPANSIONS=0.2   CFA_SHARINGS=share   CORPORI='corpus-1-*-1.txt'       # allocate-attrib-cfa
-# make measurement4 CFA_APILEVELS=ll OPERATIONS='pall' PLATFORMS=stl CFA_EXPANSIONS=-1.0                       CORPORI='corpus-1-*-1.txt'       # allocate-attrib-stl
 
 CFABUILD = ~/cfa2/build-perf
@@ -47 +37 @@
 endef
 
-OPERATIONS=pta peq pbv pall #pno
+OPERATIONS=pta peq pbv pall pno
 ALLOCS=reuse fresh
 CFA_APILEVELS=hl ll
 CFA_SHARINGS=share noshare
-PLATFORMS=cfa stl #buhr94
+PLATFORMS=cfa stl buhr94
 
 ifneq ($(filter cfa,$(PLATFORMS)),)
@@ -152 +142 @@
 CORPORI = corpus-100-*-1.txt
 
-RUN_TASKSET_CPULIST=6
-
-# General timing
-# Output file gets concatenation of program outputs
 measurement: $(MEASURE)
         tofile=measurement-`date '+%F--%H-%M-%S'`.csv ; \
@@ -162 +148 @@
             for corpus in $(CORPORI) ; do \
                         corpusbody=`cat $$corpus` ; \
-                        resulttext=`taskset --cpu-list $(RUN_TASKSET_CPULIST) ./$$prog 100 10 $$corpusbody` ; \
-                        echo $$prog,$$corpus,$$resulttext  >>  $$tofile ; \
-                        echo $$prog,$$corpus,$$resulttext  ; \
+                        printed=`./$$prog 100 10 $$corpusbody` ; \
+                        echo $$prog,$$corpus,$$printed  >>  $$tofile ; \
+                        echo $$prog,$$corpus,$$printed  ; \
                 done ; \
         done
+#                       printed=`./$$prog 10000 - 10 $$corpusbody` ; \
 
-CFA_EXPANSIONS=0.02 0.05 0.1 0.2 0.4 0.5 0.9 0.98
+CFA_EXPANSIONS=0.02 0.05 0.1 0.2 0.5 0.9
 
-# Special-case timing with extra IV for CFA_EXPANSIONS
-# Output file gets concatenation of program outputs (one line per run)
 measurement2: $(MEASURE)
         tofile=measurement-`date '+%F--%H-%M-%S'`.csv ; \
@@ -194 +179 @@
         done
 
-# Space, with the IV for CFA_EXPANSIONS
-# Runs Mubeen's malloc interceptor to get malloc-request state
-# Output file gets concatenation of the interceptor's output (one line per run); program's output ignorred
-# Expect and ignore crashes; they're during shutdown, after everything we care about is over
 measurement3: $(MEASURE)
-        tofile=measurement-`date '+%F--%H-%M-%S'`.ssv ; \
         for prog in $(MEASURE) ; do \
             for corpus in $(CORPORI) ; do \
                         for expansion in $(CFA_EXPANSIONS) ; do \
                                 corpusbody=`cat $$corpus` ; \
-                                LD_PRELOAD=~/plg2/mubeen-stat-shim/malloc/mallocWrappers.so ./$$prog 1000 1.006 $$expansion 10 $$corpusbody ; \
-                                printed=`tail -n 1 preload_dump.txt` ; \
-                                echo $$prog $$corpus $$expansion $$printed  >>  $$tofile ; \
-                                echo $$prog $$corpus $$expansion $$printed  ; \
-                                rm preload_dump.txt ; \
+                                LD_PRELOAD=~/plg2/mubeen-stat-shim/malloc/mallocWrappers.so ./$$prog 1000 1.006 $$expansion 1 $$corpusbody ; \
+                                mv preload_dump.txt preload_dump--qrun1--$$corpus--expansion-$$expansion.txt ; \
                         done ; \
                 done ; \
         done
-
-# Time attribution, with the IV for CFA_EXPANSIONS
-# Runs the SUT under perf, then crunches the perf result
-# Output file gets concatenation of perf summaries (several lines per run); program's output ignorred
-# Expect and ignore output "addr2line: DWARF error: section .debug_info is larger than its filesize!"
-measurement4: $(MEASURE)
-        RUNID=`date '+%F--%H-%M-%S'` ; \
-        tofile=measurement-$$RUNID.ssv ; \
-        echo $$tofile ; \
-        for prog in $(MEASURE) ; do \
-            for corpus in $(CORPORI) ; do \
-                        for expansion in $(CFA_EXPANSIONS) ; do \
-                                SLUG=measurement--$$prog--$$corpus--$$expansion--$$RUNID ; \
-                                corpusbody=`cat $$corpus` ; \
-                                perf record --call-graph dwarf -m16M ./$$prog 1000 1.006 $$expansion 10 $$corpusbody ; \
-                                mv perf.data $$SLUG.data ; \
-                                perf script -i $$SLUG.data > $$SLUG.perf ; \
-                                ~/flamegraph/FlameGraph/stackcollapse-perf.pl $$SLUG.perf > $$SLUG.folded ; \
-                                ~/flamegraph/FlameGraph/flamegraph.pl $$SLUG.folded > $$SLUG.svg ; \
-                                python3 process-allocn-attrib.py $$SLUG.folded | xargs -L1 echo $$prog $$corpus $$expansion >> $$tofile ; \
-                        done ; \
-                done ; \
-        done

doc/theses/mike_brooks_MMath/benchmarks/string/make-flamegraph.sh

@@ -10 +10 @@
 # $3 is coprus id  : x-100-20-1  (goes with corpusx-100-20-1.txt)
 
-SLUG=perf--$1--${2//[ .]/-}--$3--`date '+%F--%H-%M-%S'`
-benchdir=$(dirname "$0")
-echo benchdir = $benchdir
+SLUG=perf--$1--${2//[ .]/-}--$3
 
-perf record --call-graph dwarf -m16M $benchdir/perfexp-$1 $2 `cat $benchdir/corpus$3.txt`
+perf record --call-graph dwarf -m16M ~/plg2/cfa2/cfa-cc/tests/zombies/string-perf/perfexp-$1 $2 `cat ~/plg2/cfa2/cfa-cc/tests/zombies/string-perf/corpus$3.txt`
 
 mv perf.data $SLUG.data
@@ -20 +18 @@
 ../flamegraph/FlameGraph/stackcollapse-perf.pl $SLUG.perf > $SLUG.folded
 ../flamegraph/FlameGraph/flamegraph.pl $SLUG.folded > $SLUG.svg
-#cp $SLUG.svg ~/plg2/flames
+cp $SLUG.svg ~/plg2/flames

doc/theses/mike_brooks_MMath/benchmarks/string/prog-allocn.cfa

@@ -42 +42 @@
 #endif
 
+
 #if defined IMPL_CFA_HL
   #include <string.hfa>
-  #include <fstream.hfa>
   extern void TUNING_set_string_heap_liveness_threshold(double);  // in string_res.hfa
 #elif defined IMPL_CFA_LL
   #include <string_res.hfa>
-  #include <fstream.hfa>
 #endif
 

doc/theses/mike_brooks_MMath/benchmarks/string/prog-passbyval.cfa

@@ -45 +45 @@
 #if defined IMPL_CFA_HL
   #include <string.hfa>
-  #include <fstream.hfa>
 #elif defined IMPL_CFA_LL
   #include <string_res.hfa>
-  #include <fstream.hfa>
 #endif
 

doc/theses/mike_brooks_MMath/benchmarks/string/prog.cfa

@@ -45 +45 @@
 #if defined IMPL_CFA_HL
   #include <string.hfa>
-  #include <fstream.hfa>
 #elif defined IMPL_CFA_LL
   #include <string_res.hfa>
-  #include <fstream.hfa>
 #endif