From 5cb53f52c3885c23c559603b37ed8985c5f063a7 Mon Sep 17 00:00:00 2001
From: Matt Pharr <matt.pharr@intel.com>
Date: Wed, 30 May 2012 10:31:12 -0700
Subject: [PATCH] Fix various tests/[frs]* files to be correct with 32 and
 64-wide targets.

Still todo: tests/c*, tests/test-*
---
 tests/frexp-double-1.ispc                   |  4 ++--
 tests/frexp-double.ispc                     |  2 +-
 tests/frexp-float-1.ispc                    |  4 ++--
 tests/frexp-float.ispc                      |  2 +-
 tests/recursion-forward-func-decl.ispc      |  8 ++++----
 tests/recursion.ispc                        |  8 ++++----
 tests/scatter-struct-with-array-member.ispc |  1 +
 tests/scatter-struct.ispc                   |  4 ++--
 tests/scatter-vector.ispc                   |  4 ++--
 tests/soa-1.ispc                            |  1 +
 tests/soa-10.ispc                           |  1 +
 tests/soa-13.ispc                           |  1 +
 tests/soa-15.ispc                           | 12 +++---------
 tests/soa-16.ispc                           | 14 +++-----------
 tests/soa-17.ispc                           | 15 +++------------
 tests/soa-18.ispc                           |  1 +
 tests/soa-19.ispc                           |  1 +
 tests/soa-2.ispc                            |  1 +
 tests/soa-20.ispc                           |  3 ++-
 tests/soa-21.ispc                           |  5 +++--
 tests/soa-22.ispc                           |  6 +++---
 tests/soa-23.ispc                           |  8 ++++----
 tests/soa-24.ispc                           |  6 +++---
 tests/soa-25.ispc                           |  6 +++---
 tests/soa-26.ispc                           |  1 -
 tests/soa-28.ispc                           |  5 +++--
 tests/soa-29.ispc                           |  5 +++--
 tests/soa-3.ispc                            |  1 +
 tests/soa-4.ispc                            |  5 +++--
 tests/soa-5.ispc                            |  5 +++--
 tests/soa-6.ispc                            |  5 +++--
 tests/soa-7.ispc                            |  5 +++--
 tests/soa-8.ispc                            |  5 +++--
 tests/soa-9.ispc                            |  1 +
 tests/struct-gather-2.ispc                  |  4 ++--
 tests/struct-gather-3.ispc                  |  4 ++--
 tests/struct-gather.ispc                    |  4 ++--
 tests/struct-ref-lvalue.ispc                |  4 ++--
 tests/struct-test-114.ispc                  |  5 +++--
 tests/struct-vary-index-expr.ispc           | 11 ++++++-----
 tests/switch-10.ispc                        |  2 +-
 tests/switch-11.ispc                        |  2 +-
 tests/switch-12.ispc                        |  2 +-
 tests/switch-8.ispc                         |  2 +-
 tests/switch-9.ispc                         |  2 +-
 45 files changed, 97 insertions(+), 101 deletions(-)

diff --git a/tests/frexp-double-1.ispc b/tests/frexp-double-1.ispc
index db6f742e..6c38b05e 100644
--- a/tests/frexp-double-1.ispc
+++ b/tests/frexp-double-1.ispc
@@ -3,7 +3,7 @@ export uniform int width() { return programCount; }
 
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    double a = (1<<programIndex) * 1.5;
+    double a = (1<< (programIndex % 28)) * 1.5;
     if (programIndex & 1)
         a = -a;
     int exponent;
@@ -12,5 +12,5 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
 }
 
 export void result(uniform float RET[]) {
-    RET[programIndex] = 1+programIndex;
+    RET[programIndex] = 1+(programIndex % 28);
 }
diff --git a/tests/frexp-double.ispc b/tests/frexp-double.ispc
index e2728197..ba4831d7 100644
--- a/tests/frexp-double.ispc
+++ b/tests/frexp-double.ispc
@@ -3,7 +3,7 @@ export uniform int width() { return programCount; }
 
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    double a = (1<<programIndex) * 1.5;
+    double a = (1<< (programIndex%28)) * 1.5;
     if (programIndex & 1)
         a = -a;
     int exponent;
