Ignore:
Timestamp:
Aug 9, 2018, 6:35:02 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
ea5b7d6
Parents:
fb975a50 (diff), 0c827019 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into jenkins-sandbox

File:
1 moved

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    rfb975a50 r455a7d5  
    1616
    1717# applies to both programs
    18 CFLAGS =
    19 AM_CFLAGS = \
    20         -XCFA \
    21         -t \
    22         -B${abs_top_builddir}/src/driver \
    23         -g \
    24         -O2 \
    25         -Wall \
    26         -Wno-unused-function \
    27         -quiet \
    28         -I$(srcdir) \
    29         -L${abs_top_builddir}/src/libcfa \
    30         -I${abs_top_srcdir}/src/libcfa \
    31         -I${abs_top_srcdir}/src/libcfa/containers \
    32         -I${abs_top_srcdir}/src/libcfa/concurrency \
    33         -I${abs_top_srcdir}/src/libcfa/stdhdr
    34 
    35 CC = ${top_builddir}/src/driver/cfa
     18include $(top_srcdir)/src/cfa.make
     19
     20UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     21
     22AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     23AM_CFAFLAGS = -quiet -in-tree -nodebug
     24AM_UPPFLAGS = -quiet -nodebug -multi
     25
    3626TOOLSDIR = ${abs_top_srcdir}/tools/
    3727REPEAT   = ${TOOLSDIR}repeat
    … …  
    4131TIME_FORMAT = "%E"
    4232PRINT_FORMAT = %20s: #Comments needed for spacing
     33
     34LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
    4335
    4436.NOTPARALLEL:
    … …  
    108100## =========================================================================================================
    109101loop$(EXEEXT):
    110         @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     102        $(COMPILE) -DBENCH_N=5000000000 loop.c
    111103
    112104function$(EXEEXT):
    113         @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     105        $(COMPILE) -DBENCH_N=5000000000 function.c
    114106
    115107fetch_add$(EXEEXT):
    116         @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     108        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    117109
    118110## =========================================================================================================
    … …  
    133125
    134126ctxswitch-pthread$(EXEEXT):
    135         @@BACKEND_CC@ $(srcdir)/ctxswitch/pthreads.c     -DBENCH_N=50000000  -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     127        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    136128
    137129ctxswitch-cfa_coroutine$(EXEEXT):
    138         @${CC}        $(srcdir)/ctxswitch/cfa_cor.c      -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     130        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    139131
    140132ctxswitch-cfa_thread$(EXEEXT):
    141         @${CC}        $(srcdir)/ctxswitch/cfa_thrd.c     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     133        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    142134
    143135ctxswitch-cfa_thread2$(EXEEXT):
    144         @${CC}        $(srcdir)/ctxswitch/cfa_thrd2.c    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     136        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    145137
    146138ctxswitch-upp_coroutine$(EXEEXT):
    147         @u++          $(srcdir)/ctxswitch/upp_cor.cc     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     139        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    148140
    149141ctxswitch-upp_thread$(EXEEXT):
    150         @u++          $(srcdir)/ctxswitch/upp_thrd.cc    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     142        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    151143
    152144ctxswitch-kos_fibre$(EXEEXT):
    153         @${CXX}       $(srcdir)/ctxswitch/kos_fibre.cpp  -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
     145        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    154146
    155147ctxswitch-kos_fibre2$(EXEEXT):
    156         @${CXX}       $(srcdir)/ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
     148        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    157149
    158150ctxswitch-goroutine$(EXEEXT):
    … …  
    178170
    179171mutex-pthread_lock$(EXEEXT):
    180         @@BACKEND_CC@ $(srcdir)/mutex/pthreads.c    -DBENCH_N=50000000    -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     172        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    181173
    182174mutex-upp$(EXEEXT):
    183         @u++          $(srcdir)/mutex/upp.cc        -DBENCH_N=50000000    -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     175        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    184176
    185177mutex-cfa1$(EXEEXT):
    186         @${CC}        $(srcdir)/mutex/cfa1.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     178        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    187179
    188180mutex-cfa2$(EXEEXT):
    189         @${CC}        $(srcdir)/mutex/cfa2.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     181        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    190182
    191183mutex-cfa4$(EXEEXT):
    192         @${CC}        $(srcdir)/mutex/cfa4.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     184        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    193185
    194186mutex-java_thread$(EXEEXT):
    … …  
    208200
    209201signal-pthread_cond$(EXEEXT):
    210         @@BACKEND_CC@ $(srcdir)/schedint/pthreads.c -DBENCH_N=500000      -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     202        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    211203
    212204signal-upp$(EXEEXT):
    213         @u++          $(srcdir)/schedint/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     205        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    214206
    215207signal-cfa1$(EXEEXT):
    216         @${CC}        $(srcdir)/schedint/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     208        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    217209
    218210signal-cfa2$(EXEEXT):
    219         @${CC}        $(srcdir)/schedint/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     211        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    220212
    221213signal-cfa4$(EXEEXT):
    222         @${CC}        $(srcdir)/schedint/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     214        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    223215
    224216signal-java_thread$(EXEEXT):
    … …  
    237229
    238230waitfor-upp$(EXEEXT):
    239         @u++          $(srcdir)/schedext/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     231        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    240232
    241233waitfor-cfa1$(EXEEXT):
    242         @${CC}        $(srcdir)/schedext/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     234        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    243235
    244236waitfor-cfa2$(EXEEXT):
    245         @${CC}        $(srcdir)/schedext/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     237        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    246238
    247239waitfor-cfa4$(EXEEXT):
    248         @${CC}        $(srcdir)/schedext/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     240        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    249241
    250242## =========================================================================================================
    … …  
    260252
    261253creation-cfa_coroutine$(EXEEXT):
    262         @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     254        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    263255
    264256creation-cfa_coroutine_eager$(EXEEXT):
    265         @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
     257        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    266258
    267259creation-cfa_thread$(EXEEXT):
    268         @${CC}        $(srcdir)/creation/cfa_thrd.c  -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     260        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    269261
    270262creation-upp_coroutine$(EXEEXT):
    271         @u++          $(srcdir)/creation/upp_cor.cc  -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     263        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    272264
    273265creation-upp_thread$(EXEEXT):
    274         @u++          $(srcdir)/creation/upp_thrd.cc -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     266        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    275267
    276268creation-pthread$(EXEEXT):
    277         @@BACKEND_CC@ $(srcdir)/creation/pthreads.c  -DBENCH_N=250000     -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     269        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    278270
    279271creation-goroutine$(EXEEXT):
    … …  
    299291
    300292
    301 testdir = $(top_srcdir)/src/tests
     293testdir = $(top_srcdir)/tests
    302294
    303295compile-array$(EXEEXT):
    304         @${CC} -quiet -fsyntax-only -w $(testdir)/array.c                       @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     296        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    305297
    306298compile-attributes$(EXEEXT):
    307         @${CC} -quiet -fsyntax-only -w $(testdir)/attributes.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     299        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
    308300
    309301compile-empty$(EXEEXT):
    310         @${CC} -quiet -fsyntax-only -w $(srcdir)/compile/empty.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     302        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    311303
    312304compile-expression$(EXEEXT):
    313         @${CC} -quiet -fsyntax-only -w $(testdir)/expression.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     305        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    314306
    315307compile-io$(EXEEXT):
    316         @${CC} -quiet -fsyntax-only -w $(testdir)/io1.c                         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     308        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    317309
    318310compile-monitor$(EXEEXT):
    319         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/monitor.c  @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     311        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    320312
    321313compile-operators$(EXEEXT):
    322         @${CC} -quiet -fsyntax-only -w $(testdir)/operators.c                   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     314        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    323315
    324316compile-thread$(EXEEXT):
    325         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/thread.c   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     317        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    326318
    327319compile-typeof$(EXEEXT):
    328         @${CC} -quiet -fsyntax-only -w $(testdir)/typeof.c                      @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    329 
     320        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     321
Note: See TracChangeset for help on using the changeset viewer.