Changeset 46b11e2


Ignore:
Timestamp:
Feb 20, 2020, 3:34:12 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
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:
4783ff6, e59e663
Parents:
bd5b443 (diff), 13d2dac (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

Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Jenkinsfile

    rbd5b443 r46b11e2  
    215215
    216216                //Then publish the results
    217                 do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'       , groupCompile    , false, 'Compilation')
    218                 do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'  , groupCompile    , true , 'Compilation (relative)')
    219                 do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'     , groupConcurrency, false, 'Context Switching')
    220                 do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff', groupConcurrency, true , 'Context Switching (relative)')
    221                 do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'         , groupConcurrency, false, 'Mutual Exclusion')
    222                 do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'    , groupConcurrency, true , 'Mutual Exclusion (relative)')
    223                 do_plot(Settings.RunBenchmark && Settings.Publish, 'signal'        , groupConcurrency, false, 'Internal and External Scheduling')
    224                 do_plot(Settings.RunBenchmark && Settings.Publish, 'signal.diff'   , groupConcurrency, true , 'Internal and External Scheduling (relative)')
     217                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile'        , groupCompile    , false, 'Compilation')
     218                do_plot(Settings.RunBenchmark && Settings.Publish, 'compile.diff'   , groupCompile    , true , 'Compilation (relative)')
     219                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch'      , groupConcurrency, false, 'Context Switching')
     220                do_plot(Settings.RunBenchmark && Settings.Publish, 'ctxswitch.diff' , groupConcurrency, true , 'Context Switching (relative)')
     221                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex'          , groupConcurrency, false, 'Mutual Exclusion')
     222                do_plot(Settings.RunBenchmark && Settings.Publish, 'mutex.diff'     , groupConcurrency, true , 'Mutual Exclusion (relative)')
     223                do_plot(Settings.RunBenchmark && Settings.Publish, 'scheduling'     , groupConcurrency, false, 'Internal and External Scheduling')
     224                do_plot(Settings.RunBenchmark && Settings.Publish, 'scheduling.diff', groupConcurrency, true , 'Internal and External Scheduling (relative)')
    225225        }
    226226}

  • benchmark/Makefile.am

    rbd5b443 r46b11e2  
    144144
    145145cleancsv:
    146         rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     146        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv scheduling.csv
    147147
    148148jenkins$(EXEEXT): cleancsv
    … …  
    155155        +make mutex.csv
    156156        -+make mutex.diff.csv
    157         +make schedint.csv
    158         -+make schedint.diff.csv
     157        +make scheduling.csv
     158        -+make scheduling.diff.csv
    159159@DOifskipcompile@
    160160        cat compile.csv
    … …  
    165165        cat mutex.csv
    166166        -cat mutex.diff.csv
    167         cat schedint.csv
    168         -cat schedint.diff.csv
     167        cat scheduling.csv
     168        -cat scheduling.diff.csv
    169169
    170170compile.csv:
    … …  
    196196        $(srcdir)/fixcsv.sh $@
    197197
    198 schedint.csv:
     198scheduling.csv:
    199199        echo "building $@"
    200200        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@

  • benchmark/Makefile.in

    rbd5b443 r46b11e2  
    823823
    824824cleancsv:
    825         rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
     825        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv scheduling.csv
    826826
    827827jenkins$(EXEEXT): cleancsv
    … …  
    834834        +make mutex.csv
    835835        -+make mutex.diff.csv
    836         +make schedint.csv
    837         -+make schedint.diff.csv
     836        +make scheduling.csv
     837        -+make scheduling.diff.csv
    838838@DOifskipcompile@
    839839        cat compile.csv
    … …  
    844844        cat mutex.csv
    845845        -cat mutex.diff.csv
    846         cat schedint.csv
    847         -cat schedint.diff.csv
     846        cat scheduling.csv
     847        -cat scheduling.diff.csv
    848848
    849849compile.csv:
    … …  
    875875        $(srcdir)/fixcsv.sh $@
    876876
    877 schedint.csv:
     877scheduling.csv:
    878878        echo "building $@"
    879879        echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
Note: See TracChangeset for help on using the changeset viewer.