forked from OSchip/llvm-project
Fix infinite loop after r331115
There are two separate fixes here: * The lowering code for non-extending loads should report UnableToLegalize instead of emitting the same instruction. * The target should not be requesting lowering of non-extending loads. llvm-svn: 331201
This commit is contained in:
parent
4bbcb5ab04
commit
2de9d4ad5d
|
@ -1042,6 +1042,10 @@ LegalizerHelper::lower(MachineInstr &MI, unsigned TypeIdx, LLT Ty) {
|
|||
auto &MMO = **MI.memoperands_begin();
|
||||
|
||||
if (DstTy.getSizeInBits() == MMO.getSize() /* in bytes */ * 8) {
|
||||
// In the case of G_LOAD, this was a non-extending load already and we're
|
||||
// about to lower to the same instruction.
|
||||
if (MI.getOpcode() == TargetOpcode::G_LOAD)
|
||||
return UnableToLegalize;
|
||||
MIRBuilder.buildLoad(DstReg, PtrReg, MMO);
|
||||
MI.eraseFromParent();
|
||||
return Legalized;
|
||||
|
|
|
@ -151,7 +151,8 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST) {
|
|||
.clampScalar(0, s8, s64)
|
||||
.widenScalarToNextPow2(0)
|
||||
.lowerIf([=](const LegalityQuery &Query) {
|
||||
return Query.Types[0].getSizeInBits() != Query.MMODescrs[0].Size * 8;
|
||||
return Query.Types[0].isScalar() &&
|
||||
Query.Types[0].getSizeInBits() != Query.MMODescrs[0].Size * 8;
|
||||
})
|
||||
.clampNumElements(0, v2s32, v2s32);
|
||||
|
||||
|
|
|
@ -0,0 +1,61 @@
|
|||
# RUN: not llc %s -o - -run-pass=legalizer 2>&1 | FileCheck %s
|
||||
|
||||
# Check we don't infinitely loop on (currently) illegal non-extending loads
|
||||
# CHECK: LLVM ERROR: unable to legalize instruction
|
||||
|
||||
--- |
|
||||
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
|
||||
target triple = "aarch64--linux-gnu"
|
||||
|
||||
; Function Attrs: noinline nounwind optnone
|
||||
define dso_local float @simulated_vgetq_lane_f16(<8 x half> %vec, i32 %lane) #0 {
|
||||
entry:
|
||||
%__ret.i = alloca <4 x half>, align 8
|
||||
ret float 0.0
|
||||
}
|
||||
|
||||
attributes #0 = { noinline nounwind optnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a57" "target-features"="+crc,+crypto,+fp-armv8,+neon" "unsafe-fp-math"="false" "use-soft-float"="false" }
|
||||
...
|
||||
---
|
||||
name: simulated_vgetq_lane_f16
|
||||
alignment: 4
|
||||
exposesReturnsTwice: false
|
||||
legalized: false
|
||||
regBankSelected: false
|
||||
selected: false
|
||||
failedISel: false
|
||||
tracksRegLiveness: true
|
||||
liveins:
|
||||
frameInfo:
|
||||
isFrameAddressTaken: false
|
||||
isReturnAddressTaken: false
|
||||
hasStackMap: false
|
||||
hasPatchPoint: false
|
||||
stackSize: 0
|
||||
offsetAdjustment: 0
|
||||
maxAlignment: 16
|
||||
adjustsStack: false
|
||||
hasCalls: true
|
||||
stackProtector: ''
|
||||
maxCallFrameSize: 4294967295
|
||||
hasOpaqueSPAdjustment: false
|
||||
hasVAStart: false
|
||||
hasMustTailInVarArgFunc: false
|
||||
localFrameSize: 0
|
||||
savePoint: ''
|
||||
restorePoint: ''
|
||||
fixedStack:
|
||||
stack:
|
||||
- { id: 0, name: __ret.i, type: default, offset: 0, size: 8, alignment: 8,
|
||||
stack-id: 0, callee-saved-register: '', callee-saved-restored: true,
|
||||
debug-info-variable: '', debug-info-expression: '', debug-info-location: '' }
|
||||
constants:
|
||||
body: |
|
||||
bb.1.entry:
|
||||
liveins: $x0
|
||||
|
||||
%0:_(p0) = COPY $x0
|
||||
%1:_(<4 x s16>) = G_LOAD %0:_(p0) :: (load 8 from %ir.__ret.i)
|
||||
$x1 = COPY %1(<4 x s16>)
|
||||
|
||||
...
|
Loading…
Reference in New Issue