Skip to content

Commit 6cb0d23

Browse files
committed
AArch64/GlobalISel: Narrow stack passed argument access size
This fixes a verifier error in the testcase from bug 47619. The stack passed s3 value was widened to 4-bytes, and producing a 4-byte memory access with a < 1 byte result type. We need to either widen the result type or narrow the access size. This copies the code directly from the AMDGPU handling, which narrows the load size. I don't like that every target has to handle this, but this is currently broken on the 11 release branch and this is the simplest fix. This reverts commit 42bfa7c.
1 parent c1f8568 commit 6cb0d23

File tree

2 files changed

+33
-2
lines changed

2 files changed

+33
-2
lines changed

llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,16 @@ struct IncomingArgHandler : public CallLowering::IncomingValueHandler {
8484
}
8585
}
8686

87-
void assignValueToAddress(Register ValVReg, Register Addr, uint64_t Size,
87+
void assignValueToAddress(Register ValVReg, Register Addr, uint64_t MemSize,
8888
MachinePointerInfo &MPO, CCValAssign &VA) override {
8989
MachineFunction &MF = MIRBuilder.getMF();
90+
91+
// The reported memory location may be wider than the value.
92+
const LLT RegTy = MRI.getType(ValVReg);
93+
MemSize = std::min(static_cast<uint64_t>(RegTy.getSizeInBytes()), MemSize);
94+
9095
auto MMO = MF.getMachineMemOperand(
91-
MPO, MachineMemOperand::MOLoad | MachineMemOperand::MOInvariant, Size,
96+
MPO, MachineMemOperand::MOLoad | MachineMemOperand::MOInvariant, MemSize,
9297
inferAlignFromPtrInfo(MF, MPO));
9398
MIRBuilder.buildLoad(ValVReg, Addr, *MMO);
9499
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
2+
; RUN: llc -global-isel -mtriple=aarch64-unknown-unknown -stop-after=irtranslator -verify-machineinstrs %s -o - | FileCheck %s
3+
4+
; Make sure the i3 %arg8 value is correctly handled. This was trying
5+
; to use MVT for EVT values passed on the stack and asserting before
6+
; b98f902f1877c3d679f77645a267edc89ffcd5d6
7+
define i3 @bug47619(i64 %arg, i64 %arg1, i64 %arg2, i64 %arg3, i64 %arg4, i64 %arg5, i64 %arg6, i64 %arg7, i3 %arg8) {
8+
; CHECK-LABEL: name: bug47619
9+
; CHECK: bb.1.bb:
10+
; CHECK: liveins: $x0, $x1, $x2, $x3, $x4, $x5, $x6, $x7
11+
; CHECK: [[COPY:%[0-9]+]]:_(s64) = COPY $x0
12+
; CHECK: [[COPY1:%[0-9]+]]:_(s64) = COPY $x1
13+
; CHECK: [[COPY2:%[0-9]+]]:_(s64) = COPY $x2
14+
; CHECK: [[COPY3:%[0-9]+]]:_(s64) = COPY $x3
15+
; CHECK: [[COPY4:%[0-9]+]]:_(s64) = COPY $x4
16+
; CHECK: [[COPY5:%[0-9]+]]:_(s64) = COPY $x5
17+
; CHECK: [[COPY6:%[0-9]+]]:_(s64) = COPY $x6
18+
; CHECK: [[COPY7:%[0-9]+]]:_(s64) = COPY $x7
19+
; CHECK: [[FRAME_INDEX:%[0-9]+]]:_(p0) = G_FRAME_INDEX %fixed-stack.0
20+
; CHECK: [[LOAD:%[0-9]+]]:_(s3) = G_LOAD [[FRAME_INDEX]](p0) :: (invariant load 1 from %fixed-stack.0, align 16)
21+
; CHECK: [[ANYEXT:%[0-9]+]]:_(s32) = G_ANYEXT [[LOAD]](s3)
22+
; CHECK: $w0 = COPY [[ANYEXT]](s32)
23+
; CHECK: RET_ReallyLR implicit $w0
24+
bb:
25+
ret i3 %arg8
26+
}

0 commit comments

Comments
 (0)