openacc: Rename OMP_CLAUSE_TILE to OMP_CLAUSE_OACC_TILE

OMP_CLAUSE_TILE will be used for the OpenMP 5.1 loop transformation
construct "omp tile".

gcc/ChangeLog:

	* tree-core.h (enum omp_clause_code): Rename OMP_CLAUSE_TILE.
	* tree.h (OMP_CLAUSE_TILE_LIST): Rename to ...
	(OMP_CLAUSE_OACC_TILE_LIST): ... this.
	(OMP_CLAUSE_TILE_ITERVAR): Rename to ...
	(OMP_CLAUSE_OACC_TILE_ITERVAR): ... this.
	(OMP_CLAUSE_TILE_COUNT): Rename to ...
	(OMP_CLAUSE_OACC_TILE_COUNT): this.
	* gimplify.cc (gimplify_scan_omp_clauses): Adjust to renamings.
	(gimplify_adjust_omp_clauses): Likewise.
	(gimplify_omp_for): Likewise.
	* omp-general.cc (omp_extract_for_data): Likewise.
	* omp-low.cc (scan_sharing_clauses): Likewise.
	(lower_oacc_head_mark): Likewise.
	* tree-nested.cc (convert_nonlocal_omp_clauses): Likewise.
	(convert_local_omp_clauses): Likewise.
	* tree-pretty-print.cc (dump_omp_clause): Likewise.
	* tree.cc: Likewise.

gcc/c-family/ChangeLog:

	* c-omp.cc (c_oacc_split_loop_clauses): Adjust to renamings.

gcc/c/ChangeLog:

	* c-parser.cc (c_parser_omp_clause_collapse): Adjust to renamings.
	(c_parser_oacc_clause_tile): Likewise.
	(c_parser_omp_for_loop): Likewise.
	* c-typeck.cc (c_finish_omp_clauses): Likewise.

gcc/cp/ChangeLog:

	* parser.cc (cp_parser_oacc_clause_tile): Adjust to renamings.
	(cp_parser_omp_clause_collapse): Likewise.
	(cp_parser_omp_for_loop): Likewise.
	* pt.cc (tsubst_omp_clauses): Likewise.
	* semantics.cc (finish_omp_clauses): Likewise.
	(finish_omp_for): Likewise.

gcc/fortran/ChangeLog:

	* openmp.cc (enum omp_mask2): Adjust to renamings.
	(gfc_match_omp_clauses): Likewise.
	* trans-openmp.cc (gfc_trans_omp_clauses): Likewise.

16 files changed, 47 insertions, 47 deletions

