Changes in / [0d92e5c:61cfae2]

Files:

• Jenkinsfile (modified) (3 diffs)
• benchmark/Makefile.am (modified) (3 diffs)
• benchmark/Makefile.in (modified) (3 diffs)
• benchmark/baselines/calc.py (deleted)
• benchmark/baselines/x64/compile.csv (deleted)
• benchmark/baselines/x64/ctxswitch.csv (deleted)
• benchmark/baselines/x64/mutex.csv (deleted)
• benchmark/baselines/x64/signal.csv (deleted)
• benchmark/baselines/x86/compile.csv (deleted)
• benchmark/baselines/x86/ctxswitch.csv (deleted)
• benchmark/baselines/x86/mutex.csv (deleted)
• benchmark/baselines/x86/signal.csv (deleted)
• tools/baseline.py (deleted)

Jenkinsfile

@@ -106 +106 @@
 
 def build() {
+        // build_stage('Build', true) {
+        //      // Build outside of the src tree to ease cleaning
+        //      dir (BuildDir) {
+        //              //Configure the conpilation (Output is not relevant)
+        //              //Use the current directory as the installation target so nothing escapes the sandbox
+        //              //Also specify the compiler by hand
+        //              targets=""
+        //              if( Settings.RunAllTests || Settings.RunBenchmark ) {
+        //                      targets="--with-target-hosts='host:debug,host:nodebug'"
+        //              } else {
+        //                      targets="--with-target-hosts='host:debug'"
+        //              }
+
+        //              sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
+
+        //              //Compile the project
+        //              sh 'make -j 8 --no-print-directory'
+        //      }
+        // }
+
         debug = true
         release = Settings.RunAllTests || Settings.RunBenchmark
@@ -175 +195 @@
                 dir (BuildDir) {
                         //Append bench results
-                        sh "make --no-print-directory -C benchmark jenkins arch=${Settings.Architecture.name}"
+                        sh "make --no-print-directory -C benchmark jenkins"
                 }
         }
@@ -201 +221 @@
 
                 //Then publish the results
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'       , groupCompile    , 'Compilation')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile-diff'  , groupCompile    , 'Compilation Speed-Up')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'     , groupConcurrency, 'Context Switching')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch-diff', groupConcurrency, 'Context Switching Speed-Up')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'         , groupConcurrency, 'Mutual Exclusion')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex-diff'    , groupConcurrency, 'Mutual Exclusion Speed-Up')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'        , groupConcurrency, 'Internal and External Scheduling')
-                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal-diff'   , groupConcurrency, 'Internal and External Scheduling Speed-Up')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'  , groupCompile    , 'Compilation')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch', groupConcurrency, 'Context Switching')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'    , groupConcurrency, 'Mutual Exclusion')
+                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'   , groupConcurrency, 'Internal and External Scheduling')
         }
 }

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"
@@ -101 +100 @@
 @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.diff.csv
+        @cat compile.csv
 @DOendif@
-        cat ctxswitch.csv
-        -cat ctxswitch.diff.csv
-        cat mutex.csv
-        -cat mutex.diff.csv
-        cat signal.csv
-        -cat signal.diff.csv
+        @cat ctxswitch.csv
+        @cat mutex.csv
+        @cat signal.csv
 
 compile.csv:
@@ -152 +143 @@
         @+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

@@ -398 +398 @@
 # 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"
@@ -763 +762 @@
 @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.diff.csv
+        @cat compile.csv
 @DOendif@
-        cat ctxswitch.csv
-        -cat ctxswitch.diff.csv
-        cat mutex.csv
-        -cat mutex.diff.csv
-        cat signal.csv
-        -cat signal.diff.csv
+        @cat ctxswitch.csv
+        @cat mutex.csv
+        @cat signal.csv
 
 compile.csv:
@@ -815 +806 @@
         @$(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