OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

genmatch.c (enum tree_code): Add VIEW_CONVERT[012].

Browse Source 
2015-06-24  Richard Biener  <rguenther@suse.de>

	* genmatch.c (enum tree_code): Add VIEW_CONVERT[012].
	(main): Likewise.
	(lower_opt_convert): Support lowering of conditional view_convert.
	(parser::parse_operation): Likewise.
	(parser::parse_for): Likewise.

From-SVN: r224893
This commit is contained in:
Richard Biener 2015-06-24 10:53:53 +00:00 committed by Richard Biener
parent 72e839ca6b
commit 3979182284
2 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2015-06-24 Richard Biener <rguenther@suse.de>
* genmatch.c (enum tree_code): Add VIEW_CONVERT[012].
(main): Likewise.
(lower_opt_convert): Support lowering of conditional view_convert.
(parser::parse_operation): Likewise.
(parser::parse_for): Likewise.
2015-06-24 Renlin Li <renlin.li@arm.com> 2015-06-24 Renlin Li <renlin.li@arm.com>
* varasm.c (emit_local): Use unsigned int for align variable. * varasm.c (emit_local): Use unsigned int for align variable.

60
gcc/genmatch.c
View File

@ -161,6 +161,9 @@ enum tree_code {
CONVERT0, CONVERT0,
CONVERT1, CONVERT1,
CONVERT2, CONVERT2,
VIEW_CONVERT0,
VIEW_CONVERT1,
VIEW_CONVERT2,
MAX_TREE_CODES MAX_TREE_CODES
}; };
#undef DEFTREECODE #undef DEFTREECODE
@ -749,12 +752,14 @@ lower_commutative (simplify *s, vec<simplify *>& simplifiers)
children if STRIP, else replace them with an unconditional convert. */ children if STRIP, else replace them with an unconditional convert. */
operand * operand *
lower_opt_convert (operand *o, enum tree_code oper, bool strip) lower_opt_convert (operand *o, enum tree_code oper,
enum tree_code to_oper, bool strip)
{ {
if (capture *c = dyn_cast<capture *> (o)) if (capture *c = dyn_cast<capture *> (o))
{ {
if (c->what) if (c->what)
return new capture (c->where, lower_opt_convert (c->what, oper, strip)); return new capture (c->where,
lower_opt_convert (c->what, oper, to_oper, strip));
else else
return c; return c;
} }
@ -766,16 +771,18 @@ lower_opt_convert (operand *o, enum tree_code oper, bool strip)
if (*e->operation == oper) if (*e->operation == oper)
{ {
if (strip) if (strip)
return lower_opt_convert (e->ops[0], oper, strip); return lower_opt_convert (e->ops[0], oper, to_oper, strip);
expr *ne = new expr (get_operator ("CONVERT_EXPR")); expr *ne = new expr (to_oper == CONVERT_EXPR
ne->append_op (lower_opt_convert (e->ops[0], oper, strip)); ? get_operator ("CONVERT_EXPR")
: get_operator ("VIEW_CONVERT_EXPR"));
ne->append_op (lower_opt_convert (e->ops[0], oper, to_oper, strip));
return ne; return ne;
} }
expr *ne = new expr (e->operation, e->is_commutative); expr *ne = new expr (e->operation, e->is_commutative);
for (unsigned i = 0; i < e->ops.length (); ++i) for (unsigned i = 0; i < e->ops.length (); ++i)
ne->append_op (lower_opt_convert (e->ops[i], oper, strip)); ne->append_op (lower_opt_convert (e->ops[i], oper, to_oper, strip));
return ne; return ne;
} }
@ -818,20 +825,28 @@ lower_opt_convert (operand *o)
v1.safe_push (o); v1.safe_push (o);
enum tree_code opers[] = { CONVERT0, CONVERT1, CONVERT2 }; enum tree_code opers[]
= { CONVERT0, CONVERT_EXPR,
CONVERT1, CONVERT_EXPR,
CONVERT2, CONVERT_EXPR,
VIEW_CONVERT0, VIEW_CONVERT_EXPR,
VIEW_CONVERT1, VIEW_CONVERT_EXPR,
VIEW_CONVERT2, VIEW_CONVERT_EXPR };
/* Conditional converts are lowered to a pattern with the /* Conditional converts are lowered to a pattern with the
conversion and one without. The three different conditional conversion and one without. The three different conditional
convert codes are lowered separately. */ convert codes are lowered separately. */
for (unsigned i = 0; i < 3; ++i) for (unsigned i = 0; i < sizeof (opers) / sizeof (enum tree_code); i += 2)
{ {
v2 = vNULL; v2 = vNULL;
for (unsigned j = 0; j < v1.length (); ++j) for (unsigned j = 0; j < v1.length (); ++j)
if (has_opt_convert (v1[j], opers[i])) if (has_opt_convert (v1[j], opers[i]))
{ {
v2.safe_push (lower_opt_convert (v1[j], opers[i], false)); v2.safe_push (lower_opt_convert (v1[j],
v2.safe_push (lower_opt_convert (v1[j], opers[i], true)); opers[i], opers[i+1], false));
v2.safe_push (lower_opt_convert (v1[j],
opers[i], opers[i+1], true));
} }
if (v2 != vNULL) if (v2 != vNULL)
@ -2890,14 +2905,22 @@ parser::parse_operation ()
const cpp_token *token = peek (); const cpp_token *token = peek ();
if (strcmp (id, "convert0") == 0) if (strcmp (id, "convert0") == 0)
fatal_at (id_tok, "use 'convert?' here"); fatal_at (id_tok, "use 'convert?' here");
else if (strcmp (id, "view_convert0") == 0)
fatal_at (id_tok, "use 'view_convert?' here");
if (token->type == CPP_QUERY if (token->type == CPP_QUERY
&& !(token->flags & PREV_WHITE)) && !(token->flags & PREV_WHITE))
{ {
if (strcmp (id, "convert") == 0) if (strcmp (id, "convert") == 0)
id = "convert0"; id = "convert0";
else if (strcmp (id, "convert1") == 0) else if (strcmp (id, "convert1") == 0)
; ;
else if (strcmp (id, "convert2") == 0) else if (strcmp (id, "convert2") == 0)
;
else if (strcmp (id, "view_convert") == 0)
id = "view_convert0";
else if (strcmp (id, "view_convert1") == 0)
;
else if (strcmp (id, "view_convert2") == 0)
; ;
else else
fatal_at (id_tok, "non-convert operator conditionalized"); fatal_at (id_tok, "non-convert operator conditionalized");
@ -2907,8 +2930,10 @@ parser::parse_operation ()
"match expression"); "match expression");
eat_token (CPP_QUERY); eat_token (CPP_QUERY);
} }
else if (strcmp (id, "convert1") == 0 else if (strcmp (id, "convert1") == 0
|| strcmp (id, "convert2") == 0) || strcmp (id, "convert2") == 0
|| strcmp (id, "view_convert1") == 0
|| strcmp (id, "view_convert2") == 0)
fatal_at (id_tok, "expected '?' after conditional operator"); fatal_at (id_tok, "expected '?' after conditional operator");
id_base *op = get_operator (id); id_base *op = get_operator (id);
if (!op) if (!op)
@ -3325,7 +3350,9 @@ parser::parse_for (source_location)
id_base *idb = get_operator (oper); id_base *idb = get_operator (oper);
if (idb == NULL) if (idb == NULL)
fatal_at (token, "no such operator '%s'", oper); fatal_at (token, "no such operator '%s'", oper);
if (*idb == CONVERT0 || *idb == CONVERT1 || *idb == CONVERT2) if (*idb == CONVERT0 || *idb == CONVERT1 || *idb == CONVERT2
|| *idb == VIEW_CONVERT0 || *idb == VIEW_CONVERT1
|| *idb == VIEW_CONVERT2)
fatal_at (token, "conditional operators cannot be used inside for"); fatal_at (token, "conditional operators cannot be used inside for");
if (arity == -1) if (arity == -1)
@ -3661,6 +3688,9 @@ main (int argc, char **argv)
add_operator (CONVERT0, "CONVERT0", "tcc_unary", 1); add_operator (CONVERT0, "CONVERT0", "tcc_unary", 1);
add_operator (CONVERT1, "CONVERT1", "tcc_unary", 1); add_operator (CONVERT1, "CONVERT1", "tcc_unary", 1);
add_operator (CONVERT2, "CONVERT2", "tcc_unary", 1); add_operator (CONVERT2, "CONVERT2", "tcc_unary", 1);
add_operator (VIEW_CONVERT0, "VIEW_CONVERT0", "tcc_unary", 1);
add_operator (VIEW_CONVERT1, "VIEW_CONVERT1", "tcc_unary", 1);
add_operator (VIEW_CONVERT2, "VIEW_CONVERT2", "tcc_unary", 1);
#undef END_OF_BASE_TREE_CODES #undef END_OF_BASE_TREE_CODES
#undef DEFTREECODE #undef DEFTREECODE