openmp: Add begin declare target support

The following patch adds support for the begin declare target construct,
which is another spelling for declare target construct without clauses
(where it needs paired end declare target), but unlike that one accepts
clauses.

This is an OpenMP 5.1 feature, implemented with 5.2 clarification because
in 5.1 we had a restriction in the declare target chapter shared by
declare target and begin declare target that if there are any clauses
specified at least one of them needs to be to or link.  But that
was of course meant just for declare target and not begin declare target,
because begin declare target doesn't even allow to/link/enter clauses.
In addition to that, the patch also makes device_type clause duplication
an error (as stated in 5.1) and similarly makes declare target with
just device_type clause an error rather than warning.

What this patch doesn't do is:
1) OpenMP 5.1 also added an indirect clause, we don't support that
   neither on declare target nor begin declare target
   and I couldn't find it in our features pages (neither libgomp.texi
   nor web)
2) I think device_type(nohost)/device_type(host) support can't work for
   variables (in 5.0 it only talked about procedures so this could be
   also thought as 5.1 feature that we should just add to the list
   and implement)
3) I don't see any use of the "omp declare target nohost" attribute, so
   I'm not sure if device_type(nohost) works at all

2022-10-04  Jakub Jelinek  <jakub@redhat.com>

gcc/c-family/
	* c-omp.cc (c_omp_directives): Uncomment begin declare target
	entry.
gcc/c/
	* c-lang.h (struct c_omp_declare_target_attr): New type.
	(current_omp_declare_target_attribute): Change type from
	int to vec<c_omp_declare_target_attr, va_gc> *.
	* c-parser.cc (c_parser_translation_unit): Adjust for that change.
	If last pushed directive was begin declare target, use different
	wording and simplify format strings for easier translations.
	(c_parser_omp_clause_device_type): Uncomment
	check_no_duplicate_clause call.
	(c_parser_omp_declare_target): Adjust for the
	current_omp_declare_target_attribute type change, push { -1 }.
	Use error_at rather than warning_at for declare target with
	only device_type clauses.
	(OMP_BEGIN_DECLARE_TARGET_CLAUSE_MASK): Define.
	(c_parser_omp_begin): Add begin declare target support.
	(c_parser_omp_end): Adjust for the
	current_omp_declare_target_attribute type change, adjust
	diagnostics wording and simplify format strings for easier
	translations.
	* c-decl.cc (current_omp_declare_target_attribute): Change type from
	int to vec<c_omp_declare_target_attr, va_gc> *.
	(c_decl_attributes): Adjust for the
	current_omp_declare_target_attribute type change.  If device_type
	was present on begin declare target, add "omp declare target host"
	and/or "omp declare target nohost" attributes.
gcc/cp/
	* cp-tree.h (struct omp_declare_target_attr): Rename to ...
	(cp_omp_declare_target_attr): ... this.  Add device_type member.
	(omp_begin_assumes_data): Rename to ...
	(cp_omp_begin_assumes_data): ... this.
	(struct saved_scope): Change types of omp_declare_target_attribute
	and omp_begin_assumes.
	* parser.cc (cp_parser_omp_clause_device_type): Uncomment
	check_no_duplicate_clause call.
	(cp_parser_omp_all_clauses): Fix up pasto, c_name for OMP_CLAUSE_LINK
	should be "link" rather than "to".
	(cp_parser_omp_declare_target): Adjust for omp_declare_target_attr
	to cp_omp_declare_target_attr changes, push -1 as device_type.  Use
	error_at rather than warning_at for declare target with only
	device_type clauses.
	(OMP_BEGIN_DECLARE_TARGET_CLAUSE_MASK): Define.
	(cp_parser_omp_begin): Add begin declare target support.  Adjust
	for omp_begin_assumes_data to cp_omp_begin_assumes_data change.
	(cp_parser_omp_end): Adjust for the
	omp_declare_target_attr to cp_omp_declare_target_attr and
	omp_begin_assumes_data to cp_omp_begin_assumes_data type changes,
	adjust diagnostics wording and simplify format strings for easier
	translations.
	* semantics.cc (finish_translation_unit): Likewise.
	* decl2.cc (cplus_decl_attributes): If device_type was present on
	begin declare target, add "omp declare target host" and/or
	"omp declare target nohost" attributes.
gcc/testsuite/
	* c-c++-common/gomp/declare-target-4.c: Move tests that are now
	rejected into declare-target-7.c.
	* c-c++-common/gomp/declare-target-6.c: Adjust expected diagnostics.
	* c-c++-common/gomp/declare-target-7.c: New test.
	* c-c++-common/gomp/begin-declare-target-1.c: New test.
	* c-c++-common/gomp/begin-declare-target-2.c: New test.
	* c-c++-common/gomp/begin-declare-target-3.c: New test.
	* c-c++-common/gomp/begin-declare-target-4.c: New test.
	* g++.dg/gomp/attrs-9.C: Add begin declare target tests.
	* g++.dg/gomp/attrs-18.C: New test.
