Changeset 6d44da1 for benchmark/Makefile.in

Timestamp:

Sep 25, 2018, 11:35:34 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

c6bbcdb

Parents:

341bb80 (diff), 7428ad9 (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 shared_library

File:

• benchmark/Makefile.in (modified) (6 diffs)

benchmark/Makefile.in

@@ -93 +93 @@
 host_triplet = @host@
 noinst_PROGRAMS =
+@WITH_LIBFIBRE_TRUE@am__append_1 = \
+@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run  \
+@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre2.run
+
 subdir = benchmark
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -278 +282 @@
 TIME_FORMAT = "%E"
 PRINT_FORMAT = %20s: #Comments needed for spacing
+CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
+        ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
+        ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
+        ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
+        ctxswitch-goroutine.run ctxswitch-java_thread.run \
+        $(am__append_1)
 testdir = $(top_srcdir)/tests
 all: all-am
@@ -470 +480 @@
 
 
-.cfa.o: $(CFACC) $(CFACPP)
+.cfa.o:
         $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
         $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
         $(am__mv) $$depbase.Tpo $$depbase.Po
 
+<<<<<<< HEAD
 .cfa.lo:
         $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
@@ -482 +493 @@
 LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
 
+=======
+>>>>>>> master
 .NOTPARALLEL:
 
@@ -551 +564 @@
         $(COMPILE) -DBENCH_N=500000000  fetch_add.c
 
-ctxswitch$(EXEEXT): \
-        loop.run                                \
-        function.run                    \
-        fetch_add.run                   \
-        ctxswitch-pthread.run           \
-        ctxswitch-cfa_coroutine.run     \
-        ctxswitch-cfa_thread.run        \
-        ctxswitch-cfa_thread2.run       \
-        ctxswitch-upp_coroutine.run     \
-        ctxswitch-upp_thread.run        \
-        -ctxswitch-kos_fibre.run        \
-        -ctxswitch-kos_fibre2.run       \
-        ctxswitch-goroutine.run         \
-        ctxswitch-java_thread.run
+@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
+@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
+
+@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
+@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
+
+ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
 
 ctxswitch-pthread$(EXEEXT):
@@ -583 +589 @@
 ctxswitch-upp_thread$(EXEEXT):
         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
-
-ctxswitch-kos_fibre$(EXEEXT):
-        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
-
-ctxswitch-kos_fibre2$(EXEEXT):
-        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
 
 ctxswitch-goroutine$(EXEEXT):