Changes in / [d3261710:6117fc0]

Files:

• benchmark/readyQ/transfer.cfa (modified) (6 diffs)
• libcfa/src/bits/random.hfa (modified) (3 diffs)
• libcfa/src/iostream.cfa (modified) (11 diffs)

benchmark/readyQ/transfer.cfa

@@ -1 +1 @@
 #include "rq_bench.hfa"
 #include <fstream.hfa>
-#include <locale.h>
 
 Duration default_preemption() {
@@ -9 +8 @@
 #define PRINT(...)
 
-__uint128_t lead_seed;
+__lehmer64_state_t lead_seed;
 volatile unsigned leader;
 volatile size_t lead_idx;
@@ -69 +68 @@
         waitgroup();
 
-        unsigned nleader = lehmer64( lead_seed ) % nthreads;
+        unsigned nleader = __lehmer64( lead_seed ) % nthreads;
         __atomic_store_n( &leader, nleader, __ATOMIC_SEQ_CST );
 
@@ -106 +105 @@
 // ==================================================
 int main(int argc, char * argv[]) {
-        uint64_t lead_seed = getpid();
-        for(10) lehmer64( lead_seed );
+        __lehmer64_state_t lead_seed = getpid();
+        for(10) __lehmer64( lead_seed );
         unsigned nprocs = 2;
 
@@ -127 +126 @@
 
         lead_idx = 0;
-        leader = lehmer64( lead_seed ) % nthreads;
+        leader = __lehmer64( lead_seed ) % nthreads;
 
         size_t rechecks = 0;
@@ -168 +167 @@
         }
 
-        setlocale( LC_NUMERIC, getenv( "LANG" ) );
         sout | "Duration (ms)           : " | ws(3, 3, unit(eng((end - start)`dms)));
         sout | "Number of processors    : " | nprocs;

libcfa/src/bits/random.hfa

@@ -1 @@
-// 
-// Cforall Version 1.0.0 Copyright (C) 2022 University of Waterloo
-// 
-// The contents of this file are covered under the licence agreement in the
-// file "LICENCE" distributed with Cforall.
-//
-// random.hfa -- 
-// 
-// Author           : Peter A. Buhr
-// Created On       : Fri Jan 14 07:18:11 2022
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 14 07:18:58 2022
-// Update Count     : 1
-// 
-
 #pragma once
 
 #include <stdint.h>
 
-// Pipelined to allow out-of-order overlap with reduced dependencies. Critically, the current random state is returned
-// (copied), and then compute and store the next random value.
+// Pipelined to allow out-of-order overlap with reduced dependencies. Critically, return the current value, and compute
+// and store the next value.
 
+//--------------------------------------------------
 #if defined(__SIZEOF_INT128__)
-//--------------------------------------------------
         static inline uint64_t lehmer64( __uint128_t & state ) {
                 __uint128_t ret = state;
@@ -65 +50 @@
 } xorwow__state_t;
 
-// The state array must be initialized to not be all zero in the first four words.
+/* The state array must be initialized to not be all zero in the first four words */
 static inline uint32_t xorwow( xorwow__state_t & state ) {
-        // Algorithm "xorwow" from p. 5 of Marsaglia, "Xorshift RNGs".
+        /* Algorithm "xorwow" from p. 5 of Marsaglia, "Xorshift RNGs" */
         uint32_t ret = state.a + state.counter;
         uint32_t t = state.d;
@@ -99 +84 @@
 #define D  (16_l64u)
 
-// Bi-directional LCG random-number generator
 static inline uint32_t LCGBI_fwd( uint64_t & state ) {
         state = (A * state + C) & (M - 1);

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jan 19 08:15:53 2022
-// Update Count     : 1352
+// Last Modified On : Mon Jan 17 16:38:32 2022
+// Update Count     : 1349
 //
 
@@ -205 +205 @@
         ostype & ?|?( ostype & os, float f ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
-                PrintWithDP( os, "%'g", f );
+                PrintWithDP( os, "%g", f );
                 return os;
         } // ?|?
@@ -214 +214 @@
         ostype & ?|?( ostype & os, double d ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
-                PrintWithDP( os, "%'.*lg", d, DBL_DIG );
+                PrintWithDP( os, "%.*lg", d, DBL_DIG );
                 return os;
         } // ?|?
@@ -223 +223 @@
         ostype & ?|?( ostype & os, long double ld ) {
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
-                PrintWithDP( os, "%'.*Lg", ld, LDBL_DIG );
+                PrintWithDP( os, "%.*Lg", ld, LDBL_DIG );
                 return os;
         } // ?|?
@@ -233 +233 @@
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              os | crealf( fc ) | nonl;
-                PrintWithDP( os, "%'g", crealf( fc ) );
-                PrintWithDP( os, "%'+g", cimagf( fc ) );
+                PrintWithDP( os, "%g", crealf( fc ) );
+                PrintWithDP( os, "%+g", cimagf( fc ) );
                 fmt( os, "i" );
                 return os;
@@ -245 +245 @@
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              os | creal( dc ) | nonl;
-                PrintWithDP( os, "%'.*lg", creal( dc ), DBL_DIG );
-                PrintWithDP( os, "%'+.*lg", cimag( dc ), DBL_DIG );
+                PrintWithDP( os, "%.*lg", creal( dc ), DBL_DIG );
+                PrintWithDP( os, "%+.*lg", cimag( dc ), DBL_DIG );
                 fmt( os, "i" );
                 return os;
@@ -257 +257 @@
                 if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              os | creall( ldc ) || nonl;
-                PrintWithDP( os, "%'.*Lg", creall( ldc ), LDBL_DIG );
-                PrintWithDP( os, "%'+.*Lg", cimagl( ldc ), LDBL_DIG );
+                PrintWithDP( os, "%.*Lg", creall( ldc ), LDBL_DIG );
+                PrintWithDP( os, "%+.*Lg", cimagl( ldc ), LDBL_DIG );
                 fmt( os, "i" );
                 return os;
@@ -282 +282 @@
                 }; // mask
 
-          if ( s == 0p ) { fmt( os, "%s", "0p" ); return os; } // null pointer
           if ( s[0] == '\0' ) { sepOff( os ); return os; } // null string => no separator
 
@@ -694 +693 @@
                 if ( ! f.flags.pc ) memcpy( &fmtstr, DFMTNP, sizeof(DFMTNP) ); \
                 else memcpy( &fmtstr, DFMTP, sizeof(DFMTP) ); \
-                int star = 5;                                                                   /* position before first '*' */ \
+                int star = 4;                                                                   /* position before first '*' */ \
 \
                 /* Insert flags into spaces before '*', from right to left. */ \
@@ -700 +699 @@
                 if ( f.flags.sign ) { fmtstr[star] = '+'; star -= 1; } \
                 if ( f.flags.pad0 ) { fmtstr[star] = '0'; star -= 1; } \
-                fmtstr[star] = '\''; star -= 1;                                 /* locale */ \
                 fmtstr[star] = '%'; \
 \
@@ -718 +716 @@
 } // distribution
 
-FloatingPointFMTImpl( double,      "      * ",  "      *.* " )
-FloatingPointFMTImpl( long double, "      *L ", "      *.*L " )
+FloatingPointFMTImpl( double, "     * ", "     *.* " )
+FloatingPointFMTImpl( long double, "     *L ", "     *.*L " )
 
 // *********************************** character ***********************************