Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.in

    r5e49e47 r47c1928  
    9292build_triplet = @build@
    9393host_triplet = @host@
    94 EXTRA_PROGRAMS = dummy$(EXEEXT)
    9594noinst_PROGRAMS =
    96 @WITH_LIBFIBRE_TRUE@am__append_1 = \
    97 @WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run  \
    98 @WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre2.run
    99 
    10095subdir = benchmark
    10196ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    110105CONFIG_CLEAN_VPATH_FILES =
    111106PROGRAMS = $(noinst_PROGRAMS)
    112 am_dummy_OBJECTS = dummyC.$(OBJEXT) dummyCXX.$(OBJEXT)
    113 dummy_OBJECTS = $(am_dummy_OBJECTS)
    114 dummy_LDADD = $(LDADD)
    115107AM_V_P = $(am__v_P_@AM_V@)
    116108am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
     
    125117am__v_at_0 = @
    126118am__v_at_1 =
    127 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
    128 depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
    129 am__depfiles_maybe = depfiles
    130 am__mv = mv -f
    131 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    132         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    133 AM_V_CC = $(am__v_CC_@AM_V@)
    134 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
    135 am__v_CC_0 = @echo "  CC      " $@;
    136 am__v_CC_1 =
    137 CCLD = $(CC)
    138 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    139 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
    140 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
    141 am__v_CCLD_0 = @echo "  CCLD    " $@;
    142 am__v_CCLD_1 =
    143 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    144         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    145 AM_V_CXX = $(am__v_CXX_@AM_V@)
    146 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
    147 am__v_CXX_0 = @echo "  CXX     " $@;
    148 am__v_CXX_1 =
    149 CXXLD = $(CXX)
    150 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    151         -o $@
    152 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
    153 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
    154 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
    155 am__v_CXXLD_1 =
    156 SOURCES = $(dummy_SOURCES)
    157 DIST_SOURCES = $(dummy_SOURCES)
     119SOURCES =
     120DIST_SOURCES =
    158121am__can_run_installinfo = \
    159122  case $$AM_UPDATE_INFO_DIR in \
     
    162125  esac
    163126am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    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.
    167 am__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.
    175 am__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)`
    180 ETAGS = etags
    181 CTAGS = ctags
    182 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp \
    183         $(top_srcdir)/src/cfa.make compile
     127am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/src/cfa.make \
     128        compile
    184129DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    185130ACLOCAL = @ACLOCAL@
     
    311256AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    312257CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
    313 LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    314         $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
    315         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
    316         $(AM_CFLAGS) $(CFLAGS)
    317 
    318258AM_V_CFA = $(am__v_CFA_@AM_V@)
    319259am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
     
    322262
    323263# applies to both programs
    324 UPPCC = u++
    325264UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    326265AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    327266AM_CFAFLAGS = -quiet -in-tree -nodebug
    328267AM_UPPFLAGS = -quiet -nodebug -multi
    329 TOOLSDIR = ${abs_top_builddir}/tools/
    330 REPEAT = ${abs_top_builddir}/tools/repeat
    331 STATS = ${abs_top_srcdir}/tools/stat.py
     268TOOLSDIR = ${abs_top_srcdir}/tools/
     269REPEAT = ${TOOLSDIR}repeat
     270STATS = ${TOOLSDIR}stat.py
    332271repeats = 30
    333272skipcompile = no
    334273TIME_FORMAT = "%E"
    335274PRINT_FORMAT = %20s: #Comments needed for spacing
    336 dummy_SOURCES = dummyC.c dummyCXX.cpp
    337 CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
    338         ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
    339         ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
    340         ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
    341         ctxswitch-goroutine.run ctxswitch-java_thread.run \
    342         $(am__append_1)
    343275testdir = $(top_srcdir)/tests
    344276all: all-am
    345277
    346278.SUFFIXES:
    347 .SUFFIXES: .c .cfa .cpp .lo .o .obj
     279.SUFFIXES: .cfa .o
    348280$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    349281        @for dep in $?; do \
     
    379311clean-noinstPROGRAMS:
    380312        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
    381 
    382 dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES) $(EXTRA_dummy_DEPENDENCIES)
    383         @rm -f dummy$(EXEEXT)
    384         $(AM_V_CXXLD)$(CXXLINK) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
    385 
    386 mostlyclean-compile:
    387         -rm -f *.$(OBJEXT)
    388 
    389 distclean-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 
    427 ID: $(am__tagged_files)
    428         $(am__define_uniq_tagged_files); mkid -fID $$unique
    429 tags: tags-am
    430 TAGS: tags
    431 
    432 tags-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
    447 ctags: ctags-am
    448 
    449 CTAGS: ctags
    450 ctags-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 
    456 GTAGS:
    457         here=`$(am__cd) $(top_builddir) && pwd` \
    458           && $(am__cd) $(top_srcdir) \
    459           && gtags -i $(GTAGS_ARGS) "$$here"
    460 cscopelist: cscopelist-am
    461 
    462 cscopelist-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 
    476 distclean-tags:
    477         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
     313tags TAGS:
     314
     315ctags CTAGS:
     316
     317cscope cscopelist:
     318
    478319
    479320distdir: $(DISTFILES)
     
    546387
    547388distclean: distclean-am
    548         -rm -rf ./$(DEPDIR)
    549389        -rm -f Makefile
    550 distclean-am: clean-am distclean-compile distclean-generic \
    551         distclean-tags
     390distclean-am: clean-am distclean-generic
    552391
    553392dvi: dvi-am
     
    592431
    593432maintainer-clean: maintainer-clean-am
    594         -rm -rf ./$(DEPDIR)
    595433        -rm -f Makefile
    596434maintainer-clean-am: distclean-am maintainer-clean-generic
     
    598436mostlyclean: mostlyclean-am
    599437
    600 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     438mostlyclean-am: mostlyclean-generic
    601439
    602440pdf: pdf-am
     
    612450.MAKE: install-am install-strip
    613451
    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 \
     452.PHONY: all all-am check check-am clean clean-generic \
     453        clean-noinstPROGRAMS cscopelist-am ctags-am distclean \
     454        distclean-generic distdir dvi dvi-am html html-am info info-am \
     455        install install-am install-data install-data-am install-dvi \
     456        install-dvi-am install-exec install-exec-am install-html \
     457        install-html-am install-info install-info-am install-man \
     458        install-pdf install-pdf-am install-ps install-ps-am \
     459        install-strip installcheck installcheck-am installdirs \
     460        maintainer-clean maintainer-clean-generic mostlyclean \
     461        mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
    625462        uninstall-am
    626463
     
    628465
    629466
    630 .cfa.o:
     467.cfa.o: $(CFACC) $(CFACPP)
    631468        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    632469        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    633470        $(am__mv) $$depbase.Tpo $$depbase.Po
    634471
    635 .cfa.lo:
    636         $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
    637         $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    638         $(am__mv) $$depbase.Tpo $$depbase.Plo
    639 
    640 dummyC.c:
    641         @echo "int main() { return 0; }" > ${@}
    642 
    643 dummyCXX.cpp:
    644         @echo "int main() { return 0; }" > ${@}
     472LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
    645473
    646474.NOTPARALLEL:
     
    667495
    668496${REPEAT} :
    669         @+make -C ${abs_top_builddir}/tools repeat
     497        @+make -C ${TOOLSDIR} repeat
    670498
    671499jenkins$(EXEEXT):
     
    705533
    706534loop$(EXEEXT):
    707         $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     535        $(COMPILE) -DBENCH_N=5000000000 loop.c
    708536
    709537function$(EXEEXT):
    710         $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     538        $(COMPILE) -DBENCH_N=5000000000 function.c
    711539
    712540fetch_add$(EXEEXT):
    713         $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    714 
    715 @WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    716 @WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    717 
    718 @WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
    719 @WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    720 
    721 ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
     541        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
     542
     543ctxswitch$(EXEEXT): \
     544        loop.run                                \
     545        function.run                    \
     546        fetch_add.run                   \
     547        ctxswitch-pthread.run           \
     548        ctxswitch-cfa_coroutine.run     \
     549        ctxswitch-cfa_thread.run        \
     550        ctxswitch-cfa_thread2.run       \
     551        ctxswitch-upp_coroutine.run     \
     552        ctxswitch-upp_thread.run        \
     553        -ctxswitch-kos_fibre.run        \
     554        -ctxswitch-kos_fibre2.run       \
     555        ctxswitch-goroutine.run         \
     556        ctxswitch-java_thread.run
    722557
    723558ctxswitch-pthread$(EXEEXT):
     
    725560
    726561ctxswitch-cfa_coroutine$(EXEEXT):
    727         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     562        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    728563
    729564ctxswitch-cfa_thread$(EXEEXT):
    730         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     565        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    731566
    732567ctxswitch-cfa_thread2$(EXEEXT):
    733         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     568        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    734569
    735570ctxswitch-upp_coroutine$(EXEEXT):
     
    739574        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    740575
     576ctxswitch-kos_fibre$(EXEEXT):
     577        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     578
     579ctxswitch-kos_fibre2$(EXEEXT):
     580        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     581
    741582ctxswitch-goroutine$(EXEEXT):
    742583        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    743584
    744585ctxswitch-java_thread$(EXEEXT):
    745         @javac -d . $(srcdir)/ctxswitch/JavaThread.java
     586        @javac $(srcdir)/ctxswitch/JavaThread.java
    746587        @echo "#!/bin/sh" > a.out
    747         @echo "java JavaThread" >> a.out
     588        @echo "cd ctxswitch && java JavaThread" >> a.out
    748589        @chmod a+x a.out
    749590
     
    766607
    767608mutex-cfa1$(EXEEXT):
    768         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     609        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    769610
    770611mutex-cfa2$(EXEEXT):
    771         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     612        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    772613
    773614mutex-cfa4$(EXEEXT):
    774         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     615        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    775616
    776617mutex-java_thread$(EXEEXT):
    777         @javac -d . $(srcdir)/mutex/JavaThread.java
     618        @javac $(srcdir)/mutex/JavaThread.java
    778619        @echo "#!/bin/sh" > a.out
    779         @echo "java JavaThread" >> a.out
     620        @echo "cd mutex && java JavaThread" >> a.out
    780621        @chmod a+x a.out
    781622
     
    795636
    796637signal-cfa1$(EXEEXT):
    797         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     638        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    798639
    799640signal-cfa2$(EXEEXT):
    800         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     641        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    801642
    802643signal-cfa4$(EXEEXT):
    803         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     644        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    804645
    805646signal-java_thread$(EXEEXT):
    806         @javac -d . $(srcdir)/schedint/JavaThread.java
     647        @javac $(srcdir)/schedint/JavaThread.java
    807648        @echo "#!/bin/sh" > a.out
    808         @echo "java JavaThread" >> a.out
     649        @echo "cd schedint && java JavaThread" >> a.out
    809650        @chmod a+x a.out
    810651
     
    819660
    820661waitfor-cfa1$(EXEEXT):
    821         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     662        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    822663
    823664waitfor-cfa2$(EXEEXT):
    824         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     665        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    825666
    826667waitfor-cfa4$(EXEEXT):
    827         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     668        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    828669
    829670creation$(EXEEXT) :\
     
    838679
    839680creation-cfa_coroutine$(EXEEXT):
    840         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     681        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    841682
    842683creation-cfa_coroutine_eager$(EXEEXT):
    843         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
     684        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    844685
    845686creation-cfa_thread$(EXEEXT):
    846         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     687        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    847688
    848689creation-upp_coroutine$(EXEEXT):
     
    859700
    860701creation-java_thread$(EXEEXT):
    861         @javac -d . $(srcdir)/creation/JavaThread.java
     702        @javac $(srcdir)/creation/JavaThread.java
    862703        @echo "#!/bin/sh" > a.out
    863         @echo "java JavaThread" >> a.out
     704        @echo "cd creation && java JavaThread" >> a.out
    864705        @chmod a+x a.out
    865706
     
    875716
    876717compile-array$(EXEEXT):
    877         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     718        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    878719
    879720compile-attributes$(EXEEXT):
    880         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     721        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
    881722
    882723compile-empty$(EXEEXT):
    883         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     724        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    884725
    885726compile-expression$(EXEEXT):
    886         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     727        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    887728
    888729compile-io$(EXEEXT):
    889         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     730        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    890731
    891732compile-monitor$(EXEEXT):
    892         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     733        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    893734
    894735compile-operators$(EXEEXT):
    895         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     736        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    896737
    897738compile-thread$(EXEEXT):
    898         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     739        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    899740
    900741compile-typeof$(EXEEXT):
    901         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     742        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    902743
    903744# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.