Changes in tests/array-container/array-md-sbscr-cases.cfa [938885d3:b9dae14c]

File:

• tests/array-container/array-md-sbscr-cases.cfa (modified) (6 diffs)

tests/array-container/array-md-sbscr-cases.cfa

@@ -27 +27 @@
 }
 
-// Work around a compiler optimization that can lead to false failures.
-// Think of `valExpected` as a constant local to each test function.
-// When implemented that way, an optimization, run on some hardware, makes
-// its value be off-by-a-little, compared with the values that have been
-// stored-loaded (in the array under test).  This effect has been observed
-// on x86-32 with -O3.  Declaring it as below forces the expected value 
-// to be stored-loaded too, which keeps the (admittedly lazily done)
-// `assert(f1 == f2)` checks passing, when the intended <w,x,y,z> location
-// is recovered, which is the point of all these tests.
-volatile float valExpected = 0.0;
-
 // Tests all the ways to split dimensions into CFA-supported chunks, by the only order that C supports: coarsest to finest stride.
 forall( [Nw], [Nx], [Ny], [Nz] )
@@ -47 +36 @@
     ptrdiff_t iw = 2, ix = 3, iy=4, iz=5;
 
-    valExpected = getMagicNumber(iw, ix, iy, iz);
-    float valGot = wxyz[iw][ix][iy][iz];
-    assert( valGot == valExpected );
+    const float valExpected = getMagicNumber(iw, ix, iy, iz);
+    assert( wxyz[iw][ix][iy][iz] == valExpected );
 
     // order wxyz, natural split (4-0 or 0-4, no intermediate to declare)
@@ -98 +86 @@
     ptrdiff_t iw = 2, ix = 3, iy=4, iz=5;
 
-    valExpected = getMagicNumber(iw, ix, iy, iz);
+    const float valExpected = getMagicNumber(iw, ix, iy, iz);
     assert( wxyz[iw][ix][iy][iz] == valExpected );
 
@@ -120 +108 @@
 
     // order wxzy: wx*z, y
-  #if 0
-    // not working on 32-bit
+
     assert(( wxyz[[iw  , ix  , all , iz  ]][iy  ] == valExpected ));
     assert(( wxyz[[iw  , ix  , all , iz-1]][iy  ] != valExpected ));
     assert(( wxyz[[iw  , ix  , all , iz  ]][iy-1] != valExpected ));
-  #endif
 }
 
@@ -141 +127 @@
     ptrdiff_t iw = 2, ix = 3, iy=4, iz=5;
 
-    valExpected = getMagicNumber(iw, ix, iy, iz);
+    const float valExpected = getMagicNumber(iw, ix, iy, iz);
     assert( wxyz[iw][ix][iy][iz] == valExpected );
 
@@ -237 +223 @@
     fillHelloData(wxyz);
 
-    valExpected = getMagicNumber(2, 3, 4, 5);
+    const float valExpected = getMagicNumber(2, 3, 4, 5);
     assert(( wxyz [2] [3] [4] [5]  == valExpected ));
     assert(( wxyz[[2,  3]][4] [5]  == valExpected ));