Changeset 29702ad for tests

Timestamp:

Nov 22, 2022, 10:18:04 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

20cf96d

Parents:

1553a55 (diff), d41735a (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

Location:

tests

Files:

• .expect/PRNG.txt (deleted)
• .expect/PRNG.x64.txt (added)
• .expect/PRNG.x86.txt (added)
• .expect/nested_function.txt (deleted)
• .expect/nested_function.x64.txt (added)
• .expect/nested_function.x86.txt (added)
• PRNG.cfa (modified) (7 diffs)
• concurrent/barrier/generation.cfa (modified) (2 diffs)
• concurrent/barrier/order.cfa (modified) (1 diff)
• concurrent/once.cfa (modified) (1 diff)
• concurrent/readyQ/leader_spin.cfa (modified) (1 diff)
• ctrl-flow/.expect/ifwhileCtl.txt (moved) (moved from tests/.expect/ifwhileCtl.txt )
• ctrl-flow/.expect/loop-inc.txt (moved) (moved from tests/.expect/loop-inc.txt )
• ctrl-flow/.expect/loop_else.txt (moved) (moved from tests/.expect/loop_else.txt )
• ctrl-flow/.expect/loopctrl.txt (moved) (moved from tests/.expect/loopctrl.txt )
• ctrl-flow/ifwhileCtl.cfa (moved) (moved from tests/ifwhileCtl.cfa )
• ctrl-flow/loop-inc.cfa (moved) (moved from tests/loop-inc.cfa )
• ctrl-flow/loop_else.cfa (moved) (moved from tests/loop_else.cfa )
• ctrl-flow/loopctrl.cfa (moved) (moved from tests/loopctrl.cfa )
• enum_tests/.expect/anonymous.txt (added)
• enum_tests/anonymous.cfa (added)

tests/PRNG.cfa

@@ -8 +8 @@
 // Created On       : Wed Dec 29 09:38:12 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr  9 15:21:14 2022
-// Update Count     : 344
+// Last Modified On : Sun Nov 20 22:17:35 2022
+// Update Count     : 377
 // 
 
@@ -22 +22 @@
 #include <mutex_stmt.hfa>
 
+#ifdef __x86_64__                                                                               // 64-bit architecture
+#define PRNG PRNG64
+#else                                                                                                   // 32-bit architecture
+#define PRNG PRNG32
+#endif // __x86_64__
+
 #ifdef TIME                                                                                             // use -O2 -nodebug
 #define STARTTIME start = timeHiRes()
@@ -54 +60 @@
 
 
-uint32_t seed = 1009;
+unsigned int seed = 1009;
 
 thread T1 {};
@@ -158 +164 @@
 #if 1
         PRNG prng;
+
         if ( seed != 0 ) set_seed( prng, seed );
 
@@ -164 +171 @@
         for ( 20 ) {
                 sout | wd(13, prng( prng )) | nonl;                             // cascading => side-effect functions called in arbitary order
-                sout | wd(10, prng( prng, 5 )) | nonl;
-                sout | wd(13, prng( prng, 0, 5 ));
+                sout | wd(10, prng( prng, 5z )) | nonl;
+                sout | wd(13, prng( prng, 0, 5z ));
         } // for
         sout | sepEnable;
@@ -199 +206 @@
         for ( 20 ) {
                 sout | wd(13, prng()) | nonl;                                   // cascading => side-effect functions called in arbitary order
-                sout | wd(10, prng( 5 )) | nonl;
-                sout | wd(13, prng( 0, 5 ));
+                sout | wd(10, prng( 5z )) | nonl;
+                sout | wd(13, prng( 0, 5z ));
         } // for
         sout | sepEnable;
@@ -235 +242 @@
         for ( 20 ) {
                 sout | wd(13, prng( th )) | nonl;                               // cascading => side-effect functions called in arbitary order
-                sout | wd(10, prng( th, 5 )) | nonl;
-                sout | wd(13, prng( th, 0, 5 ));
+                sout | wd(10, prng( th, 5z )) | nonl;
+                sout | wd(13, prng( th, 0, 5z ));
         } // for
         sout | sepEnable;

tests/concurrent/barrier/generation.cfa

@@ -37 +37 @@
                 for(c; 'A' ~= 'Z') {
                         // Yield for chaos
-                        yield(prng(this, 10));
+                        yield( prng(this, 10) );
 
                         // Print the generation, no newline because
@@ -43 +43 @@
 
                         // Yield again for more chaos
-                        yield(prng(this, 10));
+                        yield( prng(this, 10) );
 
                         // Block on the barrier

tests/concurrent/barrier/order.cfa

@@ -37 +37 @@
         for(l; NUM_LAPS) {
                 // Yield for chaos
-                yield(prng(this, 10));
+                yield( prng(this, 10) );
 
                 // Block and what order we arrived

tests/concurrent/once.cfa

@@ -30 +30 @@
 
                 // sometime yields
-                yield(prng(this, 3));
+                yield( prng(this, 3) );
         }
 }

tests/concurrent/readyQ/leader_spin.cfa

@@ -26 +26 @@
 }
 
-PRNG lead_rng;
+PRNG64 lead_rng;
 volatile unsigned leader;
 volatile size_t lead_idx;
 
-const unsigned nthreads = 17;
-const unsigned stop_count = 327;
+const uint64_t nthreads = 17;
+const uint64_t stop_count = 327;
 
 thread$ * the_main;