Changeset 05a0ff2 for src/benchmark/Makefile.am

Timestamp:

Dec 22, 2017, 1:49:23 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

c1bf35f

Parents:

6dfa2e1 (diff), 3eb4541 (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' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/benchmark/Makefile.am (modified) (4 diffs)

src/benchmark/Makefile.am

@@ -59 +59 @@
         @echo -e '\t"githash": "'${githash}'",'
         @echo -e '\t"arch": "'   ${arch}   '",'
-        @echo -e '\t"compile": {'
-        @+make compile TIME_FORMAT='%e,' PRINT_FORMAT='\t\t\"%s\" :'
-        @echo -e '\t\t"dummy" : {}'
-        @echo -e '\t},'
         @echo -e '\t"ctxswitch": {'
         @echo -en '\t\t"coroutine":'
@@ -162 +158 @@
 ## =========================================================================================================
 signal$(EXEEXT) :\
+        signal-pthread_cond.run \
         signal-upp.run          \
         signal-cfa1.run         \
@@ -168 +165 @@
         signal-java_thread.run
 
+signal-pthread_cond$(EXEEXT):
+        @@BACKEND_CC@ schedint/pthreads.c -DBENCH_N=500000      -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
 signal-upp$(EXEEXT):
         @u++          schedint/upp.cc     -DBENCH_N=5000000     -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
@@ -198 +198 @@
 
 waitfor-cfa1$(EXEEXT):
-        @${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        ${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 waitfor-cfa2$(EXEEXT):