diff options
| author | segher <segher@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-06 04:24:45 +0000 |
|---|---|---|
| committer | segher <segher@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-06 04:24:45 +0000 |
| commit | 87f350e9bd69d2cb60bba79644f0147f875802de (patch) | |
| tree | 9e4cdfb89303c96b905f1156e38dc42d40741a1d | |
| parent | 3e83d36aef6300302cb07bef18190d150e2dc606 (diff) | |
| download | gcc-87f350e9bd69d2cb60bba79644f0147f875802de.tar.gz | |
* combine.c (combine_validate_cost): Do not count the cost of a
split I2 twice. Do not display it twice in the dump, either.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219216 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/combine.c | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1b6c3be7f60..e85a9fdf0b1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-01-05 Segher Boessenkool <segher@kernel.crashing.org> + + * combine.c (combine_validate_cost): Do not count the cost of a + split I2 twice. Do not display it twice in the dump, either. + 2015-01-05 Sandra Loosemore <sandra@codesourcery.com> Revert parts of r219199. diff --git a/gcc/combine.c b/gcc/combine.c index 6bdb3f48aeb..8e78e18eb13 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -885,6 +885,12 @@ combine_validate_cost (rtx_insn *i0, rtx_insn *i1, rtx_insn *i2, rtx_insn *i3, i1_cost = i0_cost = 0; } + /* If we have split a PARALLEL I2 to I1,I2, we have counted its cost twice; + correct that. */ + if (old_cost && i1 && INSN_UID (i1) == INSN_UID (i2)) + old_cost -= i1_cost; + + /* Calculate the replacement insn_rtx_costs. */ new_i3_cost = insn_rtx_cost (newpat, optimize_this_for_speed_p); if (newi2pat) @@ -924,14 +930,14 @@ combine_validate_cost (rtx_insn *i0, rtx_insn *i1, rtx_insn *i2, rtx_insn *i3, reject ? "rejecting" : "allowing"); if (i0) fprintf (dump_file, "%d, ", INSN_UID (i0)); - if (i1) + if (i1 && INSN_UID (i1) != INSN_UID (i2)) fprintf (dump_file, "%d, ", INSN_UID (i1)); fprintf (dump_file, "%d and %d\n", INSN_UID (i2), INSN_UID (i3)); fprintf (dump_file, "original costs "); if (i0) fprintf (dump_file, "%d + ", i0_cost); - if (i1) + if (i1 && INSN_UID (i1) != INSN_UID (i2)) fprintf (dump_file, "%d + ", i1_cost); fprintf (dump_file, "%d + %d = %d\n", i2_cost, i3_cost, old_cost); |