Skip to content

MachineVerifier: Fix check for range type #124894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 30, 2025
Merged

MachineVerifier: Fix check for range type #124894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d857e74
MachineVerifier: Fix check for range type
arsenm Jan 29, 2025
7fa5e14
Fix test
arsenm Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions llvm/lib/CodeGen/MachineVerifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1285,8 +1285,12 @@ void MachineVerifier::verifyPreISelGenericInstruction(const MachineInstr *MI) {
if (MMO.getRanges()) {
ConstantInt *i =
mdconst::extract<ConstantInt>(MMO.getRanges()->getOperand(0));
if (i->getIntegerType()->getBitWidth() !=
ValTy.getScalarType().getSizeInBits()) {
const LLT RangeTy = LLT::scalar(i->getIntegerType()->getBitWidth());
const LLT MemTy = MMO.getMemoryType();
if (MemTy.getScalarType() != RangeTy ||
ValTy.isScalar() != MemTy.isScalar() ||
(ValTy.isVector() &&
ValTy.getNumElements() != MemTy.getNumElements())) {
Comment on lines +1291 to +1293
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part, validating ValTy against MemTy, does not belong inside if (MMO.getRanges()).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are many violations of the memory type that would need to be fixed

report("range is incompatible with the result type", MI);
}
}
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/AMDGPU/GlobalISel/legalize-load-memory-metadata.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
!0 = !{i24 0, i24 1048575}
!1 = !{!"omnipotent char", !2}
!2 = !{!"Simple C/C++ TBAA"}
!3 = !{i32 0, i32 1048575}
!3 = !{i24 0, i24 1048575}
...

# Make sure range metadata is not preserved when widening loads, but
Expand Down
10 changes: 9 additions & 1 deletion llvm/test/MachineVerifier/AMDGPU/test_g_incompatible_range.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# RUN: not --crash llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx942 -run-pass=none -filetype=null %s 2>&1 | FileCheck %s
# RUN: not --crash llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx942 -run-pass=none -filetype=null %s 2>&1 | FileCheck -implicit-check-not="Bad machine code" %s
--- |
define void @mismatched_range_type() {
ret void
Expand All @@ -21,10 +21,18 @@ body: |
; CHECK: Bad machine code: range is incompatible with the result type
%3:_(<2 x s32>) = G_LOAD %0(p1) :: (volatile load (s64), align 4, !range !0, addrspace 1)

; CHECK: Bad machine code: range is incompatible with the result type
%4:_(p0) = G_LOAD %0(p1) :: (volatile load (s64), align 4, !range !0, addrspace 1)

; CHECK: Bad machine code: range is incompatible with the result type
%5:_(<2 x p0>) = G_LOAD %0(p1) :: (volatile load (s64), align 4, !range !0, addrspace 1)

; CHECK: Bad machine code: range is incompatible with the result type
%6:_(<3 x s64>) = G_LOAD %0(p1) :: (volatile load (s64), align 4, !range !0, addrspace 1)

; CHECK: Bad machine code: range is incompatible with the result type
%7:_(<3 x s64>) = G_LOAD %0(p1) :: (volatile load (<2 x s64>), align 4, !range !0, addrspace 1)

$vgpr0_vgpr1 = COPY %3
SI_RETURN implicit $vgpr0_vgpr1

Expand Down