libgomp/
	* libgomp.texi (Support begin/end declare target syntax in C/C++):
	Mark as implemented.

diff --git a/gcc/c-family/c-omp.cc b/gcc/c-family/c-omp.cc
index 7a97c40935a268adbae369b88ab0df529a9ece5f..5bb10355751ad6d3f09b4a9f194d0bfaaa7b2f2e 100644 (file)
--- a/gcc/c-family/c-omp.cc
+++ b/gcc/c-family/c-omp.cc
@@ -3112,8 +3112,8 @@ const struct c_omp_directive c_omp_directives[] = {
     C_OMP_DIR_STANDALONE, false },
   { "begin", "assumes", nullptr, PRAGMA_OMP_BEGIN,
     C_OMP_DIR_INFORMATIONAL, false },
-  /* { "begin", "declare", "target", PRAGMA_OMP_BEGIN,
-    C_OMP_DIR_DECLARATIVE, false }, */
+  { "begin", "declare", "target", PRAGMA_OMP_BEGIN,
+    C_OMP_DIR_DECLARATIVE, false },
   /* { "begin", "declare", "variant", PRAGMA_OMP_BEGIN,
     C_OMP_DIR_DECLARATIVE, false }, */
   /* { "begin", "metadirective", nullptr, PRAGMA_OMP_BEGIN,

diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc
index bac8e6cc3f69ee95b7e93c6e67f0ca918882d960..ffa63dcd8d2140eca9a027da41f21e29206b5154 100644 (file)
--- a/gcc/c/c-decl.cc
+++ b/gcc/c/c-decl.cc
@@ -153,9 +153,9 @@ static int warn_about_return_type;
 
 static bool undef_nested_function;
 
-/* If non-zero, implicit "omp declare target" attribute is added into the
-   attribute lists.  */
-int current_omp_declare_target_attribute;
+/* Vector of implicit "omp declare target" attributes to be added into
+   the attribute lists.  */
+vec<c_omp_declare_target_attr, va_gc> *current_omp_declare_target_attribute;
 
 /* If non-zero, we are inside of
    #pragma omp begin assumes ... #pragma omp end assumes region.  */
@@ -5105,7 +5105,7 @@ static tree
 c_decl_attributes (tree *node, tree attributes, int flags)
 {
   /* Add implicit "omp declare target" attribute if requested.  */
-  if (current_omp_declare_target_attribute
+  if (vec_safe_length (current_omp_declare_target_attribute)
       && ((VAR_P (*node) && is_global_var (*node))
          || TREE_CODE (*node) == FUNCTION_DECL))
     {
@@ -5119,6 +5119,22 @@ c_decl_attributes (tree *node, tree attributes, int flags)
          attributes = tree_cons (get_identifier ("omp declare target block"),
                                  NULL_TREE, attributes);
        }
+      if (TREE_CODE (*node) == FUNCTION_DECL)
+       {
+         int device_type
+           = current_omp_declare_target_attribute->last ().device_type;
+         device_type = MAX (device_type, 0);
+         if ((device_type & OMP_CLAUSE_DEVICE_TYPE_HOST) != 0
+             && !lookup_attribute ("omp declare target host", attributes))
+           attributes
+             = tree_cons (get_identifier ("omp declare target host"),
+                          NULL_TREE, attributes);
+         if ((device_type & OMP_CLAUSE_DEVICE_TYPE_NOHOST) != 0
+             && !lookup_attribute ("omp declare target nohost", attributes))
+           attributes
+             = tree_cons (get_identifier ("omp declare target nohost"),
+                          NULL_TREE, attributes);
+       }
     }
 
   /* Look up the current declaration with all the attributes merged

diff --git a/gcc/c/c-lang.h b/gcc/c/c-lang.h
index 861abe8377a6ce0702b9086e0837a1ab73852690..49a5ec3d0482b398106815ce552a853fa80a10ac 100644 (file)
--- a/gcc/c/c-lang.h
+++ b/gcc/c/c-lang.h
@@ -60,9 +60,14 @@ struct GTY(()) language_function {
   int warn_about_return_type;
 };
 
+struct GTY(()) c_omp_declare_target_attr {
+  int device_type;
+};
+
 /* If non-zero, implicit "omp declare target" attribute is added into the
    attribute lists.  */
-extern GTY(()) int current_omp_declare_target_attribute;
+extern GTY(()) vec<c_omp_declare_target_attr, va_gc>
+  *current_omp_declare_target_attribute;
 /* Similarly whether we are in between #pragma omp begin assumes and
    #pragma omp end assumes (and how many times when nested).  */
 extern GTY(()) int current_omp_begin_assumes;

diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc
index f2498dc1c37fc584e26742a2d97391301d49a739..f6a94ba31d81de62cef62c26303c878d501d7455 100644 (file)
--- a/gcc/c/c-parser.cc
+++ b/gcc/c/c-parser.cc
@@ -1675,18 +1675,22 @@ c_parser_translation_unit (c_parser *parser)
     if (DECL_SIZE (decl) == NULL_TREE && TREE_TYPE (decl) != error_mark_node)
       error ("storage size of %q+D isn%'t known", decl);
 
-  if (current_omp_declare_target_attribute)
+  if (vec_safe_length (current_omp_declare_target_attribute))
     {
+      c_omp_declare_target_attr
+       a = current_omp_declare_target_attribute->pop ();
       if (!errorcount)
-        error ("%<#pragma omp declare target%> without corresponding "
-              "%<#pragma omp end declare target%>");
-      current_omp_declare_target_attribute = 0;
+       error ("%qs without corresponding %qs",
+              a.device_type >= 0 ? "#pragma omp begin declare target"
+                                 : "#pragma omp declare target",
+              "#pragma omp end declare target");
+      vec_safe_truncate (current_omp_declare_target_attribute, 0);
     }
   if (current_omp_begin_assumes)
     {
       if (!errorcount)
-       error ("%<#pragma omp begin assumes%> without corresponding "
-              "%<#pragma omp end assumes%>");
+       error ("%qs without corresponding %qs",
+              "#pragma omp begin assumes", "#pragma omp end assumes");
       current_omp_begin_assumes = 0;
     }
 }
