Index: tests/.expect/PRNG.txt =================================================================== --- tests/.expect/PRNG.txt (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ (revision ) @@ -1,96 +1,0 @@ - - PRNG() PRNG(5) PRNG(0,5) - 37301721 2 2 - 1681308562 1 3 - 290112364 3 2 - 1852700364 4 3 - 733221210 1 3 - 1775396023 2 3 - 123981445 2 3 - 2062557687 2 0 - 283934808 1 0 - 672325890 1 3 - 1414344101 1 3 - 873424536 3 4 - 871831898 3 4 - 866783532 0 1 - 2142057611 4 4 - 17310256 2 5 - 802117363 0 4 - 492964499 0 0 - 2346353643 1 3 - 2143013105 3 2 -seed 1009 - -Sequential -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% - -Concurrent -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% - - prng() prng(5) prng(0,5) - 37301721 2 2 - 1681308562 1 3 - 290112364 3 2 - 1852700364 4 3 - 733221210 1 3 - 1775396023 2 3 - 123981445 2 3 - 2062557687 2 0 - 283934808 1 0 - 672325890 1 3 - 1414344101 1 3 - 873424536 3 4 - 871831898 3 4 - 866783532 0 1 - 2142057611 4 4 - 17310256 2 5 - 802117363 0 4 - 492964499 0 0 - 2346353643 1 3 - 2143013105 3 2 -seed 1009 - -Sequential -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% - -Concurrent -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% - - prng(t) prng(t,5) prng(t,0,5) - 37301721 2 2 - 1681308562 1 3 - 290112364 3 2 - 1852700364 4 3 - 733221210 1 3 - 1775396023 2 3 - 123981445 2 3 - 2062557687 2 0 - 283934808 1 0 - 672325890 1 3 - 1414344101 1 3 - 873424536 3 4 - 871831898 3 4 - 866783532 0 1 - 2142057611 4 4 - 17310256 2 5 - 802117363 0 4 - 492964499 0 0 - 2346353643 1 3 - 2143013105 3 2 -seed 1009 - -Sequential -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% - -Concurrent -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% -trials 100000000 buckets 100000 min 853 max 1141 avg 1000.0 std 31.1 rstd 3.1% Index: tests/.expect/PRNG.x64.txt =================================================================== --- tests/.expect/PRNG.x64.txt (revision d2ad1518036350cdec12ea05fd951c3f04312459) +++ tests/.expect/PRNG.x64.txt (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -0,0 +1,96 @@ + + PRNG() PRNG(5) PRNG(0,5) + 861 3 0 +10137507171299805328 1 2 +12205946788447993741 4 0 +16222929371023265189 2 5 +11921944259646500358 1 1 +9511863719043198063 2 0 +18170109536749574203 0 1 +15896208456307578543 0 3 +4171113079117645375 1 4 +5535309872453329531 1 1 +13293369315461644140 2 2 +855811942427900360 1 1 +9125507373316195824 1 5 +6942856496042419510 1 5 +16774706561877323900 2 4 +17765436951300330249 4 0 +3766082030894719812 1 2 +15818141700523398820 3 5 +1244962761353699441 0 5 +4506898200126256218 1 2 +seed 1009 + +Sequential +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% + +Concurrent +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% + + prng() prng(5) prng(0,5) + 861 3 0 +10137507171299805328 1 2 +12205946788447993741 4 0 +16222929371023265189 2 5 +11921944259646500358 1 1 +9511863719043198063 2 0 +18170109536749574203 0 1 +15896208456307578543 0 3 +4171113079117645375 1 4 +5535309872453329531 1 1 +13293369315461644140 2 2 +855811942427900360 1 1 +9125507373316195824 1 5 +6942856496042419510 1 5 +16774706561877323900 2 4 +17765436951300330249 4 0 +3766082030894719812 1 2 +15818141700523398820 3 5 +1244962761353699441 0 5 +4506898200126256218 1 2 +seed 1009 + +Sequential +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% + +Concurrent +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% + + prng(t) prng(t,5) prng(t,0,5) + 861 3 0 +10137507171299805328 1 2 +12205946788447993741 4 0 +16222929371023265189 2 5 +11921944259646500358 1 1 +9511863719043198063 2 0 +18170109536749574203 0 1 +15896208456307578543 0 3 +4171113079117645375 1 4 +5535309872453329531 1 1 +13293369315461644140 2 2 +855811942427900360 1 1 +9125507373316195824 1 5 +6942856496042419510 1 5 +16774706561877323900 2 4 +17765436951300330249 4 0 +3766082030894719812 1 2 +15818141700523398820 3 5 +1244962761353699441 0 5 +4506898200126256218 1 2 +seed 1009 + +Sequential +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% + +Concurrent +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% +trials 100000000 buckets 100000 min 875 max 1138 avg 1000.0 std 31.8 rstd 3.2% Index: tests/.expect/nested_function.txt =================================================================== --- tests/.expect/nested_function.txt (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ tests/.expect/nested_function.txt (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -1,1 +1,1 @@ -total 105 +total 80 Index: tests/PRNG.cfa =================================================================== --- tests/PRNG.cfa (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ tests/PRNG.cfa (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -8,6 +8,6 @@ // 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,4 +22,10 @@ #include +#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,5 +60,5 @@ -uint32_t seed = 1009; +unsigned int seed = 1009; thread T1 {}; @@ -158,4 +164,5 @@ #if 1 PRNG prng; + if ( seed != 0 ) set_seed( prng, seed ); @@ -164,6 +171,6 @@ 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,6 +206,6 @@ 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,6 +242,6 @@ 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; Index: tests/concurrent/barrier/generation.cfa =================================================================== --- tests/concurrent/barrier/generation.cfa (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ tests/concurrent/barrier/generation.cfa (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -37,5 +37,5 @@ for(c; 'A' ~= 'Z') { // Yield for chaos - yield(prng(this, 10)); + yield( (unsigned)prng(this, 10) ); // Print the generation, no newline because @@ -43,5 +43,5 @@ // Yield again for more chaos - yield(prng(this, 10)); + yield( (unsigned)prng(this, 10) ); // Block on the barrier Index: tests/concurrent/barrier/order.cfa =================================================================== --- tests/concurrent/barrier/order.cfa (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ tests/concurrent/barrier/order.cfa (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -37,5 +37,5 @@ for(l; NUM_LAPS) { // Yield for chaos - yield(prng(this, 10)); + yield( (unsigned)prng(this, 10) ); // Block and what order we arrived Index: tests/concurrent/once.cfa =================================================================== --- tests/concurrent/once.cfa (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ tests/concurrent/once.cfa (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -30,5 +30,5 @@ // sometime yields - yield(prng(this, 3)); + yield( (unsigned)prng(this, 3) ); } } Index: tests/concurrent/readyQ/leader_spin.cfa =================================================================== --- tests/concurrent/readyQ/leader_spin.cfa (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ tests/concurrent/readyQ/leader_spin.cfa (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -26,10 +26,10 @@ } -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; Index: tests/io/away_fair.cfa =================================================================== --- tests/io/away_fair.cfa (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ tests/io/away_fair.cfa (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -67,5 +67,5 @@ #endif - yield( prng( this, 15 ) ); + yield( (unsigned)prng( this, 15 ) ); #if CFA_HAVE_LINUX_IO_URING_H Index: tests/io/comp_basic.cfa =================================================================== --- tests/io/comp_basic.cfa (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ tests/io/comp_basic.cfa (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -58,5 +58,5 @@ block( globals.bar ); - yield( prng( this, 15 ) ); + yield( (unsigned)prng( this, 15 ) ); unsigned i = __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST ); Index: tests/io/comp_fair.cfa =================================================================== --- tests/io/comp_fair.cfa (revision 25b0fde212ca4f2989674f4c453738a67d543323) +++ tests/io/comp_fair.cfa (revision d2ad1518036350cdec12ea05fd951c3f04312459) @@ -78,5 +78,5 @@ block( globals.bar ); - yield( prng( this, 15 ) ); + yield( (unsigned)prng( this, 15 ) ); unsigned i = __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST );