| Message ID | CABGF_gcGzThs5+R4ki8pCsF5hwWasbKEStjPT+7trC00b=MwYA@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
On 22/07/2014 18:00, Roman Gareev wrote: > I've attached the patch, which contains generation of Gimple code from > isl_ast_node_block. Is it fine for trunk? LGTM. Tobias
Roman Gareev <gareevroman@gmail.com> writes: > I've attached the patch, which contains generation of Gimple code from > isl_ast_node_block. Is it fine for trunk? 2014-07-22 Roman Gareev <gareevroman@gmail.com> gcc/ * graphite-isl-ast-to-gimple.c: (translate_isl_ast_node_block): New function. (translate_isl_ast): Add calling of translate_isl_ast_node_block. gcc/testsuite/gcc.dg/graphite/ * isl-ast-gen-blocks-1.c: New testcase. * isl-ast-gen-blocks-2.c: New testcase. The second part of the ChangeLog entry is wrong: it should go into gcc/testsuite/ChangeLog as * gcc.dg/graphite/isl-ast-gen-blocks-1.c: New testcase. * gcc.dg/graphite/isl-ast-gen-blocks-2.c: New testcase. Please fix the ChangeLog entries; no need to add another one for that change or ask for approval: such a fix is obvious. Thanks. Rainer
On 23/07/2014 11:13, Rainer Orth wrote: > Roman Gareev <gareevroman@gmail.com> writes: > >> I've attached the patch, which contains generation of Gimple code from >> isl_ast_node_block. Is it fine for trunk? > > 2014-07-22 Roman Gareev <gareevroman@gmail.com> > > gcc/ > * graphite-isl-ast-to-gimple.c: > (translate_isl_ast_node_block): New function. > (translate_isl_ast): Add calling of translate_isl_ast_node_block. > > gcc/testsuite/gcc.dg/graphite/ > * isl-ast-gen-blocks-1.c: New testcase. > * isl-ast-gen-blocks-2.c: New testcase. > > The second part of the ChangeLog entry is wrong: it should go into > gcc/testsuite/ChangeLog as > > * gcc.dg/graphite/isl-ast-gen-blocks-1.c: New testcase. > * gcc.dg/graphite/isl-ast-gen-blocks-2.c: New testcase. > > Please fix the ChangeLog entries; no need to add another one for that > change or ask for approval: such a fix is obvious. Thanks Rainer for catching this. Cheers, Tobias
> gcc/ > * graphite-isl-ast-to-gimple.c: > (translate_isl_ast_node_block): New function. > (translate_isl_ast): Add calling of translate_isl_ast_node_block. > > gcc/testsuite/gcc.dg/graphite/ > * isl-ast-gen-blocks-1.c: New testcase. > * isl-ast-gen-blocks-2.c: New testcase. > > The second part of the ChangeLog entry is wrong: it should go into > gcc/testsuite/ChangeLog as > > * gcc.dg/graphite/isl-ast-gen-blocks-1.c: New testcase. > * gcc.dg/graphite/isl-ast-gen-blocks-2.c: New testcase. > > Please fix the ChangeLog entries; no need to add another one for that > change or ask for approval: such a fix is obvious. Thank you for the comment! -- Cheers, Roman Gareev.
Index: gcc/graphite-isl-ast-to-gimple.c =================================================================== --- gcc/graphite-isl-ast-to-gimple.c (revision 212913) +++ gcc/graphite-isl-ast-to-gimple.c (working copy) @@ -616,6 +616,26 @@ return next_e; } +/* Translates an isl_ast_node_block to Gimple. */ + +static edge +translate_isl_ast_node_block (loop_p context_loop, + __isl_keep isl_ast_node *node, + edge next_e, ivs_params &ip) +{ + gcc_assert (isl_ast_node_get_type (node) == isl_ast_node_block); + isl_ast_node_list *node_list = isl_ast_node_block_get_children (node); + int i; + for (i = 0; i < isl_ast_node_list_n_ast_node (node_list); i++) + { + isl_ast_node *tmp_node = isl_ast_node_list_get_ast_node (node_list, i); + next_e = translate_isl_ast (context_loop, tmp_node, next_e, ip); + isl_ast_node_free (tmp_node); + } + isl_ast_node_list_free (node_list); + return next_e; +} + /* Translates an ISL AST node NODE to GCC representation in the context of a SESE. */ @@ -639,7 +659,8 @@ return translate_isl_ast_node_user (node, next_e, ip); case isl_ast_node_block: - return next_e; + return translate_isl_ast_node_block (context_loop, node, + next_e, ip); default: gcc_unreachable (); Index: gcc/testsuite/gcc.dg/graphite/isl-ast-gen-blocks-1.c =================================================================== --- gcc/testsuite/gcc.dg/graphite/isl-ast-gen-blocks-1.c (revision 0) +++ gcc/testsuite/gcc.dg/graphite/isl-ast-gen-blocks-1.c (working copy) @@ -0,0 +1,27 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -fgraphite-identity -fgraphite-code-generator=isl" } */ + +int n = 50; +static int __attribute__((noinline)) +foo () +{ + int i, res; + for (i = 0, res = 0; i < n; i++) + res += i; + + return res; +} + +extern void abort (); + +int +main (void) +{ + int res = foo (); + + + if (res != 1225) + abort (); + + return 0; +} Index: gcc/testsuite/gcc.dg/graphite/isl-ast-gen-blocks-2.c =================================================================== --- gcc/testsuite/gcc.dg/graphite/isl-ast-gen-blocks-2.c (revision 0) +++ gcc/testsuite/gcc.dg/graphite/isl-ast-gen-blocks-2.c (working copy) @@ -0,0 +1,27 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -fgraphite-identity -fgraphite-code-generator=isl" } */ + +int k = 50; +static int __attribute__((noinline)) +foo () +{ + int i, res; + for (i = 0, res = 0; i < k; i++) + res += i; + + return res; +} + +extern void abort (); + +int +main (void) +{ + int res = foo (); + + + if (res != 1225) + abort (); + + return 0; +}
I've attached the patch, which contains generation of Gimple code from isl_ast_node_block. Is it fine for trunk? -- Cheers, Roman Gareev. 2014-07-22 Roman Gareev <gareevroman@gmail.com> gcc/ * graphite-isl-ast-to-gimple.c: (translate_isl_ast_node_block): New function. (translate_isl_ast): Add calling of translate_isl_ast_node_block. gcc/testsuite/gcc.dg/graphite/ * isl-ast-gen-blocks-1.c: New testcase. * isl-ast-gen-blocks-2.c: New testcase.