Changeset 3fddc6b

Timestamp:

Feb 23, 2017, 2:13:38 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

aaron-thesis, arm-eh, 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:

ca1a547, eac73eb

Parents:

bf76eab (diff), 6291725 (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 plg2:software/cfa/cfa-cc

Files:

• Jenkins/FullBuild (modified) (1 diff)
• Jenkinsfile (modified) (1 diff)
• src/benchmark/Makefile.am (modified) (4 diffs)
• src/benchmark/Makefile.in (modified) (4 diffs)
• src/benchmark/csv-data.c (modified) (1 diff)

Jenkins/FullBuild

@@ -20 +20 @@
 
                                         parallel (
-                                                gcc_6_x64: { trigger_build( 'gcc-6', 'x64' ) },
-                                                gcc_6_x86: { trigger_build( 'gcc-6', 'x86' ) },
-                                                gcc_5_x64: { trigger_build( 'gcc-5', 'x64' ) },
-                                                gcc_5_x86: { trigger_build( 'gcc-5', 'x86' ) },
-                                                gcc_4_x64: { trigger_build( 'gcc-4', 'x64' ) },
-                                                gcc_4_x86: { trigger_build( 'gcc-4', 'x86' ) },
-                                                clang_x64: { trigger_build( 'clang', 'x64' ) },
-                                                clang_x86: { trigger_build( 'clang', 'x86' ) },
+                                                gcc_6_x64: { trigger_build( 'gcc-6',   'x64' ) },
+                                                gcc_6_x86: { trigger_build( 'gcc-6',   'x86' ) },
+                                                gcc_5_x64: { trigger_build( 'gcc-5',   'x64' ) },
+                                                gcc_5_x86: { trigger_build( 'gcc-5',   'x86' ) },
+                                                gcc_4_x64: { trigger_build( 'gcc-4.9', 'x64' ) },
+                                                gcc_4_x86: { trigger_build( 'gcc-4.9', 'x86' ) },
+                                                clang_x64: { trigger_build( 'clang',   'x64' ) },
+                                                clang_x86: { trigger_build( 'clang',   'x86' ) },
                                         )
 

Jenkinsfile

@@ -68 +68 @@
         finally {
                 //Send email with final results if this is not a full build
-                if( (!do_sendemail) && (!bIsSandbox) ) {
+                if( do_sendemail && !bIsSandbox ) {
                         echo 'Notifying users of result'
                         email(currentBuild.result, log_needed)

src/benchmark/Makefile.am

@@ -24 +24 @@
 bench :
         @for ccflags in "-debug" "-nodebug"; do \
-                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
+                echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
                 ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
                 ./a.out ; \
@@ -31 +31 @@
 
 ctxswitch-coroutine:
-        ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 CorCtxSwitch.c
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
                 ./a.out ; \
@@ -38 +38 @@
 
 ctxswitch-thread:
-        ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
                 ./a.out ; \
@@ -45 +45 @@
 
 csv-data:
-        @${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -quiet -DN=10000000 csv-data.c
+        @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
         @./a.out
         @rm -f ./a.out

src/benchmark/Makefile.in

@@ -471 +471 @@
 bench :
         @for ccflags in "-debug" "-nodebug"; do \
-                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
+                echo ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -lrt bench.c;\
                 ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt bench.c;\
                 ./a.out ; \
@@ -478 +478 @@
 
 ctxswitch-coroutine:
-        ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 CorCtxSwitch.c
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 CorCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
                 ./a.out ; \
@@ -485 +485 @@
 
 ctxswitch-thread:
-        ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
+        ${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -DN=10000000 ThrdCtxSwitch.c
         @for number in 1 2 3 4 5 6 7 8 9 10; do \
                 ./a.out ; \
@@ -492 +492 @@
 
 csv-data:
-        @${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -nodebug -lrt -quiet -DN=10000000 csv-data.c
+        @${CC} ${AM_CFLAGS} ${CFLAGS} ${ccflags} @CFA_FLAGS@ -nodebug -lrt -quiet -DN=10000000 csv-data.c
         @./a.out
         @rm -f ./a.out

src/benchmark/csv-data.c

@@ -3 +3 @@
 #include <threads>
 
+extern "C" {
 #include <unistd.h>                                     // sysconf
 #include <sys/times.h>                                  // times
 #include <time.h>
+}
 
 inline unsigned long long int Time() {