[llvm] 40c6565 - [PowerPC] Remove the redundant terminator instruction when optimizing conditional trap
Victor Huang via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 18 15:53:32 PST 2021
Author: Victor Huang
Date: 2021-11-18T17:52:26-06:00
New Revision: 40c65655aff911e21830db69e00dde601a40cf54
URL: https://github.com/llvm/llvm-project/commit/40c65655aff911e21830db69e00dde601a40cf54
DIFF: https://github.com/llvm/llvm-project/commit/40c65655aff911e21830db69e00dde601a40cf54.diff
LOG: [PowerPC] Remove the redundant terminator instruction when optimizing conditional trap
This patch is a follow up patch for ae27ca9a678301969c35f2e27c76f14c9d2bb396 to
the remove redundant terminator when optimizing conditional trap.
Peer reviewed by: nemanjai
Added:
Modified:
llvm/lib/Target/PowerPC/PPCMIPeephole.cpp
llvm/test/CodeGen/PowerPC/mi-peepholes-trap-opt.mir
Removed:
################################################################################
diff --git a/llvm/lib/Target/PowerPC/PPCMIPeephole.cpp b/llvm/lib/Target/PowerPC/PPCMIPeephole.cpp
index 650798453e17e..797e322de7e8c 100644
--- a/llvm/lib/Target/PowerPC/PPCMIPeephole.cpp
+++ b/llvm/lib/Target/PowerPC/PPCMIPeephole.cpp
@@ -421,9 +421,9 @@ bool PPCMIPeephole::simplifyCode(void) {
ToErase = nullptr;
}
// If a conditional trap instruction got optimized to an
- // unconditional trap, eliminate all the instructions between
- // the trap and the terminator of the MBB.
- if (TrapOpt && !MI.isTerminator()) {
+ // unconditional trap, eliminate all the instructions after
+ // the trap.
+ if (TrapOpt) {
ToErase = &MI;
continue;
}
diff --git a/llvm/test/CodeGen/PowerPC/mi-peepholes-trap-opt.mir b/llvm/test/CodeGen/PowerPC/mi-peepholes-trap-opt.mir
index 1cb65232a2599..07bac3a2be0c1 100644
--- a/llvm/test/CodeGen/PowerPC/mi-peepholes-trap-opt.mir
+++ b/llvm/test/CodeGen/PowerPC/mi-peepholes-trap-opt.mir
@@ -25,6 +25,25 @@ body: |
# CHECK-NEXT: tdnei 3, 0
# CHECK-NEXT: blr
+---
+name: conditional_trap_opt_int_return
+alignment: 16
+tracksRegLiveness: true
+body: |
+ bb.0.entry:
+ liveins: $x3
+ %0:g8rc = COPY $x3
+ %1:g8rc = LI8 3
+ %2:g8rc = LI8 0
+ TD 24, %2, %1
+ $x3 = COPY %0
+ BLR8 implicit $lr8, implicit $rm, implicit $x3
+...
+ # CHECK-LABEL: conditional_trap_opt_int_return
+ # CHECK: # %bb.0: # %entry
+ # CHECK-NEXT: trap
+ # CHECK-NOT: blr
+
---
name: conditional_trap_opt_TW_31
alignment: 16
@@ -39,7 +58,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TW_31
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TW_24
@@ -55,7 +74,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TW_24
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_no_trap_TW_24
@@ -86,7 +105,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TW_20
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_no_trap_TW_20
@@ -133,7 +152,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TW_16
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TW_8
@@ -150,7 +169,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TW_8
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TW_2
@@ -167,7 +186,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TW_2
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TW_1
@@ -184,7 +203,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TW_1
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TW_4
@@ -201,7 +220,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TW_4
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TWI_31
@@ -216,7 +235,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TWI_31
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TWI_24
@@ -231,7 +250,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TWI_24
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_no_trap_TWI_24
@@ -260,7 +279,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TWI_20
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_no_trap_TWI_20
@@ -305,7 +324,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TWI_16
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TWI_8
@@ -322,7 +341,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TWI_8
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TWI_2
@@ -339,7 +358,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TWI_2
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TWI_1
@@ -356,7 +375,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TWI_1
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TWI_4
@@ -373,7 +392,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TWI_4
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TD_31
@@ -389,7 +408,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TD_31
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TD_24
@@ -405,7 +424,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TD_24
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_no_trap_TD_24
@@ -436,7 +455,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TD_20
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_no_trap_TD_20
@@ -483,7 +502,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TD_16
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TD_8
@@ -500,7 +519,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TD_8
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TD_2
@@ -517,7 +536,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TD_2
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TD_1
@@ -534,7 +553,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TD_1
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TD_4
@@ -551,7 +570,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TD_4
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TDI_31
@@ -566,7 +585,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TDI_31
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TDI_24
@@ -581,7 +600,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TDI_24
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_no_trap_TDI_24
@@ -610,7 +629,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TDI_20
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_no_trap_TDI_20
@@ -655,7 +674,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TDI_16
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TDI_8
@@ -672,7 +691,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TDI_8
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TDI_2
@@ -689,7 +708,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TDI_2
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TDI_1
@@ -706,7 +725,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TDI_1
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_TDI_4
@@ -723,7 +742,7 @@ body: |
# CHECK-LABEL: conditional_trap_opt_TDI_4
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
---
name: conditional_trap_opt_multiple_traps
@@ -744,4 +763,4 @@ body: |
# CHECK-LABEL: conditional_trap_opt_multiple_traps
# CHECK: # %bb.0: # %entry
# CHECK-NEXT: trap
- # CHECK-NEXT: blr
+ # CHECK-NOT: blr
More information about the llvm-commits
mailing list