OpenMP: Document ompx warnings + add Fortran omx warning [PR106670]

omp/ompx sentinels are for vendor extensions; as they might be required for
the correctness of the program, a warning should be printable. This patch
documents in the OpenMP 5.2 table the existing warnings, including the new
warning for for fixed source form Fortran.

	PR fortran/106670

gcc/fortran/ChangeLog:

	* scanner.cc (skip_fixed_omp_sentinel): Add -Wsurprising warning
	for 'omx' sentinels with -fopenmp.
	* invoke.texi (-Wsurprising): Document additional warning case.

libgomp/ChangeLog:

	* libgomp.texi (OpenMP 5.2): Add comment to ompx/omx entry.

gcc/testsuite/ChangeLog:

	* c-c++-common/gomp/ompx-1.c: New test.
	* c-c++-common/gomp/ompx-2.c: New test.
	* g++.dg/gomp/ompx-attrs-1.C: New test.
	* gfortran.dg/gomp/ompx-1.f90: New test.
	* gfortran.dg/gomp/omx-1.f: New test.
	* gfortran.dg/gomp/omx-2.f: New test.

(cherry picked from commit 264deecb16abcfc8ca8efe9b94b0ad55febd55cc)

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 6d0a243169b826f8024f5d8b66c0eab7a22279da..8c89cd5bd4379a587e0ba4f6628a6915633e1c9c 100644 (file)
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,13 @@
+2022-09-09  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-09-08  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR fortran/106670
+       * scanner.cc (skip_fixed_omp_sentinel): Add -Wsurprising warning
+       for 'omx' sentinels with -fopenmp.
+       * invoke.texi (-Wsurprising): Document additional warning case.
+
 2022-09-06  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index c0932f6cd703e0101fc614510acd855f2e38efef..d3261f0d061c422603b82f315ba3df2320f51ff0 100644 (file)
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -1092,6 +1092,11 @@ The type of a function result is declared more than once with the same type.  If
 
 @item
 A @code{CHARACTER} variable is declared with negative length.
+
+@item
+With @option{-fopenmp}, for fixed-form source code, when an @code{omx}
+vendor-extension sentinel is encountered. (The equivalent @code{ompx},
+used in free-form source code, is diagnosed by default.)
 @end itemize
 
 @item -Wtabs

diff --git a/gcc/fortran/scanner.cc b/gcc/fortran/scanner.cc
index 2dff2514700b374524258fbeb659893e551a5ecc..7e5062a13c17a7b1f865f34c3b4b9f74d6ec7913 100644 (file)
--- a/gcc/fortran/scanner.cc
+++ b/gcc/fortran/scanner.cc
@@ -982,8 +982,9 @@ static bool
 skip_fixed_omp_sentinel (locus *start)
 {
   gfc_char_t c;
-  if (((c = next_char ()) == 'm' || c == 'M')
-      && ((c = next_char ()) == 'p' || c == 'P'))
+  if ((c = next_char ()) != 'm' && c != 'M')
+    return false;
+  if ((c = next_char ()) == 'p' || c == 'P')
     {
       c = next_char ();
       if (c != '\n'
@@ -1005,6 +1006,9 @@ skip_fixed_omp_sentinel (locus *start)
            }
        }
     }
+  else if (__builtin_expect (c == 'x' || c == 'X', 0))
+    gfc_warning_now (OPT_Wsurprising,
+                    "Ignoring '!$omx' vendor-extension sentinel at %C");
   return false;
 }
 

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 5fccb81aed8ddc8338cc727ce95a458286cbfdfb..74b36e20c5a3649bc72d2562cc90274a380cf9e7 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,16 @@
+2022-09-09  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-09-08  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR fortran/106670
+       * c-c++-common/gomp/ompx-1.c: New test.
+       * c-c++-common/gomp/ompx-2.c: New test.
+       * g++.dg/gomp/ompx-attrs-1.C: New test.
+       * gfortran.dg/gomp/ompx-1.f90: New test.
+       * gfortran.dg/gomp/omx-1.f: New test.
+       * gfortran.dg/gomp/omx-2.f: New test.
+
 2022-09-08  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/testsuite/c-c++-common/gomp/ompx-1.c b/gcc/testsuite/c-c++-common/gomp/ompx-1.c
new file mode 100644 (file)
index 0000000..9758d0f
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/ompx-1.c
@@ -0,0 +1,4 @@
+void f(void)
+{
+  #pragma ompx some_vendor_extension
+}

