{
/* 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:
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;
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;
/* 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;
}
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))
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:
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);
/* 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;
}
}
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;
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))
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:
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);
{
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);
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,
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)
(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 \
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);
}
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:
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:
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)
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;
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:
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:
tag |= OLF_INDEPENDENT;
break;
- case OMP_CLAUSE_TILE:
+ case OMP_CLAUSE_OACC_TILE:
tag |= OLF_TILE;
break;
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,
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:
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:
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;
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 */
#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) \