@@ -16818,8 +16822,8 @@ c_parser_omp_clause_device_type (c_parser *parser, tree list)
   else
     goto invalid_kind;
 
-  /* check_no_duplicate_clause (list, OMP_CLAUSE_DEVICE_TYPE,
-                               "device_type");  */
+  check_no_duplicate_clause (list, OMP_CLAUSE_DEVICE_TYPE,
+                            "device_type");
   c_parser_consume_token (parser);
   parens.skip_until_found_close (parser);
   c = build_omp_clause (clause_loc, OMP_CLAUSE_DEVICE_TYPE);
@@ -22351,7 +22355,8 @@ c_parser_omp_declare_target (c_parser *parser)
   else
     {
       c_parser_skip_to_pragma_eol (parser);
-      current_omp_declare_target_attribute++;
+      c_omp_declare_target_attr attr = { -1 };
+      vec_safe_push (current_omp_declare_target_attribute, attr);
       return;
     }
   for (tree c = clauses; c; c = OMP_CLAUSE_CHAIN (c))
@@ -22429,12 +22434,17 @@ c_parser_omp_declare_target (c_parser *parser)
        }
     }
   if (device_type && only_device_type)
-    warning_at (OMP_CLAUSE_LOCATION (clauses), 0,
-               "directive with only %<device_type%> clauses ignored");
+    error_at (OMP_CLAUSE_LOCATION (clauses),
+             "directive with only %<device_type%> clause");
 }
 
 /* OpenMP 5.1
-   #pragma omp begin assumes clauses[optseq] new-line  */
+   #pragma omp begin assumes clauses[optseq] new-line
+
+   #pragma omp begin declare target clauses[optseq] new-line  */
+
+#define OMP_BEGIN_DECLARE_TARGET_CLAUSE_MASK                   \
+       (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_DEVICE_TYPE)
 
 static void
 c_parser_omp_begin (c_parser *parser)
@@ -22443,7 +22453,33 @@ c_parser_omp_begin (c_parser *parser)
   c_parser_consume_pragma (parser);
   if (c_parser_next_token_is (parser, CPP_NAME))
     p = IDENTIFIER_POINTER (c_parser_peek_token (parser)->value);
-  if (strcmp (p, "assumes") == 0)
+  if (strcmp (p, "declare") == 0)
+    {
+      c_parser_consume_token (parser);
+      p = "";
+      if (c_parser_next_token_is (parser, CPP_NAME))
+       p = IDENTIFIER_POINTER (c_parser_peek_token (parser)->value);
+      if (strcmp (p, "target") == 0)
+       {
+         c_parser_consume_token (parser);
+         tree clauses
+           = c_parser_omp_all_clauses (parser,
+                                       OMP_BEGIN_DECLARE_TARGET_CLAUSE_MASK,
+                                       "#pragma omp begin declare target");
+         int device_type = 0;
+         for (tree c = clauses; c; c = OMP_CLAUSE_CHAIN (c))
+           if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_DEVICE_TYPE)
+             device_type |= OMP_CLAUSE_DEVICE_TYPE_KIND (c);
+         c_omp_declare_target_attr attr = { device_type };
+         vec_safe_push (current_omp_declare_target_attribute, attr);
+       }
+      else
+       {
+         c_parser_error (parser, "expected %<target%>");
+         c_parser_skip_to_pragma_eol (parser);
+       }
+    }
+  else if (strcmp (p, "assumes") == 0)
     {
       c_parser_consume_token (parser);
       c_parser_omp_assumption_clauses (parser, false);
@@ -22451,7 +22487,7 @@ c_parser_omp_begin (c_parser *parser)
     }
   else
     {
-      c_parser_error (parser, "expected %<assumes%>");
+      c_parser_error (parser, "expected %<declare target%> or %<assumes%>");
       c_parser_skip_to_pragma_eol (parser);
     }
 }
