Changeset e2e7330 for src/benchmark

Timestamp:

Jan 31, 2018, 5:50:34 PM (8 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, stuck-waitfor-destruct, with_gc

Children:

295e5071

Parents:

bc6f918 (diff), 281806b6 (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

Location:

src/benchmark

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)

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":'

src/benchmark/Makefile.in

@@ -473 +473 @@
         @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":'