Choose type for integer literals to match the target mask size (if possible).

On a target with a 16-bit mask (for example), we would choose the type
of an integer literal "1024" to be an int16.  Previously, we used an int32,
which is a worse fit and leads to less efficient code than an int16
on a 16-bit mask target.  (However, we'd still give an integer literal
1000000 the type int32, even in a 16-bit target.)

Updated the tests to still pass with 8 and 16-bit targets, given this
change.

tests/aossoa-1.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_v(uniform float RET[]) {
-#define width 3
-#define maxProgramCount 64
+#define width 3ul
+#define maxProgramCount 64ul
     assert(programCount <= maxProgramCount);
 
 //CO    const uniform int width = 3;

tests/aossoa-2.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_v(uniform float RET[]) {
-#define width 4
-#define maxProgramCount 64
+#define width 4ul
+#define maxProgramCount 64ul
     assert(programCount <= maxProgramCount);
 
 //CO    const uniform int width = 4;

tests/aossoa-5.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_v(uniform float RET[]) {
-#define width 3
-#define maxProgramCount 64
+#define width 3ul
+#define maxProgramCount 64ul
     assert(programCount <= maxProgramCount);
 
 //CO    const uniform int width = 3;

tests/aossoa-6.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_v(uniform float RET[]) {
-#define width 4
-#define maxProgramCount 64
+#define width 4ul
+#define maxProgramCount 64ul
     assert(programCount <= maxProgramCount);
 
 //CO    const uniform int width = 4;

tests/atomics-12.ispc

@@ -7,7 +7,7 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
     float b = 0;
     if (programIndex < 30 && programIndex & 1)
-        b = atomic_or_global(&s, (1 << programIndex));
+        b = atomic_or_global(&s, (1ul << programIndex));
     RET[programIndex] = s;
 }
 
@@ -15,6 +15,6 @@ export void result(uniform float RET[]) {
     uniform int sum = 0;
     for (uniform int i = 0; i < min(30, programCount); ++i)
         if (i & 1)
-            sum += (1 << i);
+            sum += (1ul << i);
     RET[programIndex] = sum;
 }

tests/atomics-13.ispc

@@ -7,7 +7,7 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
     int32 b = 0;
     if (programIndex < 32 && programIndex & 1)
-        b = atomic_or_global(&s, (1 << programIndex));
+        b = atomic_or_global(&s, (1ul << programIndex));
     RET[programIndex] = popcnt(reduce_max((int32)b));
 }
 

tests/atomics-4.ispc

@@ -5,10 +5,10 @@ uniform int32 s = 0;
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
-    float b = atomic_or_global(&s, (1<<min(programIndex,30)));
+    float b = atomic_or_global(&s, (1ul<<min(programIndex,30)));
     RET[programIndex] = s;
 }
 
 export void result(uniform float RET[]) {
-    RET[programIndex] = (1<<min(programCount,31))-1;
+    RET[programIndex] = (1ul<<min(programCount,31))-1;
 }

tests/coalesce-1.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    uniform float * uniform buf = uniform new uniform float[32*32];
-    for (uniform int i = 0; i < 32*32; ++i)
+    uniform float * uniform buf = uniform new uniform float[32l*32l];
+    for (uniform int i = 0; i < 32l*32l; ++i)
         buf[i] = i;
     
     assert(programIndex <= 64);

tests/coalesce-2.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    uniform float * uniform buf = uniform new uniform float[32*32];
-    for (uniform int i = 0; i < 32*32; ++i)
+    uniform float * uniform buf = uniform new uniform float[32l*32l];
+    for (uniform int i = 0; i < 32l*32l; ++i)
         buf[i] = i;
 
     RET[programIndex] = buf[programIndex & 1];

tests/coalesce-3.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    uniform float * uniform buf = uniform new uniform float[32*32];
-    for (uniform int i = 0; i < 32*32; ++i)
+    uniform float * uniform buf = uniform new uniform float[32l*32l];
+    for (uniform int i = 0; i < 32l*32l; ++i)
         buf[i] = i;
 
     RET[programIndex] = buf[(programIndex >> 2) * 16 + (programIndex & 3)];

tests/coalesce-4.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    uniform float * uniform buf = uniform new uniform float[32*32];
-    for (uniform int i = 0; i < 32*32; ++i)
+    uniform float * uniform buf = uniform new uniform float[32l*32l];
+    for (uniform int i = 0; i < 32l*32l; ++i)
         buf[i] = i;
 
     float a = buf[2*programIndex];

tests/coalesce-5.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    uniform float * uniform buf = uniform new uniform float[32*32];
-    for (uniform int i = 0; i < 32*32; ++i)
+    uniform float * uniform buf = uniform new uniform float[32l*32l];
+    for (uniform int i = 0; i < 32l*32l; ++i)
         buf[i] = i;
 
     float a = buf[4*programIndex];

tests/coalesce-6.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    uniform float * uniform buf = uniform new uniform float[32*32];
-    for (uniform int i = 0; i < 32*32; ++i)
+    uniform float * uniform buf = uniform new uniform float[32l*32l];
+    for (uniform int i = 0; i < 32l*32l; ++i)
         buf[i] = i;
 
     float a = buf[4*programIndex];

tests/coalesce-7.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    uniform float * uniform buf = uniform new uniform float[32*32];
-    for (uniform int i = 0; i < 32*32; ++i)
+    uniform float * uniform buf = uniform new uniform float[32l*32l];
+    for (uniform int i = 0; i < 32l*32l; ++i)
         buf[i] = i;
 
     float a = buf[4*programIndex];

tests/coalesce-8.ispc

@@ -2,8 +2,8 @@
 export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    uniform float * uniform buf = uniform new uniform float[32*32];
-    for (uniform int i = 0; i < 32*32; ++i)
+    uniform float * uniform buf = uniform new uniform float[32l*32l];
+    for (uniform int i = 0; i < 32l*32l; ++i)
         buf[i] = i;
 
     int index = (programIndex < 4) ? (programIndex & 1) :

tests/count-leading-trailing-zeros-1.ispc

@@ -3,7 +3,7 @@ export uniform int width() { return programCount; }
 
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    RET[programIndex] = count_trailing_zeros(0xf0);
+    RET[programIndex] = count_trailing_zeros(0xf0ul);
 }
 
 export void result(uniform float RET[]) {

tests/count-leading-trailing-zeros-4.ispc

@@ -3,7 +3,7 @@ export uniform int width() { return programCount; }
 
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    int32 i = (1 << (programIndex % 28));
+    int32 i = (1ul << (programIndex % 28));
     RET[programIndex] = count_leading_zeros(i);
 }
 