diff --git a/gcc/testsuite/c-c++-common/gomp/ompx-2.c b/gcc/testsuite/c-c++-common/gomp/ompx-2.c
new file mode 100644 (file)
index 0000000..4b66b0e
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/ompx-2.c
@@ -0,0 +1,5 @@
+/* { dg-additional-options "-Wunknown-pragmas" } */
+void f(void)
+{
+  #pragma ompx some_vendor_extension  /* { dg-warning "-:ignoring '#pragma ompx some_vendor_extension'" } */
+}

diff --git a/gcc/testsuite/g++.dg/gomp/ompx-attrs-1.C b/gcc/testsuite/g++.dg/gomp/ompx-attrs-1.C
new file mode 100644 (file)
index 0000000..2e9fc0b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/ompx-attrs-1.C
@@ -0,0 +1,7 @@
+// { dg-do compile { target c++11 } }
+
+void
+foo ()
+{
+  [[ompx::directive(some_vendor_extension)]];  /* { dg-warning "attributes at the beginning of statement are ignored" } */
+}

diff --git a/gcc/testsuite/gfortran.dg/gomp/ompx-1.f90 b/gcc/testsuite/gfortran.dg/gomp/ompx-1.f90
new file mode 100644 (file)
index 0000000..e5dc652
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/ompx-1.f90
@@ -0,0 +1,2 @@
+!$ompx foo  ! { dg-warning "!.OMP at .1. starts a commented line as it neither is followed by a space nor is a continuation line" }
+end

diff --git a/gcc/testsuite/gfortran.dg/gomp/omx-1.f b/gcc/testsuite/gfortran.dg/gomp/omx-1.f
new file mode 100644 (file)
index 0000000..4febf89
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/omx-1.f
@@ -0,0 +1,7 @@
+!$omx foo
+!$OMX foo
+c$oMx foo
+c$OMx foo
+*$oMx foo
+*$OMx foo
+      end

diff --git a/gcc/testsuite/gfortran.dg/gomp/omx-2.f b/gcc/testsuite/gfortran.dg/gomp/omx-2.f
new file mode 100644 (file)
index 0000000..3c107d9
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/omx-2.f
@@ -0,0 +1,9 @@
+! { dg-additional-options "-Wsurprising" }
+
+!$omx foo  ! { dg-warning "Ignoring '!.omx' vendor-extension sentinel" }
+!$OMX foo  ! { dg-warning "Ignoring '!.omx' vendor-extension sentinel" }
+c$oMx foo  ! { dg-warning "Ignoring '!.omx' vendor-extension sentinel" }
+c$OMx foo  ! { dg-warning "Ignoring '!.omx' vendor-extension sentinel" }
+*$oMx foo  ! { dg-warning "Ignoring '!.omx' vendor-extension sentinel" }
+*$OMx foo  ! { dg-warning "Ignoring '!.omx' vendor-extension sentinel" }
+      end

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 62fbddbf67769974b21d659adecac21958aeaefd..5779390952f01d7fb6992dd88d5b30001d32ebb4 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-09-09  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-09-08  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR fortran/106670
+       * libgomp.texi (OpenMP 5.2): Add comment to ompx/omx entry.
+
 2022-09-09  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi
index 10bfb90abb03c569adb40abbcc758d3d76b3e365..0a0bf8aabf1f7247ca589741dcef44a7e5c05b7c 100644 (file)
--- a/libgomp/libgomp.texi
+++ b/libgomp/libgomp.texi
@@ -361,7 +361,13 @@ to address of matching mapped list item per 5.1, Sect. 2.21.7.2 @tab N @tab
 @item @code{omp_in_explicit_task} routine and @emph{implicit-task-var} ICV
       @tab N @tab
 @item @code{omp}/@code{ompx}/@code{omx} sentinels and @code{omp_}/@code{ompx_}
-      namespaces @tab N/A @tab
+      namespaces @tab N/A
+      @tab warning for @code{omp/ompx} sentinels@footnote{@code{omp/ompx}
+      sentinels as C/C++ pragma and C++ attributes are warned for with
+      @code{-Wunknown-pragmas} (implied by @code{-Wall}) and @code{-Wattributes}
+      (enabled by default), respectively; for Fortran free-source code, there is
+      a warning enabled by default and for fixed-source code with
+      @code{-Wsurprising} (enabled by @code{-Wall})}
 @item Clauses on @code{end} directive can be on directive @tab N @tab
 @item Deprecation of no-argument @code{destroy} clause on @code{depobj}
       @tab N @tab