From ece65cab18f45e6615153a4f6aa1e27925b331b2 Mon Sep 17 00:00:00 2001
From: Jean-Luc Duprat <jld@acm.org>
Date: Tue, 29 May 2012 07:51:48 -0700
Subject: [PATCH] Fix some tests for up to 64-wide gangs

---
 tests/test-103.ispc |  2 +-
 tests/test-125.ispc |  6 +++++-
 tests/test-60.ispc  |  4 ++--
 tests/test-64.ispc  | 20 ++++++++++++++++----
 tests/test-65.ispc  | 20 ++++++++++++++++----
 tests/test-66.ispc  | 20 ++++++++++++++++----
 6 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/tests/test-103.ispc b/tests/test-103.ispc
index 1c53213a..c536d032 100644
--- a/tests/test-103.ispc
+++ b/tests/test-103.ispc
@@ -4,7 +4,7 @@ export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
-    RET[programIndex] = a < 17.; 
+    RET[programIndex] = a < 65.; 
 }
 
 
diff --git a/tests/test-125.ispc b/tests/test-125.ispc
index d92d671c..e4a12811 100644
--- a/tests/test-125.ispc
+++ b/tests/test-125.ispc
@@ -5,8 +5,12 @@ export uniform int width() { return programCount; }
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex];
     if (a < 3) {
-        if (all(a < 3)) 
+        if (all(a < 256)) 
             RET[programIndex] = 1;
+        else {
+            print("FALSE %\n", a);
+            print("programCount %\n", programCount);
+        }
     }
     else RET[programIndex] = 0;
 }
diff --git a/tests/test-60.ispc b/tests/test-60.ispc
index fbdf8bd3..87f4fac2 100644
--- a/tests/test-60.ispc
+++ b/tests/test-60.ispc
@@ -4,12 +4,12 @@ export uniform int width() { return programCount; }
 
 export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     float a = aFOO[programIndex];
-    while (a < 20)
+    while (a < 64)
         ++a;
     RET[programIndex] = a;
 }
 
 
 export void result(uniform float RET[]) {
-    RET[programIndex] = 20;
+    RET[programIndex] = 64;
 }
diff --git a/tests/test-64.ispc b/tests/test-64.ispc
index 5a674a95..b9af26cc 100644
--- a/tests/test-64.ispc
+++ b/tests/test-64.ispc
@@ -19,8 +19,20 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 
 
 export void result(uniform float RET[]) {
-    RET[0] = RET[4] = RET[8] = RET[12] = 2;
-    RET[1] = RET[5] = RET[9] = RET[13] = 3;
-    RET[2] = RET[6] = RET[10] = RET[14] = 5;
-    RET[3] = RET[7] = RET[11] = RET[15] = 6;
+    RET[0] = RET[4] = RET[8] = RET[12] =\
+        RET[16] = RET[20] = RET[24] = RET[28] =\
+        RET[32] = RET[36] = RET[40] = RET[44] =\
+        RET[48] = RET[52] = RET[56] = RET[60] = 2;
+    RET[1] = RET[5] = RET[9] = RET[13] =\
+        RET[17] = RET[21] = RET[25] = RET[29] =\
+        RET[33] = RET[37] = RET[41] = RET[45] =\
+        RET[49] = RET[53] = RET[57] = RET[61] = 3;
+    RET[2] = RET[6] = RET[10] = RET[14] =\
+        RET[18] = RET[22] = RET[26] = RET[30] =\
+        RET[34] = RET[38] = RET[42] = RET[46] =\
+        RET[50] = RET[54] = RET[58] = RET[62] = 5;
+    RET[3] = RET[7] = RET[11] = RET[15] =\
+        RET[19] = RET[23] = RET[27] = RET[31] =\
+        RET[35] = RET[39] = RET[43] = RET[47] =\
+        RET[51] = RET[55] = RET[59] = RET[63] = 6;
 }
diff --git a/tests/test-65.ispc b/tests/test-65.ispc
index 71b8b39c..7510b0d5 100644
--- a/tests/test-65.ispc
+++ b/tests/test-65.ispc
@@ -17,8 +17,20 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 
 
 export void result(uniform float RET[]) {
-    RET[0] = RET[4] = RET[8] = RET[12] = 1;
-    RET[1] = RET[5] = RET[9] = RET[13] = 3;
-    RET[2] = RET[6] = RET[10] = RET[14] = 3;
-    RET[3] = RET[7] = RET[11] = RET[15] = 29;
+    RET[0] = RET[4] = RET[8] = RET[12] =\
+        RET[16] = RET[20] = RET[24] = RET[28] =\
+        RET[32] = RET[36] = RET[40] = RET[44] =\
+        RET[48] = RET[52] = RET[56] = RET[60] = 1;
+    RET[1] = RET[5] = RET[9] = RET[13] =\
+        RET[17] = RET[21] = RET[25] = RET[29] =\
+        RET[33] = RET[37] = RET[41] = RET[45] =\
+        RET[49] = RET[53] = RET[57] = RET[61] = 3;
+    RET[2] = RET[6] = RET[10] = RET[14] =\
+        RET[18] = RET[22] = RET[26] = RET[30] =\
+        RET[34] = RET[38] = RET[42] = RET[46] =\
+        RET[50] = RET[54] = RET[58] = RET[62] = 3;
+    RET[3] = RET[7] = RET[11] = RET[15] =\
+        RET[19] = RET[23] = RET[27] = RET[31] =\
+        RET[35] = RET[39] = RET[43] = RET[47] =\
+        RET[51] = RET[55] = RET[59] = RET[63] = 29;
 }
diff --git a/tests/test-66.ispc b/tests/test-66.ispc
index 8f69e8a5..a7fe0adc 100644
--- a/tests/test-66.ispc
+++ b/tests/test-66.ispc
@@ -18,8 +18,20 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 
 
 export void result(uniform float RET[]) {
-    RET[0] = RET[4] = RET[8] = RET[12] = 32;
-    RET[1] = RET[5] = RET[9] = RET[13] = 32;
-    RET[2] = RET[6] = RET[10] = RET[14] = 38;
-    RET[3] = RET[7] = RET[11] = RET[15] = 39;
+    RET[0] = RET[4] = RET[8] = RET[12] =\
+        RET[16] = RET[20] = RET[24] = RET[28] =\
+        RET[32] = RET[36] = RET[40] = RET[44] =\
+        RET[48] = RET[52] = RET[56] = RET[60] = 32;
+    RET[1] = RET[5] = RET[9] = RET[13] =\
+        RET[17] = RET[21] = RET[25] = RET[29] =\
+        RET[33] = RET[37] = RET[41] = RET[45] =\
+        RET[49] = RET[53] = RET[57] = RET[61] = 32;
+    RET[2] = RET[6] = RET[10] = RET[14] =\
+        RET[18] = RET[22] = RET[26] = RET[30] =\
+        RET[34] = RET[38] = RET[42] = RET[46] =\
+        RET[50] = RET[54] = RET[58] = RET[62] = 38;
+    RET[3] = RET[7] = RET[11] = RET[15] =\
+        RET[19] = RET[23] = RET[27] = RET[31] =\
+        RET[35] = RET[39] = RET[43] = RET[47] =\
+        RET[51] = RET[55] = RET[59] = RET[63] = 39;
 }