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

    rc3a8ecd r7cd8827  
    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@
    … …  
    136138BACKEND_CC = @BACKEND_CC@
    137139BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    138 BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
    139 CC = @CFACC@
     140CC = @CC@
    140141CCAS = @CCAS@
    141142CCASDEPMODE = @CCASDEPMODE@
    … …  
    151152CFA_NAME = @CFA_NAME@
    152153CFA_PREFIX = @CFA_PREFIX@
    153 
    154 # applies to both programs
    155 CFLAGS =
     154CFLAGS = @CFLAGS@
    156155CPP = @CPP@
    157156CPPFLAGS = @CPPFLAGS@
    … …  
    169168EXEEXT = @EXEEXT@
    170169GREP = @GREP@
     170HOST_FLAGS = @HOST_FLAGS@
    171171INSTALL = @INSTALL@
    172172INSTALL_DATA = @INSTALL_DATA@
    … …  
    178178LEXLIB = @LEXLIB@
    179179LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     180LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     181LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    180182LIBOBJS = @LIBOBJS@
    181183LIBS = @LIBS@
    182184LTLIBOBJS = @LTLIBOBJS@
    183 MACHINE_TYPE = @MACHINE_TYPE@
    184185MAKEINFO = @MAKEINFO@
    185186MKDIR_P = @MKDIR_P@
    … …  
    197198SHELL = @SHELL@
    198199STRIP = @STRIP@
     200TARGET_HOSTS = @TARGET_HOSTS@
    199201VERSION = @VERSION@
    200202YACC = @YACC@
    … …  
    252254top_builddir = @top_builddir@
    253255top_srcdir = @top_srcdir@
    254 AM_CFLAGS = \
    255         -g \
    256         -O2 \
    257         -Wall \
    258         -Wno-unused-function \
    259         -quiet \
    260         -I$(srcdir) \
    261         @BUILD_IN_TREE_FLAGS@
    262 
     256AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     257CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
     258AM_V_CFA = $(am__v_CFA_@AM_V@)
     259am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
     260am__v_CFA_0 = @echo "  CFA     " $@;
     261am__v_CFA_1 =
     262
     263# applies to both programs
     264UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     265AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     266AM_CFAFLAGS = -quiet -in-tree -nodebug
     267AM_UPPFLAGS = -quiet -nodebug -multi
    263268TOOLSDIR = ${abs_top_srcdir}/tools/
    264269REPEAT = ${TOOLSDIR}repeat
    … …  
    268273TIME_FORMAT = "%E"
    269274PRINT_FORMAT = %20s: #Comments needed for spacing
    270 testdir = $(top_srcdir)/src/tests
     275testdir = $(top_srcdir)/tests
    271276all: all-am
    272277
    273278.SUFFIXES:
    274 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
     279.SUFFIXES: .cfa .o
     280$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    275281        @for dep in $?; do \
    276282          case '$(am__configure_deps)' in \
    … …  
    281287          esac; \
    282288        done; \
    283         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/benchmark/Makefile'; \
     289        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign benchmark/Makefile'; \
    284290        $(am__cd) $(top_srcdir) && \
    285           $(AUTOMAKE) --foreign src/benchmark/Makefile
     291          $(AUTOMAKE) --foreign benchmark/Makefile
    286292Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    287293        @case '$?' in \
    … …  
    292298            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
    293299        esac;
     300$(top_srcdir)/src/cfa.make $(am__empty):
    294301
    295302$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
    … …  
    458465
    459466
     467.cfa.o: $(CFACC) $(CFACPP)
     468        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     469        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     470        $(am__mv) $$depbase.Tpo $$depbase.Po
     471
     472LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
     473
    460474.NOTPARALLEL:
    461475
    … …  
    519533
    520534loop$(EXEEXT):
    521         @@BACKEND_CC@ loop.c      -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     535        $(COMPILE) -DBENCH_N=5000000000 loop.c
    522536
    523537function$(EXEEXT):
    524         @@BACKEND_CC@ function.c  -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     538        $(COMPILE) -DBENCH_N=5000000000 function.c
    525539
    526540fetch_add$(EXEEXT):
    527         @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000  -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     541        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    528542
    529543ctxswitch$(EXEEXT): \
    … …  
    543557
    544558ctxswitch-pthread$(EXEEXT):
    545         @@BACKEND_CC@ $(srcdir)/ctxswitch/pthreads.c     -DBENCH_N=50000000  -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     559        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    546560
    547561ctxswitch-cfa_coroutine$(EXEEXT):
    548         @${CC}        $(srcdir)/ctxswitch/cfa_cor.c      -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     562        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    549563
    550564ctxswitch-cfa_thread$(EXEEXT):
    551         @${CC}        $(srcdir)/ctxswitch/cfa_thrd.c     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     565        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    552566
    553567ctxswitch-cfa_thread2$(EXEEXT):
    554         @${CC}        $(srcdir)/ctxswitch/cfa_thrd2.c    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     568        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    555569
    556570ctxswitch-upp_coroutine$(EXEEXT):
    557         @u++          $(srcdir)/ctxswitch/upp_cor.cc     -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     571        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    558572
    559573ctxswitch-upp_thread$(EXEEXT):
    560         @u++          $(srcdir)/ctxswitch/upp_thrd.cc    -DBENCH_N=50000000  -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     574        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    561575
    562576ctxswitch-kos_fibre$(EXEEXT):
    563         @${CXX}       $(srcdir)/ctxswitch/kos_fibre.cpp  -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
     577        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    564578
    565579ctxswitch-kos_fibre2$(EXEEXT):
    566         @${CXX}       $(srcdir)/ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000  -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt
     580        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    567581
    568582ctxswitch-goroutine$(EXEEXT):
    … …  
    587601
    588602mutex-pthread_lock$(EXEEXT):
    589         @@BACKEND_CC@ $(srcdir)/mutex/pthreads.c    -DBENCH_N=50000000    -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     603        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    590604
    591605mutex-upp$(EXEEXT):
    592         @u++          $(srcdir)/mutex/upp.cc        -DBENCH_N=50000000    -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     606        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    593607
    594608mutex-cfa1$(EXEEXT):
    595         @${CC}        $(srcdir)/mutex/cfa1.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     609        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    596610
    597611mutex-cfa2$(EXEEXT):
    598         @${CC}        $(srcdir)/mutex/cfa2.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     612        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    599613
    600614mutex-cfa4$(EXEEXT):
    601         @${CC}        $(srcdir)/mutex/cfa4.c        -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     615        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    602616
    603617mutex-java_thread$(EXEEXT):
    … …  
    616630
    617631signal-pthread_cond$(EXEEXT):
    618         @@BACKEND_CC@ $(srcdir)/schedint/pthreads.c -DBENCH_N=500000      -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     632        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    619633
    620634signal-upp$(EXEEXT):
    621         @u++          $(srcdir)/schedint/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     635        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    622636
    623637signal-cfa1$(EXEEXT):
    624         @${CC}        $(srcdir)/schedint/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     638        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    625639
    626640signal-cfa2$(EXEEXT):
    627         @${CC}        $(srcdir)/schedint/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     641        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    628642
    629643signal-cfa4$(EXEEXT):
    630         @${CC}        $(srcdir)/schedint/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     644        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    631645
    632646signal-java_thread$(EXEEXT):
    … …  
    643657
    644658waitfor-upp$(EXEEXT):
    645         @u++          $(srcdir)/schedext/upp.cc     -DBENCH_N=5000000     -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     659        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    646660
    647661waitfor-cfa1$(EXEEXT):
    648         @${CC}        $(srcdir)/schedext/cfa1.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     662        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    649663
    650664waitfor-cfa2$(EXEEXT):
    651         @${CC}        $(srcdir)/schedext/cfa2.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     665        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    652666
    653667waitfor-cfa4$(EXEEXT):
    654         @${CC}        $(srcdir)/schedext/cfa4.c     -DBENCH_N=500000      -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     668        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    655669
    656670creation$(EXEEXT) :\
    … …  
    665679
    666680creation-cfa_coroutine$(EXEEXT):
    667         @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     681        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    668682
    669683creation-cfa_coroutine_eager$(EXEEXT):
    670         @${CC}        $(srcdir)/creation/cfa_cor.c   -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
     684        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    671685
    672686creation-cfa_thread$(EXEEXT):
    673         @${CC}        $(srcdir)/creation/cfa_thrd.c  -DBENCH_N=10000000   -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     687        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    674688
    675689creation-upp_coroutine$(EXEEXT):
    676         @u++          $(srcdir)/creation/upp_cor.cc  -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     690        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    677691
    678692creation-upp_thread$(EXEEXT):
    679         @u++          $(srcdir)/creation/upp_thrd.cc -DBENCH_N=50000000   -I$(srcdir) -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     693        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    680694
    681695creation-pthread$(EXEEXT):
    682         @@BACKEND_CC@ $(srcdir)/creation/pthreads.c  -DBENCH_N=250000     -I$(srcdir) -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     696        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    683697
    684698creation-goroutine$(EXEEXT):
    … …  
    702716
    703717compile-array$(EXEEXT):
    704         @${CC} -quiet -fsyntax-only -w $(testdir)/array.c                       @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     718        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    705719
    706720compile-attributes$(EXEEXT):
    707         @${CC} -quiet -fsyntax-only -w $(testdir)/attributes.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     721        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
    708722
    709723compile-empty$(EXEEXT):
    710         @${CC} -quiet -fsyntax-only -w $(srcdir)/compile/empty.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     724        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    711725
    712726compile-expression$(EXEEXT):
    713         @${CC} -quiet -fsyntax-only -w $(testdir)/expression.c          @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     727        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    714728
    715729compile-io$(EXEEXT):
    716         @${CC} -quiet -fsyntax-only -w $(testdir)/io1.c                         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     730        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    717731
    718732compile-monitor$(EXEEXT):
    719         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/monitor.c  @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     733        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    720734
    721735compile-operators$(EXEEXT):
    722         @${CC} -quiet -fsyntax-only -w $(testdir)/operators.c                   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     736        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    723737
    724738compile-thread$(EXEEXT):
    725         @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/thread.c   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     739        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    726740
    727741compile-typeof$(EXEEXT):
    728         @${CC} -quiet -fsyntax-only -w $(testdir)/typeof.c                      @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     742        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    729743
    730744# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.