mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-28 14:10:41 +00:00
[SystemZ] Only attempt RxSBG optimization for integer types
As pointed out by Justin Bogner (see r240520), SystemZDAGToDAGISel::Select currently attempts to convert boolean operations into RxSBG even on some non-integer types (in particular, vector types). This would not work in any case, and it happened to trigger undefined behaviour in allOnes. This patch verifies that we have a (<= 64-bit) integer type before attempting to perform this optimization. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240634 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
f03400827b
commit
01381b0e95
@ -96,6 +96,7 @@ struct SystemZAddressingMode {
|
||||
|
||||
// Return a mask with Count low bits set.
|
||||
static uint64_t allOnes(unsigned int Count) {
|
||||
assert(Count <= 64);
|
||||
if (Count > 63)
|
||||
return UINT64_MAX;
|
||||
return (uint64_t(1) << Count) - 1;
|
||||
@ -905,6 +906,8 @@ SDValue SystemZDAGToDAGISel::convertTo(SDLoc DL, EVT VT, SDValue N) const {
|
||||
SDNode *SystemZDAGToDAGISel::tryRISBGZero(SDNode *N) {
|
||||
SDLoc DL(N);
|
||||
EVT VT = N->getValueType(0);
|
||||
if (!VT.isInteger() || VT.getSizeInBits() > 64)
|
||||
return nullptr;
|
||||
RxSBGOperands RISBG(SystemZ::RISBG, SDValue(N, 0));
|
||||
unsigned Count = 0;
|
||||
while (expandRxSBG(RISBG))
|
||||
@ -960,6 +963,10 @@ SDNode *SystemZDAGToDAGISel::tryRISBGZero(SDNode *N) {
|
||||
}
|
||||
|
||||
SDNode *SystemZDAGToDAGISel::tryRxSBG(SDNode *N, unsigned Opcode) {
|
||||
SDLoc DL(N);
|
||||
EVT VT = N->getValueType(0);
|
||||
if (!VT.isInteger() || VT.getSizeInBits() > 64)
|
||||
return nullptr;
|
||||
// Try treating each operand of N as the second operand of the RxSBG
|
||||
// and see which goes deepest.
|
||||
RxSBGOperands RxSBG[] = {
|
||||
@ -995,8 +1002,6 @@ SDNode *SystemZDAGToDAGISel::tryRxSBG(SDNode *N, unsigned Opcode) {
|
||||
Opcode = SystemZ::RISBGN;
|
||||
}
|
||||
|
||||
SDLoc DL(N);
|
||||
EVT VT = N->getValueType(0);
|
||||
SDValue Ops[5] = {
|
||||
convertTo(DL, MVT::i64, Op0),
|
||||
convertTo(DL, MVT::i64, RxSBG[I].Input),
|
||||
|
Loading…
Reference in New Issue
Block a user