Changeset 6ca0dab

Timestamp:

Oct 7, 2020, 3:02:47 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5584342

Parents:

9e18677

Message:

Fixed bug in benchmarks due to new 'Compiled' pragma

Files:

• benchmark/Makefile.am (modified) (5 diffs)
• tests/array.cfa (modified) (3 diffs)
• tests/expression.cfa (modified) (1 diff)

benchmark/Makefile.am

@@ -146 +146 @@
 
 cleancsv:
-        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv scheduling.csv
+        rm -f compile.csv basic.csv ctxswitch.csv mutex.csv schedint.csv
 
 jenkins$(EXEEXT): cleancsv
@@ -157 +157 @@
         +make mutex.csv
         -+make mutex.diff.csv
-        +make scheduling.csv
-        -+make scheduling.diff.csv
+        +make schedint.csv
+        -+make schedint.diff.csv
 @DOifskipcompile@
         cat compile.csv
@@ -167 +167 @@
         cat mutex.csv
         -cat mutex.diff.csv
-        cat scheduling.csv
-        -cat scheduling.diff.csv
+        cat schedint.csv
+        -cat schedint.diff.csv
 
 compile.csv:
@@ -198 +198 @@
         $(srcdir)/fixcsv.sh $@
 
-scheduling.csv:
+schedint.csv:
         echo "building $@"
         echo "schedint-1,schedint-2,schedext-1,schedext-2" > $@
@@ -490 +490 @@
 
 compile-array$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/array.cfa
 
 compile-attributes$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/attributes.cfa
 
 compile-empty$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(srcdir)/compile/empty.cfa
 
 compile-expression$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/expression.cfa
 
 compile-io$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/io1.cfa
 
 compile-monitor$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
 
 compile-operators$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/operators.cfa
 
 compile-thread$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/concurrent/thread.cfa
 
 compile-typeof$(EXEEXT):
-        $(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
+        $(CFACOMPILE) -DNO_COMPILED_PRAGMA -fsyntax-only -w $(testdir)/typeof.cfa
 
 ## =========================================================================================================

tests/array.cfa

@@ -1 @@
-//                               -*- Mode: C -*- 
-// 
+//                               -*- Mode: C -*-
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
+//
 // array.cfa -- test array declarations
-// 
+//
 // Author           : Peter A. Buhr
 // Created On       : Tue Feb 19 21:18:06 2019
@@ -13 +13 @@
 // Last Modified On : Sun Sep 27 09:05:40 2020
 // Update Count     : 4
-// 
+//
 
 int a1[0];
@@ -50 +50 @@
 
 int main() {
-        #pragma message( "Compiled" )                                           // force non-empty .expect file
+        #if !defined(NO_COMPILED_PRAGMA)
+                #pragma message( "Compiled" )   // force non-empty .expect file
+        #endif
 }
 

tests/expression.cfa

@@ -84 +84 @@
         (S)@{2}`mary;
 
-        #pragma message( "Compiled" )                   // force non-empty .expect file
+        #if !defined(NO_COMPILED_PRAGMA)
+                #pragma message( "Compiled" )   // force non-empty .expect file
+        #endif
 } // main