tests/exclusive-scan-and-2.ispc

@@ -3,7 +3,7 @@ export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     RET[programIndex] = -1;
-    int32 a = ~(1 << programIndex);
+    int32 a = ~(1ul << programIndex);
     if ((programIndex < 32) && (programIndex & 1) == 0) {
         RET[programIndex] = exclusive_scan_and(a);
     }
@@ -15,7 +15,7 @@ export void result(uniform float RET[]) {
     if ((programIndex & 1) == 0 && programIndex > 0 && programIndex < 32) {
         int val = 0xffffffff;
         for (int i = 0; i < programIndex-1; i += 2)
-            val &= ~(1<<i);
+            val &= ~(1ul<<i);
         RET[programIndex] = val;
     }
 }

tests/exclusive-scan-or-1.ispc

@@ -3,11 +3,11 @@ export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     RET[programIndex] = -1;
-    int32 a = (1 << (min(programIndex, 30)));
+    int32 a = (1ul << (min(programIndex, 30)));
     RET[programIndex] = exclusive_scan_or(a);
 }
 
 
 export void result(uniform float RET[]) {
-    RET[programIndex] = (1 << (min(programIndex, 31))) - 1;
+    RET[programIndex] = (1ul << (min(programIndex, 31))) - 1;
 }

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 % 28)) * 1.5;
+    double a = (1ul<< (programIndex % 28)) * 1.5;
     if (programIndex & 1)
         a = -a;
     int exponent;

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%28)) * 1.5;
+    double a = (1ul << (programIndex%28)) * 1.5;
     if (programIndex & 1)
         a = -a;
     int exponent;

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%28)) * 1.5;
+    float a = (1ul << (programIndex%28)) * 1.5;
     if (programIndex & 1)
         a = -a;
     int exponent;

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%28)) * 1.5;
+    float a = (1ul << (programIndex%28)) * 1.5;
     if (programIndex & 1)
         a = -a;
     int exponent;

tests/kilo-mega-giga-2.ispc

@@ -8,5 +8,5 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) {
-    RET[programIndex] = 2*1024*1024 + 5;
+    RET[programIndex] = 2ul*1024ul*1024ul + 5;
 }

tests/ldexp-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 % 28);
+    double a = 1ul << (programIndex % 28);
     if (programIndex & 1)
         a = -a;
     RET[programIndex] = ldexp(a, 2);
