Re: [gomp4, fortran] Patch to fix continuation checks of OpenACC and OpenMP directives

[Thomas Schwinge]

Hi!

On Tue, 30 Jun 2015 03:39:42 +0300, Ilmir Usmanov  wrote:
> 08.06.2015, 17:59, "Cesar Philippidis" :
> > On 06/07/2015 02:05 PM, Ilmir Usmanov wrote:
> >>  08.06.2015, 00:01, "Ilmir Usmanov" :
>   This patch fixes checks of OpenMP and OpenACC continuations in
>   case if someone mixes them (i.e. continues OpenMP directive with
>   !$ACC sentinel or vice versa).

Thanks for working on this!

>   OK for gomp branch?

The same applies to GCC trunk, as far as I can tell -- any reason not to
apply the patch to trunk?

> > Thanks for working on this. Does this fix PR63858 by any chance?
> No problem. I had a feeling that something is wrong in the scanner since 
> I've committed an initial support of OpenACC ver. 1.0 to gomp branch 
> (more than a year ago).
> Now it does fix the PR, because I've added support of fixed form to the 
> patch. BTW, your test in the PR has a wrong continuation. Fixed test 
> added to the patch.

I understand correctly that your patch does fix
, right?  In that case, please assign the PR
to yourself, and close it as fixed, once it is fixed in trunk.

> --- a/gcc/fortran/ChangeLog.gomp
> +++ b/gcc/fortran/ChangeLog.gomp
> @@ -1,3 +1,13 @@
> +2015-06-30  Ilmir Usmanov  
> +
> + PR/63858

The format to use is PR [component]/[number], so here: PR fortran/63858.

> --- a/gcc/testsuite/ChangeLog.gomp
> +++ b/gcc/testsuite/ChangeLog.gomp
> @@ -1,3 +1,10 @@
> +2015-06-30  Ilmir Usmanov  
> +
> + PR/63858

Same.

> --- /dev/null
> +++ b/gcc/testsuite/gfortran.dg/goacc/omp-fixed.f
> @@ -0,0 +1,32 @@
> +! { dg-do compile }
> +! { dg-additional-options "-fopenmp" }

For C, C++, we have a goacc-gomp directory, where both OpenACC and OpenMP
are enabled -- does that make sense to have for Fortran, too?


Grüße,
 Thomas


signature.asc
Description: PGP signature

Re: [gomp4, fortran] Patch to fix continuation checks of OpenACC and OpenMP directives

[Cesar Philippidis]

On 07/14/2015 02:20 PM, Ilmir Usmanov wrote:
> Ping

Sorry, I thought I had already approved this. It's fine for gomp-4_0-branch.

Cesar

> On 07.07.2015 14:27, Ilmir Usmanov wrote:
>> Ping
>>
>> 30.06.2015, 03:43, "Ilmir Usmanov" :
>>> Hi Cesar!
>>>
>>> Thanks for your review!
>>>
>>> 08.06.2015, 17:59, "Cesar Philippidis" :
   On 06/07/2015 02:05 PM, Ilmir Usmanov wrote:
>Fixed fortran mail-list address. Sorry for inconvenience.
>
>08.06.2015, 00:01, "Ilmir Usmanov" :
>>>Hi Cesar!
>>>
>>>This patch fixes checks of OpenMP and OpenACC continuations in
>>>case if someone mixes them (i.e. continues OpenMP directive with
>>>!$ACC sentinel or vice versa).
>>>
>>>OK for gomp branch?
   Thanks for working on this. Does this fix PR63858 by any chance?
>>> No problem. I had a feeling that something is wrong in the scanner since
>>> I've committed an initial support of OpenACC ver. 1.0 to gomp branch
>>> (more than a year ago).
>>> Now it does fix the PR, because I've added support of fixed form to the
>>> patch. BTW, your test in the PR has a wrong continuation. Fixed test
>>> added to the patch.
>>>
   two minor nits...