@@ -22484,19 +22520,20 @@ c_parser_omp_end (c_parser *parser)
          return;
        }
       c_parser_skip_to_pragma_eol (parser);
-      if (!current_omp_declare_target_attribute)
+      if (!vec_safe_length (current_omp_declare_target_attribute))
        error_at (loc, "%<#pragma omp end declare target%> without "
-                      "corresponding %<#pragma omp declare target%>");
+                      "corresponding %<#pragma omp declare target%> or "
+                      "%<#pragma omp begin declare target%>");
       else
-       current_omp_declare_target_attribute--;
+       current_omp_declare_target_attribute->pop ();
     }
   else if (strcmp (p, "assumes") == 0)
     {
       c_parser_consume_token (parser);
       c_parser_skip_to_pragma_eol (parser);
       if (!current_omp_begin_assumes)
-       error_at (loc, "%<#pragma omp end assumes%> without "
-                      "corresponding %<#pragma omp begin assumes%>");
+       error_at (loc, "%qs without corresponding %qs",
+                 "#pragma omp end assumes", "#pragma omp begin assumes");
       else
        current_omp_begin_assumes--;
     }

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index e734bf434371077e1454dac354f5e49a3d73f5d6..8cf97075073aeb61c285b6dbcaef03319e64dbaa 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1817,11 +1817,12 @@ union GTY((desc ("cp_tree_node_structure (&%h)"),
 };
 
 \f
-struct GTY(()) omp_declare_target_attr {
+struct GTY(()) cp_omp_declare_target_attr {
   bool attr_syntax;
+  int device_type;
 };
 
-struct GTY(()) omp_begin_assumes_data {
+struct GTY(()) cp_omp_begin_assumes_data {
   bool attr_syntax;
 };
 
@@ -1871,8 +1872,8 @@ struct GTY(()) saved_scope {
   cp_binding_level *bindings;
 
   hash_map<tree, tree> *GTY((skip)) x_local_specializations;
-  vec<omp_declare_target_attr, va_gc> *omp_declare_target_attribute;
-  vec<omp_begin_assumes_data, va_gc> *omp_begin_assumes;
+  vec<cp_omp_declare_target_attr, va_gc> *omp_declare_target_attribute;
+  vec<cp_omp_begin_assumes_data, va_gc> *omp_begin_assumes;
 
   struct saved_scope *prev;
 };

diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc
index 9f18466192f54500883b2c801ae7ddec3e2392da..e6779268ad42145ab01516a9712705ac7e6bf9f2 100644 (file)
--- a/gcc/cp/decl2.cc
+++ b/gcc/cp/decl2.cc
@@ -1652,17 +1652,40 @@ cplus_decl_attributes (tree *decl, tree attributes, int flags)
          && DECL_CLASS_SCOPE_P (*decl))
        error ("%q+D static data member inside of declare target directive",
               *decl);
-      else if (VAR_P (*decl)
-              && (processing_template_decl
-                  || !omp_mappable_type (TREE_TYPE (*decl))))
-       attributes = tree_cons (get_identifier ("omp declare target implicit"),
-                               NULL_TREE, attributes);
       else
        {
-         attributes = tree_cons (get_identifier ("omp declare target"),
-                                 NULL_TREE, attributes);
-         attributes = tree_cons (get_identifier ("omp declare target block"),
-                                 NULL_TREE, attributes);
+         if (VAR_P (*decl)
+             && (processing_template_decl
+                 || !omp_mappable_type (TREE_TYPE (*decl))))
+           attributes
+             = tree_cons (get_identifier ("omp declare target implicit"),
+                          NULL_TREE, attributes);
+         else
+           {
+             attributes = tree_cons (get_identifier ("omp declare target"),
+                                     NULL_TREE, attributes);
+             attributes
+               = tree_cons (get_identifier ("omp declare target block"),
+                            NULL_TREE, attributes);
+           }
+         if (TREE_CODE (*decl) == FUNCTION_DECL)
+           {
+             cp_omp_declare_target_attr &last
+               = scope_chain->omp_declare_target_attribute->last ();
+             int device_type = MAX (last.device_type, 0);
+             if ((device_type & OMP_CLAUSE_DEVICE_TYPE_HOST) != 0
+                 && !lookup_attribute ("omp declare target host",
+                                       attributes))
+               attributes
+                 = tree_cons (get_identifier ("omp declare target host"),
+                              NULL_TREE, attributes);
+             if ((device_type & OMP_CLAUSE_DEVICE_TYPE_NOHOST) != 0
+                 && !lookup_attribute ("omp declare target nohost",
+                                       attributes))
+               attributes
+                 = tree_cons (get_identifier ("omp declare target nohost"),
+                              NULL_TREE, attributes);
+           }
        }
     }
 

diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index 6c4f840f9d771deceae55224d368d18fc92415e5..7b416352ef815ab4242ace8a981c925b71f6faef 100644 (file)
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -40142,8 +40142,8 @@ cp_parser_omp_clause_device_type (cp_parser *parser, tree list,
     goto resync_fail;
 
   c = build_omp_clause (location, OMP_CLAUSE_DEVICE_TYPE);
-  /* check_no_duplicate_clause (list, OMP_CLAUSE_DEVICE_TYPE, "device_type",
-                               location);  */
+  check_no_duplicate_clause (list, OMP_CLAUSE_DEVICE_TYPE, "device_type",
+                            location);
   OMP_CLAUSE_DEVICE_TYPE_KIND (c) = kind;
   OMP_CLAUSE_CHAIN (c) = list;
   return c;
@@ -40667,7 +40667,7 @@ cp_parser_omp_all_clauses (cp_parser *parser, omp_clause_mask mask,
          break;
        case PRAGMA_OMP_CLAUSE_LINK:
          clauses = cp_parser_omp_var_list (parser, OMP_CLAUSE_LINK, clauses);
-         c_name = "to";
+         c_name = "link";
          break;
        case PRAGMA_OMP_CLAUSE_TO:
          if ((mask & (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_LINK)) != 0)
@@ -46564,8 +46564,8 @@ cp_parser_omp_declare_target (cp_parser *parser, cp_token *pragma_tok)
     }
   else
     {
-      struct omp_declare_target_attr a
-       = { parser->lexer->in_omp_attribute_pragma };
+      cp_omp_declare_target_attr a
+       = { parser->lexer->in_omp_attribute_pragma, -1 };
       vec_safe_push (scope_chain->omp_declare_target_attribute, a);
       cp_parser_require_pragma_eol (parser, pragma_tok);
       return;
@@ -46590,12 +46590,17 @@ cp_parser_omp_declare_target (cp_parser *parser, cp_token *pragma_tok)
                                          device_type);
     }
   if (device_type && only_device_type)
-    warning_at (OMP_CLAUSE_LOCATION (clauses), 0,
-               "directive with only %<device_type%> clauses ignored");
+    error_at (OMP_CLAUSE_LOCATION (clauses),
+             "directive with only %<device_type%> clause");
 }
 
 /* OpenMP 5.1
-   #pragma omp begin assumes clauses[optseq] new-line  */
+   # pragma omp begin assumes clauses[optseq] new-line
+
+   # pragma omp begin declare target clauses[optseq] new-line  */
+
+#define OMP_BEGIN_DECLARE_TARGET_CLAUSE_MASK                   \
+       (OMP_CLAUSE_MASK_1 << PRAGMA_OMP_CLAUSE_DEVICE_TYPE)
 
 static void
 cp_parser_omp_begin (cp_parser *parser, cp_token *pragma_tok)
