[libgomp, testsuite, openacc] Don't use const int for dimensions

Const int is handled differently at -O0 for -xc and -xc++, which can cause noise
in testsuite/libgomp.oacc-c-c++-common test-cases (which are both run for c and
c++) if const int is used for launch dimensions.

Fix this by using #defines instead.

2019-01-09  Tom de Vries  <tdevries@suse.de>

	PR target/88756
	* testsuite/libgomp.oacc-c-c++-common/reduction-1.c (ng, nw, vl): Use
	#define instead of "const int".
	* testsuite/libgomp.oacc-c-c++-common/reduction-2.c (ng, nw, vl): Same.
	* testsuite/libgomp.oacc-c-c++-common/reduction-3.c (ng, nw, vl): Same.
	* testsuite/libgomp.oacc-c-c++-common/reduction-4.c (ng, nw, vl): Same.
	* testsuite/libgomp.oacc-c-c++-common/reduction-5.c (ng, nw, vl): Same.

From-SVN: r267747

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index fba0ba0562ac4222605b28390fa8bbc2976fca3b..f953954501525a7e2784e38a4baa782fab358bab 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,13 @@
+2019-01-09  Tom de Vries  <tdevries@suse.de>
+
+       PR target/88756
+       * testsuite/libgomp.oacc-c-c++-common/reduction-1.c (ng, nw, vl): Use
+       #define instead of "const int".
+       * testsuite/libgomp.oacc-c-c++-common/reduction-2.c (ng, nw, vl): Same.
+       * testsuite/libgomp.oacc-c-c++-common/reduction-3.c (ng, nw, vl): Same.
+       * testsuite/libgomp.oacc-c-c++-common/reduction-4.c (ng, nw, vl): Same.
+       * testsuite/libgomp.oacc-c-c++-common/reduction-5.c (ng, nw, vl): Same.
+
 2019-01-09  Tom de Vries  <tdevries@suse.de>
 
        * plugin/plugin-nvptx.c (nvptx_exec): Make sure to launch with at least

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-1.c
index e8a8911faeb11e6a4191e43d5a79bbd2b6d1262f..3fe9ae6530933f95b7b3fb99ef0bf9ad2c043b20 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-1.c
@@ -8,9 +8,9 @@
 #include <stdlib.h>
 #include "reduction.h"
 
-const int ng = 8;
-const int nw = 4;
-const int vl = 32;
+#define ng 8
+#define nw 4
+#define vl 32
 
 static void
 test_reductions (void)

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-2.c
index d19b1c825ca4fe2df4c0b50edaa35d3e5fffdee2..83986abf7e0c4f517080572b1781cec0af105313 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-2.c
@@ -8,9 +8,9 @@
 #include <stdlib.h>
 #include "reduction.h"
 
-const int ng = 8;
-const int nw = 4;
-const int vl = 32;
+#define ng 8
+#define nw 4
+#define vl 32
 
 static void
 test_reductions (void)

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-3.c
index 1b948bef5a04bcba1ce81dfafb7d35b75021b607..3ac0f996a867be76bcac4605f2567255564209fc 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-3.c
@@ -8,9 +8,9 @@
 #include <stdlib.h>
 #include "reduction.h"
 
-const int ng = 8;
-const int nw = 4;
-const int vl = 32;
+#define ng 8
+#define nw 4
+#define vl 32
 
 static void
 test_reductions (void)

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c
index 79355eded80b86a76054a6d180b840e76fc90af6..b8fa954cfee137f7d1ed869fff784ea08f750039 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-4.c
@@ -9,9 +9,9 @@
 #include <complex.h>
 #include "reduction.h"
 
-const int ng = 8;
-const int nw = 4;
-const int vl = 32;
+#define ng 8
+#define nw 4
+#define vl 32
 
 static void
 test_reductions (void)

diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c
index 46b553a61ff6d37f45398e0893c2da3e5c76faad..215d919a10315be07d8f9d5086477df8e6260c36 100644 (file)
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/reduction-5.c
@@ -9,9 +9,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-const int ng = 8;
-const int nw = 4;
-const int vl = 32;
+#define ng 8
+#define nw 4
+#define vl 32
 
 const int n = 100;