diff --git a/tests/frexp-float-1.ispc b/tests/frexp-float-1.ispc
index 0d971086..7d5fc1d2 100644
--- a/tests/frexp-float-1.ispc
+++ b/tests/frexp-float-1.ispc
@@ -3,7 +3,7 @@ export uniform int width() { return programCount; }
 
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    float a = (1<<programIndex) * 1.5;
+    float a = (1<< (programIndex%28)) * 1.5;
     if (programIndex & 1)
         a = -a;
     int exponent;
@@ -12,5 +12,5 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
 }
 
 export void result(uniform float RET[]) {
-    RET[programIndex] = 1+programIndex;
+    RET[programIndex] = 1+(programIndex%28);
 }
diff --git a/tests/frexp-float.ispc b/tests/frexp-float.ispc
index 2d248448..ec54e4be 100644
--- a/tests/frexp-float.ispc
+++ b/tests/frexp-float.ispc
@@ -3,7 +3,7 @@ export uniform int width() { return programCount; }
 
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    float a = (1<<programIndex) * 1.5;
+    float a = (1<< (programIndex%28)) * 1.5;
     if (programIndex & 1)
         a = -a;
     int exponent;
diff --git a/tests/recursion-forward-func-decl.ispc b/tests/recursion-forward-func-decl.ispc
index b6dd0496..01d2e1a1 100644
--- a/tests/recursion-forward-func-decl.ispc
+++ b/tests/recursion-forward-func-decl.ispc
@@ -6,8 +6,8 @@ export uniform int width() { return programCount; }
 float f(float);
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
-    float a = aFOO[programIndex];
-    RET[programIndex] = f(a);
+    int a = aFOO[programIndex];
+    RET[programIndex] = f(a % 16);
 }
 
 float f(float x) {
@@ -16,7 +16,7 @@ float f(float x) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform float fib[16] = { 1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 66, 78, 91, 105, 120, 136 };
-    RET[programIndex] = fib[programIndex];
+    uniform float fib[16] = { 1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 66, 78, 91, 105, 120, 0 };
+    RET[programIndex] = fib[programIndex % 16];
 }
 
diff --git a/tests/recursion.ispc b/tests/recursion.ispc
index 30de649d..21730608 100644
--- a/tests/recursion.ispc
+++ b/tests/recursion.ispc
@@ -11,12 +11,12 @@ float f(float x) {
 }
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
-    float a = aFOO[programIndex];
-    RET[programIndex] = f(a);
+    int a = aFOO[programIndex];
+    RET[programIndex] = f(a % 16);
 }
 
 export void result(uniform float RET[]) { 
-    uniform float fib[16] = { 1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 66, 78, 91, 105, 120, 136 };
-    RET[programIndex] = fib[programIndex];
+    uniform float fib[16] = { 1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 66, 78, 91, 105, 120, 0 };
+    RET[programIndex] = fib[programIndex % 16];
 }
 
diff --git a/tests/scatter-struct-with-array-member.ispc b/tests/scatter-struct-with-array-member.ispc
index 081649df..07e9cce3 100644
--- a/tests/scatter-struct-with-array-member.ispc
+++ b/tests/scatter-struct-with-array-member.ispc
@@ -18,6 +18,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 
     a *= -1;
     Point vp = { a, { 2*a, 3*a, 4*a }, {5*a} };
+    assert(programCount+2 < 80);
     pts[2+programIndex] = vp;
 
     RET[programIndex] = pts[programIndex].y[2];
