git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

genmatch.c (decision_tree::gen_gimple): Merge with ... 

2015-07-30  Richard Biener  <rguenther@suse.de>

	* genmatch.c (decision_tree::gen_gimple): Merge with ...
	(decision_tree::gen_generic): ... this into ...
	(decision_tree::gen): ... this.
	(main): Adjust callers.

From-SVN: r226396
This commit is contained in:
Richard Biener 2015-07-30 11:20:21 +00:00 committed by Richard Biener
parent 81b7ff079a
commit b21ce9ce3b
2 changed files with 71 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2015-07-30 Richard Biener <rguenther@suse.de>
* genmatch.c (decision_tree::gen_gimple): Merge with ...
(decision_tree::gen_generic): ... this into ...
(decision_tree::gen): ... this.
(main): Adjust callers.
2015-07-30 Richard Biener <rguenther@suse.de> 2015-07-30 Richard Biener <rguenther@suse.de>
* genmatch.c (verbose): New global. * genmatch.c (verbose): New global.

141
gcc/genmatch.c
View File

@ -1310,8 +1310,7 @@ struct decision_tree
dt_node *root; dt_node *root;
void insert (struct simplify *, unsigned); void insert (struct simplify *, unsigned);
void gen_gimple (FILE *f = stderr); void gen (FILE *f, bool gimple);
void gen_generic (FILE *f = stderr);
void print (FILE *f = stderr); void print (FILE *f = stderr);
decision_tree () { root = new dt_node (dt_node::DT_NODE); } decision_tree () { root = new dt_node (dt_node::DT_NODE); }
@ -2997,92 +2996,14 @@ dt_simplify::gen (FILE *f, int indent, bool gimple)
tree. */ tree. */
void void
decision_tree::gen_gimple (FILE *f) decision_tree::gen (FILE *f, bool gimple)
{ {
root->analyze (); root->analyze ();
fprintf (stderr, "GIMPLE decision tree has %u leafs, maximum depth %u and " fprintf (stderr, "%s decision tree has %u leafs, maximum depth %u and "
"a total number of %u nodes\n", root->num_leafs, root->max_level, "a total number of %u nodes\n",
root->total_size); gimple ? "GIMPLE" : "GENERIC",
root->num_leafs, root->max_level, root->total_size);
for (unsigned n = 1; n <= 3; ++n)
{
/* First generate split-out functions. */
for (unsigned i = 0; i < root->kids.length (); i++)
{
dt_operand *dop = static_cast<dt_operand *>(root->kids[i]);
expr *e = static_cast<expr *>(dop->op);
if (e->ops.length () != n)
continue;
fprintf (f, "\nstatic bool\n"
"gimple_simplify_%s (code_helper *res_code, tree *res_ops,\n"
" gimple_seq *seq, tree (*valueize)(tree) "
"ATTRIBUTE_UNUSED,\n"
" code_helper ARG_UNUSED (code), tree "
"ARG_UNUSED (type)\n",
e->operation->id);
for (unsigned i = 0; i < n; ++i)
fprintf (f, ", tree op%d", i);
fprintf (f, ")\n");
fprintf (f, "{\n");
dop->gen_kids (f, 2, true);
fprintf (f, " return false;\n");
fprintf (f, "}\n");
}
/* Then generate the main entry with the outermost switch and
tail-calls to the split-out functions. */
fprintf (f, "\nstatic bool\n"
"gimple_simplify (code_helper *res_code, tree *res_ops,\n"
" gimple_seq *seq, tree (*valueize)(tree),\n"
" code_helper code, tree type");
for (unsigned i = 0; i < n; ++i)
fprintf (f, ", tree op%d", i);
fprintf (f, ")\n");
fprintf (f, "{\n");
fprintf (f, " switch (code.get_rep())\n"
" {\n");
for (unsigned i = 0; i < root->kids.length (); i++)
{
dt_operand *dop = static_cast<dt_operand *>(root->kids[i]);
expr *e = static_cast<expr *>(dop->op);
if (e->ops.length () != n)
continue;
if (*e->operation == CONVERT_EXPR
|| *e->operation == NOP_EXPR)
fprintf (f, " CASE_CONVERT:\n");
else
fprintf (f, " case %s%s:\n",
is_a <fn_id *> (e->operation) ? "-" : "",
e->operation->id);
fprintf (f, " return gimple_simplify_%s (res_code, res_ops, "
"seq, valueize, code, type", e->operation->id);
for (unsigned i = 0; i < n; ++i)
fprintf (f, ", op%d", i);
fprintf (f, ");\n");
}
fprintf (f, " default:;\n"
" }\n");
fprintf (f, " return false;\n");
fprintf (f, "}\n");
}
}
/* Main entry to generate code for matching GENERIC IL off the decision
tree. */
void
decision_tree::gen_generic (FILE *f)
{
root->analyze ();
fprintf (stderr, "GENERIC decision tree has %u leafs, maximum depth %u and "
"a total number of %u nodes\n", root->num_leafs, root->max_level,
root->total_size);
for (unsigned n = 1; n <= 3; ++n) for (unsigned n = 1; n <= 3; ++n)
{ {
@ -3096,9 +3017,19 @@ decision_tree::gen_generic (FILE *f)
GENERIC. The following drops patterns with outermost GENERIC. The following drops patterns with outermost
calls. It's easy to emit overloads for function code calls. It's easy to emit overloads for function code
though if necessary. */ though if necessary. */
|| e->operation->kind != id_base::CODE) || (!gimple
&& e->operation->kind != id_base::CODE))
continue; continue;
if (gimple)
fprintf (f, "\nstatic bool\n"
"gimple_simplify_%s (code_helper *res_code, tree *res_ops,\n"
" gimple_seq *seq, tree (*valueize)(tree) "
"ATTRIBUTE_UNUSED,\n"
" code_helper ARG_UNUSED (code), tree "
"ARG_UNUSED (type)\n",
e->operation->id);
else
fprintf (f, "\nstatic tree\n" fprintf (f, "\nstatic tree\n"
"generic_simplify_%s (location_t ARG_UNUSED (loc), enum " "generic_simplify_%s (location_t ARG_UNUSED (loc), enum "
"tree_code ARG_UNUSED (code), tree ARG_UNUSED (type)", "tree_code ARG_UNUSED (code), tree ARG_UNUSED (type)",
@ -3107,13 +3038,22 @@ decision_tree::gen_generic (FILE *f)
fprintf (f, ", tree op%d", i); fprintf (f, ", tree op%d", i);
fprintf (f, ")\n"); fprintf (f, ")\n");
fprintf (f, "{\n"); fprintf (f, "{\n");
dop->gen_kids (f, 2, false); dop->gen_kids (f, 2, gimple);
if (gimple)
fprintf (f, " return false;\n");
else
fprintf (f, " return NULL_TREE;\n"); fprintf (f, " return NULL_TREE;\n");
fprintf (f, "}\n"); fprintf (f, "}\n");
} }
/* Then generate the main entry with the outermost switch and /* Then generate the main entry with the outermost switch and
tail-calls to the split-out functions. */ tail-calls to the split-out functions. */
if (gimple)
fprintf (f, "\nstatic bool\n"
"gimple_simplify (code_helper *res_code, tree *res_ops,\n"
" gimple_seq *seq, tree (*valueize)(tree),\n"
" code_helper code, tree type");
else
fprintf (f, "\ntree\n" fprintf (f, "\ntree\n"
"generic_simplify (location_t loc, enum tree_code code, " "generic_simplify (location_t loc, enum tree_code code, "
"tree type ATTRIBUTE_UNUSED"); "tree type ATTRIBUTE_UNUSED");
@ -3122,6 +3062,10 @@ decision_tree::gen_generic (FILE *f)
fprintf (f, ")\n"); fprintf (f, ")\n");
fprintf (f, "{\n"); fprintf (f, "{\n");
if (gimple)
fprintf (f, " switch (code.get_rep())\n"
" {\n");
else
fprintf (f, " switch (code)\n" fprintf (f, " switch (code)\n"
" {\n"); " {\n");
for (unsigned i = 0; i < root->kids.length (); i++) for (unsigned i = 0; i < root->kids.length (); i++)
@ -3133,14 +3077,21 @@ decision_tree::gen_generic (FILE *f)
GENERIC. The following drops patterns with outermost GENERIC. The following drops patterns with outermost
calls. It's easy to emit overloads for function code calls. It's easy to emit overloads for function code
though if necessary. */ though if necessary. */
|| e->operation->kind != id_base::CODE) || (!gimple
&& e->operation->kind != id_base::CODE))
continue; continue;
operator_id *op_id = static_cast <operator_id *> (e->operation); if (*e->operation == CONVERT_EXPR
if (op_id->code == NOP_EXPR || op_id->code == CONVERT_EXPR) || *e->operation == NOP_EXPR)
fprintf (f, " CASE_CONVERT:\n"); fprintf (f, " CASE_CONVERT:\n");
else else
fprintf (f, " case %s:\n", e->operation->id); fprintf (f, " case %s%s:\n",
is_a <fn_id *> (e->operation) ? "-" : "",
e->operation->id);
if (gimple)
fprintf (f, " return gimple_simplify_%s (res_code, res_ops, "
"seq, valueize, code, type", e->operation->id);
else
fprintf (f, " return generic_simplify_%s (loc, code, type", fprintf (f, " return generic_simplify_%s (loc, code, type",
e->operation->id); e->operation->id);
for (unsigned i = 0; i < n; ++i) for (unsigned i = 0; i < n; ++i)
@ -3150,6 +3101,9 @@ decision_tree::gen_generic (FILE *f)
fprintf (f, " default:;\n" fprintf (f, " default:;\n"
" }\n"); " }\n");
if (gimple)
fprintf (f, " return false;\n");
else
fprintf (f, " return NULL_TREE;\n"); fprintf (f, " return NULL_TREE;\n");
fprintf (f, "}\n"); fprintf (f, "}\n");
} }
@ -4317,10 +4271,7 @@ add_operator (VIEW_CONVERT2, "VIEW_CONVERT2", "tcc_unary", 1);
if (verbose == 2) if (verbose == 2)
dt.print (stderr); dt.print (stderr);
if (gimple) dt.gen (stdout, gimple);
dt.gen_gimple (stdout);
else
dt.gen_generic (stdout);
/* Finalize. */ /* Finalize. */
cpp_finish (r, NULL); cpp_finish (r, NULL);