Skip to content

Commit

Permalink
[SystemZ] Implement getRepRegClassFor()
Browse files Browse the repository at this point in the history
This method must return a valid register class, or the list-ilp isel
scheduler will crash. For MVT::Untyped nullptr was previously returned, but
now ADDR128BitRegClass is returned instead. This is needed just as long as
list-ilp (and probably also list-hybrid) is still there.

Review: Ulrich Weigand, A Trick
https://reviews.llvm.org/D32802

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@302649 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
JonPsson committed May 10, 2017
1 parent 0e72980 commit 344c4f2
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
9 changes: 9 additions & 0 deletions lib/Target/SystemZ/SystemZISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6352,3 +6352,12 @@ MachineBasicBlock *SystemZTargetLowering::EmitInstrWithCustomInserter(
llvm_unreachable("Unexpected instr type to insert");
}
}

// This is only used by the isel schedulers, and is needed only to prevent
// compiler from crashing when list-ilp is used.
const TargetRegisterClass *
SystemZTargetLowering::getRepRegClassFor(MVT VT) const {
if (VT == MVT::Untyped)
return &SystemZ::ADDR128BitRegClass;
return TargetLowering::getRepRegClassFor(VT);
}
2 changes: 2 additions & 0 deletions lib/Target/SystemZ/SystemZISelLowering.h
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,8 @@ class SystemZTargetLowering : public TargetLowering {
MachineBasicBlock *emitLoadAndTestCmp0(MachineInstr &MI,
MachineBasicBlock *MBB,
unsigned Opcode) const;

const TargetRegisterClass *getRepRegClassFor(MVT VT) const override;
};
} // end namespace llvm

Expand Down
23 changes: 23 additions & 0 deletions test/CodeGen/SystemZ/list-ilp-crash.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
; RUN: llc < %s -mtriple=s390x-linux-gnu -mcpu=z13 -pre-RA-sched=list-ilp | FileCheck %s
;
; Check that list-ilp scheduler does not crash due to SystemZ's current use
; of MVT::Untyped.

define void @pr32723(i8) {
; CHECK: .text
BB:
br label %CF245

CF245: ; preds = %CF245, %BB
%Shuff57 = shufflevector <4 x i8> zeroinitializer, <4 x i8> zeroinitializer, <4 x i32> <i32 0, i32 2, i32 4, i32 6>
%Cmp84 = icmp uge i8 %0, undef
br i1 %Cmp84, label %CF245, label %CF260

CF260: ; preds = %CF245
%B156 = sdiv <4 x i8> %Shuff57, %Shuff57
br label %CF255

CF255: ; preds = %CF255, %CF260
%I186 = insertelement <4 x i8> %B156, i8 %0, i32 2
br label %CF255
}

0 comments on commit 344c4f2

Please sign in to comment.