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.in

    rfb975a50 r455a7d5  
    9393host_triplet = @host@
    9494noinst_PROGRAMS =
    95 subdir = src/benchmark
     95subdir = benchmark
    9696ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    97 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     97am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     98        $(top_srcdir)/configure.ac
    9899am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    99100        $(ACLOCAL_M4)
    … …  
    124125  esac
    125126am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    126 am__DIST_COMMON = $(srcdir)/Makefile.in compile
     127am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/src/cfa.make \
     128        compile
    127129DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    128130ACLOCAL = @ACLOCAL@
    … …  
    135137AWK = @AWK@
    136138BACKEND_CC = @BACKEND_CC@
    137 CC = ${top_builddir}/src/driver/cfa
     139BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     140CC = @CC@
    138141CCAS = @CCAS@
    139142CCASDEPMODE = @CCASDEPMODE@
    140143CCASFLAGS = @CCASFLAGS@
    141144CCDEPMODE = @CCDEPMODE@
     145CFACC = @CFACC@
     146CFACPP = @CFACPP@
    142147CFA_BACKEND_CC = @CFA_BACKEND_CC@
    143148CFA_BINDIR = @CFA_BINDIR@
    … …  
    147152CFA_NAME = @CFA_NAME@
    148153CFA_PREFIX = @CFA_PREFIX@
    149 
    150 # applies to both programs
    151 CFLAGS =
     154CFLAGS = @CFLAGS@
    152155CPP = @CPP@
    153156CPPFLAGS = @CPPFLAGS@
    … …  
    158161DEFS = @DEFS@
    159162DEPDIR = @DEPDIR@
     163DRIVER_DIR = @DRIVER_DIR@
    160164ECHO_C = @ECHO_C@
    161165ECHO_N = @ECHO_N@
    … …  
    173177LEXLIB = @LEXLIB@
    174178LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     179LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     180LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    175181LIBOBJS = @LIBOBJS@
    176182LIBS = @LIBS@
    177183LTLIBOBJS = @LTLIBOBJS@
    178 MACHINE_TYPE = @MACHINE_TYPE@
    179184MAKEINFO = @MAKEINFO@
    180185MKDIR_P = @MKDIR_P@
    … …  
    192197SHELL = @SHELL@
    193198STRIP = @STRIP@
     199TARGET_HOSTS = @TARGET_HOSTS@
    194200VERSION = @VERSION@
    195201YACC = @YACC@
    … …  
    247253top_builddir = @top_builddir@
    248254top_srcdir = @top_srcdir@
    249 AM_CFLAGS = \
    250         -XCFA \
    251         -t \
    252         -B${abs_top_builddir}/src/driver \
    253         -g \
    254         -O2 \
    255         -Wall \
    256         -Wno-unused-function \
    257         -quiet \
    258         -I$(srcdir) \
    259         -L${abs_top_builddir}/src/libcfa \
    260         -I${abs_top_srcdir}/src/libcfa \
    261         -I${abs_top_srcdir}/src/libcfa/containers \
    262         -I${abs_top_srcdir}/src/libcfa/concurrency \
    263         -I${abs_top_srcdir}/src/libcfa/stdhdr
    264 
     255CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
     256AM_V_CFA = $(am__v_CFA_@AM_V@)
     257am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
     258am__v_CFA_0 = @echo "  CFA     " $@;
     259am__v_CFA_1 =
     260
     261# applies to both programs
     262UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     263AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     264AM_CFAFLAGS = -quiet -in-tree -nodebug
     265AM_UPPFLAGS = -quiet -nodebug -multi
    265266TOOLSDIR = ${abs_top_srcdir}/tools/
    266267REPEAT = ${TOOLSDIR}repeat
    … …  
    270271TIME_FORMAT = "%E"
    271272PRINT_FORMAT = %20s: #Comments needed for spacing
    272 testdir = $(top_srcdir)/src/tests
     273testdir = $(top_srcdir)/tests
    273274all: all-am
    274275
    275276.SUFFIXES:
    276 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
     277.SUFFIXES: .cfa .o
     278$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    277279        @for dep in $?; do \
    278280          case '$(am__configure_deps)' in \
    … …  
    283285          esac; \
    284286        done; \
    285         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/benchmark/Makefile'; \
     287        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign benchmark/Makefile'; \
    286288        $(am__cd) $(top_srcdir) && \
    287           $(AUTOMAKE) --foreign src/benchmark/Makefile
     289          $(AUTOMAKE) --foreign benchmark/Makefile
    288290Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    289291        @case '$?' in \
    … …  
    294296            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
    295297        esac;
     298$(top_srcdir)/src/cfa.make $(am__empty):
    296299
    297300$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
    … …  
    460463
    461464
     465.cfa.o: $(CFACC) $(CFACPP)
     466        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     467        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     468        $(am__mv) $$depbase.Tpo $$depbase.Po
     469
     470LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
     471
    462472.NOTPARALLEL:
    463473
    … …  
    521531
    522532loop$(EXEEXT):
    523         @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     533        $(COMPILE) -DBENCH_N=5000000000 loop.c
    524534
    525535function$(EXEEXT):
    526         @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     536        $(COMPILE) -DBENCH_N=5000000000 function.c
    527537
    528538fetch_add$(EXEEXT):
    529         @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     539        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    530540
    531541ctxswitch$(EXEEXT): \
    … …  
    545555
    546556ctxswitch-pthread$(EXEEXT):
    547         @@BACKEND_CC@ $(srcdir)/ctxswitch/pthreads.c     -DBENCH_N=50000000  -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     557        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    548558
    549559ctxswitch-cfa_coroutine$(EXEEXT):
    550         @${CC}        $(srcdir)/ctxswitch/cfa_cor.c      -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     560        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    551561
    552562ctxswitch-cfa_thread$(EXEEXT):
    553         @${CC}        $(srcdir)/ctxswitch/cfa_thrd.c     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     563        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    554564
    555565ctxswitch-cfa_thread2$(EXEEXT):
    556         @${CC}        $(srcdir)/ctxswitch/cfa_thrd2.c    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     566        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    557567
    558568ctxswitch-upp_coroutine$(EXEEXT):
    559         @u++          $(srcdir)/ctxswitch/upp_cor.cc     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     569        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    560570
    561571ctxswitch-upp_thread$(EXEEXT):
    562         @u++          $(srcdir)/ctxswitch/upp_thrd.cc    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     572        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    563573
    564574ctxswitch-kos_fibre$(EXEEXT):
    565         @${CXX}       $(srcdir)/ctxswitch/kos_fibre.cpp  -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
     575        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    566576
    567577ctxswitch-kos_fibre2$(EXEEXT):
    568         @${CXX}       $(srcdir)/ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
     578        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    569579
    570580ctxswitch-goroutine$(EXEEXT):
    … …  
    589599
    590600mutex-pthread_lock$(EXEEXT):
    591         @@BACKEND_CC@ $(srcdir)/mutex/pthreads.c    -DBENCH_N=50000000    -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     601        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    592602
    593603mutex-upp$(EXEEXT):
    594         @u++          $(srcdir)/mutex/upp.cc        -DBENCH_N=50000000    -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     604        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    595605
    596606mutex-cfa1$(EXEEXT):
    597         @${CC}        $(srcdir)/mutex/cfa1.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     607        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    598608
    599609mutex-cfa2$(EXEEXT):
    600         @${CC}        $(srcdir)/mutex/cfa2.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     610        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    601611
    602612mutex-cfa4$(EXEEXT):
    603         @${CC}        $(srcdir)/mutex/cfa4.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     613        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    604614
    605615mutex-java_thread$(EXEEXT):
    … …  
    618628
    619629signal-pthread_cond$(EXEEXT):
    620         @@BACKEND_CC@ $(srcdir)/schedint/pthreads.c -DBENCH_N=500000      -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     630        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    621631
    622632signal-upp$(EXEEXT):
    623         @u++          $(srcdir)/schedint/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     633        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    624634
    625635signal-cfa1$(EXEEXT):
    626         @${CC}        $(srcdir)/schedint/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     636        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    627637
    628638signal-cfa2$(EXEEXT):
    629         @${CC}        $(srcdir)/schedint/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     639        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    630640
    631641signal-cfa4$(EXEEXT):
    632         @${CC}        $(srcdir)/schedint/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     642        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    633643
    634644signal-java_thread$(EXEEXT):
    … …  
    645655
    646656waitfor-upp$(EXEEXT):
    647         @u++          $(srcdir)/schedext/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     657        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    648658
    649659waitfor-cfa1$(EXEEXT):
    650         @${CC}        $(srcdir)/schedext/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     660        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    651661
    652662waitfor-cfa2$(EXEEXT):
    653         @${CC}        $(srcdir)/schedext/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     663        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    654664
    655665waitfor-cfa4$(EXEEXT):
    656         @${CC}        $(srcdir)/schedext/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     666        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    657667
    658668creation$(EXEEXT) :\
    … …  
    667677
    668678creation-cfa_coroutine$(EXEEXT):
    669         @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     679        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    670680
    671681creation-cfa_coroutine_eager$(EXEEXT):
    672         @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
     682        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    673683
    674684creation-cfa_thread$(EXEEXT):
    675         @${CC}        $(srcdir)/creation/cfa_thrd.c  -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     685        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    676686
    677687creation-upp_coroutine$(EXEEXT):
    678         @u++          $(srcdir)/creation/upp_cor.cc  -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     688        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    679689
    680690creation-upp_thread$(EXEEXT):
    681         @u++          $(srcdir)/creation/upp_thrd.cc -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     691        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    682692
    683693creation-pthread$(EXEEXT):
    684         @@BACKEND_CC@ $(srcdir)/creation/pthreads.c  -DBENCH_N=250000     -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     694        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    685695
    686696creation-goroutine$(EXEEXT):
    … …  
    704714
    705715compile-array$(EXEEXT):
    706         @${CC} -quiet -fsyntax-only -w $(testdir)/array.c                       @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     716        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    707717
    708718compile-attributes$(EXEEXT):
    709         @${CC} -quiet -fsyntax-only -w $(testdir)/attributes.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     719        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
    710720
    711721compile-empty$(EXEEXT):
    712         @${CC} -quiet -fsyntax-only -w $(srcdir)/compile/empty.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     722        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    713723
    714724compile-expression$(EXEEXT):
    715         @${CC} -quiet -fsyntax-only -w $(testdir)/expression.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     725        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    716726
    717727compile-io$(EXEEXT):
    718         @${CC} -quiet -fsyntax-only -w $(testdir)/io1.c                         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     728        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    719729
    720730compile-monitor$(EXEEXT):
    721         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/monitor.c  @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     731        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    722732
    723733compile-operators$(EXEEXT):
    724         @${CC} -quiet -fsyntax-only -w $(testdir)/operators.c                   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     734        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    725735
    726736compile-thread$(EXEEXT):
    727         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/thread.c   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     737        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    728738
    729739compile-typeof$(EXEEXT):
    730         @${CC} -quiet -fsyntax-only -w $(testdir)/typeof.c                      @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     740        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    731741
    732742# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.