@@ -46607,16 +46612,47 @@ cp_parser_omp_begin (cp_parser *parser, cp_token *pragma_tok)
       tree id = cp_lexer_peek_token (parser->lexer)->u.value;
       p = IDENTIFIER_POINTER (id);
     }
-  if (strcmp (p, "assumes") == 0)
+  if (strcmp (p, "declare") == 0)
+    {
+      cp_lexer_consume_token (parser->lexer);
+      p = "";
+      if (cp_lexer_next_token_is (parser->lexer, CPP_NAME))
+       {
+         tree id = cp_lexer_peek_token (parser->lexer)->u.value;
+         p = IDENTIFIER_POINTER (id);
+       }
+      if (strcmp (p, "target") == 0)
+       {
+         cp_lexer_consume_token (parser->lexer);
+         tree clauses
+           = cp_parser_omp_all_clauses (parser,
+                                        OMP_BEGIN_DECLARE_TARGET_CLAUSE_MASK,
+                                        "#pragma omp begin declare target",
+                                        pragma_tok);
+         int device_type = 0;
+         for (tree c = clauses; c; c = OMP_CLAUSE_CHAIN (c))
+           if (OMP_CLAUSE_CODE (c) == OMP_CLAUSE_DEVICE_TYPE)
+             device_type |= OMP_CLAUSE_DEVICE_TYPE_KIND (c);
+         cp_omp_declare_target_attr a
+           = { in_omp_attribute_pragma, device_type };
+         vec_safe_push (scope_chain->omp_declare_target_attribute, a);
+       }
+      else
+       {
+         cp_parser_error (parser, "expected %<target%>");
+         cp_parser_skip_to_pragma_eol (parser, pragma_tok);
+       }
+    }
+  else if (strcmp (p, "assumes") == 0)
     {
       cp_lexer_consume_token (parser->lexer);
       cp_parser_omp_assumption_clauses (parser, pragma_tok, false);
-      struct omp_begin_assumes_data a = { in_omp_attribute_pragma };
+      cp_omp_begin_assumes_data a = { in_omp_attribute_pragma };
       vec_safe_push (scope_chain->omp_begin_assumes, a);
     }
   else
     {
-      cp_parser_error (parser, "expected %<assumes%>");
+      cp_parser_error (parser, "expected %<declare target%> or %<assumes%>");
       cp_parser_skip_to_pragma_eol (parser, pragma_tok);
     }
 }
