Ignore:
Timestamp:
Aug 9, 2018, 1:02:07 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
9aa9126
Parents:
575a6e5
Message:

Fixed benchmark makefiles

File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r575a6e5 r7a7ab42  
    1616
    1717# 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@
     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
    2926TOOLSDIR = ${abs_top_srcdir}/tools/
    3027REPEAT   = ${TOOLSDIR}repeat
     
    3431TIME_FORMAT = "%E"
    3532PRINT_FORMAT = %20s: #Comments needed for spacing
     33
     34LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
    3635
    3736.NOTPARALLEL:
     
    101100## =========================================================================================================
    102101loop$(EXEEXT):
    103         @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     102        $(COMPILE) -DBENCH_N=5000000000 loop.c
    104103
    105104function$(EXEEXT):
    106         @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     105        $(COMPILE) -DBENCH_N=5000000000 function.c
    107106
    108107fetch_add$(EXEEXT):
    109         @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     108        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    110109
    111110## =========================================================================================================
     
    126125
    127126ctxswitch-pthread$(EXEEXT):
    128         @@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
    129128
    130129ctxswitch-cfa_coroutine$(EXEEXT):
    131         @${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
    132131
    133132ctxswitch-cfa_thread$(EXEEXT):
    134         @${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
    135134
    136135ctxswitch-cfa_thread2$(EXEEXT):
    137         @${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
    138137
    139138ctxswitch-upp_coroutine$(EXEEXT):
    140         @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
    141140
    142141ctxswitch-upp_thread$(EXEEXT):
    143         @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
    144143
    145144ctxswitch-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
     145        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    147146
    148147ctxswitch-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
     148        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    150149
    151150ctxswitch-goroutine$(EXEEXT):
     
    171170
    172171mutex-pthread_lock$(EXEEXT):
    173         @@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
    174173
    175174mutex-upp$(EXEEXT):
    176         @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
    177176
    178177mutex-cfa1$(EXEEXT):
    179         @${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
    180179
    181180mutex-cfa2$(EXEEXT):
    182         @${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
    183182
    184183mutex-cfa4$(EXEEXT):
    185         @${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
    186185
    187186mutex-java_thread$(EXEEXT):
     
    201200
    202201signal-pthread_cond$(EXEEXT):
    203         @@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
    204203
    205204signal-upp$(EXEEXT):
    206         @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
    207206
    208207signal-cfa1$(EXEEXT):
    209         @${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
    210209
    211210signal-cfa2$(EXEEXT):
    212         @${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
    213212
    214213signal-cfa4$(EXEEXT):
    215         @${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
    216215
    217216signal-java_thread$(EXEEXT):
     
    230229
    231230waitfor-upp$(EXEEXT):
    232         @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
    233232
    234233waitfor-cfa1$(EXEEXT):
    235         @${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
    236235
    237236waitfor-cfa2$(EXEEXT):
    238         @${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
    239238
    240239waitfor-cfa4$(EXEEXT):
    241         @${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
    242241
    243242## =========================================================================================================
     
    253252
    254253creation-cfa_coroutine$(EXEEXT):
    255         @${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
    256255
    257256creation-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
     257        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    259258
    260259creation-cfa_thread$(EXEEXT):
    261         @${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
    262261
    263262creation-upp_coroutine$(EXEEXT):
    264         @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
    265264
    266265creation-upp_thread$(EXEEXT):
    267         @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
    268267
    269268creation-pthread$(EXEEXT):
    270         @@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
    271270
    272271creation-goroutine$(EXEEXT):
     
    295294
    296295compile-array$(EXEEXT):
    297         @${CC} -quiet -fsyntax-only -w $(testdir)/array.c                       @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     296        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    298297
    299298compile-attributes$(EXEEXT):
    300         @${CC} -quiet -fsyntax-only -w $(testdir)/attributes.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     299        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
    301300
    302301compile-empty$(EXEEXT):
    303         @${CC} -quiet -fsyntax-only -w $(srcdir)/compile/empty.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     302        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    304303
    305304compile-expression$(EXEEXT):
    306         @${CC} -quiet -fsyntax-only -w $(testdir)/expression.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     305        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    307306
    308307compile-io$(EXEEXT):
    309         @${CC} -quiet -fsyntax-only -w $(testdir)/io1.c                         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     308        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    310309
    311310compile-monitor$(EXEEXT):
    312         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/monitor.c  @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     311        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    313312
    314313compile-operators$(EXEEXT):
    315         @${CC} -quiet -fsyntax-only -w $(testdir)/operators.c                   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     314        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    316315
    317316compile-thread$(EXEEXT):
    318         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/thread.c   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     317        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    319318
    320319compile-typeof$(EXEEXT):
    321         @${CC} -quiet -fsyntax-only -w $(testdir)/typeof.c                      @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    322 
     320        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     321
Note: See TracChangeset for help on using the changeset viewer.