Changes in / [1f86d5e:015dc50]


Ignore:
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • Jenkinsfile

    r1f86d5e r015dc50  
    77node('master') {
    88        // Globals
    9         BuildDir  = null
    10         SrcDir    = null
     9        BuildDir  = pwd tmp: true
     10        SrcDir    = pwd tmp: false
    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
    4852
    4953                        notify_server(45)
     
    149153                dir (BuildDir) {
    150154                        //Append bench results
    151                         sh "make --no-print-directory -C benchmark jenkins githash=${Settings.GitNewRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
     155                        sh "${SrcDir}/benchmark/jenkins.sh ${Settings.GitNewRef} ${Settings.Architecture} ${BuildDir}/bench.json"
    152156                }
    153157        }
     
    175179
    176180                //Then publish the results
    177                 sh 'curl --silent --show-error -H \'Content-Type: application/json\' --data @bench.json https://cforall.uwaterloo.ca:8082/jenkins/publish > /dev/null || true'
     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'
    178182        }
    179183}
     
    185189        if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
    186190
    187         sh "${SrcDir}/tools/PrettyGitLogs.sh ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
     191        sh "${SrcDir}/tools/PrettyGitLogs.sh ${SrcDir} ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
    188192
    189193        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
     
    298302                switch( param.Architecture ) {
    299303                        case 'x64':
    300                                 this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'master')
     304                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
    301305                        break
    302306                        case 'x86':
    303                                 this.Architecture = new Arch_Desc('x86', '--host=i386', 'master')
     307                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
    304308                        break
    305309                        default :
     
    377381                ]])
    378382
     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
    379386        final settings = new BuildSettings(params, env.BRANCH_NAME)
    380387
     
    404411        catch (Exception caughtError) {
    405412                err = caughtError //rethrow error later
    406                 sh 'cat *.log'
     413                sh 'cat build/*.log'
    407414        }
    408415        finally {
  • benchmark/Makefile.am

    r1f86d5e r015dc50  
    2121include $(top_srcdir)/src/cfa.make
    2222
    23 
    24 
    2523AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    2624AM_CFAFLAGS = -quiet -in-tree -nodebug
    2725AM_UPPFLAGS = -quiet -nodebug -multi
     26
     27BENCH_V_CC = $(__bench_v_CC_$(__quiet))
     28BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
     29BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
     30BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     31BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
     32BENCH_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
    2849
    2950TOOLSDIR = ${abs_top_builddir}/tools/
     
    6081
    6182%.runquiet :
    62         @+make $(basename $@) CFLAGS="-w"
     83        @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    6384        @taskset -c 1 ./a.out
    6485        @rm -f a.out
     
    110131## =========================================================================================================
    111132loop$(EXEEXT):
    112         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     133        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    113134
    114135function$(EXEEXT):
    115         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     136        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    116137
    117138fetch_add$(EXEEXT):
    118         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     139        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    119140
    120141## =========================================================================================================
     
    139160
    140161ctxswitch-kos_fibre$(EXEEXT):
    141         $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     162        $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    142163
    143164ctxswitch-kos_fibre2$(EXEEXT):
    144         $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     165        $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    145166endif
    146167
     
    148169
    149170ctxswitch-pthread$(EXEEXT):
    150         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     171        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    151172
    152173ctxswitch-cfa_coroutine$(EXEEXT):
    153         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     174        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    154175
    155176ctxswitch-cfa_thread$(EXEEXT):
    156         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     177        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    157178
    158179ctxswitch-cfa_thread2$(EXEEXT):
    159         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     180        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    160181
    161182ctxswitch-upp_coroutine$(EXEEXT):
    162         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     183        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    163184
    164185ctxswitch-upp_thread$(EXEEXT):
    165         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     186        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    166187
    167188ctxswitch-goroutine$(EXEEXT):
    168         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     189        $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    169190
    170191ctxswitch-java_thread$(EXEEXT):
    171         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     192        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    172193        @echo "#!/bin/sh" > a.out
    173194        @echo "java JavaThread" >> a.out
     
    187208
    188209mutex-pthread_lock$(EXEEXT):
    189         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     210        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    190211
    191212mutex-upp$(EXEEXT):
    192         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     213        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    193214
    194215mutex-cfa1$(EXEEXT):
    195         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     216        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    196217
    197218mutex-cfa2$(EXEEXT):
    198         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     219        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    199220
    200221mutex-cfa4$(EXEEXT):
    201         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     222        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    202223
    203224mutex-java_thread$(EXEEXT):
    204         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     225        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    205226        @echo "#!/bin/sh" > a.out
    206227        @echo "java JavaThread" >> a.out
     
    217238
    218239signal-pthread_cond$(EXEEXT):
    219         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     240        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    220241
    221242signal-upp$(EXEEXT):
    222         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     243        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    223244
    224245signal-cfa1$(EXEEXT):
    225         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     246        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    226247
    227248signal-cfa2$(EXEEXT):
    228         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     249        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    229250
    230251signal-cfa4$(EXEEXT):
    231         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     252        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    232253
    233254signal-java_thread$(EXEEXT):
    234         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     255        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    235256        @echo "#!/bin/sh" > a.out
    236257        @echo "java JavaThread" >> a.out
     
    246267
    247268waitfor-upp$(EXEEXT):
    248         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     269        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    249270
    250271waitfor-cfa1$(EXEEXT):
    251         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     272        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    252273
    253274waitfor-cfa2$(EXEEXT):
    254         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     275        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    255276
    256277waitfor-cfa4$(EXEEXT):
    257         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     278        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    258279
    259280## =========================================================================================================
     
    269290
    270291creation-cfa_coroutine$(EXEEXT):
    271         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     292        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    272293
    273294creation-cfa_coroutine_eager$(EXEEXT):
    274         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     295        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    275296
    276297creation-cfa_thread$(EXEEXT):
    277         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     298        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    278299
    279300creation-upp_coroutine$(EXEEXT):
    280         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     301        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    281302
    282303creation-upp_thread$(EXEEXT):
    283         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     304        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    284305
    285306creation-pthread$(EXEEXT):
    286         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     307        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    287308
    288309creation-goroutine$(EXEEXT):
    289         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     310        $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    290311
    291312creation-java_thread$(EXEEXT):
    292         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     313        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    293314        @echo "#!/bin/sh" > a.out
    294315        @echo "java JavaThread" >> a.out
     
    311332
    312333compile-array$(EXEEXT):
    313         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     334        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    314335
    315336compile-attributes$(EXEEXT):
    316         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     337        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    317338
    318339compile-empty$(EXEEXT):
    319         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     340        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    320341
    321342compile-expression$(EXEEXT):
    322         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     343        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    323344
    324345compile-io$(EXEEXT):
    325         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     346        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    326347
    327348compile-monitor$(EXEEXT):
    328         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     349        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    329350
    330351compile-operators$(EXEEXT):
    331         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     352        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    332353
    333354compile-thread$(EXEEXT):
    334         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     355        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    335356
    336357compile-typeof$(EXEEXT):
    337         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    338 
     358        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     359
  • benchmark/Makefile.in

    r1f86d5e r015dc50  
    374374AM_CFAFLAGS = -quiet -in-tree -nodebug
    375375AM_UPPFLAGS = -quiet -nodebug -multi
     376BENCH_V_CC = $(__bench_v_CC_$(__quiet))
     377BENCH_V_CFA = $(__bench_v_CFA_$(__quiet))
     378BENCH_V_CXX = $(__bench_v_CXX_$(__quiet))
     379BENCH_V_GOC = $(__bench_v_GOC_$(__quiet))
     380BENCH_V_JAVAC = $(__bench_v_JAVAC_$(__quiet))
     381BENCH_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)
    376395TOOLSDIR = ${abs_top_builddir}/tools/
    377396REPEAT = ${abs_top_builddir}/tools/repeat
     
    725744
    726745%.runquiet :
    727         @+make $(basename $@) CFLAGS="-w"
     746        @+make $(basename $@) CFLAGS="-w" __quiet=quiet
    728747        @taskset -c 1 ./a.out
    729748        @rm -f a.out
     
    772791
    773792loop$(EXEEXT):
    774         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     793        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    775794
    776795function$(EXEEXT):
    777         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     796        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    778797
    779798fetch_add$(EXEEXT):
    780         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     799        $(BENCH_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    781800
    782801@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    783 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     802@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    784803
    785804@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
    786 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     805@WITH_LIBFIBRE_TRUE@    $(BENCH_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    787806
    788807ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    789808
    790809ctxswitch-pthread$(EXEEXT):
    791         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     810        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    792811
    793812ctxswitch-cfa_coroutine$(EXEEXT):
    794         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     813        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    795814
    796815ctxswitch-cfa_thread$(EXEEXT):
    797         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     816        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    798817
    799818ctxswitch-cfa_thread2$(EXEEXT):
    800         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     819        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    801820
    802821ctxswitch-upp_coroutine$(EXEEXT):
    803         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     822        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    804823
    805824ctxswitch-upp_thread$(EXEEXT):
    806         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     825        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    807826
    808827ctxswitch-goroutine$(EXEEXT):
    809         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     828        $(BENCH_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    810829
    811830ctxswitch-java_thread$(EXEEXT):
    812         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     831        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    813832        @echo "#!/bin/sh" > a.out
    814833        @echo "java JavaThread" >> a.out
     
    827846
    828847mutex-pthread_lock$(EXEEXT):
    829         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     848        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    830849
    831850mutex-upp$(EXEEXT):
    832         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     851        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    833852
    834853mutex-cfa1$(EXEEXT):
    835         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     854        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    836855
    837856mutex-cfa2$(EXEEXT):
    838         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     857        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    839858
    840859mutex-cfa4$(EXEEXT):
    841         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     860        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    842861
    843862mutex-java_thread$(EXEEXT):
    844         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     863        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    845864        @echo "#!/bin/sh" > a.out
    846865        @echo "java JavaThread" >> a.out
     
    856875
    857876signal-pthread_cond$(EXEEXT):
    858         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     877        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    859878
    860879signal-upp$(EXEEXT):
    861         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     880        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    862881
    863882signal-cfa1$(EXEEXT):
    864         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     883        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    865884
    866885signal-cfa2$(EXEEXT):
    867         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     886        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    868887
    869888signal-cfa4$(EXEEXT):
    870         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     889        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    871890
    872891signal-java_thread$(EXEEXT):
    873         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     892        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    874893        @echo "#!/bin/sh" > a.out
    875894        @echo "java JavaThread" >> a.out
     
    883902
    884903waitfor-upp$(EXEEXT):
    885         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     904        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    886905
    887906waitfor-cfa1$(EXEEXT):
    888         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     907        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    889908
    890909waitfor-cfa2$(EXEEXT):
    891         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     910        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    892911
    893912waitfor-cfa4$(EXEEXT):
    894         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     913        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    895914
    896915creation$(EXEEXT) :\
     
    905924
    906925creation-cfa_coroutine$(EXEEXT):
    907         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     926        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    908927
    909928creation-cfa_coroutine_eager$(EXEEXT):
    910         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     929        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    911930
    912931creation-cfa_thread$(EXEEXT):
    913         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     932        $(BENCH_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    914933
    915934creation-upp_coroutine$(EXEEXT):
    916         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     935        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    917936
    918937creation-upp_thread$(EXEEXT):
    919         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     938        $(BENCH_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    920939
    921940creation-pthread$(EXEEXT):
    922         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     941        $(BENCH_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    923942
    924943creation-goroutine$(EXEEXT):
    925         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     944        $(BENCH_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    926945
    927946creation-java_thread$(EXEEXT):
    928         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     947        $(BENCH_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    929948        @echo "#!/bin/sh" > a.out
    930949        @echo "java JavaThread" >> a.out
     
    942961
    943962compile-array$(EXEEXT):
    944         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     963        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    945964
    946965compile-attributes$(EXEEXT):
    947         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     966        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    948967
    949968compile-empty$(EXEEXT):
    950         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     969        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    951970
    952971compile-expression$(EXEEXT):
    953         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     972        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    954973
    955974compile-io$(EXEEXT):
    956         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     975        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    957976
    958977compile-monitor$(EXEEXT):
    959         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     978        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    960979
    961980compile-operators$(EXEEXT):
    962         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     981        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    963982
    964983compile-thread$(EXEEXT):
    965         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     984        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    966985
    967986compile-typeof$(EXEEXT):
    968         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     987        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    969988
    970989# Tell versions [3.59,3.63) of GNU make to not export all variables.
  • tools/PrettyGitLogs.sh

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