Changeset 2dcd80a for tests

Timestamp:

Dec 14, 2022, 12:23:42 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

441a6a7

Parents:

7d9598d8 (diff), d8bdf13 (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)
• Makefile.am (modified) (2 diffs)
• PRNG.cfa (modified) (4 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) (2 diffs)
• 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)
• io/away_fair.cfa (modified) (1 diff)
• io/comp_fair.cfa (modified) (1 diff)
• linking/mangling/header.hfa (added)
• linking/mangling/lib.cfa (added)
• linking/mangling/main.cfa (added)

tests/Makefile.am

@@ -68 +68 @@
 .PHONY: list .validate .test_makeflags
 .INTERMEDIATE: .validate .validate.cfa .test_makeflags
-EXTRA_PROGRAMS = avl_test linkonce .dummy_hack # build but do not install
+EXTRA_PROGRAMS = avl_test linkonce linking/mangling/anon .dummy_hack # build but do not install
 EXTRA_DIST = test.py \
         pybin/__init__.py \
@@ -101 +101 @@
 avl_test_SOURCES = avltree/avl_test.cfa avltree/avl0.cfa avltree/avl1.cfa avltree/avl2.cfa avltree/avl3.cfa avltree/avl4.cfa avltree/avl-private.cfa
 linkonce_SOURCES = link-once/main.cfa link-once/partner.cfa
+linking_mangling_anon_SOURCES = linking/mangling/header.hfa linking/mangling/lib.cfa linking/mangling/main.cfa
 # automake doesn't know we still need C/CPP rules so pretend like we have a C program
 nodist__dummy_hack_SOURCES = .dummy_hack.c .dummy_hackxx.cpp

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 : Tue Nov 22 22:51:12 2022
+// Update Count     : 381
 // 
 
@@ -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 );
 

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;
@@ -50 +50 @@
         for(i; nthreads) {
                 while( threads[i]->idx != lead_idx ) {
-                        Pause();
+                        sched_yield();
                 }
         }

tests/io/away_fair.cfa

@@ -41 +41 @@
 
                 if(last == curr) {
-                        Pause();
+                        sched_yield();
                         continue;
                 }

tests/io/comp_fair.cfa

@@ -52 +52 @@
 
                 if(last == curr) {
-                        Pause();
+                        sched_yield();
                         continue;
                 }