[ was Re: [committed] Run testsuite/libgomp.oacc-c++/c++.exp at -O2 by
default ]
On 30/06/15 17:48, Tom de Vries wrote:
[ was: Re: [patch] Run testsuite/libgomp.c++/c++.exp at -O2 by default ]
On 30/06/15 14:07, Jakub Jelinek wrote:
On Mon, Jun 15, 2015 at 06:36:17PM +0200, Tom de Vries wrote:
Hi,
this patch:
- sets DEFAULT_CFLAGS to -O2, if not set otherwise
(similar to what is done in c.exp)
- removes superfluous dg-options "-O2" settings.
- removes superfluous dg-options "-fopenmp" settings.
- uses dg-additional-options for -std=<standard> settings
Tested on x86_64.
OK for trunk?
Ok, thanks.
I've also committed this patch, as obvious. It does the same, but for
libgomp.oacc-c++/c++.exp (which was based on libgomp.c++/c++.exp).
I've backported this patch to the gomp-4_0-branch, in addition with two
more patches cleaning up dg-options in testsuite/libgomp.oacc-c-c++-common.
Committed as attached.
Thanks,
- Tom
[PATCH 1/3] Run testsuite/libgomp.oacc-c++/c++.exp at -O2 by default
2015-06-30 Tom de Vries <t...@codesourcery.com>
backport from trunk:
2015-06-30 Tom de Vries <t...@codesourcery.com>
* testsuite/libgomp.oacc-c++/c++.exp: Set DEFAULT_CFLAGS to -O2 if not
already set. Use DEFAULT_CFLAGS in dg-runtest.
* testsuite/libgomp.oacc-c-c++-common/collapse-3.c: Remove dg-options
"-O2".
---
libgomp/testsuite/libgomp.oacc-c++/c++.exp | 7 ++++++-
libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c | 1 -
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
index a3d0eda..80cb317 100644
--- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp
+++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp
@@ -18,6 +18,11 @@ proc check_effective_target_c { } {
return 0
}
+# If a testcase doesn't have special options, use these.
+if ![info exists DEFAULT_CFLAGS] then {
+ set DEFAULT_CFLAGS "-O2"
+}
+
# Initialize dg.
dg-init
@@ -108,7 +113,7 @@ if { $lang_test_file_found } {
}
set tagopt "$tagopt -DACC_MEM_SHARED=$acc_mem_shared"
- dg-runtest $tests "$tagopt" $libstdcxx_includes
+ dg-runtest $tests "$tagopt" "$libstdcxx_includes $DEFAULT_CFLAGS"
}
}
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c
index a5be728..6800428 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/collapse-3.c
@@ -1,5 +1,4 @@
/* { dg-do run } */
-/* { dg-options "-O2" } */
#include <string.h>
#include <stdlib.h>
--
1.9.1
[PATCH 2/3] Remove dg-options in libgomp.oacc-c-c++-common/kernels*.c
2015-06-30 Tom de Vries <t...@codesourcery.com>
* testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c: Drop "-O2" in
dg-options and replace dg-options with dg-additional-options.
* testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c: Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c: Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c:
Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c:
Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c: Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c: Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c: Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c: Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-loop.c: Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c:
Same.
* testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c: Same.
---
libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c | 2 +-
libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c | 2 +-
libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c | 2 +-
.../libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c | 2 +-
.../testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c | 2 +-
libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c | 2 +-
libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c | 2 +-
libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c | 2 +-
libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c | 2 +-
libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c | 2 +-
.../libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c | 2 +-
libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c
index 0a0d754..13e57bd 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-2.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c
index 7084711..f61a74a 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-3.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c
index 325ea7d..b889ef9 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-2.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c
index 9c378a2..d508a44 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit-2.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c
index 78cf4c1..11d82f7 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-enter-exit.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c
index 67c2c36..a7d4e84 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data-update.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c
index acd7f30..607d7de 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-data.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c
index fdd6256..1433cb2 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-mod-not-zero.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c
index 52d8e24..fd0d5b1 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop-n.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c
index 294a5bf..3762e5a 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-loop.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c
index cab10df..767f6c8 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-parallel-loop-data-enter-exit.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c
index 6984a3b..511e25f 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/kernels-reduction.c
@@ -1,5 +1,5 @@
/* { dg-do run } */
-/* { dg-options "-ftree-parallelize-loops=32 -O2" } */
+/* { dg-additional-options "-ftree-parallelize-loops=32" } */
#include <stdlib.h>
--
1.9.1
[PATCH 3/3] Remove dg-options in libgomp.oacc-c-c++-common
2015-06-30 Tom de Vries <t...@codesourcery.com>
* testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c: Remove
dg-options "-O2" setting.
* testsuite/libgomp.oacc-c-c++-common/routine-1.c: Replace dg-options
with dg-additional-options.
* testsuite/libgomp.oacc-c-c++-common/routine-2.c: Same.
---
libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c | 1 -
libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c | 4 ++--
libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c
index d3306aa..5685dbd 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/goacc-data-end.c
@@ -1,5 +1,4 @@
/* { dg-do run } */
-/* { dg-options "-O2" } */
/* Data directive at end of function. This is the variant that triggered
PR65419. */
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c
index 144f892..6b22e7f 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-1.c
@@ -1,7 +1,7 @@
-/* FIXME: remove -fno-var-tracking from dg-options. */
+/* FIXME: remove -fno-var-tracking from dg-aditional-options. */
/* { dg-do run } */
-/* { dg-options "-fno-inline -fno-var-tracking" } */
+/* { dg-additional-options "-fno-inline -fno-var-tracking" } */
#include <stdio.h>
#include <stdlib.h>
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c
index f08aeda..e1605b9 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-2.c
@@ -1,7 +1,7 @@
-/* FIXME: remove -fno-var-tracking from dg-options. */
+/* FIXME: remove -fno-var-tracking from dg-additional-options. */
/* { dg-do run } */
-/* { dg-options "-fno-inline -fno-var-tracking" } */
+/* { dg-additional-options "-fno-inline -fno-var-tracking" } */
#include <stdio.h>
#include <stdlib.h>
--
1.9.1
