Merge pull request #2505 from rgmunozj/development

fix out-of-bounds bug in loop_bounds and map examples

Author: jimmytwei

Publications/GPU-Opt-Guide/OpenMP/07_loop_bounds/test_loop_bounds_fp.cpp

@@ -19,7 +19,7 @@
 #define scaled_rand() ((rand() % MAX) / (1.0 * MAX))
 
 #define IDX2(i, j) (i * P + j)
-#define IDX4(b, i, j, k) (b * P * P * P + i * P * P + j * P + k)
+#define IDX4(b, i, j, k) ((b * P * P * P + i * P * P + j * P + k) % SIZE)
 
 int main(void) {
   double w[SIZE];            /* output */

Publications/GPU-Opt-Guide/OpenMP/07_loop_bounds/test_loop_bounds_map.cpp

@@ -19,7 +19,7 @@
 #define scaled_rand() ((rand() % MAX) / (1.0 * MAX))
 
 #define IDX2(i, j) (i * P + j)
-#define IDX4(b, i, j, k) (b * P * P * P + i * P * P + j * P + k)
+#define IDX4(b, i, j, k) ((b * P * P * P + i * P * P + j * P + k) % SIZE)
 
 int main(void) {
   double w[SIZE];            /* output */

Publications/GPU-Opt-Guide/OpenMP/07_loop_bounds/test_loop_bounds_nofp_nomap.cpp

@@ -19,7 +19,7 @@
 #define scaled_rand() ((rand() % MAX) / (1.0 * MAX))
 
 #define IDX2(i, j) (i * P + j)
-#define IDX4(b, i, j, k) (b * P * P * P + i * P * P + j * P + k)
+#define IDX4(b, i, j, k) ((b * P * P * P + i * P * P + j * P + k) % SIZE)
 
 int main(void) {
   double w[SIZE];            /* output */

Publications/GPU-Opt-Guide/OpenMP/10_map/test_map_to_or_from.cpp

@@ -19,7 +19,7 @@
 #define scaled_rand() ((rand() % MAX) / (1.0 * MAX))
 
 #define IDX2(i, j) (i * P + j)
-#define IDX4(b, i, j, k) (b * P * P * P + i * P * P + j * P + k)
+#define IDX4(b, i, j, k) ((b * P * P * P + i * P * P + j * P + k) % SIZE)
 
 int main(void) {
   double w[SIZE];            /* output */

Publications/GPU-Opt-Guide/OpenMP/10_map/test_map_tofrom.cpp

@@ -19,7 +19,7 @@
 #define scaled_rand() ((rand() % MAX) / (1.0 * MAX))
 
 #define IDX2(i, j) (i * P + j)
-#define IDX4(b, i, j, k) (b * P * P * P + i * P * P + j * P + k)
+#define IDX4(b, i, j, k) ((b * P * P * P + i * P * P + j * P + k) % SIZE)
 
 int main(void) {
   double w[SIZE];            /* output */