[PATCH] D23207: If-conversion incorrectly calculates liveness of redefined registers
Krzysztof Parzyszek via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 5 07:50:06 PDT 2016
kparzysz updated this revision to Diff 66955.
kparzysz added a comment.
Remove a leftover debug statement.
Repository:
rL LLVM
https://reviews.llvm.org/D23207
Files:
lib/CodeGen/IfConversion.cpp
test/CodeGen/Hexagon/ifcvt-impuse-livein.mir
Index: test/CodeGen/Hexagon/ifcvt-impuse-livein.mir
===================================================================
--- /dev/null
+++ test/CodeGen/Hexagon/ifcvt-impuse-livein.mir
@@ -0,0 +1,34 @@
+# RUN: llc -march=hexagon -run-pass if-converter %s -o - | FileCheck %s
+
+--- |
+ define void @foo() {
+ ret void
+ }
+...
+
+---
+name: foo
+tracksRegLiveness: true
+allVRegsAllocated: true
+body: |
+ bb.0:
+ successors: %bb.1, %bb.2
+ liveins: %r0, %r1, %r2, %p1
+ J2_jumpf %p1, %bb.1, implicit-def %pc
+ J2_jump %bb.2, implicit-def %pc
+ bb.1:
+ successors: %bb.3
+ liveins: %r2
+ %r0 = A2_tfrsi 2
+ J2_jump %bb.3, implicit-def %pc
+ bb.2:
+ successors: %bb.3
+ liveins: %r0
+ ; CHECK: %r2 = C2_cmoveit %p1, 1, implicit %r2
+ %r2 = A2_tfrsi 1
+ bb.3:
+ liveins: %r0, %r2
+ %r0 = A2_add %r0, %r2
+ J2_jumpr %r31, implicit-def %pc
+...
+
Index: lib/CodeGen/IfConversion.cpp
===================================================================
--- lib/CodeGen/IfConversion.cpp
+++ lib/CodeGen/IfConversion.cpp
@@ -1431,10 +1431,11 @@
// Remove the conditional branch from entry to the blocks.
BBI.NonPredSize -= TII->RemoveBranch(*BBI.BB);
- // Initialize liveins to the first BB. These are potentially redefined by
- // predicated instructions.
+ // Initialize Redefs to be the live-outs from the split block. These are
+ // potentially redefined by predicated instructions.
Redefs.init(TRI);
Redefs.addLiveIns(*BBI1->BB);
+ Redefs.addLiveIns(*BBI2->BB);
// Remove the duplicated instructions at the beginnings of both paths.
// Skip dbg_value instructions
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23207.66955.patch
Type: text/x-patch
Size: 1668 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160805/66ae037f/attachment.bin>
More information about the llvm-commits
mailing list