[PATCH] D74352: [SystemZ] Bugfix in emitSelect()

[Jonas Paulsson via Phabricator via llvm-commits]

jonpa updated this revision to Diff 243860.
jonpa marked 2 inline comments as done.
jonpa added a comment.

Do the check after checking for a select pseudo. Moved down also the check for CC-def, since a SelectPseudo does not define CC.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D74352/new/

https://reviews.llvm.org/D74352

Files:
  llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
  llvm/test/CodeGen/SystemZ/multiselect-02.mir


Index: llvm/test/CodeGen/SystemZ/multiselect-02.mir
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/SystemZ/multiselect-02.mir
@@ -0,0 +1,43 @@
+# RUN: llc -mtriple=s390x-linux-gnu -mcpu=z10 -run-pass=finalize-isel -o - %s \
+# RUN:   | FileCheck %s
+#
+# Test that an instruction (ZEXT128) that uses custom insertion gets treated
+# correctly also when it lies between two Select instructions that could
+# potentially be handled together.
+#
+# CHECK-LABEL: bb.0.entry:
+# CHECK-NOT: ZEXT128
+
+--- |
+  declare void @bar(i32)
+  define i32 @fun() { entry: ret i32 0 }
+---
+name:            fun
+body:             |
+  bb.0.entry:
+    %1:addr64bit = IMPLICIT_DEF
+    %0:gr32bit = LLC %1, 0, $noreg :: (load 1 from `i8* undef`)
+    CHI killed %0, 0, implicit-def $cc
+    %2:gr32bit = LHI 2
+    %3:gr32bit = LHI 8
+    %4:gr32bit = Select32 killed %3, killed %2, 14, 8, implicit $cc
+    %5:gr32bit = LHI 128
+    %7:gr64bit = IMPLICIT_DEF
+    %6:gr64bit = INSERT_SUBREG %7, killed %5, %subreg.subreg_l32
+    %8:gr128bit = ZEXT128 killed %6
+    %10:addr64bit = IMPLICIT_DEF
+    %9:gr128bit = DL %8, %10, 0, $noreg :: (load 4 from `i64* undef` + 4)
+    %11:gr32bit = COPY %9.subreg_l32
+    %12:gr64bit = LGHI 2
+    %13:gr64bit = LGHI 8
+    %14:gr64bit = Select64 killed %13, killed %12, 14, 8, implicit $cc
+    CR %4, %11, implicit-def $cc
+    %15:gr32bit = Select32 %11, %4, 14, 4, implicit $cc
+    ADJCALLSTACKDOWN 0, 0
+    $r2d = COPY %14
+    CallBRASL @bar, $r2d, csr_systemz, implicit-def dead $r14d, implicit-def dead $cc, implicit $fpc
+    ADJCALLSTACKUP 0, 0
+    $r2l = COPY %15
+    Return implicit $r2l
+
+...
Index: llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
===================================================================
--- llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
+++ llvm/lib/Target/SystemZ/SystemZISelLowering.cpp
@@ -6886,8 +6886,6 @@
   for (MachineBasicBlock::iterator NextMIIt =
          std::next(MachineBasicBlock::iterator(MI));
        NextMIIt != MBB->end(); ++NextMIIt) {
-    if (NextMIIt->definesRegister(SystemZ::CC))
-      break;
     if (isSelectPseudo(*NextMIIt)) {
       assert(NextMIIt->getOperand(3).getImm() == CCValid &&
              "Bad CCValid operands since CC was not redefined.");
@@ -6898,6 +6896,9 @@
       }
       break;
     }
+    if (NextMIIt->definesRegister(SystemZ::CC) ||
+        NextMIIt->usesCustomInsertionHook())
+      break;
     bool User = false;
     for (auto SelMI : Selects)
       if (NextMIIt->readsVirtualRegister(SelMI->getOperand(0).getReg())) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D74352.243860.patch
Type: text/x-patch
Size: 2616 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200211/e924dde1/attachment.bin>