>0001-Fix-mix-of-OpenACC-and-OpenMP-sentinels-in-continuat.patch
>
>From 5492bf5bc991b6924f5e3b35c11eeaed745df073 Mon Sep 17
> 00:00:00 2001
>From: Ilmir Usmanov 
>Date: Sun, 7 Jun 2015 23:55:22 +0300
>Subject: [PATCH] Fix mix of OpenACC and OpenMP sentinels in
> continuation
>
>---
> gcc/fortran/ChangeLog | 5 +
   Use ChangeLog.gomp for gomp-4_0-branch.
>>> Done.
>>>
>+ /* In case we have an OpenMP directive continued by OpenACC
>+ sentinel, or vice versa, we get both openmp_flag and
>+ openacc_flag on. */
>+
>+ if (openacc_flag && openmp_flag)
>+ {
>+ int is_openmp = 0;
>+ for (i = 0; i < 5; i++, c = next_char ())
>+ {
>+ if (gfc_wide_tolower (c) != (unsigned char) "!$acc"[i])
>+ is_openmp = 1;
>+ if (i == 4)
>+ old_loc = gfc_current_locus;
>+ }
>+ gfc_error ("Wrong %s continuation at %C: expected %s, got %s",
>+ is_openmp ? "OpenACC" : "OpenMP",
>+ is_openmp ? "!$ACC" : "!$OMP",
>+ is_openmp ? "!$OMP" : "!$ACC");
   I think it's better for the translation project if you made this a
   complete string. So maybe change this line into

 gfc_error (is_openmp ? "Wrong continuation at %C: expected
 !$ACC, got"
" !$OMP",
: "Wrong continuation at %C: expected !$OMP, got
 !$ACC");
>>> Done
>>>
   Other than that, it looks fine.

   Thanks,
   Cesar
>>> OK for gomp branch?
>>>
>>> -- 
>>> Ilmir.
>> -- 
>> Ilmir.
>>

Re: [gomp4, fortran] Patch to fix continuation checks of OpenACC and OpenMP directives

[Ilmir Usmanov]

Ping

On 07.07.2015 14:27, Ilmir Usmanov wrote:

Ping

30.06.2015, 03:43, "Ilmir Usmanov" :

Hi Cesar!

Thanks for your review!

08.06.2015, 17:59, "Cesar Philippidis" :

  On 06/07/2015 02:05 PM, Ilmir Usmanov wrote:

   Fixed fortran mail-list address. Sorry for inconvenience.

   08.06.2015, 00:01, "Ilmir Usmanov" :

   Hi Cesar!

   This patch fixes checks of OpenMP and OpenACC continuations in
   case if someone mixes them (i.e. continues OpenMP directive with
   !$ACC sentinel or vice versa).

   OK for gomp branch?

  Thanks for working on this. Does this fix PR63858 by any chance?

No problem. I had a feeling that something is wrong in the scanner since
I've committed an initial support of OpenACC ver. 1.0 to gomp branch
(more than a year ago).
Now it does fix the PR, because I've added support of fixed form to the
patch. BTW, your test in the PR has a wrong continuation. Fixed test
added to the patch.


  two minor nits...


   0001-Fix-mix-of-OpenACC-and-OpenMP-sentinels-in-continuat.patch

   From 5492bf5bc991b6924f5e3b35c11eeaed745df073 Mon Sep 17 00:00:00 2001
   From: Ilmir Usmanov 
   Date: Sun, 7 Jun 2015 23:55:22 +0300
   Subject: [PATCH] Fix mix of OpenACC and OpenMP sentinels in continuation

   ---
gcc/fortran/ChangeLog | 5 +

  Use ChangeLog.gomp for gomp-4_0-branch.

Done.


   + /* In case we have an OpenMP directive continued by OpenACC
   + sentinel, or vice versa, we get both openmp_flag and
   + openacc_flag on. */
   +
   + if (openacc_flag && openmp_flag)
   + {
   + int is_openmp = 0;
   + for (i = 0; i < 5; i++, c = next_char ())
   + {
   + if (gfc_wide_tolower (c) != (unsigned char) "!$acc"[i])
   + is_openmp = 1;
   + if (i == 4)
   + old_loc = gfc_current_locus;
   + }
   + gfc_error ("Wrong %s continuation at %C: expected %s, got %s",
   + is_openmp ? "OpenACC" : "OpenMP",
   + is_openmp ? "!$ACC" : "!$OMP",
   + is_openmp ? "!$OMP" : "!$ACC");

  I think it's better for the translation project if you made this a
  complete string. So maybe change this line into

gfc_error (is_openmp ? "Wrong continuation at %C: expected !$ACC, got"
   " !$OMP",
   : "Wrong continuation at %C: expected !$OMP, got !$ACC");

Done


  Other than that, it looks fine.

  Thanks,
  Cesar

OK for gomp branch?

--
Ilmir.

--
Ilmir.


--
Ilmir.

Re: [gomp4, fortran] Patch to fix continuation checks of OpenACC and OpenMP directives

[Ilmir Usmanov]

Hi Cesar!

Thanks for your review!

08.06.2015, 17:59, "Cesar Philippidis" :

On 06/07/2015 02:05 PM, Ilmir Usmanov wrote:

 Fixed fortran mail-list address. Sorry for inconvenience.

 08.06.2015, 00:01, "Ilmir Usmanov" :

 Hi Cesar!

 This patch fixes checks of OpenMP and OpenACC continuations in
 case if someone mixes them (i.e. continues OpenMP directive with
 !$ACC sentinel or vice versa).

 OK for gomp branch?


Thanks for working on this. Does this fix PR63858 by any chance?
No problem. I had a feeling that something is wrong in the scanner since 
I've committed an initial support of OpenACC ver. 1.0 to gomp branch 
(more than a year ago).
Now it does fix the PR, because I've added support of fixed form to the 
patch. BTW, your test in the PR has a wrong continuation. Fixed test 
added to the patch.




two minor nits...


 0001-Fix-mix-of-OpenACC-and-OpenMP-sentinels-in-continuat.patch

 From 5492bf5bc991b6924f5e3b35c11eeaed745df073 Mon Sep 17 00:00:00 2001
 From: Ilmir Usmanov 
 Date: Sun, 7 Jun 2015 23:55:22 +0300
 Subject: [PATCH] Fix mix of OpenACC and OpenMP sentinels in continuation

 ---
  gcc/fortran/ChangeLog | 5 +


Use ChangeLog.gomp for gomp-4_0-branch.

Done.




 + /* In case we have an OpenMP directive continued by OpenACC
 + sentinel, or vice versa, we get both openmp_flag and
 + openacc_flag on. */
 +
 + if (openacc_flag && openmp_flag)
 + {
 + int is_openmp = 0;
 + for (i = 0; i < 5; i++, c = next_char ())
 + {
 + if (gfc_wide_tolower (c) != (unsigned char) "!$acc"[i])
 + is_openmp = 1;
 + if (i == 4)
 + old_loc = gfc_current_locus;
 + }
 + gfc_error ("Wrong %s continuation at %C: expected %s, got %s",
 + is_openmp ? "OpenACC" : "OpenMP",
 + is_openmp ? "!$ACC" : "!$OMP",
 + is_openmp ? "!$OMP" : "!$ACC");


I think it's better for the translation project if you made this a
complete string. So maybe change this line into

  gfc_error (is_openmp ? "Wrong continuation at %C: expected !$ACC, got"
 " !$OMP",
 : "Wrong continuation at %C: expected !$OMP, got !$ACC");

Done



Other than that, it looks fine.

Thanks,
Cesar


OK for gomp branch?

--
Ilmir.



>From dc98062b499838ca4391c0ed497f40205267a44e Mon Sep 17 00:00:00 2001
From: Ilmir Usmanov 
Date: Tue, 30 Jun 2015 03:05:23 +0300
Subject: [PATCH] PR/63858

---
 gcc/fortran/ChangeLog.gomp  |  10 ++
 gcc/fortran/scanner.c   | 259 +---
 gcc/testsuite/ChangeLog.gomp|   7 +
 gcc/testsuite/gfortran.dg/goacc/omp-fixed.f |  32 
 gcc/testsuite/gfortran.dg/goacc/omp.f95 |   8 +
 5 files changed, 216 insertions(+), 100 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/goacc/omp-fixed.f

diff --git a/gcc/fortran/ChangeLog.gomp b/gcc/fortran/ChangeLog.gomp
index aa02ffe..0a5bf47 100644
--- a/gcc/fortran/ChangeLog.gomp
+++ b/gcc/fortran/ChangeLog.gomp
@@ -1,3 +1,13 @@
+2015-06-30  Ilmir Usmanov  
+
+	PR/63858
+	Fix mix of OpenACC and OpenMP sentinels in continuation.
+	* scanner.c (skip_omp_attribute_fixed, skip_oacc_attribute_fixed): New
+	functions.
+	(skip_fixed_comments): Fix mix of OpenACC and OpenMP sentinels in
+	continuation.
+	(gfc_next_char_literal): Likewise.
+
 2015-06-18  James Norris  
 
 	* trans-decl.c (find_module_oacc_declare_clauses): Fix setting of
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index f0e6404..d66cf65 100644
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -935,6 +935,63 @@ skip_free_comments (void)
   return false;
 }
 
+/* Return true if MP was matched in fixed form.  */
+static bool
+skip_omp_attribute_fixed (locus *start)
+{
+  gfc_char_t c;
+  if (((c = next_char ()) == 'm' || c == 'M')
+  && ((c = next_char ()) == 'p' || c == 'P'))
+{
+  c = next_char ();
+  if (c != '\n'
+	  && (continue_flag
+	  || c == ' ' || c == '\t' || c == '0'))
+	{
+	  do
+	c = next_char ();
+	  while (gfc_is_whitespace (c));
+	  if (c != '\n' && c != '!')
+	{
+	  /* Canonicalize to *$omp.  */
+	  *start->nextc = '*';
+	  openmp_flag = 1;
+	  gfc_current_locus = *start;
+	  return true;
+	}
+	}
+}
+  return false;
+}
+
+/* Return true if CC was matched in fixed form.  */
+static bool
+skip_oacc_attribute_fixed (locus *start)
+{
+  gfc_char_t c;
+  if (((c = next_char ()) == 'c' || c == 'C')
+  && ((c = next_char ()) == 'c' || c == 'C'))
+{
+  c = next_char ();
+  if (c != '\n'
+	  && (continue_flag
+	  || c == ' ' || c == '\t' || c == '0'))
+	{
+	  do
+	c = next_char ();
+	  while (gfc_is_whitespace (c));
+	  if (c != '\n' && c != '!')
+	{
+	  /* Canonicalize to *$omp.  */
+	  *start->nextc = '*';
+	  openacc_flag = 1;
+	  gfc_current_locus = *start;
+	  return true;
+	}
+	}
+}
+  return false;
+}
 
 /* Skip comment lines in fixed source mode.  We have the same rules as
in skip_free_comment(), except that we can have a 'c', 'C' or '*'
@@ -1003,128 +1060,92 @@ skip_fixed_com

Re: [gomp4, fortran] Patch to fix continuation checks of OpenACC and OpenMP directives

[Cesar Philippidis]

On 06/07/2015 02:05 PM, Ilmir Usmanov wrote:
> Fixed fortran mail-list address. Sorry for inconvenience.
> 
> 08.06.2015, 00:01, "Ilmir Usmanov" :
>>> Hi Cesar!
>>> 
>>> This patch fixes checks of OpenMP and OpenACC continuations in
>>> case if someone mixes them (i.e. continues OpenMP directive with
>>> !$ACC sentinel or vice versa).
>>> 
>>> OK for gomp branch?

Thanks for working on this. Does this fix PR63858 by any chance?

two minor nits...

> 0001-Fix-mix-of-OpenACC-and-OpenMP-sentinels-in-continuat.patch
> 
> 
> From 5492bf5bc991b6924f5e3b35c11eeaed745df073 Mon Sep 17 00:00:00 2001
> From: Ilmir Usmanov 
> Date: Sun, 7 Jun 2015 23:55:22 +0300
> Subject: [PATCH] Fix mix of OpenACC and OpenMP sentinels in continuation
> 
> ---
>  gcc/fortran/ChangeLog   |  5 +

Use ChangeLog.gomp for gomp-4_0-branch.

>  gcc/fortran/scanner.c   | 28 
>  gcc/testsuite/ChangeLog |  5 +
>  gcc/testsuite/gfortran.dg/goacc/omp.f95 |  8 
>  4 files changed, 42 insertions(+), 4 deletions(-)
> 
> diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
> index 67f9e09..f61e0e9 100644
> --- a/gcc/fortran/ChangeLog
> +++ b/gcc/fortran/ChangeLog
> @@ -1,3 +1,8 @@
> +2015-06-07  Ilmir Usmanov  
> +
> + * scanner.c (gfc_next_char_literal): Fix mix of OpenACC and OpenMP
> + sentinels in continuation.
> +
>  2015-05-05  David Malcolm  
>  
>   * expr.c (check_inquiry): Fix indentation so that it reflects the
> diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
> index f0e6404..5af4eea 100644
> --- a/gcc/fortran/scanner.c
> +++ b/gcc/fortran/scanner.c
> @@ -1331,7 +1331,7 @@ restart:
>   continue_line = gfc_linebuf_linenum (gfc_current_locus.lb);
>  
>if (flag_openmp)
> - if (prev_openmp_flag != openmp_flag)
> + if (prev_openmp_flag != openmp_flag && !openacc_flag)
> {
>   gfc_current_locus = old_loc;
>   openmp_flag = prev_openmp_flag;
> @@ -1340,7 +1340,7 @@ restart:
> }
>  
>if (flag_openacc)
> - if (prev_openacc_flag != openacc_flag)
> + if (prev_openacc_flag != openacc_flag && !openmp_flag)
> {
>   gfc_current_locus = old_loc;
>   openacc_flag = prev_openacc_flag;
> @@ -1359,7 +1359,7 @@ restart:
>while (gfc_is_whitespace (c))
>   c = next_char ();
>  
> -  if (openmp_flag)
> +  if (openmp_flag && !openacc_flag)
>   {
> for (i = 0; i < 5; i++, c = next_char ())
>   {
> @@ -1370,7 +1370,7 @@ restart:
> while (gfc_is_whitespace (c))
>   c = next_char ();
>   }
> -  if (openacc_flag)
> +  if (openacc_flag && !openmp_flag)
>   {
> for (i = 0; i < 5; i++, c = next_char ())
>   {
> @@ -1382,6 +1382,26 @@ restart:
>   c = next_char ();
>   }
>  
> +  /* In case we have an OpenMP directive continued by OpenACC
> +  sentinel, or vice versa, we get both openmp_flag and
> +  openacc_flag on.  */
> +
> +  if (openacc_flag && openmp_flag)
> + {
> +   int is_openmp = 0;
> +   for (i = 0; i < 5; i++, c = next_char ())
> + {
> +   if (gfc_wide_tolower (c) != (unsigned char) "!$acc"[i])
> + is_openmp = 1;
> +   if (i == 4)
> + old_loc = gfc_current_locus;
> + }
> +   gfc_error ("Wrong %s continuation at %C: expected %s, got %s",
> +  is_openmp ? "OpenACC" : "OpenMP",
> +  is_openmp ? "!$ACC" : "!$OMP",
> +  is_openmp ? "!$OMP" : "!$ACC");

I think it's better for the translation project if you made this a
complete string. So maybe change this line into

  gfc_error (is_openmp ? "Wrong continuation at %C: expected !$ACC, got"
 " !$OMP",
 : "Wrong continuation at %C: expected !$OMP, got !$ACC");

Other than that, it looks fine.

Thanks,
Cesar

Re: [gomp4, fortran] Patch to fix continuation checks of OpenACC and OpenMP directives

[Ilmir Usmanov]

Fixed fortran mail-list address. Sorry for inconvenience.

08.06.2015, 00:01, "Ilmir Usmanov" :
> Hi Cesar!
>
> This patch fixes checks of OpenMP and OpenACC continuations in case if 
> someone mixes them (i.e. continues OpenMP directive with !$ACC sentinel or 
> vice versa).
>
> OK for gomp branch?
>
> --
> Ilmir.

--
Ilmir.
From 5492bf5bc991b6924f5e3b35c11eeaed745df073 Mon Sep 17 00:00:00 2001
From: Ilmir Usmanov 
Date: Sun, 7 Jun 2015 23:55:22 +0300
Subject: [PATCH] Fix mix of OpenACC and OpenMP sentinels in continuation

---
 gcc/fortran/ChangeLog   |  5 +
 gcc/fortran/scanner.c   | 28 
 gcc/testsuite/ChangeLog |  5 +
 gcc/testsuite/gfortran.dg/goacc/omp.f95 |  8 
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 67f9e09..f61e0e9 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-07  Ilmir Usmanov  
+
+	* scanner.c (gfc_next_char_literal): Fix mix of OpenACC and OpenMP
+	sentinels in continuation.
+
 2015-05-05  David Malcolm  
 
 	* expr.c (check_inquiry): Fix indentation so that it reflects the
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c
index f0e6404..5af4eea 100644
--- a/gcc/fortran/scanner.c
+++ b/gcc/fortran/scanner.c
@@ -1331,7 +1331,7 @@ restart:
 	continue_line = gfc_linebuf_linenum (gfc_current_locus.lb);
 
   if (flag_openmp)
-	if (prev_openmp_flag != openmp_flag)
+	if (prev_openmp_flag != openmp_flag && !openacc_flag)
 	  {
 	gfc_current_locus = old_loc;
 	openmp_flag = prev_openmp_flag;
@@ -1340,7 +1340,7 @@ restart:
 	  }
 
   if (flag_openacc)
-	if (prev_openacc_flag != openacc_flag)
+	if (prev_openacc_flag != openacc_flag && !openmp_flag)
 	  {
 	gfc_current_locus = old_loc;
 	openacc_flag = prev_openacc_flag;
@@ -1359,7 +1359,7 @@ restart:
   while (gfc_is_whitespace (c))
 	c = next_char ();
 
-  if (openmp_flag)
+  if (openmp_flag && !openacc_flag)
 	{
 	  for (i = 0; i < 5; i++, c = next_char ())
 	{
@@ -1370,7 +1370,7 @@ restart:
 	  while (gfc_is_whitespace (c))
 	c = next_char ();
 	}
-  if (openacc_flag)
+  if (openacc_flag && !openmp_flag)
 	{
 	  for (i = 0; i < 5; i++, c = next_char ())
 	{
@@ -1382,6 +1382,26 @@ restart:
 	c = next_char ();
 	}
 
+  /* In case we have an OpenMP directive continued by OpenACC
+	 sentinel, or vice versa, we get both openmp_flag and
+	 openacc_flag on.  */
+
+  if (openacc_flag && openmp_flag)
+	{
+	  int is_openmp = 0;
+	  for (i = 0; i < 5; i++, c = next_char ())
+	{
+	  if (gfc_wide_tolower (c) != (unsigned char) "!$acc"[i])
+		is_openmp = 1;
+	  if (i == 4)
+		old_loc = gfc_current_locus;
+	}
+	  gfc_error ("Wrong %s continuation at %C: expected %s, got %s",
+	 is_openmp ? "OpenACC" : "OpenMP",
+	 is_openmp ? "!$ACC" : "!$OMP",
+	 is_openmp ? "!$OMP" : "!$ACC");
+	}
+
   if (c != '&')
 	{
 	  if (in_string)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7c4781c..05a9a52 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-07  Ilmir Usmanov  
+
+	* gfortran.dg/goacc/omp.f95: Add mix of OpenACC and OpenMP
+	sentinels in continuation to test.
+
 2015-05-06  Yvan Roux  
 
 	PR target/64208
diff --git a/gcc/testsuite/gfortran.dg/goacc/omp.f95 b/gcc/testsuite/gfortran.dg/goacc/omp.f95
index 24f639f..a7333eb 100644
--- a/gcc/testsuite/gfortran.dg/goacc/omp.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/omp.f95
@@ -63,4 +63,12 @@ contains
  !$omp end parallel
  !$acc end data
end subroutine roku
+
+   subroutine nana
+ !$acc parallel &
+ !$omp do ! { dg-error "Wrong OpenACC continuation" }
+
+ !$omp parallel &
+ !$acc loop ! { dg-error "Wrong OpenMP continuation" }
+   end subroutine nana
 end module test
\ No newline at end of file
-- 
1.9.1