@@ -46658,21 +46694,28 @@ cp_parser_omp_end (cp_parser *parser, cp_token *pragma_tok)
       if (!vec_safe_length (scope_chain->omp_declare_target_attribute))
        error_at (pragma_tok->location,
                  "%<#pragma omp end declare target%> without corresponding "
-                 "%<#pragma omp declare target%>");
+                 "%<#pragma omp declare target%> or "
+                 "%<#pragma omp begin declare target%>");
       else
        {
-         omp_declare_target_attr
+         cp_omp_declare_target_attr
            a = scope_chain->omp_declare_target_attribute->pop ();
          if (a.attr_syntax != in_omp_attribute_pragma)
            {
              if (a.attr_syntax)
                error_at (pragma_tok->location,
-                         "%<declare target%> in attribute syntax terminated "
-                         "with %<end declare target%> in pragma syntax");
+                         "%qs in attribute syntax terminated "
+                         "with %qs in pragma syntax",
+                         a.device_type >= 0 ? "begin declare target"
+                                            : "declare target",
+                         "end declare target");
              else
                error_at (pragma_tok->location,
-                         "%<declare target%> in pragma syntax terminated "
-                         "with %<end declare target%> in attribute syntax");
+                         "%qs in pragma syntax terminated "
+                         "with %qs in attribute syntax",
+                         a.device_type >= 0 ? "begin declare target"
+                                            : "declare target",
+                         "end declare target");
            }
        }
     }
@@ -46682,22 +46725,24 @@ cp_parser_omp_end (cp_parser *parser, cp_token *pragma_tok)
       cp_parser_require_pragma_eol (parser, pragma_tok);
       if (!vec_safe_length (scope_chain->omp_begin_assumes))
        error_at (pragma_tok->location,
-                 "%<#pragma omp end assumes%> without corresponding "
-                 "%<#pragma omp begin assumes%>");
+                 "%qs without corresponding %qs",
+                 "#pragma omp end assumes", "#pragma omp begin assumes");
       else
        {
-         omp_begin_assumes_data
+         cp_omp_begin_assumes_data
            a = scope_chain->omp_begin_assumes->pop ();
          if (a.attr_syntax != in_omp_attribute_pragma)
            {
              if (a.attr_syntax)
                error_at (pragma_tok->location,
-                         "%<begin assumes%> in attribute syntax terminated "
-                         "with %<end assumes%> in pragma syntax");
+                         "%qs in attribute syntax terminated "
+                         "with %qs in pragma syntax",
+                         "begin assumes", "end assumes");
              else
                error_at (pragma_tok->location,
-                         "%<begin assumes%> in pragma syntax terminated "
-                         "with %<end assumes%> in attribute syntax");
+                         "%qs in pragma syntax terminated "
+                         "with %qs in attribute syntax",
+                         "begin assumes", "end assumes");
            }
        }
     }

diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index 58b5b433692283646629a9ca2e1ea893906f7e55..30cf2f99a558246114f6b32a1d350fd36573a4ff 100644 (file)
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -3360,16 +3360,20 @@ finish_translation_unit (void)
 
   if (vec_safe_length (scope_chain->omp_declare_target_attribute))
     {
+      cp_omp_declare_target_attr
+       a = scope_chain->omp_declare_target_attribute->pop ();
       if (!errorcount)
-       error ("%<#pragma omp declare target%> without corresponding "
-              "%<#pragma omp end declare target%>");
+       error ("%qs without corresponding %qs",
+              a.device_type >= 0 ? "#pragma omp begin declare target"
+                                 : "#pragma omp declare target",
+              "#pragma omp end declare target");
       vec_safe_truncate (scope_chain->omp_declare_target_attribute, 0);
     }
   if (vec_safe_length (scope_chain->omp_begin_assumes))
     {
       if (!errorcount)
-       error ("%<#pragma omp begin assumes%> without corresponding "
-              "%<#pragma omp end assumes%>");
+       error ("%qs without corresponding %qs",
+              "#pragma omp begin assumes", "#pragma omp end assumes");
       vec_safe_truncate (scope_chain->omp_begin_assumes, 0);
     }
 }

diff --git a/gcc/testsuite/c-c++-common/gomp/begin-declare-target-1.c b/gcc/testsuite/c-c++-common/gomp/begin-declare-target-1.c
new file mode 100644 (file)
index 0000000..fd8caba
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/begin-declare-target-1.c
@@ -0,0 +1,25 @@
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+extern int a;
+#pragma omp begin declare target device_type (host)
+int b;
+#pragma omp begin declare target device_type (any)
+char d;
+#pragma omp end declare target
+#pragma omp end declare target
+#pragma omp begin declare target
+long c;
+#pragma omp end declare target
+#pragma omp declare target
+int foo (void) { return 0; }
+#pragma omp begin declare target device_type (any)
+int bar (void) { return 0; }
+#pragma omp end declare target
+#pragma omp end declare target
+#pragma omp begin declare target device_type (any)
+int baz (void) { return 0; }
+#pragma omp declare target
+int qux (void) { return 0; }
+#pragma omp end declare target
+#pragma omp end declare target

