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
This commit is contained in:
Segher Boessenkool 2015-01-06 05:24:45 +01:00 committed by Segher Boessenkool
parent 0964f8458a
commit 2f48c66c9d
2 changed files with 13 additions and 2 deletions

View File

@ -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.

View File

@ -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);