Changes in / [015dc50:1f86d5e]


Ignore:
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • Jenkinsfile

    r015dc50 r1f86d5e  
    77node('master') {
    88        // Globals
    9         BuildDir  = pwd tmp: true
    10         SrcDir    = pwd tmp: false
     9        BuildDir  = null
     10        SrcDir    = null
    1111        Settings  = null
    1212        StageName = ''
    … …  
    4646                                publish()
    4747                        }
    48 
    49                         // Update the build directories when exiting the node
    50                         BuildDir  = pwd tmp: true
    51                         SrcDir    = pwd tmp: false
    5248
    5349                        notify_server(45)
    … …  
    153149                dir (BuildDir) {
    154150                        //Append bench results
    155                         sh "${SrcDir}/benchmark/jenkins.sh ${Settings.GitNewRef} ${Settings.Architecture} ${BuildDir}/bench.json"
     151                        sh "make --no-print-directory -C benchmark jenkins githash=${Settings.GitNewRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
    156152                }
    157153        }
    … …  
    179175
    180176                //Then publish the results
    181                 sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @${BuildDir}/bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
     177                sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
    182178        }
    183179}
    … …  
    189185        if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
    190186
    191         sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
     187        sh "${SrcDir}/tools/PrettyGitLogs.sh ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
    192188
    193189        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
    … …  
    302298                switch( param.Architecture ) {
    303299                        case 'x64':
    304                                 this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
     300                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'master')
    305301                        break
    306302                        case 'x86':
    307                                 this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
     303                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'master')
    308304                        break
    309305                        default :
    … …  
    381377                ]])
    382378
    383         // It's unfortunate but it looks like we need to checkout the entire repo just to get the pretty git printer
    384         checkout scm
    385 
    386379        final settings = new BuildSettings(params, env.BRANCH_NAME)
    387380
    … …  
    411404        catch (Exception caughtError) {
    412405                err = caughtError //rethrow error later
    413                 sh 'cat build/*.log'
     406                sh 'cat *.log'
    414407        }
    415408        finally {

  • benchmark/Makefile.am

    r015dc50 r1f86d5e  
    2121include $(top_srcdir)/src/cfa.make
    2222
     23
     24
    2325AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    2426AM_CFAFLAGS = -quiet -in-tree -nodebug
    2527AM_UPPFLAGS = -quiet -nodebug -multi
    26 
    27 BENCH_V_CC = $(__bench_v_CC_$(__quiet))
    28 BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
    29 BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
    30 BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
    31 BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
    32 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
    33 
    34 __quiet = verbose
    35 __bench_v_CC_quiet = @
    36 __bench_v_CFA_quiet = @
    37 __bench_v_CXX_quiet = @
    38 __bench_v_GOC_quiet = @
    39 __bench_v_JAVAC_quiet = @
    40 __bench_v_UPP_quiet = @
    41 __bench_v_CC_verbose = $(AM_V_CC)
    42 __bench_v_CFA_verbose = $(AM_V_CFA)
    43 __bench_v_CXX_verbose = $(AM_V_CXX)
    44 __bench_v_GOC_verbose = $(AM_V_GOC)
    45 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    46 __bench_v_UPP_verbose = $(AM_V_UPP)
    47 
    48 
    4928
    5029TOOLSDIR = ${abs_top_builddir}/tools/
    … …  
    8160
    8261%.runquiet :
    83         @+make $(basename $@) CFLAGS="-w" __quiet=quiet
     62        @+make $(basename $@) CFLAGS="-w"
    8463        @taskset -c 1 ./a.out
    8564        @rm -f a.out
    … …  
    131110## =========================================================================================================
    132111loop$(EXEEXT):
    133         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     112        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    134113
    135114function$(EXEEXT):
    136         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     115        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    137116
    138117fetch_add$(EXEEXT):
    139         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     118        $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    140119
    141120## =========================================================================================================
    … …  
    160139
    161140ctxswitch-kos_fibre$(EXEEXT):
    162         $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     141        $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    163142
    164143ctxswitch-kos_fibre2$(EXEEXT):
    165         $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     144        $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    166145endif
    167146
    … …  
    169148
    170149ctxswitch-pthread$(EXEEXT):
    171         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     150        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    172151
    173152ctxswitch-cfa_coroutine$(EXEEXT):
    174         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     153        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    175154
    176155ctxswitch-cfa_thread$(EXEEXT):
    177         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     156        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    178157
    179158ctxswitch-cfa_thread2$(EXEEXT):
    180         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     159        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    181160
    182161ctxswitch-upp_coroutine$(EXEEXT):
    183         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     162        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    184163
    185164ctxswitch-upp_thread$(EXEEXT):
    186         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     165        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    187166
    188167ctxswitch-goroutine$(EXEEXT):
    189         $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     168        $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    190169
    191170ctxswitch-java_thread$(EXEEXT):
    192         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     171        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    193172        @echo "#!/bin/sh" > a.out
    194173        @echo "java JavaThread" >> a.out
    … …  
    208187
    209188mutex-pthread_lock$(EXEEXT):
    210         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     189        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    211190
    212191mutex-upp$(EXEEXT):
    213         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     192        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    214193
    215194mutex-cfa1$(EXEEXT):
    216         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     195        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    217196
    218197mutex-cfa2$(EXEEXT):
    219         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     198        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    220199
    221200mutex-cfa4$(EXEEXT):
    222         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     201        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    223202
    224203mutex-java_thread$(EXEEXT):
    225         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     204        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    226205        @echo "#!/bin/sh" > a.out
    227206        @echo "java JavaThread" >> a.out
    … …  
    238217
    239218signal-pthread_cond$(EXEEXT):
    240         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     219        $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    241220
    242221signal-upp$(EXEEXT):
    243         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     222        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    244223
    245224signal-cfa1$(EXEEXT):
    246         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     225        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    247226
    248227signal-cfa2$(EXEEXT):
    249         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     228        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    250229
    251230signal-cfa4$(EXEEXT):
    252         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     231        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    253232
    254233signal-java_thread$(EXEEXT):
    255         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     234        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    256235        @echo "#!/bin/sh" > a.out
    257236        @echo "java JavaThread" >> a.out
    … …  
    267246
    268247waitfor-upp$(EXEEXT):
    269         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     248        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    270249
    271250waitfor-cfa1$(EXEEXT):
    272         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     251        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    273252
    274253waitfor-cfa2$(EXEEXT):
    275         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     254        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    276255
    277256waitfor-cfa4$(EXEEXT):
    278         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     257        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    279258
    280259## =========================================================================================================
    … …  
    290269
    291270creation-cfa_coroutine$(EXEEXT):
    292         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     271        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    293272
    294273creation-cfa_coroutine_eager$(EXEEXT):
    295         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     274        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    296275
    297276creation-cfa_thread$(EXEEXT):
    298         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     277        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    299278
    300279creation-upp_coroutine$(EXEEXT):
    301         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     280        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    302281
    303282creation-upp_thread$(EXEEXT):
    304         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     283        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    305284
    306285creation-pthread$(EXEEXT):
    307         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     286        $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    308287
    309288creation-goroutine$(EXEEXT):
    310         $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     289        $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    311290
    312291creation-java_thread$(EXEEXT):
    313         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     292        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    314293        @echo "#!/bin/sh" > a.out
    315294        @echo "java JavaThread" >> a.out
    … …  
    332311
    333312compile-array$(EXEEXT):
    334         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     313        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    335314
    336315compile-attributes$(EXEEXT):
    337         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     316        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    338317
    339318compile-empty$(EXEEXT):
    340         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     319        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    341320
    342321compile-expression$(EXEEXT):
    343         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     322        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    344323
    345324compile-io$(EXEEXT):
    346         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     325        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    347326
    348327compile-monitor$(EXEEXT):
    349         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     328        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    350329
    351330compile-operators$(EXEEXT):
    352         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     331        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    353332
    354333compile-thread$(EXEEXT):
    355         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     334        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    356335
    357336compile-typeof$(EXEEXT):
    358         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    359 
     337        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     338

  • benchmark/Makefile.in

    r015dc50 r1f86d5e  
    374374AM_CFAFLAGS = -quiet -in-tree -nodebug
    375375AM_UPPFLAGS = -quiet -nodebug -multi
    376 BENCH_V_CC = $(__bench_v_CC_$(__quiet))
    377 BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
    378 BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
    379 BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
    380 BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
    381 BENCH_V_UPP = $(__bench_v_UPP_$(__quiet))
    382 __quiet = verbose
    383 __bench_v_CC_quiet = @
    384 __bench_v_CFA_quiet = @
    385 __bench_v_CXX_quiet = @
    386 __bench_v_GOC_quiet = @
    387 __bench_v_JAVAC_quiet = @
    388 __bench_v_UPP_quiet = @
    389 __bench_v_CC_verbose = $(AM_V_CC)
    390 __bench_v_CFA_verbose = $(AM_V_CFA)
    391 __bench_v_CXX_verbose = $(AM_V_CXX)
    392 __bench_v_GOC_verbose = $(AM_V_GOC)
    393 __bench_v_JAVAC_verbose = $(AM_V_JAVAC)
    394 __bench_v_UPP_verbose = $(AM_V_UPP)
    395376TOOLSDIR = ${abs_top_builddir}/tools/
    396377REPEAT = ${abs_top_builddir}/tools/repeat
    … …  
    744725
    745726%.runquiet :
    746         @+make $(basename $@) CFLAGS="-w" __quiet=quiet
     727        @+make $(basename $@) CFLAGS="-w"
    747728        @taskset -c 1 ./a.out
    748729        @rm -f a.out
    … …  
    791772
    792773loop$(EXEEXT):
    793         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     774        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    794775
    795776function$(EXEEXT):
    796         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     777        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    797778
    798779fetch_add$(EXEEXT):
    799         $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     780        $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    800781
    801782@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    802 @WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     783@WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    803784
    804785@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
    805 @WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     786@WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    806787
    807788ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    808789
    809790ctxswitch-pthread$(EXEEXT):
    810         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     791        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    811792
    812793ctxswitch-cfa_coroutine$(EXEEXT):
    813         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     794        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    814795
    815796ctxswitch-cfa_thread$(EXEEXT):
    816         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     797        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    817798
    818799ctxswitch-cfa_thread2$(EXEEXT):
    819         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     800        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    820801
    821802ctxswitch-upp_coroutine$(EXEEXT):
    822         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     803        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    823804
    824805ctxswitch-upp_thread$(EXEEXT):
    825         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     806        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    826807
    827808ctxswitch-goroutine$(EXEEXT):
    828         $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     809        $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    829810
    830811ctxswitch-java_thread$(EXEEXT):
    831         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     812        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    832813        @echo "#!/bin/sh" > a.out
    833814        @echo "java JavaThread" >> a.out
    … …  
    846827
    847828mutex-pthread_lock$(EXEEXT):
    848         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     829        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    849830
    850831mutex-upp$(EXEEXT):
    851         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     832        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    852833
    853834mutex-cfa1$(EXEEXT):
    854         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     835        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    855836
    856837mutex-cfa2$(EXEEXT):
    857         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     838        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    858839
    859840mutex-cfa4$(EXEEXT):
    860         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     841        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    861842
    862843mutex-java_thread$(EXEEXT):
    863         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     844        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    864845        @echo "#!/bin/sh" > a.out
    865846        @echo "java JavaThread" >> a.out
    … …  
    875856
    876857signal-pthread_cond$(EXEEXT):
    877         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     858        $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    878859
    879860signal-upp$(EXEEXT):
    880         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     861        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    881862
    882863signal-cfa1$(EXEEXT):
    883         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     864        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    884865
    885866signal-cfa2$(EXEEXT):
    886         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     867        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    887868
    888869signal-cfa4$(EXEEXT):
    889         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     870        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    890871
    891872signal-java_thread$(EXEEXT):
    892         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     873        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    893874        @echo "#!/bin/sh" > a.out
    894875        @echo "java JavaThread" >> a.out
    … …  
    902883
    903884waitfor-upp$(EXEEXT):
    904         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     885        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    905886
    906887waitfor-cfa1$(EXEEXT):
    907         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     888        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    908889
    909890waitfor-cfa2$(EXEEXT):
    910         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     891        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    911892
    912893waitfor-cfa4$(EXEEXT):
    913         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     894        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    914895
    915896creation$(EXEEXT) :\
    … …  
    924905
    925906creation-cfa_coroutine$(EXEEXT):
    926         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     907        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    927908
    928909creation-cfa_coroutine_eager$(EXEEXT):
    929         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     910        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    930911
    931912creation-cfa_thread$(EXEEXT):
    932         $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     913        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    933914
    934915creation-upp_coroutine$(EXEEXT):
    935         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     916        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    936917
    937918creation-upp_thread$(EXEEXT):
    938         $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     919        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    939920
    940921creation-pthread$(EXEEXT):
    941         $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     922        $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    942923
    943924creation-goroutine$(EXEEXT):
    944         $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     925        $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    945926
    946927creation-java_thread$(EXEEXT):
    947         $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     928        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    948929        @echo "#!/bin/sh" > a.out
    949930        @echo "java JavaThread" >> a.out
    … …  
    961942
    962943compile-array$(EXEEXT):
    963         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     944        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    964945
    965946compile-attributes$(EXEEXT):
    966         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     947        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    967948
    968949compile-empty$(EXEEXT):
    969         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     950        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    970951
    971952compile-expression$(EXEEXT):
    972         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     953        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    973954
    974955compile-io$(EXEEXT):
    975         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     956        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    976957
    977958compile-monitor$(EXEEXT):
    978         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     959        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    979960
    980961compile-operators$(EXEEXT):
    981         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     962        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    982963
    983964compile-thread$(EXEEXT):
    984         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     965        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    985966
    986967compile-typeof$(EXEEXT):
    987         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     968        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    988969
    989970# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • tools/PrettyGitLogs.sh

    r015dc50 r1f86d5e  
    33set -e
    44
    5 GIT="git --git-dir=$1/.git"
    6 
    7 GIT_UPDATE="$2/GIT_UPDATE"
    8 GIT_LOG="$2/GIT_LOG"
    9 GIT_DIFF="$2/GIT_DIFF"
     5GIT_UPDATE="$1/GIT_UPDATE"
     6GIT_LOG="$1/GIT_LOG"
     7GIT_DIFF="$1/GIT_DIFF"
    108
    119rm -f ${GIT_UPDATE}  ${GIT_LOG}  ${GIT_DIFF}
    1210
    13 GitOldRef=$3
    14 GitNewRef=$4
     11GitOldRef=$2
     12GitNewRef=$3
    1513
    1614
Note: See TracChangeset for help on using the changeset viewer.