Replace array size in Array Notation testcode with #define.

2013-06-19  Balaji V. Iyer  <balaji.v.iyer@intel.com>

       * c-c++-common/cilk-plus/AN/builtin_fn_custom.c: Replaced all the
       hard-coded values of array sizes with a #define.
       * c-c++-common/cilk-plus/AN/builtin_fn_mutating.c: Likewise.
       * c-c++-common/cilk-plus/AN/builtin_func_double2.c: Likewise.
       * c-c++-common/cilk-plus/AN/gather_scatter.c: Likewise.
       * c-c++-common/cilk-plus/AN/pr57577.c: Likewise.
       * c-c++-common/cilk-plus/AN/sec_implicit_ex.c: Likewise.

From-SVN: r200205

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0946253..f731837 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2013-06-19  Balaji V. Iyer  <balaji.v.iyer@intel.com>
+
+       * c-c++-common/cilk-plus/AN/builtin_fn_custom.c: Replaced all the
+       hard-coded values of array sizes with a #define.
+       * c-c++-common/cilk-plus/AN/builtin_fn_mutating.c: Likewise.
+       * c-c++-common/cilk-plus/AN/builtin_func_double2.c: Likewise.
+       * c-c++-common/cilk-plus/AN/gather_scatter.c: Likewise.
+       * c-c++-common/cilk-plus/AN/pr57577.c: Likewise.
+       * c-c++-common/cilk-plus/AN/sec_implicit_ex.c: Likewise.
+
 2013-06-19  Yufeng Zhang  <yufeng.zhang@arm.com>
 
        * gcc.dg/torture/stackalign/builtin-apply-2.c: set
@@ -2274,7 +2284,6 @@
 
        * gcc.target/aarch64/negs.c: New.
 
->>>>>>> trunk
 2013-04-11  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/56895

diff --git a/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_fn_custom.c b/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_fn_custom.c
index c5d3d7c..0f066d4 100644 (file)
--- a/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_fn_custom.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_fn_custom.c
@@ -1,6 +1,7 @@
 /* { dg-do run } */
 /* { dg-options "-fcilkplus" } */
 
+#define NUMBER 100
 #if HAVE_IO
 #include <stdio.h>
 #endif
