Changeset 8d66610 for tests/array-container/array-basic.cfa

Timestamp:

May 21, 2021, 4:48:10 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

f1bce515

Parents:

5407cdc (diff), 7404cdc (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

File:

• tests/array-container/array-basic.cfa (modified) (6 diffs)

tests/array-container/array-basic.cfa

@@ -5 +5 @@
 //
 
-forall( ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nx], [Ny], [Nz] )
 void typesTest( tag(Nx), tag(Ny), tag(Nz) ) {
 
@@ -59 +59 @@
 }
 
-forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nw], [Nx], [Ny], [Nz] )
 void fillHelloData( array( float, Nw, Nx, Ny, Nz ) & wxyz ) {
     for (w; z(Nw))
@@ -68 +68 @@
 }
 
-forall( ztype(Zn)
+forall( [Zn]
       , S & | sized(S)
       )
@@ -86 +86 @@
 }
 
-forall( ztype(Nw), ztype(Nx), ztype(Ny), ztype(Nz) )
+forall( [Nw], [Nx], [Ny], [Nz] )
 void runtimeTest( tag(Nw), tag(Nx), tag(Ny), tag(Nz) ) {
 
@@ -105 +105 @@
     printf("result Ws [][][][] lo = %f\n", result);
 
-    // fixme: -[[-,-,-,-]] not working
-    // result = total1d_low( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
-    // printf("result Ws [,,,]    lo = %f\n", result);
+    result = total1d_low( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
+    printf("result Ws [,,,]    lo = %f\n", result);
 
     result = total1d_hi( wxyz[all][slice_ix][slice_ix][slice_ix] );
     printf("result Ws [][][][] hi = %f\n", result);
 
-    // fixme: -[[-,-,-,-]] not working
-    // result = total1d_hi( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
-    // printf("result Ws [,,,]    hi = %f\n", result);
+    result = total1d_hi( wxyz[[all, slice_ix, slice_ix, slice_ix]] );
+    printf("result Ws [,,,]    hi = %f\n", result);
 
     // summing across X, with w=y=z=1
@@ -126 +124 @@
     printf("result Xs [][][][] lo = %f\n", result);
 
-    // fixme: -[[-,-,-,-]] not working
-    // result = total1d_low( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
-    // printf("result Xs [,,,]    lo = %f\n", result);
+    result = total1d_low( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
+    printf("result Xs [,,,]    lo = %f\n", result);
 
     result = total1d_hi( wxyz[slice_ix][all][slice_ix][slice_ix] );    
     printf("result Xs [][][][] hi = %f\n", result);
 
-    // fixme: -[[-,-,-,-]] not working
-    // result = total1d_hi( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
-    // printf("result Xs [,,,]    hi = %f\n", result);
+    result = total1d_hi( wxyz[[slice_ix, all, slice_ix, slice_ix]] );
+    printf("result Xs [,,,]    hi = %f\n", result);
 
 }