Skip to content

Commit d1bb956

Browse files
committed
PR 91865: Avoid ZERO_EXTEND of ZERO_EXTEND in make_compound_operation.
This patch is my proposed solution to PR rtl-optimization/91865. Normally RTX simplification canonicalizes a ZERO_EXTEND of a ZERO_EXTEND to a single ZERO_EXTEND, but as shown in this PR it is possible for combine's make_compound_operation to unintentionally generate a non-canonical ZERO_EXTEND of a ZERO_EXTEND, which is unlikely to be matched by the backend. For the new test case: const int table[2] = {1, 2}; int foo (char i) { return table[i]; } compiling with -O2 -mlarge on msp430 we currently see: Trying 2 -> 7: 2: r25:HI=zero_extend(R12:QI) REG_DEAD R12:QI 7: r28:PSI=sign_extend(r25:HI)#0 REG_DEAD r25:HI Failed to match this instruction: (set (reg:PSI 28 [ iD.1772 ]) (zero_extend:PSI (zero_extend:HI (reg:QI 12 R12 [ iD.1772 ])))) which results in the following code: foo: AND #0xff, R12 RLAM.A #4, R12 { RRAM.A #4, R12 RLAM.A #1, R12 MOVX.W table(R12), R12 RETA With this patch, we now see: Trying 2 -> 7: 2: r25:HI=zero_extend(R12:QI) REG_DEAD R12:QI 7: r28:PSI=sign_extend(r25:HI)#0 REG_DEAD r25:HI Successfully matched this instruction: (set (reg:PSI 28 [ iD.1772 ]) (zero_extend:PSI (reg:QI 12 R12 [ iD.1772 ]))) allowing combination of insns 2 and 7 original costs 4 + 8 = 12 replacement cost 8 foo: MOV.B R12, R12 RLAM.A #1, R12 MOVX.W table(R12), R12 RETA 2023-10-26 Roger Sayle <[email protected]> Richard Biener <[email protected]> gcc/ChangeLog PR rtl-optimization/91865 * combine.cc (make_compound_operation): Avoid creating a ZERO_EXTEND of a ZERO_EXTEND. gcc/testsuite/ChangeLog PR rtl-optimization/91865 * gcc.target/msp430/pr91865.c: New test case.
1 parent 2f592b7 commit d1bb956

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

gcc/combine.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8449,8 +8449,8 @@ make_compound_operation (rtx x, enum rtx_code in_code)
84498449
if (code == ZERO_EXTEND)
84508450
{
84518451
new_rtx = make_compound_operation (XEXP (x, 0), next_code);
8452-
tem = simplify_const_unary_operation (ZERO_EXTEND, GET_MODE (x),
8453-
new_rtx, GET_MODE (XEXP (x, 0)));
8452+
tem = simplify_unary_operation (ZERO_EXTEND, GET_MODE (x),
8453+
new_rtx, GET_MODE (XEXP (x, 0)));
84548454
if (tem)
84558455
return tem;
84568456
SUBST (XEXP (x, 0), new_rtx);
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* { dg-do compile } */
2+
/* { dg-options "-O2 -mlarge" } */
3+
4+
const int table[2] = {1, 2};
5+
int foo (char i) { return table[i]; }
6+
7+
/* { dg-final { scan-assembler-not "AND" } } */
8+
/* { dg-final { scan-assembler-not "RRAM" } } */

0 commit comments

Comments
 (0)