Ignore:
Timestamp:
Aug 14, 2018, 4:10:58 PM (8 years ago)
Author:
Peter A. Buhr <pabuhr@…>
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, stuck-waitfor-destruct
Children:
636e1b9
Parents:
c3a8ecd (diff), 5a5d31a (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' of plg2:software/cfa/cfa-cc

File:
1 moved

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    rc3a8ecd r7cd8827  
    1515###############################################################################
    1616
     17AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     18
    1719# applies to both programs
    18 CFLAGS =
    19 AM_CFLAGS = \
    20         -g \
    21         -O2 \
    22         -Wall \
    23         -Wno-unused-function \
    24         -quiet \
    25         -I$(srcdir) \
    26         @BUILD_IN_TREE_FLAGS@
    27 
    28 CC = @CFACC@
     20include $(top_srcdir)/src/cfa.make
     21
     22UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     23
     24AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     25AM_CFAFLAGS = -quiet -in-tree -nodebug
     26AM_UPPFLAGS = -quiet -nodebug -multi
     27
    2928TOOLSDIR = ${abs_top_srcdir}/tools/
    3029REPEAT   = ${TOOLSDIR}repeat
    … …  
    3433TIME_FORMAT = "%E"
    3534PRINT_FORMAT = %20s: #Comments needed for spacing
     35
     36LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
    3637
    3738.NOTPARALLEL:
    … …  
    101102## =========================================================================================================
    102103loop$(EXEEXT):
    103         @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     104        $(COMPILE) -DBENCH_N=5000000000 loop.c
    104105
    105106function$(EXEEXT):
    106         @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     107        $(COMPILE) -DBENCH_N=5000000000 function.c
    107108
    108109fetch_add$(EXEEXT):
    109         @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     110        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    110111
    111112## =========================================================================================================
    … …  
    126127
    127128ctxswitch-pthread$(EXEEXT):
    128         @@BACKEND_CC@ $(srcdir)/ctxswitch/pthreads.c     -DBENCH_N=50000000  -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     129        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    129130
    130131ctxswitch-cfa_coroutine$(EXEEXT):
    131         @${CC}        $(srcdir)/ctxswitch/cfa_cor.c      -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     132        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    132133
    133134ctxswitch-cfa_thread$(EXEEXT):
    134         @${CC}        $(srcdir)/ctxswitch/cfa_thrd.c     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     135        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    135136
    136137ctxswitch-cfa_thread2$(EXEEXT):
    137         @${CC}        $(srcdir)/ctxswitch/cfa_thrd2.c    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     138        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    138139
    139140ctxswitch-upp_coroutine$(EXEEXT):
    140         @u++          $(srcdir)/ctxswitch/upp_cor.cc     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     141        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    141142
    142143ctxswitch-upp_thread$(EXEEXT):
    143         @u++          $(srcdir)/ctxswitch/upp_thrd.cc    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     144        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    144145
    145146ctxswitch-kos_fibre$(EXEEXT):
    146         @${CXX}       $(srcdir)/ctxswitch/kos_fibre.cpp  -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
     147        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    147148
    148149ctxswitch-kos_fibre2$(EXEEXT):
    149         @${CXX}       $(srcdir)/ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
     150        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    150151
    151152ctxswitch-goroutine$(EXEEXT):
    … …  
    171172
    172173mutex-pthread_lock$(EXEEXT):
    173         @@BACKEND_CC@ $(srcdir)/mutex/pthreads.c    -DBENCH_N=50000000    -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     174        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    174175
    175176mutex-upp$(EXEEXT):
    176         @u++          $(srcdir)/mutex/upp.cc        -DBENCH_N=50000000    -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     177        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    177178
    178179mutex-cfa1$(EXEEXT):
    179         @${CC}        $(srcdir)/mutex/cfa1.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     180        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    180181
    181182mutex-cfa2$(EXEEXT):
    182         @${CC}        $(srcdir)/mutex/cfa2.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     183        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    183184
    184185mutex-cfa4$(EXEEXT):
    185         @${CC}        $(srcdir)/mutex/cfa4.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     186        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    186187
    187188mutex-java_thread$(EXEEXT):
    … …  
    201202
    202203signal-pthread_cond$(EXEEXT):
    203         @@BACKEND_CC@ $(srcdir)/schedint/pthreads.c -DBENCH_N=500000      -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     204        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    204205
    205206signal-upp$(EXEEXT):
    206         @u++          $(srcdir)/schedint/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     207        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    207208
    208209signal-cfa1$(EXEEXT):
    209         @${CC}        $(srcdir)/schedint/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     210        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    210211
    211212signal-cfa2$(EXEEXT):
    212         @${CC}        $(srcdir)/schedint/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     213        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    213214
    214215signal-cfa4$(EXEEXT):
    215         @${CC}        $(srcdir)/schedint/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     216        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    216217
    217218signal-java_thread$(EXEEXT):
    … …  
    230231
    231232waitfor-upp$(EXEEXT):
    232         @u++          $(srcdir)/schedext/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     233        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    233234
    234235waitfor-cfa1$(EXEEXT):
    235         @${CC}        $(srcdir)/schedext/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     236        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    236237
    237238waitfor-cfa2$(EXEEXT):
    238         @${CC}        $(srcdir)/schedext/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     239        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    239240
    240241waitfor-cfa4$(EXEEXT):
    241         @${CC}        $(srcdir)/schedext/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     242        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    242243
    243244## =========================================================================================================
    … …  
    253254
    254255creation-cfa_coroutine$(EXEEXT):
    255         @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     256        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    256257
    257258creation-cfa_coroutine_eager$(EXEEXT):
    258         @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
     259        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    259260
    260261creation-cfa_thread$(EXEEXT):
    261         @${CC}        $(srcdir)/creation/cfa_thrd.c  -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     262        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    262263
    263264creation-upp_coroutine$(EXEEXT):
    264         @u++          $(srcdir)/creation/upp_cor.cc  -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     265        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    265266
    266267creation-upp_thread$(EXEEXT):
    267         @u++          $(srcdir)/creation/upp_thrd.cc -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     268        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    268269
    269270creation-pthread$(EXEEXT):
    270         @@BACKEND_CC@ $(srcdir)/creation/pthreads.c  -DBENCH_N=250000     -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     271        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    271272
    272273creation-goroutine$(EXEEXT):
    … …  
    292293
    293294
    294 testdir = $(top_srcdir)/src/tests
     295testdir = $(top_srcdir)/tests
    295296
    296297compile-array$(EXEEXT):
    297         @${CC} -quiet -fsyntax-only -w $(testdir)/array.c                       @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     298        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    298299
    299300compile-attributes$(EXEEXT):
    300         @${CC} -quiet -fsyntax-only -w $(testdir)/attributes.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     301        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
    301302
    302303compile-empty$(EXEEXT):
    303         @${CC} -quiet -fsyntax-only -w $(srcdir)/compile/empty.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     304        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    304305
    305306compile-expression$(EXEEXT):
    306         @${CC} -quiet -fsyntax-only -w $(testdir)/expression.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     307        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    307308
    308309compile-io$(EXEEXT):
    309         @${CC} -quiet -fsyntax-only -w $(testdir)/io1.c                         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     310        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    310311
    311312compile-monitor$(EXEEXT):
    312         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/monitor.c  @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     313        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    313314
    314315compile-operators$(EXEEXT):
    315         @${CC} -quiet -fsyntax-only -w $(testdir)/operators.c                   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     316        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    316317
    317318compile-thread$(EXEEXT):
    318         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/thread.c   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     319        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    319320
    320321compile-typeof$(EXEEXT):
    321         @${CC} -quiet -fsyntax-only -w $(testdir)/typeof.c                      @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    322 
     322        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     323
Note: See TracChangeset for help on using the changeset viewer.