Changes in / [61cfae2:0d92e5c]


Ignore:
Files:
10 added
3 edited

Legend:

Unmodified
Added
Removed

  • Jenkinsfile

    r61cfae2 r0d92e5c  
    106106
    107107def build() {
    108         // build_stage('Build', true) {
    109         //      // Build outside of the src tree to ease cleaning
    110         //      dir (BuildDir) {
    111         //              //Configure the conpilation (Output is not relevant)
    112         //              //Use the current directory as the installation target so nothing escapes the sandbox
    113         //              //Also specify the compiler by hand
    114         //              targets=""
    115         //              if( Settings.RunAllTests || Settings.RunBenchmark ) {
    116         //                      targets="--with-target-hosts='host:debug,host:nodebug'"
    117         //              } else {
    118         //                      targets="--with-target-hosts='host:debug'"
    119         //              }
    120 
    121         //              sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
    122 
    123         //              //Compile the project
    124         //              sh 'make -j 8 --no-print-directory'
    125         //      }
    126         // }
    127 
    128108        debug = true
    129109        release = Settings.RunAllTests || Settings.RunBenchmark
    … …  
    195175                dir (BuildDir) {
    196176                        //Append bench results
    197                         sh "make --no-print-directory -C benchmark jenkins"
     177                        sh "make --no-print-directory -C benchmark jenkins arch=${Settings.Architecture.name}"
    198178                }
    199179        }
    … …  
    221201
    222202                //Then publish the results
    223                 do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'  , groupCompile    , 'Compilation')
    224                 do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch', groupConcurrency, 'Context Switching')
    225                 do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'    , groupConcurrency, 'Mutual Exclusion')
    226                 do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'   , groupConcurrency, 'Internal and External Scheduling')
     203                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'       , groupCompile    , 'Compilation')
     204                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile-diff'  , groupCompile    , 'Compilation Speed-Up')
     205                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'     , groupConcurrency, 'Context Switching')
     206                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch-diff', groupConcurrency, 'Context Switching Speed-Up')
     207                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'         , groupConcurrency, 'Mutual Exclusion')
     208                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex-diff'    , groupConcurrency, 'Mutual Exclusion Speed-Up')
     209                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'        , groupConcurrency, 'Internal and External Scheduling')
     210                do_plot(Settings.RunBenchmark && Settings.Publish, 'signal-diff'   , groupConcurrency, 'Internal and External Scheduling Speed-Up')
    227211        }
    228212}

  • benchmark/Makefile.am

    r61cfae2 r0d92e5c  
    5252# NEED AT LEAST 4 DATA VALUES FOR BENCHMARKS BECAUSE THE MAX AND MIN VALUES ARE REMOVED
    5353repeats  = 5 # 31 for benchmarks
     54arch     = x64
    5455skipcompile = no
    5556TIME_FORMAT = "%E"
    … …  
    100101@DOifskipcompile@
    101102        @+make compile.csv
     103        @-+make compile.diff.csv
    102104@DOendif@
    103105        @+make ctxswitch.csv
     106        @-+make ctxswitch.diff.csv
    104107        @+make mutex.csv
     108        @-+make mutex.diff.csv
    105109        @+make signal.csv
     110        @-+make signal.diff.csv
    106111@DOifskipcompile@
    107         @cat compile.csv
     112        cat compile.csv
     113        -cat compile.diff.csv
    108114@DOendif@
    109         @cat ctxswitch.csv
    110         @cat mutex.csv
    111         @cat signal.csv
     115        cat ctxswitch.csv
     116        -cat ctxswitch.diff.csv
     117        cat mutex.csv
     118        -cat mutex.diff.csv
     119        cat signal.csv
     120        -cat signal.diff.csv
    112121
    113122compile.csv:
    … …  
    143152        @+make waitfor-cfa2.runquiet >> $@
    144153        @$(srcdir)/fixcsv.sh $@
     154
     155%.diff.csv: %.csv
     156        @test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
     157        @$(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
     158
    145159
    146160## =========================================================================================================

  • benchmark/Makefile.in

    r61cfae2 r0d92e5c  
    398398# NEED AT LEAST 4 DATA VALUES FOR BENCHMARKS BECAUSE THE MAX AND MIN VALUES ARE REMOVED
    399399repeats = 5 # 31 for benchmarks
     400arch = x64
    400401skipcompile = no
    401402TIME_FORMAT = "%E"
    … …  
    762763@DOifskipcompile@
    763764        @+make compile.csv
     765        @-+make compile.diff.csv
    764766@DOendif@
    765767        @+make ctxswitch.csv
     768        @-+make ctxswitch.diff.csv
    766769        @+make mutex.csv
     770        @-+make mutex.diff.csv
    767771        @+make signal.csv
     772        @-+make signal.diff.csv
    768773@DOifskipcompile@
    769         @cat compile.csv
     774        cat compile.csv
     775        -cat compile.diff.csv
    770776@DOendif@
    771         @cat ctxswitch.csv
    772         @cat mutex.csv
    773         @cat signal.csv
     777        cat ctxswitch.csv
     778        -cat ctxswitch.diff.csv
     779        cat mutex.csv
     780        -cat mutex.diff.csv
     781        cat signal.csv
     782        -cat signal.diff.csv
    774783
    775784compile.csv:
    … …  
    806815        @$(srcdir)/fixcsv.sh $@
    807816
     817%.diff.csv: %.csv
     818        @test -e $(srcdir)/baselines/$(arch)/$< || (echo "Error : Missing baseline for ${<}" && false)
     819        @$(srcdir)/baselines/calc.py $(srcdir)/baselines/$(arch)/$(<) $(<) > $@
     820
    808821loop$(EXEEXT):
    809822        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
Note: See TracChangeset for help on using the changeset viewer.