diff --git a/tests/scatter-struct.ispc b/tests/scatter-struct.ispc
index b5d58e16..dae97b6f 100644
--- a/tests/scatter-struct.ispc
+++ b/tests/scatter-struct.ispc
@@ -17,8 +17,8 @@ void set(Foo f[], int offset, Foo val) {
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
-    Foo foo[35];
-    for (uniform int i = 0; i < 35; ++i) {
+    Foo foo[programCount+5];
+    for (uniform int i = 0; i < programCount+5; ++i) {
         foo[i].f = a;
         foo[i].a = i;
         foo[i].y = 2*a;
diff --git a/tests/scatter-vector.ispc b/tests/scatter-vector.ispc
index 8882af2b..50ac7c49 100644
--- a/tests/scatter-vector.ispc
+++ b/tests/scatter-vector.ispc
@@ -17,8 +17,8 @@ void set(uniform float3 f[], int offset, float3 val) {
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
 
-    uniform float3 foo[35];
-    for (uniform int i = 0; i < 35; ++i) {
+    uniform float3 foo[programCount+5];
+    for (uniform int i = 0; i < programCount+5; ++i) {
         foo[i].x = i;
         foo[i].y = -1;
         foo[i].z = 2*i;
diff --git a/tests/soa-1.ispc b/tests/soa-1.ispc
index 37a8f681..ffe391d9 100644
--- a/tests/soa-1.ispc
+++ b/tests/soa-1.ispc
@@ -13,6 +13,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
         pts[i].z = 3*b*i;
     }
 
+    assert(programCount < 80);
     RET[programIndex] = pts[programIndex].y;
 }
 
diff --git a/tests/soa-10.ispc b/tests/soa-10.ispc
index 2e1c8d30..b46ec080 100644
--- a/tests/soa-10.ispc
+++ b/tests/soa-10.ispc
@@ -15,6 +15,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 
     uniform Point up = pts[1];
 
+    assert(programCount < 80);
     RET[programIndex] = up.y;
 }
 
diff --git a/tests/soa-13.ispc b/tests/soa-13.ispc
index d1f7b056..3738b48b 100644
--- a/tests/soa-13.ispc
+++ b/tests/soa-13.ispc
@@ -17,6 +17,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     uniform Point up = { b, 3, 170 };
     pts[(int64)1] = up;
 
+    assert(programCount < 80);
     RET[programIndex] = pts[(int64)programIndex].z;
 }
 
diff --git a/tests/soa-15.ispc b/tests/soa-15.ispc
index 8e6bb0ce..a4dac089 100644
--- a/tests/soa-15.ispc
+++ b/tests/soa-15.ispc
@@ -15,10 +15,8 @@ static void p(uniform float *uniform ptr) {
 }
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
-    soa<4> Point pts[10];
-//CO    uniform Point pts[40];
-//CO    foreach (i = 0 ... 40) {
-    for (uniform int i = 0; i < 40; ++i) {
+    soa<4> Point pts[30];
+    for (uniform int i = 0; i < 120; ++i) {
         pts[i].x = b*i;
         pts[i].y[0] = 2*b*i;
         pts[i].y[1] = 2*b*i+1;
@@ -26,14 +24,10 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
         pts[i].z = 3*b*i;
     }
 
-//CO    p((uniform float * uniform)&pts[0]);
-
-//CO    print("delta %\n", ((uniform float * varying)(&pts[2+programIndex]) -
-//CO                        (uniform float * uniform)&pts[0]));
-
     float a = aFOO[programIndex]; 
     a *= -1;
     Point vp = { a, { 2*a, 3*a, 4*a }, {5*a} };
+    assert(programCount+2 < 120);
     pts[2+programIndex] = vp;
 
 //CO    p((uniform float * uniform)&pts[0]);
diff --git a/tests/soa-16.ispc b/tests/soa-16.ispc
index 0f8c9c1f..f23c39cb 100644
--- a/tests/soa-16.ispc
+++ b/tests/soa-16.ispc
@@ -15,10 +15,8 @@ static void p(uniform float *uniform ptr) {
 }
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
-    soa<4> Point pts[10];
-//CO    uniform Point pts[40];
-//CO    foreach (i = 0 ... 40) {
-    for (uniform int i = 0; i < 40; ++i) {
+    soa<4> Point pts[30];
+    for (uniform int i = 0; i < 120; ++i) {
         pts[i].x = b*i;
         pts[i].y[0] = 2*b*i;
         pts[i].y[1] = 2*b*i+1;
@@ -26,18 +24,12 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
         pts[i].z = 3*b*i;
     }
 
-//CO    p((uniform float * uniform)&pts[0]);
-
-//CO    print("delta %\n", ((uniform float * varying)(&pts[2+programIndex]) -
-//CO                        (uniform float * uniform)&pts[0]));
-
     float a = aFOO[programIndex]; 
     a *= -1;
     Point vp = { a, { 2*a, 3*a, 4*a }, {5*a} };
+    assert(programCount + 2 < 120);
     pts[2+programIndex] = vp;
 
-//CO    p((uniform float * uniform)&pts[0]);
-
     RET[programIndex] = pts[programIndex].y[2];
 }
 
diff --git a/tests/soa-17.ispc b/tests/soa-17.ispc
index 2423cf66..f25b85bd 100644
--- a/tests/soa-17.ispc
+++ b/tests/soa-17.ispc
@@ -16,10 +16,8 @@ static void p(uniform float *uniform ptr) {
 }
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
-    soa<4> Point pts[10];
-//CO    uniform Point pts[40];
-//CO    foreach (i = 0 ... 40) {
-    for (uniform int i = 0; i < 40; ++i) {
+    soa<4> Point pts[40];
+    for (uniform int i = 0; i < 160; ++i) {
         pts[i].x = b*i;
         pts[i].y[0] = 2*b*i;
         pts[i].y[1] = 2*b*i+1;
@@ -27,19 +25,12 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
         pts[i].z = 3*b*i;
     }
 
-//CO    p((uniform float * uniform)&pts[0]);
-
-//CO    print("one size %\n", sizeof(soa<4> Point));
-//CO    print("delta %\n", ((uniform int8 * varying)(&pts[2+programIndex]) -
-//CO                        (uniform int8 * uniform)&pts[0]));
-
     float a = aFOO[programIndex]; 
     a *= -1;
     Point vp = { a, { 2*a, 3*a, 4*a }, {5*a} };
+    assert(2+programIndex < 160);
     pts[2+programIndex] = vp;
 
-//CO    p((uniform float * uniform)&pts[0]);
-
     RET[programIndex] = pts[programIndex].y[2];
 }
 
diff --git a/tests/soa-18.ispc b/tests/soa-18.ispc
index 1e8b70f6..39e0a80f 100644
--- a/tests/soa-18.ispc
+++ b/tests/soa-18.ispc
@@ -17,6 +17,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     ++ptr;
     ptr->y = -programIndex;
 
+    assert(1+programCount < 80);
     RET[programIndex] = pts[1+programIndex].y;
 }
 
diff --git a/tests/soa-19.ispc b/tests/soa-19.ispc
index 3b7ad46f..f9a8103b 100644
--- a/tests/soa-19.ispc
+++ b/tests/soa-19.ispc
@@ -16,6 +16,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     soa<8> Point * ptr = &pts[6+programIndex];
     ptr->y = -programIndex;;
 
+    assert(6+programIndex < 80);
     RET[programIndex] = pts[6+programIndex].y;
 }
 
diff --git a/tests/soa-2.ispc b/tests/soa-2.ispc
index d8ec37e3..e92d7c9b 100644
--- a/tests/soa-2.ispc
+++ b/tests/soa-2.ispc
@@ -13,6 +13,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
         pts[i].z = 3*b*i;
     }
 
