diff mbox

[committed,gomp4] Run testsuite/libgomp.oacc-c++/c++.exp at -O2 by default

Message ID 55930A84.9010801@mentor.com
State New
Headers show

Commit Message

Tom de Vries June 30, 2015, 9:30 p.m. UTC 
[ 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

Comments

Cesar Philippidis June 30, 2015, 11:24 p.m. UTC | #1 
On 06/30/2015 02:30 PM, Tom de Vries wrote:
> 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" } */

Is -fno-var-tracking still required? I thought Thomas fixed that a while
ago.

Cesar
diff mbox

Patch

[PATCH 3/3] Remove dg-options in libgomp.oacc-c-c++-common

2015-06-30  Tom de Vries  <tom@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