@@ -11,7 +11,7 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
 
 export void result(uniform float RET[]) {
     int pi = programIndex % 28;
-    RET[programIndex] = (1 << (pi + 2));
+    RET[programIndex] = (1ul << (pi + 2));
     if (programIndex & 1)
         RET[programIndex] = -RET[programIndex];
 }

tests/ldexp-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 % 28);
+    float a = 1ul << (programIndex % 28);
     if (programIndex & 1)
         a = -a;
     RET[programIndex] = ldexp(a, 2);
@@ -11,7 +11,7 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
 
 export void result(uniform float RET[]) {
     int pi = programIndex % 28;
-    RET[programIndex] = (1 << (pi + 2));
+    RET[programIndex] = (1ul << (pi + 2));
     if (programIndex & 1)
         RET[programIndex] = -RET[programIndex];
 }

tests/local-atomics-12.ispc

@@ -7,7 +7,7 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
     float b = 0;
     if (programIndex < 29 && (programIndex & 1))
-        b = atomic_or_local(&s, (1 << programIndex));
+        b = atomic_or_local(&s, (1ul << programIndex));
     RET[programIndex] = s;
 }
 
@@ -15,6 +15,6 @@ export void result(uniform float RET[]) {
     uniform int sum = 0;
     for (uniform int i = 0; i < min(programCount, 29); ++i)
         if (i & 1)
-            sum += (1 << i);
+            sum += (1ul << i);
     RET[programIndex] = sum;
 }

tests/local-atomics-13.ispc

@@ -7,7 +7,7 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
     int32 b = 0;
     if (programIndex < 28 && (programIndex & 1))
-        b = atomic_or_local(&s, (1 << programIndex));
+        b = atomic_or_local(&s, (1ul << programIndex));
     RET[programIndex] = popcnt(reduce_max(b));
 }
 

tests/local-atomics-14.ispc

@@ -7,7 +7,7 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
     float b = 0;
     if (programIndex < 32 && (programIndex & 1))
-        b = atomic_or_local(&s, (1 << programIndex));
+        b = atomic_or_local(&s, (1ul << programIndex));
     RET[programIndex] = (s>>20);
 }
 
@@ -15,6 +15,6 @@ export void result(uniform float RET[]) {
     uniform int sum = 0;
     for (uniform int i = 0; i < min(32, programCount); ++i)
         if (i & 1)
-            sum += (1 << i);
+            sum += (1ul << i);
     RET[programIndex] = ((unsigned int64)(0xffffffffff000000 | sum)) >> 20;
 }

tests/local-atomics-4.ispc

@@ -7,10 +7,10 @@ export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
     float b = 0;
     if (programIndex < 29)
-        atomic_or_local(&s, (1<<programIndex));
+        atomic_or_local(&s, (1ul<<programIndex));
     RET[programIndex] = s;
 }
 
 export void result(uniform float RET[]) {
-    RET[programIndex] = (1<<min(29,programCount))-1;
+    RET[programIndex] = (1ul<<min(29,programCount))-1;
 }

tests/rand-distrib-1.ispc

@@ -11,7 +11,7 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
     for (uniform int i = 0; i < iters; ++i) {
         unsigned int val = random(&state);
         for (uniform int j = 0; j < 32; ++j) {
-            if (val & (1<<j))
+            if (val & (1ul<<j))
                 ++count[j];
         }
     }

tests/sizeof-9.ispc

@@ -2,7 +2,7 @@
 export uniform int width() { return programCount; }
 
 export void f_f(uniform float RET[], uniform float aFOO[]) {
-    RET[programIndex] = sizeof 1;
+  RET[programIndex] = sizeof 1u;
 }
 
 export void result(uniform float RET[]) {

tests/test-83.ispc

@@ -6,7 +6,7 @@ float f(int i) { return i + 1.; }
 float f(float v) { return 2 * v; }
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
-    RET[programIndex] = f(a) + f(10); 
+    RET[programIndex] = f(a) + f(10l);
 }
 
 export void result(uniform float RET[]) {

tests/test-84.ispc

@@ -6,7 +6,7 @@ float f(float v) { return 2 * v; }
 float f(int i) { return i + 1.; }
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
-    RET[programIndex] = f(a) + f(10); 
+    RET[programIndex] = f(a) + f(10l);
 }
 
 export void result(uniform float RET[]) {

tests/test-85.ispc

@@ -8,7 +8,7 @@ float f(float a, int b) { return a + b; }
 float f(int i) { return i + 1.; }
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex]; 
-    RET[programIndex] = f(a) + f() + f(a, a) + f(10); 
+    RET[programIndex] = f(a) + f() + f(a, a) + f(10l);
 }
 
 export void result(uniform float RET[]) {