Changeset 6d44da1 for benchmark/Makefile.am

Timestamp:

Sep 25, 2018, 11:35:34 AM (6 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.am (modified) (4 diffs)

benchmark/Makefile.am

@@ -33 +33 @@
 TIME_FORMAT = "%E"
 PRINT_FORMAT = %20s: #Comments needed for spacing
-
-LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
 
 .NOTPARALLEL:
@@ -111 +109 @@
 
 ## =========================================================================================================
-ctxswitch$(EXEEXT): \
+CTXSWITCH_DEPEND  =                 \
         loop.run                                \
         function.run                    \
@@ -121 +119 @@
         ctxswitch-upp_coroutine.run     \
         ctxswitch-upp_thread.run        \
-        -ctxswitch-kos_fibre.run        \
-        -ctxswitch-kos_fibre2.run       \
         ctxswitch-goroutine.run         \
         ctxswitch-java_thread.run
 
+if WITH_LIBFIBRE
+CTXSWITCH_DEPEND  +=           \
+        ctxswitch-kos_fibre.run  \
+        ctxswitch-kos_fibre2.run
+
+
+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
+endif
+
+ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
+
 ctxswitch-pthread$(EXEEXT):
         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
@@ -143 +154 @@
 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):