Changes in / [c9aba81:d0c91a6]


Ignore:
Files:
15 added
15 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • Jenkinsfile

    rc9aba81 rd0c91a6  
    44// Main loop of the compilation
    55//===========================================================================================================
    6 node ('master'){
    7 
     6
     7node('master') {
    88        // Globals
    9         BuildDir  = pwd tmp: true
    10         SrcDir    = pwd tmp: false
     9        BuildDir  = null
     10        SrcDir    = null
    1111        Settings  = null
    1212        StageName = ''
    … …  
    2626                        Settings = prepare_build()
    2727
    28                         clean()
    29 
    30                         checkout()
    31 
    32                         notify_server(0)
    33 
    34                         build()
    35 
    36                         test()
    37 
    38                         benchmark()
    39 
    40                         build_doc()
    41 
    42                         publish()
     28                        node(Settings.Architecture.node) {
     29                                BuildDir  = pwd tmp: true
     30                                SrcDir    = pwd tmp: false
     31
     32                                clean()
     33
     34                                checkout()
     35
     36                                notify_server(0)
     37
     38                                build()
     39
     40                                test()
     41
     42                                benchmark()
     43
     44                                build_doc()
     45
     46                                publish()
     47                        }
    4348
    4449                        notify_server(45)
    … …  
    7580        }
    7681}
    77 
    7882//===========================================================================================================
    7983// Main compilation routines
    … …  
    250254        public String name
    251255        public String flags
    252 
    253         Arch_Desc(String name, String flags) {
     256        public String node
     257
     258        Arch_Desc(String name, String flags, String node) {
    254259                this.name  = name
    255260                this.flags = flags
     261                this.node  = node
    256262        }
    257263}
    … …  
    292298                switch( param.Architecture ) {
    293299                        case 'x64':
    294                                 this.Architecture = new Arch_Desc('x64', '--host=x86_64')
     300                                this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
    295301                        break
    296302                        case 'x86':
    297                                 this.Architecture = new Arch_Desc('x86', '--host=i386')
     303                                this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
    298304                        break
    299305                        default :

  • benchmark/Makefile.am

    rc9aba81 rd0c91a6  
    2121include $(top_srcdir)/src/cfa.make
    2222
    23 UPPCC = u++
     23
    2424
    2525AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    … …  
    2727AM_UPPFLAGS = -quiet -nodebug -multi
    2828
    29 TOOLSDIR = ${abs_top_srcdir}/tools/
    30 REPEAT   = ${TOOLSDIR}repeat
    31 STATS    = ${TOOLSDIR}stat.py
     29TOOLSDIR = ${abs_top_builddir}/tools/
     30REPEAT   = ${abs_top_builddir}/tools/repeat
     31STATS    = ${abs_top_srcdir}/tools/stat.py
    3232repeats  = 30
    3333skipcompile = no
    … …  
    3535PRINT_FORMAT = %20s: #Comments needed for spacing
    3636
    37 #prevent any tests in parallel
     37# Dummy hack tricks
     38EXTRA_PROGRAMS = dummy # build but do not install
     39dummy_SOURCES = dummyC.c dummyCXX.cpp
     40
     41dummyC.c:
     42        @echo "int main() { return 0; }" > ${@}
     43
     44dummyCXX.cpp:
     45        @echo "int main() { return 0; }" > ${@}
     46
    3847.NOTPARALLEL:
    39 
    40 #make sure automake includes the compile rules for C and C++
    41 EXTRA_PROGRAMS = dummy
    42 dummy_SOURCES = c.c cxx.cpp
    4348
    4449## =========================================================================================================
    … …  
    6469
    6570${REPEAT} :
    66         @+make -C ${TOOLSDIR} repeat
     71        @+make -C ${abs_top_builddir}/tools repeat
    6772
    6873## =========================================================================================================
    … …  
    146151
    147152ctxswitch-cfa_coroutine$(EXEEXT):
    148         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     153        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    149154
    150155ctxswitch-cfa_thread$(EXEEXT):
    151         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     156        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    152157
    153158ctxswitch-cfa_thread2$(EXEEXT):
    154         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     159        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    155160
    156161ctxswitch-upp_coroutine$(EXEEXT):
    … …  
    188193
    189194mutex-cfa1$(EXEEXT):
    190         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     195        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    191196
    192197mutex-cfa2$(EXEEXT):
    193         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     198        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    194199
    195200mutex-cfa4$(EXEEXT):
    196         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     201        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    197202
    198203mutex-java_thread$(EXEEXT):
    … …  
    218223
    219224signal-cfa1$(EXEEXT):
    220         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     225        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    221226
    222227signal-cfa2$(EXEEXT):
    223         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     228        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    224229
    225230signal-cfa4$(EXEEXT):
    226         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     231        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    227232
    228233signal-java_thread$(EXEEXT):
    … …  
    244249
    245250waitfor-cfa1$(EXEEXT):
    246         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     251        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    247252
    248253waitfor-cfa2$(EXEEXT):
    249         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     254        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    250255
    251256waitfor-cfa4$(EXEEXT):
    252         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     257        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    253258
    254259## =========================================================================================================
    … …  
    264269
    265270creation-cfa_coroutine$(EXEEXT):
    266         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     271        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    267272
    268273creation-cfa_coroutine_eager$(EXEEXT):
    269         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     274        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    270275
    271276creation-cfa_thread$(EXEEXT):
    272         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     277        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    273278
    274279creation-upp_coroutine$(EXEEXT):
    … …  
    306311
    307312compile-array$(EXEEXT):
    308         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     313        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    309314
    310315compile-attributes$(EXEEXT):
    … …  
    312317
    313318compile-empty$(EXEEXT):
    314         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     319        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    315320
    316321compile-expression$(EXEEXT):
    317         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     322        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    318323
    319324compile-io$(EXEEXT):
    320         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     325        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    321326
    322327compile-monitor$(EXEEXT):
    323         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     328        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    324329
    325330compile-operators$(EXEEXT):
    326         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     331        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    327332
    328333compile-thread$(EXEEXT):
    329         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     334        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    330335
    331336compile-typeof$(EXEEXT):
    332         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    333 
     337        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     338

  • benchmark/Makefile.in

    rc9aba81 rd0c91a6  
    111111CONFIG_CLEAN_FILES =
    112112CONFIG_CLEAN_VPATH_FILES =
    113 am_dummy_OBJECTS = c.$(OBJEXT) cxx.$(OBJEXT)
     113am_dummy_OBJECTS = dummyC.$(OBJEXT) dummyCXX.$(OBJEXT)
    114114dummy_OBJECTS = $(am_dummy_OBJECTS)
    115115dummy_LDADD = $(LDADD)
    … …  
    364364am__v_GOC_0 = @echo "  GOC     " $@;
    365365am__v_GOC_1 =
     366UPPCC = u++
    366367UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    367368AM_V_UPP = $(am__v_UPP_@AM_V@)
    … …  
    371372
    372373# applies to both programs
    373 UPPCC = u++
    374374AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    375375AM_CFAFLAGS = -quiet -in-tree -nodebug
    376376AM_UPPFLAGS = -quiet -nodebug -multi
    377 TOOLSDIR = ${abs_top_srcdir}/tools/
    378 REPEAT = ${TOOLSDIR}repeat
    379 STATS = ${TOOLSDIR}stat.py
     377TOOLSDIR = ${abs_top_builddir}/tools/
     378REPEAT = ${abs_top_builddir}/tools/repeat
     379STATS = ${abs_top_srcdir}/tools/stat.py
    380380repeats = 30
    381381skipcompile = no
    382382TIME_FORMAT = "%E"
    383383PRINT_FORMAT = %20s: #Comments needed for spacing
    384 dummy_SOURCES = c.c cxx.cpp
     384dummy_SOURCES = dummyC.c dummyCXX.cpp
    385385CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
    386386        ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
    … …  
    435435        -rm -f *.tab.c
    436436
    437 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c.Po@am__quote@
    438 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx.Po@am__quote@
     437@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyC.Po@am__quote@
     438@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyCXX.Po@am__quote@
    439439
    440440.c.o:
    … …  
    706706        $(am__mv) $$depbase.Tpo $$depbase.Plo
    707707
    708 #prevent any tests in parallel
     708dummyC.c:
     709        @echo "int main() { return 0; }" > ${@}
     710
     711dummyCXX.cpp:
     712        @echo "int main() { return 0; }" > ${@}
     713
    709714.NOTPARALLEL:
    710715
    … …  
    730735
    731736${REPEAT} :
    732         @+make -C ${TOOLSDIR} repeat
     737        @+make -C ${abs_top_builddir}/tools repeat
    733738
    734739jenkins$(EXEEXT):
    … …  
    788793
    789794ctxswitch-cfa_coroutine$(EXEEXT):
    790         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     795        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    791796
    792797ctxswitch-cfa_thread$(EXEEXT):
    793         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     798        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    794799
    795800ctxswitch-cfa_thread2$(EXEEXT):
    796         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     801        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    797802
    798803ctxswitch-upp_coroutine$(EXEEXT):
    … …  
    829834
    830835mutex-cfa1$(EXEEXT):
    831         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     836        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    832837
    833838mutex-cfa2$(EXEEXT):
    834         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     839        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    835840
    836841mutex-cfa4$(EXEEXT):
    837         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     842        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    838843
    839844mutex-java_thread$(EXEEXT):
    … …  
    858863
    859864signal-cfa1$(EXEEXT):
    860         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     865        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    861866
    862867signal-cfa2$(EXEEXT):
    863         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     868        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    864869
    865870signal-cfa4$(EXEEXT):
    866         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     871        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    867872
    868873signal-java_thread$(EXEEXT):
    … …  
    882887
    883888waitfor-cfa1$(EXEEXT):
    884         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     889        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    885890
    886891waitfor-cfa2$(EXEEXT):
    887         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     892        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    888893
    889894waitfor-cfa4$(EXEEXT):
    890         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     895        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    891896
    892897creation$(EXEEXT) :\
    … …  
    901906
    902907creation-cfa_coroutine$(EXEEXT):
    903         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     908        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    904909
    905910creation-cfa_coroutine_eager$(EXEEXT):
    906         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     911        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    907912
    908913creation-cfa_thread$(EXEEXT):
    909         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     914        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    910915
    911916creation-upp_coroutine$(EXEEXT):
    … …  
    938943
    939944compile-array$(EXEEXT):
    940         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     945        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    941946
    942947compile-attributes$(EXEEXT):
    … …  
    944949
    945950compile-empty$(EXEEXT):
    946         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     951        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    947952
    948953compile-expression$(EXEEXT):
    949         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     954        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    950955
    951956compile-io$(EXEEXT):
    952         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     957        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    953958
    954959compile-monitor$(EXEEXT):
    955         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     960        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    956961
    957962compile-operators$(EXEEXT):
    958         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     963        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    959964
    960965compile-thread$(EXEEXT):
    961         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     966        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    962967
    963968compile-typeof$(EXEEXT):
    964         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     969        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    965970
    966971# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • src/cfa.make

    rc9aba81 rd0c91a6  
    3232am__v_GOC_1 =
    3333
    34 
     34UPPCC = u++
    3535UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    3636

  • tests/Makefile.in

    rc9aba81 rd0c91a6  
    350350am__v_GOC_0 = @echo "  GOC     " $@;
    351351am__v_GOC_1 =
     352UPPCC = u++
    352353UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    353354AM_V_UPP = $(am__v_UPP_@AM_V@)
Note: See TracChangeset for help on using the changeset viewer.