Changeset 5e49e47


Ignore:
Timestamp:
Jan 15, 2019, 3:37:36 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
d0c91a6
Parents:
3b6a87c
Message:

Fix code rot in benchmark (not jenkins)

Files:
4 edited
15 moved

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.am

    r3b6a87c r5e49e47  
    2020include $(top_srcdir)/src/cfa.make
    2121
     22UPPCC = u++
    2223UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    2324
     
    2627AM_UPPFLAGS = -quiet -nodebug -multi
    2728
    28 TOOLSDIR = ${abs_top_srcdir}/tools/
    29 REPEAT   = ${TOOLSDIR}repeat
    30 STATS    = ${TOOLSDIR}stat.py
     29TOOLSDIR = ${abs_top_builddir}/tools/
     30REPEAT   = ${abs_top_builddir}/tools/repeat
     31STATS    = ${abs_top_srcdir}/tools/stat.py
    3132repeats  = 30
    3233skipcompile = no
    3334TIME_FORMAT = "%E"
    3435PRINT_FORMAT = %20s: #Comments needed for spacing
     36
     37EXTRA_PROGRAMS = dummy # build but do not install
     38
     39dummy_SOURCES = dummyC.c dummyCXX.cpp
     40
     41dummyC.c:
     42        @echo "int main() { return 0; }" > ${@}
     43
     44dummyCXX.cpp:
     45        @echo "int main() { return 0; }" > ${@}
    3546
    3647.NOTPARALLEL:
     
    5970
    6071${REPEAT} :
    61         @+make -C ${TOOLSDIR} repeat
     72        @+make -C ${abs_top_builddir}/tools repeat
    6273
    6374## =========================================================================================================
     
    100111## =========================================================================================================
    101112loop$(EXEEXT):
    102         $(COMPILE) -DBENCH_N=5000000000 loop.c
     113        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    103114
    104115function$(EXEEXT):
    105         $(COMPILE) -DBENCH_N=5000000000 function.c
     116        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    106117
    107118fetch_add$(EXEEXT):
    108         $(COMPILE) -DBENCH_N=500000000  fetch_add.c
     119        $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    109120
    110121## =========================================================================================================
     
    141152
    142153ctxswitch-cfa_coroutine$(EXEEXT):
    143         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     154        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    144155
    145156ctxswitch-cfa_thread$(EXEEXT):
    146         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     157        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    147158
    148159ctxswitch-cfa_thread2$(EXEEXT):
    149         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     160        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    150161
    151162ctxswitch-upp_coroutine$(EXEEXT):
     
    159170
    160171ctxswitch-java_thread$(EXEEXT):
    161         @javac $(srcdir)/ctxswitch/JavaThread.java
     172        @javac -d . $(srcdir)/ctxswitch/JavaThread.java
    162173        @echo "#!/bin/sh" > a.out
    163         @echo "cd ctxswitch && java JavaThread" >> a.out
     174        @echo "java JavaThread" >> a.out
    164175        @chmod a+x a.out
    165176
     
    183194
    184195mutex-cfa1$(EXEEXT):
    185         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     196        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    186197
    187198mutex-cfa2$(EXEEXT):
    188         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     199        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    189200
    190201mutex-cfa4$(EXEEXT):
    191         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     202        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    192203
    193204mutex-java_thread$(EXEEXT):
    194         @javac $(srcdir)/mutex/JavaThread.java
     205        @javac -d . $(srcdir)/mutex/JavaThread.java
    195206        @echo "#!/bin/sh" > a.out
    196         @echo "cd mutex && java JavaThread" >> a.out
     207        @echo "java JavaThread" >> a.out
    197208        @chmod a+x a.out
    198209
     
    213224
    214225signal-cfa1$(EXEEXT):
    215         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     226        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    216227
    217228signal-cfa2$(EXEEXT):
    218         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     229        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    219230
    220231signal-cfa4$(EXEEXT):
    221         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     232        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    222233
    223234signal-java_thread$(EXEEXT):
    224         @javac $(srcdir)/schedint/JavaThread.java
     235        @javac -d . $(srcdir)/schedint/JavaThread.java
    225236        @echo "#!/bin/sh" > a.out
    226         @echo "cd schedint && java JavaThread" >> a.out
     237        @echo "java JavaThread" >> a.out
    227238        @chmod a+x a.out
    228239
     
    239250
    240251waitfor-cfa1$(EXEEXT):
    241         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     252        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    242253
    243254waitfor-cfa2$(EXEEXT):
    244         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     255        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    245256
    246257waitfor-cfa4$(EXEEXT):
    247         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     258        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    248259
    249260## =========================================================================================================
     
    259270
    260271creation-cfa_coroutine$(EXEEXT):
    261         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     272        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    262273
    263274creation-cfa_coroutine_eager$(EXEEXT):
    264         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     275        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
    265276
    266277creation-cfa_thread$(EXEEXT):
    267         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     278        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    268279
    269280creation-upp_coroutine$(EXEEXT):
     
    280291
    281292creation-java_thread$(EXEEXT):
    282         @javac $(srcdir)/creation/JavaThread.java
     293        @javac -d . $(srcdir)/creation/JavaThread.java
    283294        @echo "#!/bin/sh" > a.out
    284         @echo "cd creation && java JavaThread" >> a.out
     295        @echo "java JavaThread" >> a.out
    285296        @chmod a+x a.out
    286297
     
    301312
    302313compile-array$(EXEEXT):
    303         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     314        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    304315
    305316compile-attributes$(EXEEXT):
     
    307318
    308319compile-empty$(EXEEXT):
    309         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     320        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    310321
    311322compile-expression$(EXEEXT):
    312         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     323        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    313324
    314325compile-io$(EXEEXT):
    315         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     326        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    316327
    317328compile-monitor$(EXEEXT):
    318         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     329        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    319330
    320331compile-operators$(EXEEXT):
    321         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     332        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    322333
    323334compile-thread$(EXEEXT):
    324         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     335        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    325336
    326337compile-typeof$(EXEEXT):
    327         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    328 
     338        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     339
  • benchmark/Makefile.in

    r3b6a87c r5e49e47  
    9292build_triplet = @build@
    9393host_triplet = @host@
     94EXTRA_PROGRAMS = dummy$(EXEEXT)
    9495noinst_PROGRAMS =
    9596@WITH_LIBFIBRE_TRUE@am__append_1 = \
     
    109110CONFIG_CLEAN_VPATH_FILES =
    110111PROGRAMS = $(noinst_PROGRAMS)
     112am_dummy_OBJECTS = dummyC.$(OBJEXT) dummyCXX.$(OBJEXT)
     113dummy_OBJECTS = $(am_dummy_OBJECTS)
     114dummy_LDADD = $(LDADD)
    111115AM_V_P = $(am__v_P_@AM_V@)
    112116am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    121125am__v_at_0 = @
    122126am__v_at_1 =
    123 SOURCES =
    124 DIST_SOURCES =
     127DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
     128depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
     129am__depfiles_maybe = depfiles
     130am__mv = mv -f
     131COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     132        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     133AM_V_CC = $(am__v_CC_@AM_V@)
     134am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
     135am__v_CC_0 = @echo "  CC      " $@;
     136am__v_CC_1 =
     137CCLD = $(CC)
     138LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     139AM_V_CCLD = $(am__v_CCLD_@AM_V@)
     140am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
     141am__v_CCLD_0 = @echo "  CCLD    " $@;
     142am__v_CCLD_1 =
     143CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     144        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     145AM_V_CXX = $(am__v_CXX_@AM_V@)
     146am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
     147am__v_CXX_0 = @echo "  CXX     " $@;
     148am__v_CXX_1 =
     149CXXLD = $(CXX)
     150CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     151        -o $@
     152AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
     153am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
     154am__v_CXXLD_0 = @echo "  CXXLD   " $@;
     155am__v_CXXLD_1 =
     156SOURCES = $(dummy_SOURCES)
     157DIST_SOURCES = $(dummy_SOURCES)
    125158am__can_run_installinfo = \
    126159  case $$AM_UPDATE_INFO_DIR in \
     
    129162  esac
    130163am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    131 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/src/cfa.make \
    132         compile
     164# Read a list of newline-separated strings from the standard input,
     165# and print each of them once, without duplicates.  Input order is
     166# *not* preserved.
     167am__uniquify_input = $(AWK) '\
     168  BEGIN { nonempty = 0; } \
     169  { items[$$0] = 1; nonempty = 1; } \
     170  END { if (nonempty) { for (i in items) print i; }; } \
     171'
     172# Make sure the list of sources is unique.  This is necessary because,
     173# e.g., the same source file might be shared among _SOURCES variables
     174# for different programs/libraries.
     175am__define_uniq_tagged_files = \
     176  list='$(am__tagged_files)'; \
     177  unique=`for i in $$list; do \
     178    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     179  done | $(am__uniquify_input)`
     180ETAGS = etags
     181CTAGS = ctags
     182am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp \
     183        $(top_srcdir)/src/cfa.make compile
    133184DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    134185ACLOCAL = @ACLOCAL@
     
    271322
    272323# applies to both programs
     324UPPCC = u++
    273325UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    274326AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    275327AM_CFAFLAGS = -quiet -in-tree -nodebug
    276328AM_UPPFLAGS = -quiet -nodebug -multi
    277 TOOLSDIR = ${abs_top_srcdir}/tools/
    278 REPEAT = ${TOOLSDIR}repeat
    279 STATS = ${TOOLSDIR}stat.py
     329TOOLSDIR = ${abs_top_builddir}/tools/
     330REPEAT = ${abs_top_builddir}/tools/repeat
     331STATS = ${abs_top_srcdir}/tools/stat.py
    280332repeats = 30
    281333skipcompile = no
    282334TIME_FORMAT = "%E"
    283335PRINT_FORMAT = %20s: #Comments needed for spacing
     336dummy_SOURCES = dummyC.c dummyCXX.cpp
    284337CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
    285338        ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
     
    292345
    293346.SUFFIXES:
    294 .SUFFIXES: .cfa .lo .o
     347.SUFFIXES: .c .cfa .cpp .lo .o .obj
    295348$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    296349        @for dep in $?; do \
     
    326379clean-noinstPROGRAMS:
    327380        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
    328 tags TAGS:
    329 
    330 ctags CTAGS:
    331 
    332 cscope cscopelist:
    333 
     381
     382dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES) $(EXTRA_dummy_DEPENDENCIES)
     383        @rm -f dummy$(EXEEXT)
     384        $(AM_V_CXXLD)$(CXXLINK) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
     385
     386mostlyclean-compile:
     387        -rm -f *.$(OBJEXT)
     388
     389distclean-compile:
     390        -rm -f *.tab.c
     391
     392@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyC.Po@am__quote@
     393@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyCXX.Po@am__quote@
     394
     395.c.o:
     396@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     397@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     398@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
     399@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     400@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     401@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
     402
     403.c.obj:
     404@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     405@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     406@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
     407@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     408@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     409@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     410
     411.cpp.o:
     412@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     413@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     414@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
     415@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     416@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     417@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
     418
     419.cpp.obj:
     420@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     421@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     422@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
     423@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     424@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     425@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     426
     427ID: $(am__tagged_files)
     428        $(am__define_uniq_tagged_files); mkid -fID $$unique
     429tags: tags-am
     430TAGS: tags
     431
     432tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
     433        set x; \
     434        here=`pwd`; \
     435        $(am__define_uniq_tagged_files); \
     436        shift; \
     437        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
     438          test -n "$$unique" || unique=$$empty_fix; \
     439          if test $$# -gt 0; then \
     440            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     441              "$$@" $$unique; \
     442          else \
     443            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     444              $$unique; \
     445          fi; \
     446        fi
     447ctags: ctags-am
     448
     449CTAGS: ctags
     450ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
     451        $(am__define_uniq_tagged_files); \
     452        test -z "$(CTAGS_ARGS)$$unique" \
     453          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
     454             $$unique
     455
     456GTAGS:
     457        here=`$(am__cd) $(top_builddir) && pwd` \
     458          && $(am__cd) $(top_srcdir) \
     459          && gtags -i $(GTAGS_ARGS) "$$here"
     460cscopelist: cscopelist-am
     461
     462cscopelist-am: $(am__tagged_files)
     463        list='$(am__tagged_files)'; \
     464        case "$(srcdir)" in \
     465          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
     466          *) sdir=$(subdir)/$(srcdir) ;; \
     467        esac; \
     468        for i in $$list; do \
     469          if test -f "$$i"; then \
     470            echo "$(subdir)/$$i"; \
     471          else \
     472            echo "$$sdir/$$i"; \
     473          fi; \
     474        done >> $(top_builddir)/cscope.files
     475
     476distclean-tags:
     477        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
    334478
    335479distdir: $(DISTFILES)
     
    402546
    403547distclean: distclean-am
     548        -rm -rf ./$(DEPDIR)
    404549        -rm -f Makefile
    405 distclean-am: clean-am distclean-generic
     550distclean-am: clean-am distclean-compile distclean-generic \
     551        distclean-tags
    406552
    407553dvi: dvi-am
     
    446592
    447593maintainer-clean: maintainer-clean-am
     594        -rm -rf ./$(DEPDIR)
    448595        -rm -f Makefile
    449596maintainer-clean-am: distclean-am maintainer-clean-generic
     
    451598mostlyclean: mostlyclean-am
    452599
    453 mostlyclean-am: mostlyclean-generic
     600mostlyclean-am: mostlyclean-compile mostlyclean-generic
    454601
    455602pdf: pdf-am
     
    465612.MAKE: install-am install-strip
    466613
    467 .PHONY: all all-am check check-am clean clean-generic \
    468         clean-noinstPROGRAMS cscopelist-am ctags-am distclean \
    469         distclean-generic distdir dvi dvi-am html html-am info info-am \
    470         install install-am install-data install-data-am install-dvi \
    471         install-dvi-am install-exec install-exec-am install-html \
    472         install-html-am install-info install-info-am install-man \
    473         install-pdf install-pdf-am install-ps install-ps-am \
    474         install-strip installcheck installcheck-am installdirs \
    475         maintainer-clean maintainer-clean-generic mostlyclean \
    476         mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
     614.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
     615        clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
     616        distclean-compile distclean-generic distclean-tags distdir dvi \
     617        dvi-am html html-am info info-am install install-am \
     618        install-data install-data-am install-dvi install-dvi-am \
     619        install-exec install-exec-am install-html install-html-am \
     620        install-info install-info-am install-man install-pdf \
     621        install-pdf-am install-ps install-ps-am install-strip \
     622        installcheck installcheck-am installdirs maintainer-clean \
     623        maintainer-clean-generic mostlyclean mostlyclean-compile \
     624        mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
    477625        uninstall-am
    478626
     
    489637        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    490638        $(am__mv) $$depbase.Tpo $$depbase.Plo
     639
     640dummyC.c:
     641        @echo "int main() { return 0; }" > ${@}
     642
     643dummyCXX.cpp:
     644        @echo "int main() { return 0; }" > ${@}
    491645
    492646.NOTPARALLEL:
     
    513667
    514668${REPEAT} :
    515         @+make -C ${TOOLSDIR} repeat
     669        @+make -C ${abs_top_builddir}/tools repeat
    516670
    517671jenkins$(EXEEXT):
     
    551705
    552706loop$(EXEEXT):
    553         $(COMPILE) -DBENCH_N=5000000000 loop.c
     707        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    554708
    555709function$(EXEEXT):
    556         $(COMPILE) -DBENCH_N=5000000000 function.c
     710        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    557711
    558712fetch_add$(EXEEXT):
    559         $(COMPILE) -DBENCH_N=500000000  fetch_add.c
     713        $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    560714
    561715@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
     
    571725
    572726ctxswitch-cfa_coroutine$(EXEEXT):
    573         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     727        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    574728
    575729ctxswitch-cfa_thread$(EXEEXT):
    576         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     730        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    577731
    578732ctxswitch-cfa_thread2$(EXEEXT):
    579         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     733        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    580734
    581735ctxswitch-upp_coroutine$(EXEEXT):
     
    589743
    590744ctxswitch-java_thread$(EXEEXT):
    591         @javac $(srcdir)/ctxswitch/JavaThread.java
     745        @javac -d . $(srcdir)/ctxswitch/JavaThread.java
    592746        @echo "#!/bin/sh" > a.out
    593         @echo "cd ctxswitch && java JavaThread" >> a.out
     747        @echo "java JavaThread" >> a.out
    594748        @chmod a+x a.out
    595749
     
    612766
    613767mutex-cfa1$(EXEEXT):
    614         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     768        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    615769
    616770mutex-cfa2$(EXEEXT):
    617         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     771        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    618772
    619773mutex-cfa4$(EXEEXT):
    620         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     774        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    621775
    622776mutex-java_thread$(EXEEXT):
    623         @javac $(srcdir)/mutex/JavaThread.java
     777        @javac -d . $(srcdir)/mutex/JavaThread.java
    624778        @echo "#!/bin/sh" > a.out
    625         @echo "cd mutex && java JavaThread" >> a.out
     779        @echo "java JavaThread" >> a.out
    626780        @chmod a+x a.out
    627781
     
    641795
    642796signal-cfa1$(EXEEXT):
    643         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     797        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    644798
    645799signal-cfa2$(EXEEXT):
    646         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     800        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    647801
    648802signal-cfa4$(EXEEXT):
    649         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     803        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    650804
    651805signal-java_thread$(EXEEXT):
    652         @javac $(srcdir)/schedint/JavaThread.java
     806        @javac -d . $(srcdir)/schedint/JavaThread.java
    653807        @echo "#!/bin/sh" > a.out
    654         @echo "cd schedint && java JavaThread" >> a.out
     808        @echo "java JavaThread" >> a.out
    655809        @chmod a+x a.out
    656810
     
    665819
    666820waitfor-cfa1$(EXEEXT):
    667         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     821        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    668822
    669823waitfor-cfa2$(EXEEXT):
    670         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     824        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    671825
    672826waitfor-cfa4$(EXEEXT):
    673         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     827        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    674828
    675829creation$(EXEEXT) :\
     
    684838
    685839creation-cfa_coroutine$(EXEEXT):
    686         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     840        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    687841
    688842creation-cfa_coroutine_eager$(EXEEXT):
    689         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     843        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
    690844
    691845creation-cfa_thread$(EXEEXT):
    692         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     846        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    693847
    694848creation-upp_coroutine$(EXEEXT):
     
    705859
    706860creation-java_thread$(EXEEXT):
    707         @javac $(srcdir)/creation/JavaThread.java
     861        @javac -d . $(srcdir)/creation/JavaThread.java
    708862        @echo "#!/bin/sh" > a.out
    709         @echo "cd creation && java JavaThread" >> a.out
     863        @echo "java JavaThread" >> a.out
    710864        @chmod a+x a.out
    711865
     
    721875
    722876compile-array$(EXEEXT):
    723         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     877        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    724878
    725879compile-attributes$(EXEEXT):
    726         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
     880        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    727881
    728882compile-empty$(EXEEXT):
    729         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     883        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    730884
    731885compile-expression$(EXEEXT):
    732         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     886        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    733887
    734888compile-io$(EXEEXT):
    735         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     889        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    736890
    737891compile-monitor$(EXEEXT):
    738         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     892        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    739893
    740894compile-operators$(EXEEXT):
    741         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     895        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    742896
    743897compile-thread$(EXEEXT):
    744         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     898        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    745899
    746900compile-typeof$(EXEEXT):
    747         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     901        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    748902
    749903# Tell versions [3.59,3.63) of GNU make to not export all variables.
  • tools/Makefile.am

    r3b6a87c r5e49e47  
    1818
    1919CC = @BACKEND_CC@
    20 AM_CFLAGS = -Wall -Wextra -O2 -g
     20AM_CFLAGS = -Wall -Wextra -O2 -g -std=c11
    2121
    2222noinst_PROGRAMS = busy catchsig repeat watchdog
  • tools/Makefile.in

    r3b6a87c r5e49e47  
    305305top_srcdir = @top_srcdir@
    306306AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    307 AM_CFLAGS = -Wall -Wextra -O2 -g
     307AM_CFLAGS = -Wall -Wextra -O2 -g -std=c11
    308308busy_SOURCES = busy.c
    309309busy_LDFLAGS = -pthread
Note: See TracChangeset for help on using the changeset viewer.