+    assert(programCount < 80);
     RET[programIndex] = pts[programIndex].z;
 }
 
diff --git a/tests/soa-20.ispc b/tests/soa-20.ispc
index f8a1fe6f..8e87ece6 100644
--- a/tests/soa-20.ispc
+++ b/tests/soa-20.ispc
@@ -12,7 +12,8 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
         pts[i].y = 2*b*i;
         pts[i].z = 3*b*i;
     }
-    
+
+    assert(6+programIndex < 80);
     soa<8> Point * ptr = &pts[6+programIndex];
     RET[programIndex] = ptr - pts;
 }
diff --git a/tests/soa-21.ispc b/tests/soa-21.ispc
index f19ae448..46309788 100644
--- a/tests/soa-21.ispc
+++ b/tests/soa-21.ispc
@@ -12,8 +12,8 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Foo * uniform pts = uniform new soa<8> Foo[4];
-    foreach (i = 0 ... 32) {
+    soa<8> Foo * uniform pts = uniform new soa<8> Foo[11];
+    foreach (i = 0 ... 88) {
         pts[i].x = b*i;
         pts[i].z = -b*i;
         for (uniform int j = 0; j < 10; ++j) {
@@ -23,6 +23,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
         }
     }
     
+    assert(7+programCount < 88);
     soa<8> Foo * ptr = &pts[7+programIndex];
     RET[programIndex] = ptr->pts[3].z;
 }
diff --git a/tests/soa-22.ispc b/tests/soa-22.ispc
index 41795c96..60448694 100644
--- a/tests/soa-22.ispc
+++ b/tests/soa-22.ispc
@@ -12,9 +12,8 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Foo * uniform pts = uniform new soa<8> Foo[4];
-//CO    uniform Foo pts[32];
-    foreach (i = 0 ... 32) {
+    soa<8> Foo * uniform pts = uniform new soa<8> Foo[10];
+    foreach (i = 0 ... 80) {
         pts[i].x = b*i;
         pts[i].z = -b*i;
         for (uniform int j = 0; j < 3; ++j) {
@@ -27,6 +26,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
         }
     }
     
+    assert(programIndex < 80);
     RET[programIndex] = pts[programIndex].pts[programIndex % 3][programIndex % 4].z;
 }
 
diff --git a/tests/soa-23.ispc b/tests/soa-23.ispc
index 24b7b679..928eba25 100644
--- a/tests/soa-23.ispc
+++ b/tests/soa-23.ispc
@@ -11,15 +11,15 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Foo * uniform pts = uniform new soa<8> Foo[4];
-//CO    uniform Foo pts[32];
-    foreach (i = 0 ... 32) {
+    soa<8> Foo * uniform pts = uniform new soa<8> Foo[10];
+    foreach (i = 0 ... 80) {
         pts[i].vec.x = b*i;
         pts[i].vec.y = -b*i;
         pts[i].vec.z = 2*b*i;
         pts[i].z = i;
     }
-    
+
+    assert(programIndex + 2 < 80);
     RET[programIndex] = pts[programIndex+2].vec.y;
 }
 
diff --git a/tests/soa-24.ispc b/tests/soa-24.ispc
index 23835c9c..758f094e 100644
--- a/tests/soa-24.ispc
+++ b/tests/soa-24.ispc
@@ -11,9 +11,8 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Foo * uniform pts = uniform new soa<8> Foo[4];
-//CO    uniform Foo pts[32];
-    foreach (i = 0 ... 32) {
+    soa<8> Foo * uniform pts = uniform new soa<8> Foo[10];
+    foreach (i = 0 ... 80) {
         pts[i].vec.x = b*i;
         pts[i].vec.y = -b*i;
         pts[i].vec.z = 2*b*i;
@@ -21,6 +20,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     }
 
     pts[programIndex+2].vec.z *= -1;    
+    assert(programIndex < 80);
     float<3> vl = pts[programIndex].vec;
     RET[programIndex] = vl.z;
 }
diff --git a/tests/soa-25.ispc b/tests/soa-25.ispc
index d3be5253..b21e0d57 100644
--- a/tests/soa-25.ispc
+++ b/tests/soa-25.ispc
@@ -11,9 +11,8 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Foo * uniform pts = uniform new soa<8> Foo[4];
-//CO    uniform Foo pts[32];
-    foreach (i = 0 ... 32) {
+    soa<8> Foo * uniform pts = uniform new soa<8> Foo[10];
+    foreach (i = 0 ... 80) {
         pts[i].vec.x = b*i;
         pts[i].vec.y = -b*i;
         pts[i].vec.z = 2*b*i;
@@ -21,6 +20,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     }
 
     pts[2].vec.x *= -1;    
+    assert(programCount < 80);
     float<3> vl = pts[programIndex].vec;
     RET[programIndex] = vl.x;
 }
diff --git a/tests/soa-26.ispc b/tests/soa-26.ispc
index b765825a..cf1fc6d2 100644
--- a/tests/soa-26.ispc
+++ b/tests/soa-26.ispc
@@ -12,7 +12,6 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
     soa<8> Foo * uniform pts = uniform new soa<8> Foo[4];
-//CO    uniform Foo pts[32];
     for (uniform int i = 0; i < 32; ++i) {
         pts[i].vec.x = b*i;
         pts[i].vec.y = -b*i;
diff --git a/tests/soa-28.ispc b/tests/soa-28.ispc
index 92f3c4a3..a4df02dc 100644
--- a/tests/soa-28.ispc
+++ b/tests/soa-28.ispc
@@ -6,9 +6,9 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Point pts[10];
+    soa<8> Point pts[20];
 
-    foreach (i = b-5 ... 80) {
+    foreach (i = b-5 ... 160) {
         pts[i].x = b*i;
         pts[i].y = 2*b*i;
         pts[i].z = 3*b*i;
@@ -16,6 +16,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 
     uniform Point up = pts[4];
 
+    assert(2*programCount < 160);
     RET[programIndex] = pts[2*programIndex].x;
 }
 
diff --git a/tests/soa-29.ispc b/tests/soa-29.ispc
index e9a5a069..9c2d6f28 100644
--- a/tests/soa-29.ispc
+++ b/tests/soa-29.ispc
@@ -6,9 +6,9 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Point pts[10];
+    soa<8> Point pts[20];
 
-    for (int i = programIndex; i < 16*b; i += programCount) {
+    for (int i = programIndex; i < 32*b; i += programCount) {
         pts[i].x = b*i;
         pts[i].y = 2*b*i;
         pts[i].z = 3*b*i;
@@ -16,6 +16,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 
     uniform Point up = pts[4];
 
+    assert(2*programIndex < 160);
     RET[programIndex] = pts[2*programIndex].x;
 }
 
diff --git a/tests/soa-3.ispc b/tests/soa-3.ispc
index 0eed0bf4..2cec07a5 100644
--- a/tests/soa-3.ispc
+++ b/tests/soa-3.ispc
@@ -16,6 +16,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
         pts[i].z = 3*b*i;
     }
 
+    assert(programCount < 80);
     RET[programIndex] = pts[programIndex].y[2];
 }
 
diff --git a/tests/soa-4.ispc b/tests/soa-4.ispc
index 3af768fb..88a35393 100644
--- a/tests/soa-4.ispc
+++ b/tests/soa-4.ispc
@@ -6,14 +6,15 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Point pts[8];
-    foreach (i = 0 ... 64) {
+    soa<8> Point pts[10];
+    foreach (i = 0 ... 80) {
         pts[i].x = 0;
         pts[i].y = 0;
         pts[i].z = 0;
     }
 
     Point pv = { a, b, -a };
+    assert(8+programCount < 80);
     pts[8+programIndex] = pv;
 
     RET[programIndex] = pts[8+programIndex].z;
diff --git a/tests/soa-5.ispc b/tests/soa-5.ispc
index ae775c65..070375c6 100644
--- a/tests/soa-5.ispc
+++ b/tests/soa-5.ispc
@@ -6,14 +6,15 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Point pts[8];
-    foreach (i = 0 ... 64) {
+    soa<8> Point pts[9];
+    foreach (i = 0 ... 72) {
         pts[i].x = 0;
         pts[i].y = 0;
         pts[i].z = 0;
     }
 
     Point pv = { a, b, -a };
+    assert(6+programCount < 72);
     pts[6+programIndex] = pv;
 
     RET[programIndex] = pts[6+programIndex].x;
diff --git a/tests/soa-6.ispc b/tests/soa-6.ispc
index 4dd8439e..942b2d4e 100644
--- a/tests/soa-6.ispc
+++ b/tests/soa-6.ispc
@@ -6,14 +6,15 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Point pts[8];
-    foreach (i = 0 ... 64) {
+    soa<8> Point pts[11];
+    foreach (i = 0 ... 88) {
         pts[i].x = -42;
         pts[i].y = 0;
         pts[i].z = 0;
     }
 
     Point pv = { a, b, -a };
+    assert(8+programCount < 88);
     pts[8+programIndex] = pv;
 
     RET[programIndex] = pts[6+programIndex].x;
diff --git a/tests/soa-7.ispc b/tests/soa-7.ispc
index 042cf3dc..a7163aa4 100644
--- a/tests/soa-7.ispc
+++ b/tests/soa-7.ispc
@@ -6,14 +6,15 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Point pts[8];
-    foreach (i = 0 ... 64) {
+    soa<8> Point pts[11];
+    foreach (i = 0 ... 88) {
         pts[i].x = -42;
         pts[i].y = 0;
         pts[i].z = 0;
     }
 
     Point pv = { a, b, -a };
+    assert(8+programCount < 88);
     pts[8+programIndex].x = pv.x;
     pts[8+programIndex].y = pv.y;
     pts[8+programIndex].z = pv.z;
diff --git a/tests/soa-8.ispc b/tests/soa-8.ispc
index 0235fc2c..1e4b88d6 100644
--- a/tests/soa-8.ispc
+++ b/tests/soa-8.ispc
@@ -6,14 +6,15 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex]; 
 
-    soa<8> Point pts[8];
-    foreach (i = 0 ... 64) {
+    soa<8> Point pts[12];
+    foreach (i = 0 ... 96) {
         pts[i].x = -42;
         pts[i].y = 0;
         pts[i].z = 0;
     }
 
     Point pv = { a, b, -a };
+    assert(8+programCount < 96);
     pts[7+programIndex] = pv;
 
     RET[programIndex] = pts[8+programIndex].x;
diff --git a/tests/soa-9.ispc b/tests/soa-9.ispc
index 0249434c..872065b9 100644
--- a/tests/soa-9.ispc
+++ b/tests/soa-9.ispc
@@ -16,6 +16,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     uniform Point up = { b, 3, 170 };
     pts[1] = up;
 
+    assert(programCount < 80);
     RET[programIndex] = pts[programIndex].z;
 }
 
diff --git a/tests/struct-gather-2.ispc b/tests/struct-gather-2.ispc
index cfd427b7..6411ae90 100644
--- a/tests/struct-gather-2.ispc
+++ b/tests/struct-gather-2.ispc
@@ -13,9 +13,9 @@ float func(Foo foo[], int offset) {
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex];
-    Foo foo[17];
+    Foo foo[programCount+5];
     uniform int i;
-    for (i = 0; i < 17; ++i)
+    for (i = 0; i < programCount+5; ++i)
         foo[i].f = i*a;
     RET[programIndex] = func(foo, (int)a);
 }
diff --git a/tests/struct-gather-3.ispc b/tests/struct-gather-3.ispc
index cfd427b7..6de2c123 100644
--- a/tests/struct-gather-3.ispc
+++ b/tests/struct-gather-3.ispc
@@ -13,9 +13,9 @@ float func(Foo foo[], int offset) {
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex];
-    Foo foo[17];
+    Foo foo[programCount+1];
     uniform int i;
-    for (i = 0; i < 17; ++i)
+    for (i = 0; i < programCount+1; ++i)
         foo[i].f = i*a;
     RET[programIndex] = func(foo, (int)a);
 }
diff --git a/tests/struct-gather.ispc b/tests/struct-gather.ispc
index efa42e1d..a92a5862 100644
--- a/tests/struct-gather.ispc
+++ b/tests/struct-gather.ispc
@@ -9,9 +9,9 @@ struct Foo {
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex];
-    Foo foo[17];
+    Foo foo[programCount+1];
     uniform int i;
-    for (i = 0; i < 17; ++i)
+    for (i = 0; i < programCount+1; ++i)
         foo[i].f = i*a;
     RET[programIndex] = foo[(int)a].f;
 }
diff --git a/tests/struct-ref-lvalue.ispc b/tests/struct-ref-lvalue.ispc
index 535a1a0f..5cfbdf31 100644
--- a/tests/struct-ref-lvalue.ispc
+++ b/tests/struct-ref-lvalue.ispc
@@ -11,8 +11,8 @@ void f(Foo foo[], float a) {
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex];
-    Foo foo[17];
-    for (uniform int i = 0; i < 17; ++i)
+    Foo foo[programCount+5];
+    for (uniform int i = 0; i < programCount+5; ++i)
         foo[i].f = a;
     f(foo, a);
     RET[programIndex] = foo[a].f;
diff --git a/tests/struct-test-114.ispc b/tests/struct-test-114.ispc
index 66c4b07c..b5d8b18b 100644
--- a/tests/struct-test-114.ispc
+++ b/tests/struct-test-114.ispc
@@ -10,12 +10,13 @@ struct Foo {
 export void f_fi(uniform float RET[], uniform float aFOO[], uniform int bFOO[]) {
     float a = aFOO[programIndex];
     int b = bFOO[programIndex];
-    varying Foo myFoo[17];
+    varying Foo myFoo[128];
     uniform int i;
-    for (i = 0; i < 17; ++i) {
+    for (i = 0; i < 128; ++i) {
         myFoo[i].x = i;
         myFoo[i].f = 2*i;
     }
+    assert(b/2 < 128);
     RET[programIndex] = myFoo[b/2].f;
 }
 
diff --git a/tests/struct-vary-index-expr.ispc b/tests/struct-vary-index-expr.ispc
index dbf8de8f..169a9570 100644
--- a/tests/struct-vary-index-expr.ispc
+++ b/tests/struct-vary-index-expr.ispc
@@ -7,13 +7,14 @@ struct Foo { float f; };
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex];
-    Foo foo[17];
-    for (uniform int i = 0; i < 17; ++i)
+    Foo foo[programCount+1];
+    uniform int ind[programCount+1];
+    for (uniform int i = 0; i < programCount+1; ++i) {
         foo[i].f = a;
+        ind[i] = i+1;
+    }
     ++foo[a].f;
-    assert(programCount <= 16);
-    uniform int i[16] = { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 };
-    RET[programIndex] = foo[i[programIndex]].f;
+    RET[programIndex] = foo[ind[programIndex]].f;
 }
 
 export void result(uniform float RET[]) { RET[programIndex] = 2+programIndex; }
diff --git a/tests/switch-10.ispc b/tests/switch-10.ispc
index abd94d7c..2957aee6 100644
--- a/tests/switch-10.ispc
+++ b/tests/switch-10.ispc
@@ -21,7 +21,7 @@ int switchit(int a, uniform int b) {
         }
         return -1234;
     }
-    case 32:
+    case 9999:
         *((int *)NULL) = 0;
     default:
         return 0;
diff --git a/tests/switch-11.ispc b/tests/switch-11.ispc
index daacdf76..c520f4f5 100644
--- a/tests/switch-11.ispc
+++ b/tests/switch-11.ispc
@@ -27,7 +27,7 @@ int switchit(int a, uniform int b) {
         }
         return 42;
     }
-    case 32:
+    case 9999:
         *((int *)NULL) = 0;
     default:
         return 0;
diff --git a/tests/switch-12.ispc b/tests/switch-12.ispc
index 9a803012..67e4d076 100644
--- a/tests/switch-12.ispc
+++ b/tests/switch-12.ispc
@@ -31,7 +31,7 @@ int switchit(int a, uniform int b) {
         }
         return 42;
     }
-    case 32:
+    case 9999:
         *((int *)NULL) = 0;
     default:
         return 0;
diff --git a/tests/switch-8.ispc b/tests/switch-8.ispc
index ca1848e8..24297e2f 100644
--- a/tests/switch-8.ispc
+++ b/tests/switch-8.ispc
@@ -12,7 +12,7 @@ int switchit(int a, uniform int b) {
         if (a & 1)
             break;
         return 2;
-    case 32:
+    case 9999:
         *((int *)NULL) = 0;
     default:
     case 1:
diff --git a/tests/switch-9.ispc b/tests/switch-9.ispc
index 9bfd0d03..3d3f8318 100644
--- a/tests/switch-9.ispc
+++ b/tests/switch-9.ispc
@@ -12,7 +12,7 @@ int switchit(int a, uniform int b) {
         if (a & 1)
             break;
         return 2;
-    case 32:
+    case 9999:
         *((int *)NULL) = 0;
     default:
         return 0;