diff --git a/gcc/testsuite/c-c++-common/gomp/begin-declare-target-2.c b/gcc/testsuite/c-c++-common/gomp/begin-declare-target-2.c
new file mode 100644 (file)
index 0000000..2bc72cf
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/begin-declare-target-2.c
@@ -0,0 +1,18 @@
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+extern int a;
+#pragma omp begin declare target
+#pragma omp declare target to (a)
+#pragma omp end declare target
+int b;
+#pragma omp begin declare target to (b)                /* { dg-error "'to' is not valid for '#pragma omp begin declare target'" } */
+#pragma omp end declare target
+int c;
+#pragma omp begin declare target link (c)      /* { dg-error "'link' is not valid for '#pragma omp begin declare target'" } */
+#pragma omp end declare target
+int m;
+#pragma omp begin declare target device_type (host) device_type (any)  /* { dg-error "too many 'device_type' clauses" } */
+#pragma omp end declare target
+#pragma omp begin declare target
+#pragma omp end declare target to (p)          /* { dg-error "expected end of line before .to." } */

diff --git a/gcc/testsuite/c-c++-common/gomp/begin-declare-target-3.c b/gcc/testsuite/c-c++-common/gomp/begin-declare-target-3.c
new file mode 100644 (file)
index 0000000..ac4d4d9
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/begin-declare-target-3.c
@@ -0,0 +1,19 @@
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+#pragma omp begin declare target
+int a[] = { 1, 2, 3 };
+extern int b[];                        /* { dg-error "'b' in declare target directive does not have mappable type" } */
+extern int c[];                        /* { dg-error "'c' in declare target directive does not have mappable type" } */
+extern int d[];                        /* { dg-error "'d' in declare target directive does not have mappable type" } */
+int d[3];
+#pragma omp end declare target
+int c[3];
+#pragma omp begin declare target device_type (host)
+int e[] = { 1, 2, 3 };
+extern int f[];                        /* { dg-error "'f' in declare target directive does not have mappable type" } */
+extern int g[];                        /* { dg-error "'g' in declare target directive does not have mappable type" } */
+extern int h[];                        /* { dg-error "'h' in declare target directive does not have mappable type" } */
+int h[3];
+#pragma omp end declare target
+int g[3];

diff --git a/gcc/testsuite/c-c++-common/gomp/begin-declare-target-4.c b/gcc/testsuite/c-c++-common/gomp/begin-declare-target-4.c
new file mode 100644 (file)
index 0000000..d275f73
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/begin-declare-target-4.c
@@ -0,0 +1,2 @@
+#pragma omp begin declare target
+void foo (void);       /* { dg-error "'#pragma omp begin declare target' without corresponding '#pragma omp end declare target'" } */

diff --git a/gcc/testsuite/c-c++-common/gomp/declare-target-4.c b/gcc/testsuite/c-c++-common/gomp/declare-target-4.c
index 887a815e84a4b5cc2133f268fff7eaf7bd117644..a6bd1286ef17f7739a3a52431d78d03a9357d10d 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/declare-target-4.c
+++ b/gcc/testsuite/c-c++-common/gomp/declare-target-4.c
@@ -1,8 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-fopenmp" } */
 
-#pragma omp declare target device_type (any)           /* { dg-warning "directive with only 'device_type' clauses ignored" } */
-
 void f1 (void) {}
 void f2 (void);
 #pragma omp declare target to (f1) device_type (any) to (f2)
@@ -38,7 +36,3 @@ void f13 (void) {}
 void f14 (void) {}
 #pragma omp declare target device_type (nohost) to (f14)
 #pragma omp declare target device_type (any) to (f14)
-void f15 (void) {}
-#pragma omp declare target device_type (host) to (f15) device_type (nohost)
-void f16 (void) {}
-#pragma omp declare target device_type (any) to (f15) device_type (any)

diff --git a/gcc/testsuite/c-c++-common/gomp/declare-target-6.c b/gcc/testsuite/c-c++-common/gomp/declare-target-6.c
index 586eb50f8016f1cf810ba21d2508f2988b19876f..ba323e2a6f6e7c222df12bb8ee9c5b735957019e 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/declare-target-6.c
+++ b/gcc/testsuite/c-c++-common/gomp/declare-target-6.c
@@ -1,2 +1,2 @@
-#pragma omp end declare target /* { dg-error "'#pragma omp end declare target' without corresponding '#pragma omp declare target'" } */
+#pragma omp end declare target /* { dg-error "'#pragma omp end declare target' without corresponding '#pragma omp declare target' or '#pragma omp begin declare target'" } */
 void foo (void);

diff --git a/gcc/testsuite/c-c++-common/gomp/declare-target-7.c b/gcc/testsuite/c-c++-common/gomp/declare-target-7.c
new file mode 100644 (file)
index 0000000..747000a
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/declare-target-7.c
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+#pragma omp declare target device_type (any)           /* { dg-error "directive with only 'device_type' clause" } */
+
+void f1 (void) {}
+#pragma omp declare target device_type (host) to (f1) device_type (nohost)     /* { dg-error "too many 'device_type' clauses" } */
+#pragma omp declare target device_type (any) to (f1) device_type (any)         /* { dg-error "too many 'device_type' clauses" } */