diff --git a/gcc/c-family/c-omp.cc b/gcc/c-family/c-omp.cc
index 440e3b7..9232f5a 100644
--- a/gcc/c-family/c-omp.cc
+++ b/gcc/c-family/c-omp.cc
@@ -1893,7 +1893,7 @@ c_oacc_split_loop_clauses (tree clauses, tree *not_loop_clauses,
         {
 	  /* Loop clauses.  */
 	case OMP_CLAUSE_COLLAPSE:
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	case OMP_CLAUSE_GANG:
 	case OMP_CLAUSE_WORKER:
 	case OMP_CLAUSE_VECTOR:
diff --git a/gcc/c/c-parser.cc b/gcc/c/c-parser.cc
index e32e6a0..80dc9a2 100644
--- a/gcc/c/c-parser.cc
+++ b/gcc/c/c-parser.cc
@@ -13590,7 +13590,7 @@ c_parser_omp_clause_collapse (c_parser *parser, tree list)
   location_t loc;
 
   check_no_duplicate_clause (list, OMP_CLAUSE_COLLAPSE, "collapse");
-  check_no_duplicate_clause (list, OMP_CLAUSE_TILE, "tile");
+  check_no_duplicate_clause (list, OMP_CLAUSE_OACC_TILE, "tile");
 
   loc = c_parser_peek_token (parser)->location;
   matching_parens parens;
@@ -14763,7 +14763,7 @@ c_parser_oacc_clause_tile (c_parser *parser, tree list)
   location_t loc;
   tree tile = NULL_TREE;
 
-  check_no_duplicate_clause (list, OMP_CLAUSE_TILE, "tile");
+  check_no_duplicate_clause (list, OMP_CLAUSE_OACC_TILE, "tile");
   check_no_duplicate_clause (list, OMP_CLAUSE_COLLAPSE, "collapse");
 
   loc = c_parser_peek_token (parser)->location;
@@ -14815,9 +14815,9 @@ c_parser_oacc_clause_tile (c_parser *parser, tree list)
   /* Consume the trailing ')'.  */
   c_parser_consume_token (parser);
 
-  c = build_omp_clause (loc, OMP_CLAUSE_TILE);
+  c = build_omp_clause (loc, OMP_CLAUSE_OACC_TILE);
   tile = nreverse (tile);
-  OMP_CLAUSE_TILE_LIST (c) = tile;
+  OMP_CLAUSE_OACC_TILE_LIST (c) = tile;
   OMP_CLAUSE_CHAIN (c) = list;
   return c;
 }
@@ -19884,10 +19884,10 @@ c_parser_omp_for_loop (location_t loc, c_parser *parser, enum tree_code code,
   for (cl = clauses; cl; cl = OMP_CLAUSE_CHAIN (cl))
     if (OMP_CLAUSE_CODE (cl) == OMP_CLAUSE_COLLAPSE)
       collapse = tree_to_shwi (OMP_CLAUSE_COLLAPSE_EXPR (cl));
-    else if (OMP_CLAUSE_CODE (cl) == OMP_CLAUSE_TILE)
+    else if (OMP_CLAUSE_CODE (cl) == OMP_CLAUSE_OACC_TILE)
       {
 	tiling = true;
-	collapse = list_length (OMP_CLAUSE_TILE_LIST (cl));
+	collapse = list_length (OMP_CLAUSE_OACC_TILE_LIST (cl));
       }
     else if (OMP_CLAUSE_CODE (cl) == OMP_CLAUSE_ORDERED
 	     && OMP_CLAUSE_ORDERED_EXPR (cl))
diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc
index 9454e9d..772da02 100644
--- a/gcc/c/c-typeck.cc
+++ b/gcc/c/c-typeck.cc
@@ -15615,7 +15615,7 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
 	case OMP_CLAUSE_GANG:
 	case OMP_CLAUSE_WORKER:
 	case OMP_CLAUSE_VECTOR:
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	case OMP_CLAUSE_IF_PRESENT:
 	case OMP_CLAUSE_FINALIZE:
 	case OMP_CLAUSE_NOHOST:
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index c1e0a4f..1c4450b 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -37200,7 +37200,7 @@ cp_parser_oacc_clause_tile (cp_parser *parser, location_t clause_loc, tree list)
      so, but the spec authors never considered such a case and have
      differing opinions on what it might mean, including 'not
      allowed'.)  */
-  check_no_duplicate_clause (list, OMP_CLAUSE_TILE, "tile", clause_loc);
+  check_no_duplicate_clause (list, OMP_CLAUSE_OACC_TILE, "tile", clause_loc);
   check_no_duplicate_clause (list, OMP_CLAUSE_COLLAPSE, "collapse",
 			     clause_loc);
 
@@ -37229,9 +37229,9 @@ cp_parser_oacc_clause_tile (cp_parser *parser, location_t clause_loc, tree list)
   /* Consume the trailing ')'.  */
   cp_lexer_consume_token (parser->lexer);
 
-  c = build_omp_clause (clause_loc, OMP_CLAUSE_TILE);
+  c = build_omp_clause (clause_loc, OMP_CLAUSE_OACC_TILE);
   tile = nreverse (tile);
-  OMP_CLAUSE_TILE_LIST (c) = tile;
+  OMP_CLAUSE_OACC_TILE_LIST (c) = tile;
   OMP_CLAUSE_CHAIN (c) = list;
   return c;
 }
@@ -37344,7 +37344,7 @@ cp_parser_omp_clause_collapse (cp_parser *parser, tree list, location_t location
     }
 
   check_no_duplicate_clause (list, OMP_CLAUSE_COLLAPSE, "collapse", location);
-  check_no_duplicate_clause (list, OMP_CLAUSE_TILE, "tile", location);
+  check_no_duplicate_clause (list, OMP_CLAUSE_OACC_TILE, "tile", location);
   c = build_omp_clause (loc, OMP_CLAUSE_COLLAPSE);
   OMP_CLAUSE_CHAIN (c) = list;
   OMP_CLAUSE_COLLAPSE_EXPR (c) = num;
@@ -43028,10 +43028,10 @@ cp_parser_omp_for_loop (cp_parser *parser, enum tree_code code, tree clauses,
   for (cl = clauses; cl; cl = OMP_CLAUSE_CHAIN (cl))
     if (OMP_CLAUSE_CODE (cl) == OMP_CLAUSE_COLLAPSE)
       collapse = tree_to_shwi (OMP_CLAUSE_COLLAPSE_EXPR (cl));
-    else if (OMP_CLAUSE_CODE (cl) == OMP_CLAUSE_TILE)
+    else if (OMP_CLAUSE_CODE (cl) == OMP_CLAUSE_OACC_TILE)
       {
 	tiling = true;
-	collapse = list_length (OMP_CLAUSE_TILE_LIST (cl));
+	collapse = list_length (OMP_CLAUSE_OACC_TILE_LIST (cl));
       }
     else if (OMP_CLAUSE_CODE (cl) == OMP_CLAUSE_ORDERED
 	     && OMP_CLAUSE_ORDERED_EXPR (cl))
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 2e4fa7e..dcd3f61 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -17807,7 +17807,7 @@ tsubst_omp_clauses (tree clauses, enum c_omp_region_type ort,
 			     complain, in_decl,
 			     /*integral_constant_expression_p=*/false);
 	  /* FALLTHRU */
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	case OMP_CLAUSE_IF:
 	case OMP_CLAUSE_NUM_THREADS:
 	case OMP_CLAUSE_SCHEDULE:
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index fa79cb4..b08f663 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -8840,8 +8840,8 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
 	  mergeable_seen = true;
 	  break;
 
-	case OMP_CLAUSE_TILE:
-	  for (tree list = OMP_CLAUSE_TILE_LIST (c); !remove && list;
+	case OMP_CLAUSE_OACC_TILE:
+	  for (tree list = OMP_CLAUSE_OACC_TILE_LIST (c); !remove && list;
 	       list = TREE_CHAIN (list))
 	    {
 	      t = TREE_VALUE (list);
@@ -10604,9 +10604,9 @@ finish_omp_for (location_t locus, enum tree_code code, tree declv,
     {
       tree c;
 
-      c = omp_find_clause (clauses, OMP_CLAUSE_TILE);
+      c = omp_find_clause (clauses, OMP_CLAUSE_OACC_TILE);
       if (c)
-	collapse = list_length (OMP_CLAUSE_TILE_LIST (c));
+	collapse = list_length (OMP_CLAUSE_OACC_TILE_LIST (c));
       else
 	{
 	  c = omp_find_clause (clauses, OMP_CLAUSE_COLLAPSE);
diff --git a/gcc/fortran/openmp.cc b/gcc/fortran/openmp.cc
index e9b8d11..09cfbe5 100644
--- a/gcc/fortran/openmp.cc
+++ b/gcc/fortran/openmp.cc
@@ -1113,7 +1113,7 @@ enum omp_mask2
   OMP_CLAUSE_WAIT,
   OMP_CLAUSE_DELETE,
   OMP_CLAUSE_AUTO,
-  OMP_CLAUSE_TILE,
+  OMP_CLAUSE_OACC_TILE,
   OMP_CLAUSE_IF_PRESENT,
   OMP_CLAUSE_FINALIZE,
   OMP_CLAUSE_ATTACH,
@@ -4062,7 +4062,7 @@ gfc_match_omp_clauses (gfc_omp_clauses **cp, const omp_mask mask,
 	      c->threads = needs_space = true;
 	      continue;
 	    }
-	  if ((mask & OMP_CLAUSE_TILE)
+	  if ((mask & OMP_CLAUSE_OACC_TILE)
 	      && !c->tile_list
 	      && match_oacc_expr_list ("tile (", &c->tile_list,
 				       true) == MATCH_YES)
@@ -4263,7 +4263,7 @@ error:
   (omp_mask (OMP_CLAUSE_COLLAPSE) | OMP_CLAUSE_GANG | OMP_CLAUSE_WORKER	      \
    | OMP_CLAUSE_VECTOR | OMP_CLAUSE_SEQ | OMP_CLAUSE_INDEPENDENT	      \
    | OMP_CLAUSE_PRIVATE | OMP_CLAUSE_REDUCTION | OMP_CLAUSE_AUTO	      \
-   | OMP_CLAUSE_TILE)
+   | OMP_CLAUSE_OACC_TILE)
 #define OACC_PARALLEL_LOOP_CLAUSES \
   (OACC_LOOP_CLAUSES | OACC_PARALLEL_CLAUSES)
 #define OACC_KERNELS_LOOP_CLAUSES \
diff --git a/gcc/fortran/trans-openmp.cc b/gcc/fortran/trans-openmp.cc
index 8cd40ab..ec901ac 100644
--- a/gcc/fortran/trans-openmp.cc
+++ b/gcc/fortran/trans-openmp.cc
@@ -6166,8 +6166,8 @@ gfc_trans_omp_clauses (stmtblock_t *block, gfc_omp_clauses *clauses,
       for (el = clauses->tile_list; el; el = el->next)
 	vec_safe_push (tvec, gfc_convert_expr_to_tree (block, el->expr));
 
-      c = build_omp_clause (gfc_get_location (&where), OMP_CLAUSE_TILE);
-      OMP_CLAUSE_TILE_LIST (c) = build_tree_list_vec (tvec);
+      c = build_omp_clause (gfc_get_location (&where), OMP_CLAUSE_OACC_TILE);
+      OMP_CLAUSE_OACC_TILE_LIST (c) = build_tree_list_vec (tvec);
       omp_clauses = gfc_trans_add_clause (c, omp_clauses);
       tvec->truncate (0);
     }
diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
index f8ca924..85d4162 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -11328,7 +11328,7 @@ gimplify_scan_omp_clauses (tree *list_p, gimple_seq *pre_p,
 	case OMP_CLAUSE_ORDERED:
 	case OMP_CLAUSE_UNTIED:
 	case OMP_CLAUSE_COLLAPSE:
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	case OMP_CLAUSE_AUTO:
 	case OMP_CLAUSE_SEQ:
 	case OMP_CLAUSE_INDEPENDENT:
@@ -12651,7 +12651,7 @@ gimplify_adjust_omp_clauses (gimple_seq *pre_p, gimple_seq body, tree *list_p,
 	case OMP_CLAUSE_VECTOR:
 	case OMP_CLAUSE_AUTO:
 	case OMP_CLAUSE_SEQ:
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	case OMP_CLAUSE_IF_PRESENT:
 	case OMP_CLAUSE_FINALIZE:
 	case OMP_CLAUSE_INCLUSIVE:
@@ -13642,9 +13642,9 @@ gimplify_omp_for (tree *expr_p, gimple_seq *pre_p)
   c = omp_find_clause (OMP_FOR_CLAUSES (for_stmt), OMP_CLAUSE_COLLAPSE);
   if (c)
     collapse = tree_to_shwi (OMP_CLAUSE_COLLAPSE_EXPR (c));
-  c = omp_find_clause (OMP_FOR_CLAUSES (for_stmt), OMP_CLAUSE_TILE);
+  c = omp_find_clause (OMP_FOR_CLAUSES (for_stmt), OMP_CLAUSE_OACC_TILE);
   if (c)
-    tile = list_length (OMP_CLAUSE_TILE_LIST (c));
+    tile = list_length (OMP_CLAUSE_OACC_TILE_LIST (c));
   c = omp_find_clause (OMP_FOR_CLAUSES (for_stmt), OMP_CLAUSE_ALLOCATE);
   hash_set<tree> *allocate_uids = NULL;
   if (c)
diff --git a/gcc/omp-general.cc b/gcc/omp-general.cc
index 899aae6..7398a80 100644
--- a/gcc/omp-general.cc
+++ b/gcc/omp-general.cc
@@ -272,12 +272,12 @@ omp_extract_for_data (gomp_for *for_stmt, struct omp_for_data *fd,
 	    collapse_count = &OMP_CLAUSE_COLLAPSE_COUNT (t);
 	  }
 	break;
-      case OMP_CLAUSE_TILE:
-	fd->tiling = OMP_CLAUSE_TILE_LIST (t);
+      case OMP_CLAUSE_OACC_TILE:
+	fd->tiling = OMP_CLAUSE_OACC_TILE_LIST (t);
 	fd->collapse = list_length (fd->tiling);
 	gcc_assert (fd->collapse);
-	collapse_iter = &OMP_CLAUSE_TILE_ITERVAR (t);
-	collapse_count = &OMP_CLAUSE_TILE_COUNT (t);
+	collapse_iter = &OMP_CLAUSE_OACC_TILE_ITERVAR (t);
+	collapse_count = &OMP_CLAUSE_OACC_TILE_COUNT (t);
 	break;
       case OMP_CLAUSE__REDUCTEMP_:
 	fd->have_reductemp = true;
diff --git a/gcc/omp-low.cc b/gcc/omp-low.cc
index c18ec6a6..bb4d148 100644
--- a/gcc/omp-low.cc
+++ b/gcc/omp-low.cc
@@ -2030,7 +2030,7 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
 	case OMP_CLAUSE_INDEPENDENT:
 	case OMP_CLAUSE_AUTO:
 	case OMP_CLAUSE_SEQ:
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	case OMP_CLAUSE__SIMT_:
 	case OMP_CLAUSE_DEFAULT:
 	case OMP_CLAUSE_NONTEMPORAL:
@@ -2256,7 +2256,7 @@ scan_sharing_clauses (tree clauses, omp_context *ctx,
 	case OMP_CLAUSE_INDEPENDENT:
 	case OMP_CLAUSE_AUTO:
 	case OMP_CLAUSE_SEQ:
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	case OMP_CLAUSE__SIMT_:
 	case OMP_CLAUSE_IF_PRESENT:
 	case OMP_CLAUSE_FINALIZE:
@@ -8919,7 +8919,7 @@ lower_oacc_head_mark (location_t loc, tree ddvar, tree clauses,
 	  tag |= OLF_INDEPENDENT;
 	  break;
 
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	  tag |= OLF_TILE;
 	  break;
 
diff --git a/gcc/tree-core.h b/gcc/tree-core.h
index a10b921..1b7b7ff 100644
--- a/gcc/tree-core.h
+++ b/gcc/tree-core.h
@@ -517,7 +517,7 @@ enum omp_clause_code {
   OMP_CLAUSE_VECTOR_LENGTH,
 
   /* OpenACC clause: tile ( size-expr-list ).  */
-  OMP_CLAUSE_TILE,
+  OMP_CLAUSE_OACC_TILE,
 
   /* OpenACC clause: if_present.  */
   OMP_CLAUSE_IF_PRESENT,
diff --git a/gcc/tree-nested.cc b/gcc/tree-nested.cc
index cf1c52a..777f85f 100644
--- a/gcc/tree-nested.cc
+++ b/gcc/tree-nested.cc
@@ -1474,7 +1474,7 @@ convert_nonlocal_omp_clauses (tree *pclauses, struct walk_stmt_info *wi)
 	case OMP_CLAUSE_DEFAULT:
 	case OMP_CLAUSE_COPYIN:
 	case OMP_CLAUSE_COLLAPSE:
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	case OMP_CLAUSE_UNTIED:
 	case OMP_CLAUSE_MERGEABLE:
 	case OMP_CLAUSE_PROC_BIND:
@@ -2270,7 +2270,7 @@ convert_local_omp_clauses (tree *pclauses, struct walk_stmt_info *wi)
 	case OMP_CLAUSE_DEFAULT:
 	case OMP_CLAUSE_COPYIN:
 	case OMP_CLAUSE_COLLAPSE:
-	case OMP_CLAUSE_TILE:
+	case OMP_CLAUSE_OACC_TILE:
 	case OMP_CLAUSE_UNTIED:
 	case OMP_CLAUSE_MERGEABLE:
 	case OMP_CLAUSE_PROC_BIND:
diff --git a/gcc/tree-pretty-print.cc b/gcc/tree-pretty-print.cc
index f00486e..49060cc 100644
--- a/gcc/tree-pretty-print.cc
+++ b/gcc/tree-pretty-print.cc
@@ -1512,9 +1512,9 @@ dump_omp_clause (pretty_printer *pp, tree clause, int spc, dump_flags_t flags)
     case OMP_CLAUSE_INDEPENDENT:
       pp_string (pp, "independent");
       break;
-    case OMP_CLAUSE_TILE:
+    case OMP_CLAUSE_OACC_TILE:
       pp_string (pp, "tile(");
-      dump_generic_node (pp, OMP_CLAUSE_TILE_LIST (clause),
+      dump_generic_node (pp, OMP_CLAUSE_OACC_TILE_LIST (clause),
 			 spc, flags, false);
       pp_right_paren (pp);
       break;
diff --git a/gcc/tree.cc b/gcc/tree.cc
index 5dd514d..e5eaa66 100644
--- a/gcc/tree.cc
+++ b/gcc/tree.cc
@@ -346,7 +346,7 @@ unsigned const char omp_clause_num_ops[] =
   1, /* OMP_CLAUSE_NUM_GANGS  */
   1, /* OMP_CLAUSE_NUM_WORKERS  */
   1, /* OMP_CLAUSE_VECTOR_LENGTH  */
-  3, /* OMP_CLAUSE_TILE  */
+  3, /* OMP_CLAUSE_OACC_TILE  */
   0, /* OMP_CLAUSE_IF_PRESENT */
   0, /* OMP_CLAUSE_FINALIZE */
   0, /* OMP_CLAUSE_NOHOST */
diff --git a/gcc/tree.h b/gcc/tree.h
index dd8ee9f2..bf69d8b 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1939,12 +1939,12 @@ class auto_suppress_location_wrappers
 #define OMP_CLAUSE_ENTER_TO(NODE) \
   (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_ENTER)->base.public_flag)
 
-#define OMP_CLAUSE_TILE_LIST(NODE) \
-  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_TILE), 0)
-#define OMP_CLAUSE_TILE_ITERVAR(NODE) \
-  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_TILE), 1)
-#define OMP_CLAUSE_TILE_COUNT(NODE) \
-  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_TILE), 2)
+#define OMP_CLAUSE_OACC_TILE_LIST(NODE) \
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_OACC_TILE), 0)
+#define OMP_CLAUSE_OACC_TILE_ITERVAR(NODE) \
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_OACC_TILE), 1)
+#define OMP_CLAUSE_OACC_TILE_COUNT(NODE) \
+  OMP_CLAUSE_OPERAND (OMP_CLAUSE_SUBCODE_CHECK (NODE, OMP_CLAUSE_OACC_TILE), 2)
 
 /* _CONDTEMP_ holding temporary with iteration count.  */
 #define OMP_CLAUSE__CONDTEMP__ITER(NODE) \