re PR translation/79999 (possible typo in gimplify.c: depend(sink:))

	PR translation/79999
	* gimplify.c (gimplify_omp_ordered): Reword diagnostics to talk about
	depend clause with source (or sink) modifier.
	* omp-expand.c (expand_omp_ordered_sink): Likewise.

	* c-c++-common/gomp/doacross-1.c: Adjust expected diagnostics.
	* c-c++-common/gomp/doacross-3.c: New test.

From-SVN: r269468

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 082e90b01264b5a772fe26297f8917c3af384b88..e2ece539fe471d34569d9ec03aafa47a6d862464 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2019-03-07  Jakub Jelinek  <jakub@redhat.com>
 
+       PR translation/79999
+       * gimplify.c (gimplify_omp_ordered): Reword diagnostics to talk about
+       depend clause with source (or sink) modifier.
+       * omp-expand.c (expand_omp_ordered_sink): Likewise.
+
        PR target/89602
        * config/i386/sse.md (avx512f_mov<ssescalarmodelower>_mask,
        *avx512f_load<mode>_mask, avx512f_store<mode>_mask): New define_insns.

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index fa85b1c86dea5d4b7480489b2115a61b30860054..6d7a314719dec98f7da83f895c77cbb6358437e6 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -12145,8 +12145,8 @@ gimplify_omp_ordered (tree expr, gimple_seq body)
            if (!fail && i != gimplify_omp_ctxp->loop_iter_var.length () / 2)
              {
                error_at (OMP_CLAUSE_LOCATION (c),
-                         "number of variables in %<depend(sink)%> "
-                         "clause does not match number of "
+                         "number of variables in %<depend%> clause with "
+                         "%<sink%> modifier does not match number of "
                          "iteration variables");
                failures++;
              }
@@ -12158,8 +12158,8 @@ gimplify_omp_ordered (tree expr, gimple_seq body)
            if (source_c)
              {
                error_at (OMP_CLAUSE_LOCATION (c),
-                         "more than one %<depend(source)%> clause on an "
-                         "%<ordered%> construct");
+                         "more than one %<depend%> clause with %<source%> "
+                         "modifier on an %<ordered%> construct");
                failures++;
              }
            else
@@ -12169,8 +12169,9 @@ gimplify_omp_ordered (tree expr, gimple_seq body)
   if (source_c && sink_c)
     {
       error_at (OMP_CLAUSE_LOCATION (source_c),
-               "%<depend(source)%> clause specified together with "
-               "%<depend(sink:)%> clauses on the same construct");
+               "%<depend%> clause with %<source%> modifier specified "
+               "together with %<depend%> clauses with %<sink%> modifier "
+               "on the same construct");
       failures++;
     }
 

diff --git a/gcc/omp-expand.c b/gcc/omp-expand.c
index 5c2dba9d1c5ffc3d1178369331bf2a1d63e38ef4..89a3a3232671954418ee5b2892891fb6ad2f0bb7 100644 (file)
--- a/gcc/omp-expand.c
+++ b/gcc/omp-expand.c
@@ -2147,8 +2147,8 @@ expand_omp_ordered_sink (gimple_stmt_iterator *gsi, struct omp_for_data *fd,
              forward = tree_int_cst_sgn (step) != -1;
            }
          if (forward ^ OMP_CLAUSE_DEPEND_SINK_NEGATIVE (deps))
-           warning_at (loc, 0, "%<depend(sink)%> clause waiting for "
-                               "lexically later iteration");
+           warning_at (loc, 0, "%<depend%> clause with %<sink%> modifier "
+                               "waiting for lexically later iteration");
          break;
        }
       deps = TREE_CHAIN (deps);
