Changes in / [515a037:85acec94]


Ignore:
Files:
3 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    r515a037 r85acec94  
    2020include $(top_srcdir)/src/cfa.make
    2121
    22 UPPCC = u++
     22UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    2323
    2424AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    … …  
    3434PRINT_FORMAT = %20s: #Comments needed for spacing
    3535
    36 #prevent any tests in parallel
    3736.NOTPARALLEL:
    3837
    39 #make sure automake includes the compile rules for C and C++
    40 EXTRA_PROGRAMS = dummy
    41 dummy_SOURCES = c.c cxx.cpp
    42 
    43 ## =========================================================================================================
     38noinst_PROGRAMS =
     39
    4440all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    4541
    … …  
    5147        @${STATS} .result.log
    5248        @echo "------------------------------------------------------"
    53         @rm -f a.out .result.log *.class
     49        @rm -f a.out .result.log
    5450
    5551%.runquiet :
    … …  
    104100## =========================================================================================================
    105101loop$(EXEEXT):
    106         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     102        $(COMPILE) -DBENCH_N=5000000000 loop.c
    107103
    108104function$(EXEEXT):
    109         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     105        $(COMPILE) -DBENCH_N=5000000000 function.c
    110106
    111107fetch_add$(EXEEXT):
    112         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     108        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    113109
    114110## =========================================================================================================
    … …  
    133129
    134130ctxswitch-kos_fibre$(EXEEXT):
    135         $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     131        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    136132
    137133ctxswitch-kos_fibre2$(EXEEXT):
    138         $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     134        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    139135endif
    140136
    … …  
    142138
    143139ctxswitch-pthread$(EXEEXT):
    144         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     140        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    145141
    146142ctxswitch-cfa_coroutine$(EXEEXT):
    147         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     143        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    148144
    149145ctxswitch-cfa_thread$(EXEEXT):
    150         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     146        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    151147
    152148ctxswitch-cfa_thread2$(EXEEXT):
    153         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     149        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    154150
    155151ctxswitch-upp_coroutine$(EXEEXT):
    156         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     152        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    157153
    158154ctxswitch-upp_thread$(EXEEXT):
    159         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     155        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    160156
    161157ctxswitch-goroutine$(EXEEXT):
    162         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     158        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    163159
    164160ctxswitch-java_thread$(EXEEXT):
    165         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     161        @javac $(srcdir)/ctxswitch/JavaThread.java
    166162        @echo "#!/bin/sh" > a.out
    167         @echo "java JavaThread" >> a.out
     163        @echo "cd ctxswitch && java JavaThread" >> a.out
    168164        @chmod a+x a.out
    169165
    … …  
    181177
    182178mutex-pthread_lock$(EXEEXT):
    183         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     179        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    184180
    185181mutex-upp$(EXEEXT):
    186         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     182        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    187183
    188184mutex-cfa1$(EXEEXT):
    189         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     185        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    190186
    191187mutex-cfa2$(EXEEXT):
    192         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     188        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    193189
    194190mutex-cfa4$(EXEEXT):
    195         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     191        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    196192
    197193mutex-java_thread$(EXEEXT):
    198         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     194        @javac $(srcdir)/mutex/JavaThread.java
    199195        @echo "#!/bin/sh" > a.out
    200         @echo "java JavaThread" >> a.out
     196        @echo "cd mutex && java JavaThread" >> a.out
    201197        @chmod a+x a.out
    202198
    … …  
    211207
    212208signal-pthread_cond$(EXEEXT):
    213         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     209        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    214210
    215211signal-upp$(EXEEXT):
    216         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     212        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    217213
    218214signal-cfa1$(EXEEXT):
    219         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     215        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    220216
    221217signal-cfa2$(EXEEXT):
    222         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     218        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    223219
    224220signal-cfa4$(EXEEXT):
    225         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     221        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    226222
    227223signal-java_thread$(EXEEXT):
    228         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     224        @javac $(srcdir)/schedint/JavaThread.java
    229225        @echo "#!/bin/sh" > a.out
    230         @echo "java JavaThread" >> a.out
     226        @echo "cd schedint && java JavaThread" >> a.out
    231227        @chmod a+x a.out
    232228
    … …  
    240236
    241237waitfor-upp$(EXEEXT):
    242         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     238        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    243239
    244240waitfor-cfa1$(EXEEXT):
    245         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     241        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    246242
    247243waitfor-cfa2$(EXEEXT):
    248         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     244        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    249245
    250246waitfor-cfa4$(EXEEXT):
    251         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     247        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    252248
    253249## =========================================================================================================
    … …  
    263259
    264260creation-cfa_coroutine$(EXEEXT):
    265         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     261        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    266262
    267263creation-cfa_coroutine_eager$(EXEEXT):
    268         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     264        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    269265
    270266creation-cfa_thread$(EXEEXT):
    271         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     267        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    272268
    273269creation-upp_coroutine$(EXEEXT):
    274         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     270        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    275271
    276272creation-upp_thread$(EXEEXT):
    277         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     273        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    278274
    279275creation-pthread$(EXEEXT):
    280         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     276        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    281277
    282278creation-goroutine$(EXEEXT):
    283         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     279        @go build -o a.out $(srcdir)/creation/goroutine.go
    284280
    285281creation-java_thread$(EXEEXT):
    286         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     282        @javac $(srcdir)/creation/JavaThread.java
    287283        @echo "#!/bin/sh" > a.out
    288         @echo "java JavaThread" >> a.out
     284        @echo "cd creation && java JavaThread" >> a.out
    289285        @chmod a+x a.out
    290286
    … …  
    305301
    306302compile-array$(EXEEXT):
    307         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     303        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    308304
    309305compile-attributes$(EXEEXT):
    310         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     306        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    311307
    312308compile-empty$(EXEEXT):
    313         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     309        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    314310
    315311compile-expression$(EXEEXT):
    316         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     312        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    317313
    318314compile-io$(EXEEXT):
    319         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     315        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    320316
    321317compile-monitor$(EXEEXT):
    322         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     318        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    323319
    324320compile-operators$(EXEEXT):
    325         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     321        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    326322
    327323compile-thread$(EXEEXT):
    328         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     324        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    329325
    330326compile-typeof$(EXEEXT):
    331         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    332 
     327        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     328

  • benchmark/Makefile.in

    r515a037 r85acec94  
    1717######################## -*- Mode: Makefile-Automake -*- ######################
    1818###############################################################################
     19
    1920VPATH = @srcdir@
    2021am__is_gnu_make = { \
    … …  
    9192build_triplet = @build@
    9293host_triplet = @host@
    93 EXTRA_PROGRAMS = dummy$(EXEEXT)
     94noinst_PROGRAMS =
    9495@WITH_LIBFIBRE_TRUE@am__append_1 = \
    9596@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run  \
    … …  
    107108CONFIG_CLEAN_FILES =
    108109CONFIG_CLEAN_VPATH_FILES =
    109 am_dummy_OBJECTS = c.$(OBJEXT) cxx.$(OBJEXT)
    110 dummy_OBJECTS = $(am_dummy_OBJECTS)
    111 dummy_LDADD = $(LDADD)
     110PROGRAMS = $(noinst_PROGRAMS)
    112111AM_V_P = $(am__v_P_@AM_V@)
    113112am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    … …  
    122121am__v_at_0 = @
    123122am__v_at_1 =
    124 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
    125 depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
    126 am__depfiles_maybe = depfiles
    127 am__mv = mv -f
    128 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    129         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    130 AM_V_CC = $(am__v_CC_@AM_V@)
    131 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
    132 am__v_CC_0 = @echo "  CC      " $@;
    133 am__v_CC_1 =
    134 CCLD = $(CC)
    135 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    136 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
    137 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
    138 am__v_CCLD_0 = @echo "  CCLD    " $@;
    139 am__v_CCLD_1 =
    140 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    141         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    142 AM_V_CXX = $(am__v_CXX_@AM_V@)
    143 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
    144 am__v_CXX_0 = @echo "  CXX     " $@;
    145 am__v_CXX_1 =
    146 CXXLD = $(CXX)
    147 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    148         -o $@
    149 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
    150 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
    151 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
    152 am__v_CXXLD_1 =
    153 SOURCES = $(dummy_SOURCES)
    154 DIST_SOURCES = $(dummy_SOURCES)
     123SOURCES =
     124DIST_SOURCES =
    155125am__can_run_installinfo = \
    156126  case $$AM_UPDATE_INFO_DIR in \
    … …  
    159129  esac
    160130am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    161 # Read a list of newline-separated strings from the standard input,
    162 # and print each of them once, without duplicates.  Input order is
    163 # *not* preserved.
    164 am__uniquify_input = $(AWK) '\
    165   BEGIN { nonempty = 0; } \
    166   { items[$$0] = 1; nonempty = 1; } \
    167   END { if (nonempty) { for (i in items) print i; }; } \
    168 '
    169 # Make sure the list of sources is unique.  This is necessary because,
    170 # e.g., the same source file might be shared among _SOURCES variables
    171 # for different programs/libraries.
    172 am__define_uniq_tagged_files = \
    173   list='$(am__tagged_files)'; \
    174   unique=`for i in $$list; do \
    175     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    176   done | $(am__uniquify_input)`
    177 ETAGS = etags
    178 CTAGS = ctags
    179 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp \
    180         $(top_srcdir)/src/cfa.make compile
     131am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/src/cfa.make \
     132        compile
    181133DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    182134ACLOCAL = @ACLOCAL@
    … …  
    317269am__v_CFA_0 = @echo "  CFA     " $@;
    318270am__v_CFA_1 =
    319 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    320 am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
    321 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
    322 am__v_JAVAC_1 =
    323 AM_V_GOC = $(am__v_GOC_@AM_V@)
    324 am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
    325 am__v_GOC_0 = @echo "  GOC     " $@;
    326 am__v_GOC_1 =
     271
     272# applies to both programs
    327273UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    328 AM_V_UPP = $(am__v_UPP_@AM_V@)
    329 am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@)
    330 am__v_UPP_0 = @echo "  UPP     " $@;
    331 am__v_UPP_1 =
    332 
    333 # applies to both programs
    334 UPPCC = u++
    335274AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    336275AM_CFAFLAGS = -quiet -in-tree -nodebug
    … …  
    343282TIME_FORMAT = "%E"
    344283PRINT_FORMAT = %20s: #Comments needed for spacing
    345 dummy_SOURCES = c.c cxx.cpp
    346284CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
    347285        ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
    … …  
    354292
    355293.SUFFIXES:
    356 .SUFFIXES: .c .cfa .cpp .lo .o .obj
     294.SUFFIXES: .cfa .lo .o
    357295$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    358296        @for dep in $?; do \
    … …  
    386324$(am__aclocal_m4_deps):
    387325
    388 dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES) $(EXTRA_dummy_DEPENDENCIES)
    389         @rm -f dummy$(EXEEXT)
    390         $(AM_V_CXXLD)$(CXXLINK) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
    391 
    392 mostlyclean-compile:
    393         -rm -f *.$(OBJEXT)
    394 
    395 distclean-compile:
    396         -rm -f *.tab.c
    397 
    398 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c.Po@am__quote@
    399 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx.Po@am__quote@
    400 
    401 .c.o:
    402 @am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    403 @am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    404 @am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
    405 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    406 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    407 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
    408 
    409 .c.obj:
    410 @am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
    411 @am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
    412 @am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
    413 @AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    414 @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    415 @am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    416 
    417 .cpp.o:
    418 @am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    419 @am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    420 @am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    421 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    422 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    423 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
    424 
    425 .cpp.obj:
    426 @am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
    427 @am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
    428 @am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
    429 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
    430 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    431 @am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    432 
    433 ID: $(am__tagged_files)
    434         $(am__define_uniq_tagged_files); mkid -fID $$unique
    435 tags: tags-am
    436 TAGS: tags
    437 
    438 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
    439         set x; \
    440         here=`pwd`; \
    441         $(am__define_uniq_tagged_files); \
    442         shift; \
    443         if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
    444           test -n "$$unique" || unique=$$empty_fix; \
    445           if test $$# -gt 0; then \
    446             $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    447               "$$@" $$unique; \
    448           else \
    449             $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    450               $$unique; \
    451           fi; \
    452         fi
    453 ctags: ctags-am
    454 
    455 CTAGS: ctags
    456 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
    457         $(am__define_uniq_tagged_files); \
    458         test -z "$(CTAGS_ARGS)$$unique" \
    459           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
    460              $$unique
    461 
    462 GTAGS:
    463         here=`$(am__cd) $(top_builddir) && pwd` \
    464           && $(am__cd) $(top_srcdir) \
    465           && gtags -i $(GTAGS_ARGS) "$$here"
    466 cscopelist: cscopelist-am
    467 
    468 cscopelist-am: $(am__tagged_files)
    469         list='$(am__tagged_files)'; \
    470         case "$(srcdir)" in \
    471           [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
    472           *) sdir=$(subdir)/$(srcdir) ;; \
    473         esac; \
    474         for i in $$list; do \
    475           if test -f "$$i"; then \
    476             echo "$(subdir)/$$i"; \
    477           else \
    478             echo "$$sdir/$$i"; \
    479           fi; \
    480         done >> $(top_builddir)/cscope.files
    481 
    482 distclean-tags:
    483         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
     326clean-noinstPROGRAMS:
     327        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
     328tags TAGS:
     329
     330ctags CTAGS:
     331
     332cscope cscopelist:
     333
    484334
    485335distdir: $(DISTFILES)
    … …  
    515365check-am: all-am
    516366check: check-am
    517 all-am: Makefile
     367all-am: Makefile $(PROGRAMS)
    518368installdirs:
    519369install: install-am
    … …  
    549399clean: clean-am
    550400
    551 clean-am: clean-generic mostlyclean-am
     401clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
    552402
    553403distclean: distclean-am
    554         -rm -rf ./$(DEPDIR)
    555404        -rm -f Makefile
    556 distclean-am: clean-am distclean-compile distclean-generic \
    557         distclean-tags
     405distclean-am: clean-am distclean-generic
    558406
    559407dvi: dvi-am
    … …  
    598446
    599447maintainer-clean: maintainer-clean-am
    600         -rm -rf ./$(DEPDIR)
    601448        -rm -f Makefile
    602449maintainer-clean-am: distclean-am maintainer-clean-generic
    … …  
    604451mostlyclean: mostlyclean-am
    605452
    606 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     453mostlyclean-am: mostlyclean-generic
    607454
    608455pdf: pdf-am
    … …  
    618465.MAKE: install-am install-strip
    619466
    620 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
    621         cscopelist-am ctags ctags-am distclean distclean-compile \
    622         distclean-generic distclean-tags distdir dvi dvi-am html \
    623         html-am info info-am install install-am install-data \
    624         install-data-am install-dvi install-dvi-am install-exec \
    625         install-exec-am install-html install-html-am install-info \
    626         install-info-am install-man install-pdf install-pdf-am \
    627         install-ps install-ps-am install-strip installcheck \
    628         installcheck-am installdirs maintainer-clean \
    629         maintainer-clean-generic mostlyclean mostlyclean-compile \
    630         mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
     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 \
    631477        uninstall-am
    632478
    … …  
    644490        $(am__mv) $$depbase.Tpo $$depbase.Plo
    645491
    646 #prevent any tests in parallel
    647492.NOTPARALLEL:
    648493
    … …  
    656501        @${STATS} .result.log
    657502        @echo "------------------------------------------------------"
    658         @rm -f a.out .result.log *.class
     503        @rm -f a.out .result.log
    659504
    660505%.runquiet :
    … …  
    706551
    707552loop$(EXEEXT):
    708         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     553        $(COMPILE) -DBENCH_N=5000000000 loop.c
    709554
    710555function$(EXEEXT):
    711         $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     556        $(COMPILE) -DBENCH_N=5000000000 function.c
    712557
    713558fetch_add$(EXEEXT):
    714         $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     559        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    715560
    716561@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    717 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     562@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    718563
    719564@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
    720 @WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     565@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    721566
    722567ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    723568
    724569ctxswitch-pthread$(EXEEXT):
    725         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     570        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    726571
    727572ctxswitch-cfa_coroutine$(EXEEXT):
    728         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     573        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    729574
    730575ctxswitch-cfa_thread$(EXEEXT):
    731         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     576        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
    732577
    733578ctxswitch-cfa_thread2$(EXEEXT):
    734         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     579        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    735580
    736581ctxswitch-upp_coroutine$(EXEEXT):
    737         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     582        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    738583
    739584ctxswitch-upp_thread$(EXEEXT):
    740         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     585        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    741586
    742587ctxswitch-goroutine$(EXEEXT):
    743         $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     588        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    744589
    745590ctxswitch-java_thread$(EXEEXT):
    746         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
     591        @javac $(srcdir)/ctxswitch/JavaThread.java
    747592        @echo "#!/bin/sh" > a.out
    748         @echo "java JavaThread" >> a.out
     593        @echo "cd ctxswitch && java JavaThread" >> a.out
    749594        @chmod a+x a.out
    750595
    … …  
    761606
    762607mutex-pthread_lock$(EXEEXT):
    763         $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     608        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    764609
    765610mutex-upp$(EXEEXT):
    766         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     611        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    767612
    768613mutex-cfa1$(EXEEXT):
    769         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     614        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    770615
    771616mutex-cfa2$(EXEEXT):
    772         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     617        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    773618
    774619mutex-cfa4$(EXEEXT):
    775         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     620        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    776621
    777622mutex-java_thread$(EXEEXT):
    778         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
     623        @javac $(srcdir)/mutex/JavaThread.java
    779624        @echo "#!/bin/sh" > a.out
    780         @echo "java JavaThread" >> a.out
     625        @echo "cd mutex && java JavaThread" >> a.out
    781626        @chmod a+x a.out
    782627
    … …  
    790635
    791636signal-pthread_cond$(EXEEXT):
    792         $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     637        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    793638
    794639signal-upp$(EXEEXT):
    795         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     640        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    796641
    797642signal-cfa1$(EXEEXT):
    798         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     643        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    799644
    800645signal-cfa2$(EXEEXT):
    801         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     646        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    802647
    803648signal-cfa4$(EXEEXT):
    804         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     649        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    805650
    806651signal-java_thread$(EXEEXT):
    807         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
     652        @javac $(srcdir)/schedint/JavaThread.java
    808653        @echo "#!/bin/sh" > a.out
    809         @echo "java JavaThread" >> a.out
     654        @echo "cd schedint && java JavaThread" >> a.out
    810655        @chmod a+x a.out
    811656
    … …  
    817662
    818663waitfor-upp$(EXEEXT):
    819         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     664        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    820665
    821666waitfor-cfa1$(EXEEXT):
    822         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     667        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    823668
    824669waitfor-cfa2$(EXEEXT):
    825         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     670        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    826671
    827672waitfor-cfa4$(EXEEXT):
    828         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     673        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    829674
    830675creation$(EXEEXT) :\
    … …  
    839684
    840685creation-cfa_coroutine$(EXEEXT):
    841         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     686        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    842687
    843688creation-cfa_coroutine_eager$(EXEEXT):
    844         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     689        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    845690
    846691creation-cfa_thread$(EXEEXT):
    847         $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     692        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    848693
    849694creation-upp_coroutine$(EXEEXT):
    850         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     695        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    851696
    852697creation-upp_thread$(EXEEXT):
    853         $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     698        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    854699
    855700creation-pthread$(EXEEXT):
    856         $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     701        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    857702
    858703creation-goroutine$(EXEEXT):
    859         $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
     704        @go build -o a.out $(srcdir)/creation/goroutine.go
    860705
    861706creation-java_thread$(EXEEXT):
    862         $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
     707        @javac $(srcdir)/creation/JavaThread.java
    863708        @echo "#!/bin/sh" > a.out
    864         @echo "java JavaThread" >> a.out
     709        @echo "cd creation && java JavaThread" >> a.out
    865710        @chmod a+x a.out
    866711
    … …  
    876721
    877722compile-array$(EXEEXT):
    878         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     723        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    879724
    880725compile-attributes$(EXEEXT):
    881         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     726        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    882727
    883728compile-empty$(EXEEXT):
    884         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     729        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    885730
    886731compile-expression$(EXEEXT):
    887         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     732        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    888733
    889734compile-io$(EXEEXT):
    890         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     735        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    891736
    892737compile-monitor$(EXEEXT):
    893         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     738        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    894739
    895740compile-operators$(EXEEXT):
    896         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     741        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    897742
    898743compile-thread$(EXEEXT):
    899         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     744        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    900745
    901746compile-typeof$(EXEEXT):
    902         $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     747        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    903748
    904749# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • driver/as.cc

    r515a037 r85acec94  
    1 //
     1// 
    22// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
    33//
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 //
     6// 
    77// as.c -- map assembler file, scan for debug information. If found, expand file by one character and insert Cforall
    88//         language code on the N line from the start of the debug information.
    9 //
     9// 
    1010// Author           : Peter A. Buhr
    1111// Created On       : Wed Aug  1 10:49:42 2018
    … …  
    1313// Last Modified On : Sat Sep  8 08:40:16 2018
    1414// Update Count     : 97
    15 //
     15// 
    1616
    1717#include <cstdio>                                                                               // perror
    … …  
    4545
    4646        if ( size ) {                                                                           // cannot map 0 sized file
    47                 char * start = (char *)mmap( NULL, size + 2, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 );
     47                char * start = (char *)mmap( NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 );
    4848                if ( start == (void *)-1 ) { perror( "mmap" ); exit( EXIT_FAILURE ); };
    4949
    … …  
    6565                } // if
    6666
    67                 if ( munmap( start, size + 2 ) ) { perror( "munmap" ); exit( EXIT_FAILURE ); }; // update on disk
     67                if ( munmap( start, size ) ) { perror( "munmap" ); exit( EXIT_FAILURE ); }; // update on disk
    6868        } // if
    6969

  • libcfa/src/Makefile.am

    r515a037 r85acec94  
    6868libdeps = $(join \
    6969        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
    70         $(notdir ${libobjs:.lo=.Plo}) \
     70        $(notdir ${libobjs:.lo=.Po}) \
    7171)
    7272
    73 include $(libdeps)
    74 
    75 $(libdeps):
    76         @mkdir -p $(dir $@)
    77         @echo '#dummy' > $@
     73-include $(libdeps)
    7874
    7975prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    80         ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
     76        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    8177
    8278prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    8379        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
    84         @CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
     80        @CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    8581
    8682

  • libcfa/src/Makefile.in

    r515a037 r85acec94  
    407407am__v_CFA_0 = @echo "  CFA     " $@;
    408408am__v_CFA_1 =
    409 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    410 am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
    411 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
    412 am__v_JAVAC_1 =
    413 AM_V_GOC = $(am__v_GOC_@AM_V@)
    414 am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
    415 am__v_GOC_0 = @echo "  GOC     " $@;
    416 am__v_GOC_1 =
    417 UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    418 AM_V_UPP = $(am__v_UPP_@AM_V@)
    419 am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@)
    420 am__v_UPP_0 = @echo "  UPP     " $@;
    421 am__v_UPP_1 =
    422409lib_LTLIBRARIES = libcfa.la
    423410
    … …  
    466453libdeps = $(join \
    467454        $(addsuffix $(DEPDIR)/ , $(dir $(libobjs) ) ), \
    468         $(notdir ${libobjs:.lo=.Plo}) \
     455        $(notdir ${libobjs:.lo=.Po}) \
    469456)
    470457
    … …  
    922909$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    923910
    924 include $(libdeps)
    925 
    926 $(libdeps):
    927         @mkdir -p $(dir $@)
    928         @echo '#dummy' > $@
     911-include $(libdeps)
    929912
    930913prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    931         ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
     914        ${AM_V_GEN}@CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    932915
    933916prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    934917        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
    935         @CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree @CONFIG_CFAFLAGS@ -XCFA -l ${<} -c -o ${@}
     918        @CFACC@ ${AM_CFLAGS} ${CFLAGS} -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    936919
    937920#----------------------------------------------------------------------------------------------------------------

  • libcfa/src/bits/locks.hfa

    r515a037 r85acec94  
    3737#endif
    3838
     39#if defined( __i386 ) || defined( __x86_64 ) || defined( __ARM_ARCH )
     40        // Intel recommendation
     41        #define __ALIGN__ __attribute__(( aligned (128) ))
     42#elif defined( __sparc )
     43        #define __ALIGN__ CALIGN
     44#else
     45        #error unsupported architecture
     46#endif
     47
    3948struct __spinlock_t {
    4049        // Wrap in struct to prevent false sharing with debug info
    41         volatile bool lock;
     50        struct {
     51                // Align lock on 128-bit boundary
     52                __ALIGN__ volatile bool lock;
     53        };
    4254        #ifdef __CFA_DEBUG__
    4355                // previous function to acquire the lock
    … …  
    4658                void* prev_thrd;
    4759        #endif
    48 };
     60} __ALIGN__;
    4961
    5062#ifdef __cforall

  • libcfa/src/iostream.cfa

    r515a037 r85acec94  
    194194                        // opening delimiters, no space after
    195195                        ['('] : Open, ['['] : Open, ['{'] : Open,
    196                         ['='] : Open, ['$'] : Open, [(unsigned char)'�'] : Open, [(unsigned char)'�'] : Open,
    197                         [(unsigned char)'�'] : Open, [(unsigned char)'�'] : Open, [(unsigned char)'�'] : Open,
     196                        ['='] : Open, ['$'] : Open, [(unsigned char)'£'] : Open, [(unsigned char)'¥'] : Open,
     197                        [(unsigned char)'¡'] : Open, [(unsigned char)'¿'] : Open, [(unsigned char)'«'] : Open,
    198198                        // closing delimiters, no space before
    199199                        [','] : Close, ['.'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
    200                         ['%'] : Close, [(unsigned char)'�'] : Close, [(unsigned char)'�'] : Close,
     200                        ['%'] : Close, [(unsigned char)'¢'] : Close, [(unsigned char)'»'] : Close,
    201201                        [')'] : Close, [']'] : Close, ['}'] : Close,
    202202                        // opening-closing delimiters, no space before or after

  • src/Parser/parser.yy

    r515a037 r85acec94  
    196196                new ExpressionNode( build_binary_val( compop == OperKinds::LThan || compop == OperKinds::LEThan ? // choose += or -= for upto/downto
    197197                                                                                          OperKinds::PlusAssn : OperKinds::MinusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) );
    198 <<<<<<< HEAD
    199 =======
    200198} // forCtrl
    201199
    … …  
    206204                SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); return nullptr;
    207205        } // if
    208 >>>>>>> master
    209206} // forCtrl
    210207
    … …  
    11481145
    11491146for_control_expression:
    1150 <<<<<<< HEAD
    1151         comma_expression_opt                                                            // CFA
    1152                 {
    1153                         if ( ! $1 ) {                                                           // => for ( ;; )
    1154                                 $$ = new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr );
    1155                         } else {
    1156                                 $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
    1157                                                           OperKinds::LThan, $1->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
    1158                         } // if
    1159                 }
    1160 =======
    11611147        comma_expression                                                                        // CFA
    11621148                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
    11631149                                                OperKinds::LThan, $1->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
    1164 >>>>>>> master
    11651150        | constant_expression inclexcl constant_expression      // CFA
    11661151                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
    11671152        | constant_expression inclexcl constant_expression '~' constant_expression // CFA
    11681153                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
    1169 <<<<<<< HEAD
    1170         | comma_expression_opt ';' comma_expression                     // CFA
    1171                 {
    1172                         if ( ! $1 ) {
    1173                                 SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
    1174                         } else if ( ! $3 ) {
    1175                                 SemanticError( yylloc, "Missing loop range." ); $$ = nullptr;
    1176                         } else {
    1177                                 if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
    1178                                         $$ = forCtrl( $3, new string( identifier->name ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
    1179                                                                   OperKinds::LThan, $3->clone(), new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
    1180                                 } else {
    1181                                         SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
    1182                                 } // if
    1183                         } // if
    1184                 }
    1185         | comma_expression_opt ';' constant_expression inclexcl constant_expression // CFA
    1186                 {
    1187                         if ( ! $1 ) {
    1188                                 SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
    1189                         } else {
    1190                                 if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
    1191                                         $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
    1192                                 } else {
    1193                                         SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
    1194                                 } // if
    1195                         } // if
    1196                 }
    1197         | comma_expression_opt ';' constant_expression inclexcl constant_expression '~' constant_expression // CFA
    1198                 {
    1199                         if ( ! $1 ) {
    1200                                 SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
    1201                         } else {
    1202                                 if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
    1203                                         $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, $7 );
    1204                                 } else {
    1205                                         SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
    1206                                 } // if
    1207                         } // if
    1208                 }
    1209         | comma_expression_opt ';' comma_expression_opt ';' comma_expression_opt
    1210 =======
    12111154        | comma_expression ';' comma_expression                         // CFA
    12121155                { $$ = forCtrl( $3, $1, new ExpressionNode( build_constantInteger( *new string( "0" ) ) ),
    … …  
    12171160                { $$ = forCtrl( $3, $1, $3->clone(), $4, $5, $7 ); }
    12181161        | comma_expression ';' comma_expression_opt ';' comma_expression_opt
    1219 >>>>>>> master
    12201162                { $$ = new ForCtrl( $1, $3, $5 ); }
    12211163        | ';' comma_expression_opt ';' comma_expression_opt
    … …  
    18861828        | TYPEOF '(' comma_expression ')'                                       // GCC: typeof( a+b ) y;
    18871829                { $$ = DeclarationNode::newTypeof( $3 ); }
    1888 <<<<<<< HEAD
    1889         | BASETYPEOF '(' type ')'                                                       // CFA: basetypeof(x) y;
    1890                 { $$ = $3; }
    1891         | BASETYPEOF '(' comma_expression ')'                           // CFA: basetypeof(a+b) y;
    1892                 { $$ = DeclarationNode::newTypeof( $3 ); }
    1893         | ATTR_TYPEGENname '(' type ')'                                         // CFA: e.g., @type(x) y;
    1894 =======
    18951830        | BASETYPEOF '(' type ')'                                                       // CFA: basetypeof( x ) y;
    18961831                { $$ = DeclarationNode::newTypeof( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ), true ); }
    … …  
    18981833                { $$ = DeclarationNode::newTypeof( $3, true ); }
    18991834        | ATTR_TYPEGENname '(' type ')'                                         // CFA: e.g., @type( x ) y;
    1900 >>>>>>> master
    19011835                { $$ = DeclarationNode::newAttr( $1, $3 ); }
    19021836        | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type( a+b ) y;

  • src/cfa.make

    r515a037 r85acec94  
    2121        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    2222        $(am__mv) $$depbase.Tpo $$depbase.Plo
    23 
    24 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    25 am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
    26 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
    27 am__v_JAVAC_1 =
    28 
    29 AM_V_GOC = $(am__v_GOC_@AM_V@)
    30 am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
    31 am__v_GOC_0 = @echo "  GOC     " $@;
    32 am__v_GOC_1 =
    33 
    34 
    35 UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    36 
    37 AM_V_UPP = $(am__v_UPP_@AM_V@)
    38 am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@)
    39 am__v_UPP_0 = @echo "  UPP     " $@;
    40 am__v_UPP_1 =

  • tests/Makefile.in

    r515a037 r85acec94  
    296296AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    297297CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
    298 LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    299         $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
    300         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
    301         $(AM_CFLAGS) $(CFLAGS)
    302 
    303298AM_V_CFA = $(am__v_CFA_@AM_V@)
    304299am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
    305300am__v_CFA_0 = @echo "  CFA     " $@;
    306301am__v_CFA_1 =
    307 AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
    308 am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
    309 am__v_JAVAC_0 = @echo "  JAVAC   " $@;
    310 am__v_JAVAC_1 =
    311 AM_V_GOC = $(am__v_GOC_@AM_V@)
    312 am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
    313 am__v_GOC_0 = @echo "  GOC     " $@;
    314 am__v_GOC_1 =
    315 UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    316 AM_V_UPP = $(am__v_UPP_@AM_V@)
    317 am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@)
    318 am__v_UPP_0 = @echo "  UPP     " $@;
    319 am__v_UPP_1 =
    320302debug = yes
    321303installed = no
    … …  
    334316
    335317.SUFFIXES:
    336 .SUFFIXES: .c .cfa .lo .o .obj .validate
     318.SUFFIXES: .c .cfa .o .obj .validate
    337319$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    338320        @for dep in $?; do \
    … …  
    633615        $(am__mv) $$depbase.Tpo $$depbase.Po
    634616
    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 
    640617.PHONY: list .validate
    641618.INTERMEDIATE: .validate .validate.cfa
Note: See TracChangeset for help on using the changeset viewer.