From 38ad2d079800cafd77f35c32a335697f643fa1a3 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 24 Jul 2012 08:37:43 +0000 Subject: [PATCH] re PR middle-end/53616 (416.gamess in SPEC CPU 2006 miscompiled) 2012-07-24 Richard Guenther PR tree-optimization/53616 * tree-loop-distribution.c (ldist_gen): Do not change partition ordering when merging partitions. From-SVN: r189802 --- gcc/ChangeLog | 6 ++++++ gcc/tree-loop-distribution.c | 29 +++++++++++++++++++---------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7404a62a354..6c386867b1c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-07-24 Richard Guenther + + PR tree-optimization/53616 + * tree-loop-distribution.c (ldist_gen): Do not change + partition ordering when merging partitions. + 2012-07-24 Alan Modra PR target/53914 diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c index 58ed12b1e69..18df9fbd249 100644 --- a/gcc/tree-loop-distribution.c +++ b/gcc/tree-loop-distribution.c @@ -1289,16 +1289,25 @@ ldist_gen (struct loop *loop, struct graph *rdg, nbp = 0; goto ldist_done; } - for (i = 0; VEC_iterate (partition_t, partitions, i, into); ++i) - if (!partition_builtin_p (into)) - break; - for (++i; VEC_iterate (partition_t, partitions, i, partition); ++i) - if (!partition_builtin_p (partition)) - { - bitmap_ior_into (into->stmts, partition->stmts); - VEC_ordered_remove (partition_t, partitions, i); - i--; - } + /* Only fuse adjacent non-builtin partitions, see PR53616. + ??? Use dependence information to improve partition ordering. */ + i = 0; + do + { + for (; VEC_iterate (partition_t, partitions, i, into); ++i) + if (!partition_builtin_p (into)) + break; + for (++i; VEC_iterate (partition_t, partitions, i, partition); ++i) + if (!partition_builtin_p (partition)) + { + bitmap_ior_into (into->stmts, partition->stmts); + VEC_ordered_remove (partition_t, partitions, i); + i--; + } + else + break; + } + while ((unsigned) i < VEC_length (partition_t, partitions)); } else { -- 2.34.1