diff options
| author | Sebastian Pop <sebastian.pop@amd.com> | 2008-10-15 16:17:45 +0000 |
|---|---|---|
| committer | Sebastian Pop <spop@gcc.gnu.org> | 2008-10-15 16:17:45 +0000 |
| commit | 575da9be0d5aea2f99b4b86ad20e10d4391aae39 (patch) | |
| tree | cb79e18f32e1dd5d9b1e0daae6ef2a74a18a0c69 /gcc | |
| parent | 36174c82ee3314e97e8750909f5ff61b7dccbb1b (diff) | |
| download | gcc-575da9be0d5aea2f99b4b86ad20e10d4391aae39.zip gcc-575da9be0d5aea2f99b4b86ad20e10d4391aae39.tar.gz gcc-575da9be0d5aea2f99b4b86ad20e10d4391aae39.tar.bz2 | |
re PR middle-end/37828 ([graphite] ICE in expand_scalar_variables_expr, at graphite.c:3421 with -floop-block)
2008-10-15 Sebastian Pop <sebastian.pop@amd.com>
Harsha Jagasia <harsha.jagasia@amd.com>
PR tree-optimization/37828
* testsuite/gcc.dg/graphite/pr37828.c: New.
* graphite.c (graphite_trans_loop_block): Do not loop block
single nested loops.
Co-Authored-By: Harsha Jagasia <harsha.jagasia@amd.com>
From-SVN: r141142
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/graphite.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/graphite/pr37828.c | 25 |
4 files changed, 47 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1ac849f..cc80609 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,11 @@ 2008-10-15 Sebastian Pop <sebastian.pop@amd.com> + Harsha Jagasia <harsha.jagasia@amd.com> + + PR tree-optimization/37828 + * graphite.c (graphite_trans_loop_block): Do not loop block + single nested loops. + +2008-10-15 Sebastian Pop <sebastian.pop@amd.com> PR tree-optimization/37686 * tree-loop-linear.c (linear_transform_loops): Build a diff --git a/gcc/graphite.c b/gcc/graphite.c index a615e2c..c31c305 100644 --- a/gcc/graphite.c +++ b/gcc/graphite.c @@ -4767,13 +4767,19 @@ graphite_trans_loop_block (VEC (graphite_bb_p, heap) *bbs, int loops) /* TODO: - Calculate the stride size automatically. */ int stride_size = 64; + /* It makes no sense to block a single loop. */ + for (i = 0; VEC_iterate (graphite_bb_p, bbs, i, gb); i++) + if (gbb_nb_loops (gb) < 2) + return false; + for (i = 0; VEC_iterate (graphite_bb_p, bbs, i, gb); i++) transform_done |= graphite_trans_bb_block (gb, stride_size, loops); return transform_done; } -/* Loop block all basic blocks of SCOP. */ +/* Loop block all basic blocks of SCOP. Return false when the + transform is not performed. */ static bool graphite_trans_scop_block (scop_p scop) @@ -4790,10 +4796,10 @@ graphite_trans_scop_block (scop_p scop) lambda_vector last_schedule = lambda_vector_new (max_schedule); if (VEC_length (graphite_bb_p, SCOP_BBS (scop)) == 0) - return transform_done; + return false; /* Get the data of the first bb. */ - gb = VEC_index (graphite_bb_p, SCOP_BBS (scop), 0); + gb = VEC_index (graphite_bb_p, SCOP_BBS (scop), 0); last_nb_loops = gbb_nb_loops (gb); lambda_vector_copy (GBB_STATIC_SCHEDULE (gb), last_schedule, last_nb_loops + 1); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 328a514..91966c4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,4 +1,10 @@ 2008-10-15 Sebastian Pop <sebastian.pop@amd.com> + Harsha Jagasia <harsha.jagasia@amd.com> + + PR tree-optimization/37828 + * testsuite/gcc.dg/graphite/pr37828.c: New. + +2008-10-15 Sebastian Pop <sebastian.pop@amd.com> PR tree-optimization/37686 * testsuite/gcc.dg/tree-ssa/pr37686.c: New. diff --git a/gcc/testsuite/gcc.dg/graphite/pr37828.c b/gcc/testsuite/gcc.dg/graphite/pr37828.c new file mode 100644 index 0000000..0a0412d --- /dev/null +++ b/gcc/testsuite/gcc.dg/graphite/pr37828.c @@ -0,0 +1,25 @@ +/* { dg-options "-O2 -floop-block" } */ + +typedef struct foo +{ + struct foo **Node; +} foo; + +static int sort_and_split (foo **Root, foo **Finite, long first) +{ + foo *cd; + long i; + for (i = 0; i < first; i++) + cd->Node[i] = Finite[first+i]; + + sort_and_split(Root, Finite, first); + return (0); +} + + +void Build_foo(foo **Root, foo **Finite, foo **Infinite) +{ + long low, high; + while (sort_and_split(Root, Finite, low) == 0); +} + |