Changeset 41b8ea4 for tests

Timestamp:

Oct 7, 2020, 5:10:45 PM (5 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

490fb92e, 69c5c00

Parents:

2fb35df (diff), 848439f (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:software/cfa/cfa-cc into master

Location:

tests

Files:

• .expect/array.txt (modified) (1 diff)
• .expect/expression.txt (modified) (1 diff)
• .expect/poly-d-cycle.txt (moved) (moved from tests/.expect/poly-cycle.txt )
• .expect/poly-o-cycle.txt (added)
• array.cfa (modified) (3 diffs)
• concurrent/park/contention.cfa (modified) (2 diffs)
• concurrent/park/force_preempt.cfa (modified) (2 diffs)
• concurrent/park/start_parked.cfa (modified) (2 diffs)
• expression.cfa (modified) (1 diff)
• poly-d-cycle.cfa (added)
• poly-o-cycle.cfa (moved) (moved from tests/poly-cycle.cfa ) (1 diff)

tests/.expect/array.txt

@@ -1 +1 @@
 array.cfa: In function '_X4mainFi___1':
-array.cfa:54:9: note: #pragma message: Compiled
+array.cfa:55:9: note: #pragma message: Compiled

tests/.expect/expression.txt

@@ -1 +1 @@
 expression.cfa: In function '_X4mainFi___1':
-expression.cfa:88:9: note: #pragma message: Compiled
+expression.cfa:89:9: note: #pragma message: Compiled

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/concurrent/park/contention.cfa

@@ -21 +21 @@
                 if(blocked[idx]) {
                         Thread * thrd = __atomic_exchange_n(&blocked[idx], 0p, __ATOMIC_SEQ_CST);
-                        unpark( *thrd __cfaabi_dbg_ctx2 );
+                        unpark( *thrd );
                 } else {
                         Thread * thrd = __atomic_exchange_n(&blocked[idx], &this, __ATOMIC_SEQ_CST);
-                        unpark( *thrd __cfaabi_dbg_ctx2 );
-                        park( __cfaabi_dbg_ctx );
+                        unpark( *thrd );
+                        park();
                 }
         }
@@ -41 +41 @@
                         int idx = myrand() % blocked_size;
                         Thread * thrd = __atomic_exchange_n(&blocked[idx], 0p, __ATOMIC_SEQ_CST);
-                        unpark( *thrd __cfaabi_dbg_ctx2 );
+                        unpark( *thrd );
                         yield( myrand() % 20 );
                 }

tests/concurrent/park/force_preempt.cfa

@@ -30 +30 @@
 
                 // Unpark this thread, don't force a yield
-                unpark( this __cfaabi_dbg_ctx2 );
+                unpark( this );
                 assert(mask == 0xCAFEBABA);
 
@@ -43 +43 @@
                 // Park this thread,
                 assert(mask == (id_hash ^ 0xCAFEBABA));
-                park( __cfaabi_dbg_ctx );
+                park();
                 assert(mask == (id_hash ^ 0xCAFEBABA));
 

tests/concurrent/park/start_parked.cfa

@@ -3 +3 @@
 thread Parker {};
 void main( Parker & ) {
-        park( __cfaabi_dbg_ctx );
+        park();
 }
 
@@ -9 +9 @@
         for(1000) {
                 Parker parker;
-                unpark( parker __cfaabi_dbg_ctx2 );
+                unpark( parker );
         }
         printf( "done\n" );                                                                     // non-empty .expect file

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

tests/poly-o-cycle.cfa

@@ -1 @@
-// Check that a cycle of polymorphic data structures can be instancated.
+// Check that a cycle of polymorphic otype structures can be instancated.
 
 #include <stdio.h>