@@ -18,17 +19,17 @@ double my_func (double x, double y)
 /* char __sec_reduce_add (int *); */
 int main(void)
 {
-  int ii,array[10], y = 0, y_int = 0, array2[10];
-  double x, yy, array3[10], array4[10];
+  int ii,array[NUMBER], y = 0, y_int = 0, array2[NUMBER];
+  double x, yy, array3[NUMBER], array4[NUMBER];
   double max_value = 0.000, min_value = 0.000, add_value, mul_value = 1.00;
   int max_index = 0, min_index = 0;
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     {
       array[ii] = 1+ii;
       array2[ii]= 2; 
     }
 
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     {
       if (ii%2 && ii)
        array3[ii] = (double)(1.0000/(double)ii);
@@ -43,7 +44,7 @@ int main(void)
 
   /* Initialize it to the first variable.  */
   max_value = array3[0] * array4[0];
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     if (array3[ii] * array4[ii] > max_value) {
       max_value = array3[ii] * array4[ii];
       max_index = ii;
@@ -52,7 +53,7 @@ int main(void)
   
   
 #if HAVE_IO
-  for (ii = 0; ii < 10; ii++) 
+  for (ii = 0; ii < NUMBER; ii++) 
     printf("%5.3f ", array3[ii] * array4[ii]);
   printf("\n");
   printf("Max = %5.3f\t Max Index = %2d\n", x, y);

diff --git a/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_fn_mutating.c b/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_fn_mutating.c
index 7c194c2..e01fbb1 100644 (file)
--- a/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_fn_mutating.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_fn_mutating.c
@@ -1,6 +1,7 @@
 /* { dg-do run } */
 /* { dg-options "-fcilkplus" } */
 
+#define NUMBER 100
 #if HAVE_IO
 #include <stdio.h>
 #endif
@@ -15,18 +16,18 @@ void my_func (double *x, double y)
 
 int main(void)
 {
-  int ii,array[10], y = 0, y_int = 0, array2[10];
-  double x = 0.000, yy, array3[10], array4[10];
+  int ii,array[NUMBER], y = 0, y_int = 0, array2[NUMBER];
+  double x = 0.000, yy, array3[NUMBER], array4[NUMBER];
   double max_value = 0.000, min_value = 0.000, add_value, mul_value = 1.00;
   int max_index = 0, min_index = 0;
 #if 1
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     {
       array[ii] = 1+ii;
       array2[ii]= 2; 
     }
 
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     {
       if (ii%2 && ii)
        array3[ii] = (double)(1.0000/(double)ii);
@@ -42,16 +43,16 @@ int main(void)
 
   /* Initialize it to the first variable.  */
   max_value = array3[0] * array4[0];
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     if (array3[ii] * array4[ii] > max_value) {
       max_index = ii;
     }
     
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     my_func (&max_value, array3[ii] * array4[ii]);
   
 #if HAVE_IO
-  for (ii = 0; ii < 10; ii++) 
+  for (ii = 0; ii < NUMBER; ii++) 
     printf("%5.3f ", array3[ii] * array4[ii]);
   printf("\n");
   printf("Max = %5.3f\t Max Index = %2d\n", x, y);

diff --git a/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_func_double2.c b/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_func_double2.c
index 7337a51..6554912 100644 (file)
--- a/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_func_double2.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/AN/builtin_func_double2.c
@@ -1,6 +1,7 @@
 /* { dg-do run } */
 /* { dg-options "-fcilkplus" } */
 
+#define NUMBER 100
 #if HAVE_IO
 #include <stdio.h>
 #endif
@@ -8,10 +9,10 @@
 int main(void)
 {
   int argc = 1;
-  int ii,array[10], y = 0, y_int = 0, array2[10], y_int2=0, y2=0;
-  double x, yy, array3[10], array4[10];
+  int ii,array[NUMBER], y = 0, y_int = 0, array2[NUMBER], y_int2=0, y2=0;
+  double x, yy, array3[NUMBER], array4[NUMBER];
   int all_zero, all_nonzero, any_zero, any_nonzero;
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     {
       array[ii] = 0;
       array2[ii] = 5;
@@ -29,7 +30,7 @@ int main(void)
 
   any_zero = 0;
   any_nonzero = 0;
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     {
       if ((array3[ii] + array[4]) == 0)
        any_zero = 1;
@@ -45,7 +46,7 @@ int main(void)
 
   all_zero = 0;
   all_nonzero = 0;
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     {
       if (((array3[ii] + array4[ii]) * (argc-1)) == 0)
        all_zero = 1;
@@ -60,11 +61,11 @@ int main(void)
  
 
 #if HAVE_IO
-  for (ii = 0; ii < 10; ii++) {
+  for (ii = 0; ii < NUMBER; ii++) {
     printf("%5.3f ", array3[ii] +array4[ii]);
   }
   printf("\n");
-  for (ii = 0; ii < 10; ii++) {
+  for (ii = 0; ii < NUMBER; ii++) {
     printf("%5.3f ", (array3[ii] + array4[ii]) * (argc-1));
   }
   printf("\n");

diff --git a/gcc/testsuite/c-c++-common/cilk-plus/AN/gather_scatter.c b/gcc/testsuite/c-c++-common/cilk-plus/AN/gather_scatter.c
index b11a40e..9cb16e1 100644 (file)
--- a/gcc/testsuite/c-c++-common/cilk-plus/AN/gather_scatter.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/AN/gather_scatter.c
@@ -1,18 +1,19 @@
 /* { dg-do run } */
 /* { dg-options "-fcilkplus" } */
 
+#define NUMBER 100
 #if HAVE_IO
 #include <stdio.h>
 #endif
 
 int main(void)
 {
-  int array[10][10], array2[10], array3[10], x = 0, y;
+  int array[NUMBER][NUMBER], array2[NUMBER], array3[NUMBER], x = 0, y;
   int x_correct, y_correct, ii, jj = 0;
-  float array4[10][10][10][10];
-  for (ii = 0; ii < 10; ii++)
+  float array4[NUMBER][NUMBER][NUMBER][NUMBER];
+  for (ii = 0; ii < NUMBER; ii++)
     {
-      for (jj = 0; jj < 10; jj++)
+      for (jj = 0; jj < NUMBER; jj++)
        {
          array[ii][jj] = 1+ii;
          array2[ii]= 2;
@@ -22,32 +23,32 @@ int main(void)
   
   array[array2[:]][array3[:]] = 1000;
 
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     if (array[array2[ii]][array3[ii]] != 1000)
       return 1;
   
 #if HAVE_IO
-  for (ii = 0; ii < 10; ii++) {
-    for (jj = 0; jj < 10; jj++) {
+  for (ii = 0; ii < NUMBER; ii++) {
+    for (jj = 0; jj < NUMBER; jj++) {
       printf("%4d\t", array[ii][jj]);
     }
     printf("\n");
   }
 #endif
 
-  array4[array2[:]][array3[0:10:1]][array2[0:10:1]][array3[0:10:1]] =
+  array4[array2[:]][array3[0:NUMBER:1]][array2[0:NUMBER:1]][array3[0:NUMBER:1]] =
     (float)array[array2[:]][array3[:]]; 
 
-  for (ii = 0; ii < 10; ii++)
+  for (ii = 0; ii < NUMBER; ii++)
     if (array4[array2[ii]][array3[ii]][array2[ii]][array3[ii]] !=
        (float)array[array2[ii]][array3[ii]])
       return 2;
   
 #if HAVE_IO
-  for (ii = 0; ii < 10; ii++) {
-      for (jj = 0; jj < 10; jj++) {
-         for (kk = 0; kk < 10; kk++) {
-             for (ll = 0; ll < 10; ll++) {
+  for (ii = 0; ii < NUMBER; ii++) {
+      for (jj = 0; jj < NUMBER; jj++) {
+         for (kk = 0; kk < NUMBER; kk++) {
+             for (ll = 0; ll < NUMBER; ll++) {
                  printf("%4d\n", array4[ii][jj][kk][ll]);
              }
          }

diff --git a/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57577.c b/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57577.c
index fb3490e..98ab9e1 100644 (file)
--- a/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57577.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/AN/pr57577.c
@@ -1,7 +1,8 @@
 /* { dg-do compile } */
 /* { dg-options "-fcilkplus" } */
 
-int A[10], B[10][10];
+#define NUMBER 100
+int A[NUMBER], B[NUMBER][NUMBER];
 int foo (int a);
 
 int main () {

diff --git a/gcc/testsuite/c-c++-common/cilk-plus/AN/sec_implicit_ex.c b/gcc/testsuite/c-c++-common/cilk-plus/AN/sec_implicit_ex.c
index 4912e6c..d650d9a 100644 (file)
--- a/gcc/testsuite/c-c++-common/cilk-plus/AN/sec_implicit_ex.c
+++ b/gcc/testsuite/c-c++-common/cilk-plus/AN/sec_implicit_ex.c
@@ -1,24 +1,27 @@
 /* { dg-do run } */
 /* { dg-options "-fcilkplus" } */
 
+#define NUMBER 100
+
 int main(void)
 {
-  int jj, kk, array_3C[10][10][10];
-  int ii,array[10], y = 0, y_int = 0, array2[10], array_3[10][10][10];
-  double x, yy, array3[10], array4[10];
+  int jj, kk, array_3C[NUMBER][NUMBER][NUMBER];
+  int ii,array[NUMBER], y = 0, y_int = 0, array2[NUMBER], 
+      array_3[NUMBER][NUMBER][NUMBER];
+  double x, yy, array3[NUMBER], array4[NUMBER];
 
   array[:] = __sec_implicit_index (0);
   array_3[:][:][:] = __sec_implicit_index (1) + __sec_implicit_index(0) +
     __sec_implicit_index (2);
 
-  for (ii = 0; ii < 10; ii++)
-    for (jj = 0; jj < 10; jj++)
-      for (kk = 0; kk < 10; kk++)
+  for (ii = 0; ii < NUMBER; ii++)
+    for (jj = 0; jj < NUMBER; jj++)
+      for (kk = 0; kk < NUMBER; kk++)
        array_3C[ii][jj][kk] = ii+jj+kk;
        
-  for (ii = 0; ii < 10; ii++)
-    for (jj = 0; jj < 10; jj++)
-      for (kk = 0; kk < 10; kk++)
+  for (ii = 0; ii < NUMBER; ii++)
+    for (jj = 0; jj < NUMBER; jj++)
+      for (kk = 0; kk < NUMBER; kk++)
        if (array_3[ii][jj][kk] != array_3C[ii][jj][kk])
          return 1;