From 2f48c66c9deb7c5f008c8c6152aee28d18d4126a Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Tue, 6 Jan 2015 05:24:45 +0100 Subject: [PATCH] combine.c (combine_validate_cost): Do not count the cost of a split I2 twice. * combine.c (combine_validate_cost): Do not count the cost of a split I2 twice. Do not display it twice in the dump, either. From-SVN: r219216 --- gcc/ChangeLog | 5 +++++ 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 + + * 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 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); -- 2.30.2