diff --git a/gcc/testsuite/g++.dg/gomp/attrs-18.C b/gcc/testsuite/g++.dg/gomp/attrs-18.C
new file mode 100644 (file)
index 0000000..6858f3f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/attrs-18.C
@@ -0,0 +1,41 @@
+// { dg-do compile { target c++11 } }
+
+#pragma omp begin declare target
+#pragma omp begin declare target device_type (any)
+[[omp::directive (begin declare target, device_type (host))]];
+int a;
+[[omp::directive (end declare target)]];
+#pragma omp end declare target
+#pragma omp end declare target
+[[omp::directive (begin declare target device_type (nohost))]];
+int b;
+#pragma omp end declare target         // { dg-error "'begin declare target' in attribute syntax terminated with 'end declare target' in pragma syntax" }
+#pragma omp begin declare target
+int c;
+[[omp::directive (end declare target)]];// { dg-error "'begin declare target' in pragma syntax terminated with 'end declare target' in attribute syntax" }
+#pragma omp begin declare target device_type (host)
+[[omp::directive (begin declare target)]];
+int d;
+#pragma omp end declare target         // { dg-error "'begin declare target' in attribute syntax terminated with 'end declare target' in pragma syntax" }
+#pragma omp begin declare target
+int e;
+[[omp::directive (end declare target)]];// { dg-error "'begin declare target' in pragma syntax terminated with 'end declare target' in attribute syntax" }
+#pragma omp end declare target
+[[omp::directive (begin declare target device_type (any))]];
+[[omp::directive (begin declare target)]];
+int f;
+#pragma omp end declare target         // { dg-error "'begin declare target' in attribute syntax terminated with 'end declare target' in pragma syntax" }
+#pragma omp begin declare target
+int g;
+[[omp::directive (end declare target)]];// { dg-error "'begin declare target' in pragma syntax terminated with 'end declare target' in attribute syntax" }
+[[omp::directive (end declare target)]];
+[[omp::directive (begin declare target)]];
+#pragma omp begin declare target
+int h;
+#pragma omp end declare target
+#pragma omp end declare target         // { dg-error "'begin declare target' in attribute syntax terminated with 'end declare target' in pragma syntax" }
+#pragma omp begin declare target
+[[omp::directive (begin declare target)]];
+int i;
+[[omp::directive (end declare target)]];
+[[omp::directive (end declare target)]];// { dg-error "'begin declare target' in pragma syntax terminated with 'end declare target' in attribute syntax" }

diff --git a/gcc/testsuite/g++.dg/gomp/attrs-9.C b/gcc/testsuite/g++.dg/gomp/attrs-9.C
index fa02299bcafd902bc7927a8b4eff1b0bf47ad8fc..cf7cef46b7073df1df43dc37960188c67f39529c 100644 (file)
--- a/gcc/testsuite/g++.dg/gomp/attrs-9.C
+++ b/gcc/testsuite/g++.dg/gomp/attrs-9.C
@@ -14,6 +14,21 @@ int b, c, e;
 int d;
 [[omp::directive (end declare target)]];
 [[omp::directive (end declare target)]];
+[[omp::directive (begin declare target, device_type (any))]];
+[[omp::directive (begin declare target)]];
+int f;
+[[omp::directive (end declare target)]];
+[[omp::directive (end declare target)]];
+[[omp::directive (begin declare target device_type (host))]];
+[[omp::directive (declare target)]];
+int g;
+[[omp::directive (end declare target)]];
+[[omp::directive (end declare target)]];
+[[omp::directive (declare target)]];
+[[omp::directive (begin declare target, device_type (nohost))]];
+int h;
+[[omp::directive (end declare target)]];
+[[omp::directive (end declare target)]];
 [[omp::directive (nothing)]];
 [[omp::directive (begin assumes no_openmp no_openmp_routines no_parallelism
                                absent (atomic, barrier, cancel, cancellation point)

diff --git a/libgomp/libgomp.texi b/libgomp/libgomp.texi
index 2b11f30440943607c9034e20e2db273d09260254..d170594921f725bd3bb29c96f2e30cb50d910b5a 100644 (file)
--- a/libgomp/libgomp.texi
+++ b/libgomp/libgomp.texi
@@ -345,7 +345,7 @@ The OpenMP 4.5 specification is fully supported.
 @item Support of structured block sequences in C/C++ @tab Y @tab
 @item @code{unconstrained} and @code{reproducible} modifiers on @code{order}
       clause @tab Y @tab
-@item Support @code{begin/end declare target} syntax in C/C++ @tab N @tab
+@item Support @code{begin/end declare target} syntax in C/C++ @tab Y @tab
 @item Pointer predetermined firstprivate getting initialized
 to address of matching mapped list item per 5.1, Sect. 2.21.7.2 @tab N @tab
 @item For Fortran, diagnose placing declarative before/between @code{USE},