Changeset d0c91a6 for benchmark


Ignore:
Timestamp:
Jan 15, 2019, 4:16:15 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
c802eb88
Parents:
5e49e47 (diff), c9aba81 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into jenkins-sandbox

Location:
benchmark
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.am

    r5e49e47 rd0c91a6  
    1616
    1717AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     18ACLOCAL_AMFLAGS  = -I automake
    1819
    1920# applies to both programs
    2021include $(top_srcdir)/src/cfa.make
    2122
    22 UPPCC = u++
    23 UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     23
    2424
    2525AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    … …  
    3535PRINT_FORMAT = %20s: #Comments needed for spacing
    3636
     37# Dummy hack tricks
    3738EXTRA_PROGRAMS = dummy # build but do not install
    38 
    3939dummy_SOURCES = dummyC.c dummyCXX.cpp
    4040
    … …  
    4747.NOTPARALLEL:
    4848
    49 noinst_PROGRAMS =
    50 
     49## =========================================================================================================
    5150all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
    5251
    … …  
    5857        @${STATS} .result.log
    5958        @echo "------------------------------------------------------"
    60         @rm -f a.out .result.log
     59        @rm -f a.out .result.log *.class
    6160
    6261%.runquiet :
    … …  
    111110## =========================================================================================================
    112111loop$(EXEEXT):
    113         $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     112        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    114113
    115114function$(EXEEXT):
    116         $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     115        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    117116
    118117fetch_add$(EXEEXT):
    119         $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     118        $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    120119
    121120## =========================================================================================================
    … …  
    140139
    141140ctxswitch-kos_fibre$(EXEEXT):
    142         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     141        $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    143142
    144143ctxswitch-kos_fibre2$(EXEEXT):
    145         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     144        $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    146145endif
    147146
    … …  
    149148
    150149ctxswitch-pthread$(EXEEXT):
    151         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     150        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    152151
    153152ctxswitch-cfa_coroutine$(EXEEXT):
    154         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     153        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    155154
    156155ctxswitch-cfa_thread$(EXEEXT):
    157         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     156        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    158157
    159158ctxswitch-cfa_thread2$(EXEEXT):
    160         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     159        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    161160
    162161ctxswitch-upp_coroutine$(EXEEXT):
    163         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     162        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    164163
    165164ctxswitch-upp_thread$(EXEEXT):
    166         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     165        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    167166
    168167ctxswitch-goroutine$(EXEEXT):
    169         @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     168        $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    170169
    171170ctxswitch-java_thread$(EXEEXT):
    172         @javac -d . $(srcdir)/ctxswitch/JavaThread.java
     171        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    173172        @echo "#!/bin/sh" > a.out
    174173        @echo "java JavaThread" >> a.out
    … …  
    188187
    189188mutex-pthread_lock$(EXEEXT):
    190         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     189        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    191190
    192191mutex-upp$(EXEEXT):
    193         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     192        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    194193
    195194mutex-cfa1$(EXEEXT):
    196         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     195        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    197196
    198197mutex-cfa2$(EXEEXT):
    199         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     198        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    200199
    201200mutex-cfa4$(EXEEXT):
    202         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     201        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    203202
    204203mutex-java_thread$(EXEEXT):
    205         @javac -d . $(srcdir)/mutex/JavaThread.java
     204        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    206205        @echo "#!/bin/sh" > a.out
    207206        @echo "java JavaThread" >> a.out
    … …  
    218217
    219218signal-pthread_cond$(EXEEXT):
    220         @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     219        $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    221220
    222221signal-upp$(EXEEXT):
    223         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     222        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    224223
    225224signal-cfa1$(EXEEXT):
    226         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     225        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    227226
    228227signal-cfa2$(EXEEXT):
    229         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     228        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    230229
    231230signal-cfa4$(EXEEXT):
    232         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     231        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    233232
    234233signal-java_thread$(EXEEXT):
    235         @javac -d . $(srcdir)/schedint/JavaThread.java
     234        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    236235        @echo "#!/bin/sh" > a.out
    237236        @echo "java JavaThread" >> a.out
    … …  
    247246
    248247waitfor-upp$(EXEEXT):
    249         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     248        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    250249
    251250waitfor-cfa1$(EXEEXT):
    252         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     251        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    253252
    254253waitfor-cfa2$(EXEEXT):
    255         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     254        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    256255
    257256waitfor-cfa4$(EXEEXT):
    258         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     257        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    259258
    260259## =========================================================================================================
    … …  
    270269
    271270creation-cfa_coroutine$(EXEEXT):
    272         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     271        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    273272
    274273creation-cfa_coroutine_eager$(EXEEXT):
    275         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
     274        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
    276275
    277276creation-cfa_thread$(EXEEXT):
    278         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     277        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    279278
    280279creation-upp_coroutine$(EXEEXT):
    281         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     280        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    282281
    283282creation-upp_thread$(EXEEXT):
    284         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     283        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    285284
    286285creation-pthread$(EXEEXT):
    287         @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     286        $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    288287
    289288creation-goroutine$(EXEEXT):
    290         @go build -o a.out $(srcdir)/creation/goroutine.go
     289        $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    291290
    292291creation-java_thread$(EXEEXT):
    293         @javac -d . $(srcdir)/creation/JavaThread.java
     292        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    294293        @echo "#!/bin/sh" > a.out
    295294        @echo "java JavaThread" >> a.out
    … …  
    312311
    313312compile-array$(EXEEXT):
    314         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     313        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    315314
    316315compile-attributes$(EXEEXT):
    317         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     316        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    318317
    319318compile-empty$(EXEEXT):
    320         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     319        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    321320
    322321compile-expression$(EXEEXT):
    323         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     322        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    324323
    325324compile-io$(EXEEXT):
    326         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     325        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    327326
    328327compile-monitor$(EXEEXT):
    329         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     328        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    330329
    331330compile-operators$(EXEEXT):
    332         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     331        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    333332
    334333compile-thread$(EXEEXT):
    335         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     334        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    336335
    337336compile-typeof$(EXEEXT):
    338         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    339 
     337        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     338

  • benchmark/Makefile.in

    r5e49e47 rd0c91a6  
    1717######################## -*- Mode: Makefile-Automake -*- ######################
    1818###############################################################################
    19 
    2019VPATH = @srcdir@
    2120am__is_gnu_make = { \
    … …  
    9392host_triplet = @host@
    9493EXTRA_PROGRAMS = dummy$(EXEEXT)
    95 noinst_PROGRAMS =
    9694@WITH_LIBFIBRE_TRUE@am__append_1 = \
    9795@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run  \
    … …  
    10098subdir = benchmark
    10199ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    102 am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
    103         $(top_srcdir)/configure.ac
     100am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
     101        $(top_srcdir)/automake/ltoptions.m4 \
     102        $(top_srcdir)/automake/ltsugar.m4 \
     103        $(top_srcdir)/automake/ltversion.m4 \
     104        $(top_srcdir)/automake/lt~obsolete.m4 \
     105        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
    104106am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    105107        $(ACLOCAL_M4)
    … …  
    109111CONFIG_CLEAN_FILES =
    110112CONFIG_CLEAN_VPATH_FILES =
    111 PROGRAMS = $(noinst_PROGRAMS)
    112113am_dummy_OBJECTS = dummyC.$(OBJEXT) dummyCXX.$(OBJEXT)
    113114dummy_OBJECTS = $(am_dummy_OBJECTS)
    114115dummy_LDADD = $(LDADD)
     116AM_V_lt = $(am__v_lt_@AM_V@)
     117am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     118am__v_lt_0 = --silent
     119am__v_lt_1 =
    115120AM_V_P = $(am__v_P_@AM_V@)
    116121am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    … …  
    131136COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    132137        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     138LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     139        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
     140        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     141        $(AM_CFLAGS) $(CFLAGS)
    133142AM_V_CC = $(am__v_CC_@AM_V@)
    134143am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
    … …  
    136145am__v_CC_1 =
    137146CCLD = $(CC)
    138 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     147LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     148        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     149        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    139150AM_V_CCLD = $(am__v_CCLD_@AM_V@)
    140151am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
    … …  
    143154CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    144155        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     156LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     157        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
     158        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     159        $(AM_CXXFLAGS) $(CXXFLAGS)
    145160AM_V_CXX = $(am__v_CXX_@AM_V@)
    146161am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
    … …  
    148163am__v_CXX_1 =
    149164CXXLD = $(CXX)
    150 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    151         -o $@
     165CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     166        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     167        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    152168AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
    153169am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
    … …  
    187203AMTAR = @AMTAR@
    188204AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     205AR = @AR@
    189206AUTOCONF = @AUTOCONF@
    190207AUTOHEADER = @AUTOHEADER@
    191208AUTOMAKE = @AUTOMAKE@
    192209AWK = @AWK@
    193 BACKEND_CC = @BACKEND_CC@
    194210BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    195211CC = @CC@
    … …  
    211227CPPFLAGS = @CPPFLAGS@
    212228CXX = @CXX@
     229CXXCPP = @CXXCPP@
    213230CXXDEPMODE = @CXXDEPMODE@
    214231CXXFLAGS = @CXXFLAGS@
    … …  
    216233DEFS = @DEFS@
    217234DEPDIR = @DEPDIR@
     235DLLTOOL = @DLLTOOL@
    218236DRIVER_DIR = @DRIVER_DIR@
     237DSYMUTIL = @DSYMUTIL@
     238DUMPBIN = @DUMPBIN@
    219239ECHO_C = @ECHO_C@
    220240ECHO_N = @ECHO_N@
    … …  
    222242EGREP = @EGREP@
    223243EXEEXT = @EXEEXT@
     244FGREP = @FGREP@
    224245GREP = @GREP@
    225246HOST_FLAGS = @HOST_FLAGS@
    … …  
    229250INSTALL_SCRIPT = @INSTALL_SCRIPT@
    230251INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     252LD = @LD@
    231253LDFLAGS = @LDFLAGS@
    232254LEX = @LEX@
    … …  
    237259LIBOBJS = @LIBOBJS@
    238260LIBS = @LIBS@
     261LIBTOOL = @LIBTOOL@
     262LIPO = @LIPO@
     263LN_S = @LN_S@
    239264LTLIBOBJS = @LTLIBOBJS@
     265LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    240266MAKEINFO = @MAKEINFO@
     267MANIFEST_TOOL = @MANIFEST_TOOL@
    241268MKDIR_P = @MKDIR_P@
     269NM = @NM@
     270NMEDIT = @NMEDIT@
     271OBJDUMP = @OBJDUMP@
    242272OBJEXT = @OBJEXT@
     273OTOOL = @OTOOL@
     274OTOOL64 = @OTOOL64@
    243275PACKAGE = @PACKAGE@
    244276PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    250282PATH_SEPARATOR = @PATH_SEPARATOR@
    251283RANLIB = @RANLIB@
     284SED = @SED@
    252285SET_MAKE = @SET_MAKE@
    253286SHELL = @SHELL@
    … …  
    261294abs_top_builddir = @abs_top_builddir@
    262295abs_top_srcdir = @abs_top_srcdir@
     296ac_ct_AR = @ac_ct_AR@
    263297ac_ct_CC = @ac_ct_CC@
    264298ac_ct_CXX = @ac_ct_CXX@
     299ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    265300am__include = @am__include@
    266301am__leading_dot = @am__leading_dot@
    … …  
    310345top_srcdir = @top_srcdir@
    311346AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     347ACLOCAL_AMFLAGS = -I automake
    312348CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
    313349LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
    … …  
    320356am__v_CFA_0 = @echo "  CFA     " $@;
    321357am__v_CFA_1 =
    322 
    323 # applies to both programs
     358AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
     359am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
     360am__v_JAVAC_0 = @echo "  JAVAC   " $@;
     361am__v_JAVAC_1 =
     362AM_V_GOC = $(am__v_GOC_@AM_V@)
     363am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
     364am__v_GOC_0 = @echo "  GOC     " $@;
     365am__v_GOC_1 =
    324366UPPCC = u++
    325367UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     368AM_V_UPP = $(am__v_UPP_@AM_V@)
     369am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@)
     370am__v_UPP_0 = @echo "  UPP     " $@;
     371am__v_UPP_1 =
     372
     373# applies to both programs
    326374AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    327375AM_CFAFLAGS = -quiet -in-tree -nodebug
    … …  
    377425$(am__aclocal_m4_deps):
    378426
    379 clean-noinstPROGRAMS:
    380         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
    381 
    382427dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES) $(EXTRA_dummy_DEPENDENCIES)
    383428        @rm -f dummy$(EXEEXT)
    … …  
    409454@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    410455
     456.c.lo:
     457@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     458@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     459@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Plo
     460@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     461@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     462@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
     463
    411464.cpp.o:
    412465@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    … …  
    424477@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    425478@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     479
     480.cpp.lo:
     481@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     482@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     483@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
     484@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     485@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     486@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
     487
     488mostlyclean-libtool:
     489        -rm -f *.lo
     490
     491clean-libtool:
     492        -rm -rf .libs _libs
    426493
    427494ID: $(am__tagged_files)
    … …  
    509576check-am: all-am
    510577check: check-am
    511 all-am: Makefile $(PROGRAMS)
     578all-am: Makefile
    512579installdirs:
    513580install: install-am
    … …  
    543610clean: clean-am
    544611
    545 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
     612clean-am: clean-generic clean-libtool mostlyclean-am
    546613
    547614distclean: distclean-am
    … …  
    598665mostlyclean: mostlyclean-am
    599666
    600 mostlyclean-am: mostlyclean-compile mostlyclean-generic
     667mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     668        mostlyclean-libtool
    601669
    602670pdf: pdf-am
    … …  
    613681
    614682.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 \
    625         uninstall-am
     683        clean-libtool cscopelist-am ctags ctags-am distclean \
     684        distclean-compile distclean-generic distclean-libtool \
     685        distclean-tags distdir dvi dvi-am html html-am info info-am \
     686        install install-am install-data install-data-am install-dvi \
     687        install-dvi-am install-exec install-exec-am install-html \
     688        install-html-am install-info install-info-am install-man \
     689        install-pdf install-pdf-am install-ps install-ps-am \
     690        install-strip installcheck installcheck-am installdirs \
     691        maintainer-clean maintainer-clean-generic mostlyclean \
     692        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     693        pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
    626694
    627695.PRECIOUS: Makefile
    … …  
    655723        @${STATS} .result.log
    656724        @echo "------------------------------------------------------"
    657         @rm -f a.out .result.log
     725        @rm -f a.out .result.log *.class
    658726
    659727%.runquiet :
    … …  
    705773
    706774loop$(EXEEXT):
    707         $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
     775        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    708776
    709777function$(EXEEXT):
    710         $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
     778        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    711779
    712780fetch_add$(EXEEXT):
    713         $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     781        $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
    714782
    715783@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
    716 @WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     784@WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    717785
    718786@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
    719 @WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     787@WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    720788
    721789ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    722790
    723791ctxswitch-pthread$(EXEEXT):
    724         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     792        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    725793
    726794ctxswitch-cfa_coroutine$(EXEEXT):
    727         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
     795        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    728796
    729797ctxswitch-cfa_thread$(EXEEXT):
    730         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
     798        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    731799
    732800ctxswitch-cfa_thread2$(EXEEXT):
    733         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
     801        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    734802
    735803ctxswitch-upp_coroutine$(EXEEXT):
    736         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     804        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    737805
    738806ctxswitch-upp_thread$(EXEEXT):
    739         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     807        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    740808
    741809ctxswitch-goroutine$(EXEEXT):
    742         @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     810        $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    743811
    744812ctxswitch-java_thread$(EXEEXT):
    745         @javac -d . $(srcdir)/ctxswitch/JavaThread.java
     813        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    746814        @echo "#!/bin/sh" > a.out
    747815        @echo "java JavaThread" >> a.out
    … …  
    760828
    761829mutex-pthread_lock$(EXEEXT):
    762         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     830        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    763831
    764832mutex-upp$(EXEEXT):
    765         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     833        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    766834
    767835mutex-cfa1$(EXEEXT):
    768         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
     836        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    769837
    770838mutex-cfa2$(EXEEXT):
    771         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
     839        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    772840
    773841mutex-cfa4$(EXEEXT):
    774         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
     842        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    775843
    776844mutex-java_thread$(EXEEXT):
    777         @javac -d . $(srcdir)/mutex/JavaThread.java
     845        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    778846        @echo "#!/bin/sh" > a.out
    779847        @echo "java JavaThread" >> a.out
    … …  
    789857
    790858signal-pthread_cond$(EXEEXT):
    791         @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     859        $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    792860
    793861signal-upp$(EXEEXT):
    794         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     862        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    795863
    796864signal-cfa1$(EXEEXT):
    797         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
     865        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    798866
    799867signal-cfa2$(EXEEXT):
    800         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
     868        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    801869
    802870signal-cfa4$(EXEEXT):
    803         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
     871        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    804872
    805873signal-java_thread$(EXEEXT):
    806         @javac -d . $(srcdir)/schedint/JavaThread.java
     874        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    807875        @echo "#!/bin/sh" > a.out
    808876        @echo "java JavaThread" >> a.out
    … …  
    816884
    817885waitfor-upp$(EXEEXT):
    818         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     886        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    819887
    820888waitfor-cfa1$(EXEEXT):
    821         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
     889        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    822890
    823891waitfor-cfa2$(EXEEXT):
    824         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
     892        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    825893
    826894waitfor-cfa4$(EXEEXT):
    827         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
     895        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    828896
    829897creation$(EXEEXT) :\
    … …  
    838906
    839907creation-cfa_coroutine$(EXEEXT):
    840         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
     908        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    841909
    842910creation-cfa_coroutine_eager$(EXEEXT):
    843         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
     911        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
    844912
    845913creation-cfa_thread$(EXEEXT):
    846         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
     914        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    847915
    848916creation-upp_coroutine$(EXEEXT):
    849         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     917        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    850918
    851919creation-upp_thread$(EXEEXT):
    852         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     920        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    853921
    854922creation-pthread$(EXEEXT):
    855         @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     923        $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    856924
    857925creation-goroutine$(EXEEXT):
    858         @go build -o a.out $(srcdir)/creation/goroutine.go
     926        $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    859927
    860928creation-java_thread$(EXEEXT):
    861         @javac -d . $(srcdir)/creation/JavaThread.java
     929        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    862930        @echo "#!/bin/sh" > a.out
    863931        @echo "java JavaThread" >> a.out
    … …  
    875943
    876944compile-array$(EXEEXT):
    877         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
     945        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    878946
    879947compile-attributes$(EXEEXT):
    880         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
     948        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    881949
    882950compile-empty$(EXEEXT):
    883         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
     951        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    884952
    885953compile-expression$(EXEEXT):
    886         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
     954        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    887955
    888956compile-io$(EXEEXT):
    889         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
     957        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    890958
    891959compile-monitor$(EXEEXT):
    892         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
     960        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    893961
    894962compile-operators$(EXEEXT):
    895         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
     963        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    896964
    897965compile-thread$(EXEEXT):
    898         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
     966        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    899967
    900968compile-typeof$(EXEEXT):
    901         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
     969        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    902970
    903971# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • benchmark/Monitor.c

    r5e49e47 rd0c91a6  
    2929        EndTime = Time();
    3030
    31         sout | ( EndTime - StartTime ) / N | endl;
     31        sout | ( EndTime - StartTime ) / N;
    3232}
Note: See TracChangeset for help on using the changeset viewer.