@@ -2284,8 +2284,9 @@ expand_omp_ordered_sink (gimple_stmt_iterator *gsi, struct omp_for_data *fd,
                               build_int_cst (itype, 0));
          if (integer_zerop (t) && !warned_step)
            {
-             warning_at (loc, 0, "%<depend(sink)%> refers to iteration never "
-                                 "in the iteration space");
+             warning_at (loc, 0, "%<depend%> clause with %<sink%> modifier "
+                                 "refers to iteration never in the iteration "
+                                 "space");
              warned_step = true;
            }
          cond = fold_build2_loc (loc, BIT_AND_EXPR, boolean_type_node,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 31b1f69b8144096c6ff1680162962f08ebcd35df..e2b22ba5436ed569af5972b9a4404eb849a64fb4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2019-03-07  Jakub Jelinek  <jakub@redhat.com>
 
+       PR translation/79999
+       * c-c++-common/gomp/doacross-1.c: Adjust expected diagnostics.
+       * c-c++-common/gomp/doacross-3.c: New test.
+
        PR target/89602
        * gcc.target/i386/avx512f-vmovss-1.c: New test.
        * gcc.target/i386/avx512f-vmovss-2.c: New test.

diff --git a/gcc/testsuite/c-c++-common/gomp/doacross-1.c b/gcc/testsuite/c-c++-common/gomp/doacross-1.c
index 6244ca08d2c9d94cbefcd84cb7838b3975affadc..eacaeaef80a467ddbcda3ddb00aae87c5279b0e3 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/doacross-1.c
+++ b/gcc/testsuite/c-c++-common/gomp/doacross-1.c
@@ -38,11 +38,11 @@ foo (void)
   for (i = 0; i < 64; i++)
     {
       #pragma omp ordered depend (sink: i - 1) depend (sink: i - 2)
-      #pragma omp ordered depend (source) depend (source) /* { dg-error "more than one .depend.source.. clause on an" } */
+      #pragma omp ordered depend (source) depend (source) /* { dg-error "more than one .depend. clause with .source. modifier on an .ordered. construct" } */
     }
   #pragma omp for ordered (1)
   for (i = 0; i < 64; i++)
     {
-      #pragma omp ordered depend (sink: i - 1) depend (source) depend (sink: i - 2) /* { dg-error "clause specified together with" } */
+      #pragma omp ordered depend (sink: i - 1) depend (source) depend (sink: i - 2) /* { dg-error ".depend. clause with .source. modifier specified together with .depend. clauses with .sink. modifier on the same construct" } */
     }
 }

diff --git a/gcc/testsuite/c-c++-common/gomp/doacross-3.c b/gcc/testsuite/c-c++-common/gomp/doacross-3.c
new file mode 100644 (file)
index 0000000..6d75172
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/doacross-3.c
@@ -0,0 +1,54 @@
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+void
+foo (void)
+{
+  int i, j;
+  #pragma omp for ordered (1)
+  for (i = 0; i < 64; i++)
+    {
+      #pragma omp ordered depend (sink: i + 1) /* { dg-warning "'depend' clause with 'sink' modifier waiting for lexically later iteration" } */
+      #pragma omp ordered depend (source)
+    }
+  #pragma omp for ordered (1)
+  for (i = 63; i >= 0; i--)
+    {
+      #pragma omp ordered depend (sink: i - 1) /* { dg-warning "'depend' clause with 'sink' modifier waiting for lexically later iteration" } */
+      #pragma omp ordered depend (source)
+    }
+  #pragma omp for ordered (2) collapse (2)
+  for (i = 0; i < 64; i++)
+    for (j = 0; j < 64; j++)
+      {
+       #pragma omp ordered depend (sink: i + 1, j - 2) /* { dg-warning "'depend' clause with 'sink' modifier waiting for lexically later iteration" } */
+       #pragma omp ordered depend (source)
+      }
+  #pragma omp for ordered (2) collapse (2)
+  for (i = 63; i >= 0; --i)
+    for (j = 0; j < 64; j++)
+      {
+       #pragma omp ordered depend (sink: i - 2, j - 2) /* { dg-warning "'depend' clause with 'sink' modifier waiting for lexically later iteration" } */
+       #pragma omp ordered depend (source)
+      }
+  #pragma omp for ordered (2) collapse (2)
+  for (i = 0; i < 64; i++)
+    for (j = 0; j < 64; j++)
+      {
+       #pragma omp ordered depend (sink: i - 1, j + 2)
+       #pragma omp ordered depend (source)
+      }
+  #pragma omp for ordered (2) collapse (2)
+  for (i = 63; i >= 0; --i)
+    for (j = 0; j < 64; j++)
+      {
+       #pragma omp ordered depend (sink: i + 2, j + 2)
+       #pragma omp ordered depend (source)
+      }
+  #pragma omp for ordered (1)
+  for (i = 0; i < 64; i += 2)
+    {
+      #pragma omp ordered depend (sink: i - 1) /* { dg-warning "'depend' clause with 'sink' modifier refers to iteration never in the iteration space" } */
+      #pragma omp ordered depend (source)
+    }
+}