Changes in / [d0c91a6:c9aba81]


Ignore:
Files:
15 added
15 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • Jenkinsfile

    rd0c91a6 rc9aba81  
    44// Main loop of the compilation
    55//===========================================================================================================
    6 
    7 node('master') {
     6node ('master'){
     7
    88        // Globals
    9         BuildDir  = null
    10         SrcDir    = null
     9        BuildDir  = pwd tmp: true
     10        SrcDir    = pwd tmp: false
    1111        Settings  = null
    1212        StageName = ''
    … …  
    2626                        Settings = prepare_build()
    2727
    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                         }
     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()
    4843
    4944                        notify_server(45)
    … …  
    8075        }
    8176}
     77
    8278//===========================================================================================================
    8379// Main compilation routines
    … …  
    254250        public String name
    255251        public String flags
    256         public String node
    257 
    258         Arch_Desc(String name, String flags, String node) {
     252
     253        Arch_Desc(String name, String flags) {
    259254                this.name  = name
    260255                this.flags = flags
    261                 this.node  = node
    262256        }
    263257}
    … …  
    298292                switch( param.Architecture ) {
    299293                        case 'x64':
    300                                 this.Architecture = new Arch_Desc('x64', '--host=x86_64', 'x64')
     294                                this.Architecture = new Arch_Desc('x64', '--host=x86_64')
    301295                        break
    302296                        case 'x86':
    303                                 this.Architecture = new Arch_Desc('x86', '--host=i386', 'x86')
     297                                this.Architecture = new Arch_Desc('x86', '--host=i386')
    304298                        break
    305299                        default :

  • benchmark/Makefile.am

    rd0c91a6 rc9aba81  
    2121include $(top_srcdir)/src/cfa.make
    2222
    23 
     23UPPCC = u++
    2424
    2525AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    … …  
    2727AM_UPPFLAGS = -quiet -nodebug -multi
    2828
    29 TOOLSDIR = ${abs_top_builddir}/tools/
    30 REPEAT   = ${abs_top_builddir}/tools/repeat
    31 STATS    = ${abs_top_srcdir}/tools/stat.py
     29TOOLSDIR = ${abs_top_srcdir}/tools/
     30REPEAT   = ${TOOLSDIR}repeat
     31STATS    = ${TOOLSDIR}stat.py
    3232repeats  = 30
    3333skipcompile = no
    … …  
    3535PRINT_FORMAT = %20s: #Comments needed for spacing
    3636
    37 # Dummy hack tricks
    38 EXTRA_PROGRAMS = dummy # build but do not install
    39 dummy_SOURCES = dummyC.c dummyCXX.cpp
    40 
    41 dummyC.c:
    42         @echo "int main() { return 0; }" > ${@}
    43 
    44 dummyCXX.cpp:
    45         @echo "int main() { return 0; }" > ${@}
    46 
     37#prevent any tests in parallel
    4738.NOTPARALLEL:
     39
     40#make sure automake includes the compile rules for C and C++
     41EXTRA_PROGRAMS = dummy
     42dummy_SOURCES = c.c cxx.cpp
    4843
    4944## =========================================================================================================
    … …  
    6964
    7065${REPEAT} :
    71         @+make -C ${abs_top_builddir}/tools repeat
     66        @+make -C ${TOOLSDIR} repeat
    7267
    7368## =========================================================================================================
    … …  
    151146
    152147ctxswitch-cfa_coroutine$(EXEEXT):
    153         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     148        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    154149
    155150ctxswitch-cfa_thread$(EXEEXT):
    156         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     151        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    157152
    158153ctxswitch-cfa_thread2$(EXEEXT):
    159         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     154        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    160155
    161156ctxswitch-upp_coroutine$(EXEEXT):
    … …  
    193188
    194189mutex-cfa1$(EXEEXT):
    195         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     190        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    196191
    197192mutex-cfa2$(EXEEXT):
    198         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     193        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    199194
    200195mutex-cfa4$(EXEEXT):
    201         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     196        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    202197
    203198mutex-java_thread$(EXEEXT):
    … …  
    223218
    224219signal-cfa1$(EXEEXT):
    225         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     220        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    226221
    227222signal-cfa2$(EXEEXT):
    228         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     223        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    229224
    230225signal-cfa4$(EXEEXT):
    231         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     226        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    232227
    233228signal-java_thread$(EXEEXT):
    … …  
    249244
    250245waitfor-cfa1$(EXEEXT):
    251         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     246        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    252247
    253248waitfor-cfa2$(EXEEXT):
    254         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     249        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    255250
    256251waitfor-cfa4$(EXEEXT):
    257         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     252        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    258253
    259254## =========================================================================================================
    … …  
    269264
    270265creation-cfa_coroutine$(EXEEXT):
    271         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     266        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    272267
    273268creation-cfa_coroutine_eager$(EXEEXT):
    274         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     269        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    275270
    276271creation-cfa_thread$(EXEEXT):
    277         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     272        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    278273
    279274creation-upp_coroutine$(EXEEXT):
    … …  
    311306
    312307compile-array$(EXEEXT):
    313         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     308        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    314309
    315310compile-attributes$(EXEEXT):
    … …  
    317312
    318313compile-empty$(EXEEXT):
    319         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     314        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    320315
    321316compile-expression$(EXEEXT):
    322         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     317        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    323318
    324319compile-io$(EXEEXT):
    325         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     320        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    326321
    327322compile-monitor$(EXEEXT):
    328         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     323        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    329324
    330325compile-operators$(EXEEXT):
    331         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     326        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    332327
    333328compile-thread$(EXEEXT):
    334         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     329        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    335330
    336331compile-typeof$(EXEEXT):
    337         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    338 
     332        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     333

  • benchmark/Makefile.in

    rd0c91a6 rc9aba81  
    111111CONFIG_CLEAN_FILES =
    112112CONFIG_CLEAN_VPATH_FILES =
    113 am_dummy_OBJECTS = dummyC.$(OBJEXT) dummyCXX.$(OBJEXT)
     113am_dummy_OBJECTS = c.$(OBJEXT) cxx.$(OBJEXT)
    114114dummy_OBJECTS = $(am_dummy_OBJECTS)
    115115dummy_LDADD = $(LDADD)
    … …  
    364364am__v_GOC_0 = @echo "  GOC     " $@;
    365365am__v_GOC_1 =
    366 UPPCC = u++
    367366UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    368367AM_V_UPP = $(am__v_UPP_@AM_V@)
    … …  
    372371
    373372# applies to both programs
     373UPPCC = u++
    374374AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    375375AM_CFAFLAGS = -quiet -in-tree -nodebug
    376376AM_UPPFLAGS = -quiet -nodebug -multi
    377 TOOLSDIR = ${abs_top_builddir}/tools/
    378 REPEAT = ${abs_top_builddir}/tools/repeat
    379 STATS = ${abs_top_srcdir}/tools/stat.py
     377TOOLSDIR = ${abs_top_srcdir}/tools/
     378REPEAT = ${TOOLSDIR}repeat
     379STATS = ${TOOLSDIR}stat.py
    380380repeats = 30
    381381skipcompile = no
    382382TIME_FORMAT = "%E"
    383383PRINT_FORMAT = %20s: #Comments needed for spacing
    384 dummy_SOURCES = dummyC.c dummyCXX.cpp
     384dummy_SOURCES = c.c cxx.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)/dummyC.Po@am__quote@
    438 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyCXX.Po@am__quote@
     437@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c.Po@am__quote@
     438@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx.Po@am__quote@
    439439
    440440.c.o:
    … …  
    706706        $(am__mv) $$depbase.Tpo $$depbase.Plo
    707707
    708 dummyC.c:
    709         @echo "int main() { return 0; }" > ${@}
    710 
    711 dummyCXX.cpp:
    712         @echo "int main() { return 0; }" > ${@}
    713 
     708#prevent any tests in parallel
    714709.NOTPARALLEL:
    715710
    … …  
    735730
    736731${REPEAT} :
    737         @+make -C ${abs_top_builddir}/tools repeat
     732        @+make -C ${TOOLSDIR} repeat
    738733
    739734jenkins$(EXEEXT):
    … …  
    793788
    794789ctxswitch-cfa_coroutine$(EXEEXT):
    795         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     790        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    796791
    797792ctxswitch-cfa_thread$(EXEEXT):
    798         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     793        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    799794
    800795ctxswitch-cfa_thread2$(EXEEXT):
    801         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     796        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    802797
    803798ctxswitch-upp_coroutine$(EXEEXT):
    … …  
    834829
    835830mutex-cfa1$(EXEEXT):
    836         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     831        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    837832
    838833mutex-cfa2$(EXEEXT):
    839         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     834        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    840835
    841836mutex-cfa4$(EXEEXT):
    842         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     837        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    843838
    844839mutex-java_thread$(EXEEXT):
    … …  
    863858
    864859signal-cfa1$(EXEEXT):
    865         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     860        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    866861
    867862signal-cfa2$(EXEEXT):
    868         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     863        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    869864
    870865signal-cfa4$(EXEEXT):
    871         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     866        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    872867
    873868signal-java_thread$(EXEEXT):
    … …  
    887882
    888883waitfor-cfa1$(EXEEXT):
    889         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     884        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    890885
    891886waitfor-cfa2$(EXEEXT):
    892         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     887        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    893888
    894889waitfor-cfa4$(EXEEXT):
    895         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     890        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    896891
    897892creation$(EXEEXT) :\
    … …  
    906901
    907902creation-cfa_coroutine$(EXEEXT):
    908         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     903        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    909904
    910905creation-cfa_coroutine_eager$(EXEEXT):
    911         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
     906        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    912907
    913908creation-cfa_thread$(EXEEXT):
    914         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     909        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    915910
    916911creation-upp_coroutine$(EXEEXT):
    … …  
    943938
    944939compile-array$(EXEEXT):
    945         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     940        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    946941
    947942compile-attributes$(EXEEXT):
    … …  
    949944
    950945compile-empty$(EXEEXT):
    951         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     946        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    952947
    953948compile-expression$(EXEEXT):
    954         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     949        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    955950
    956951compile-io$(EXEEXT):
    957         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     952        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    958953
    959954compile-monitor$(EXEEXT):
    960         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     955        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    961956
    962957compile-operators$(EXEEXT):
    963         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     958        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    964959
    965960compile-thread$(EXEEXT):
    966         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     961        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    967962
    968963compile-typeof$(EXEEXT):
    969         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     964        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    970965
    971966# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • src/cfa.make

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

  • tests/Makefile.in

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