Skip to content

[MachineVerifier] Improve G_EXTRACT_SUBVECTOR checking #109202

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 3 commits into from
Sep 19, 2024
Merged

[MachineVerifier] Improve G_EXTRACT_SUBVECTOR checking #109202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b0dd2b
[MachineVerifier] Check that the destination of G_EXTRACT_SUBVECTOR i…
topperc Sep 18, 2024
70feddd
fixup! address comment. fix bad test case. fix diagnostic message.
topperc Sep 18, 2024
27cd76e
fixup! Add check for a generic error that's also being emitted
topperc Sep 18, 2024
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
15 changes: 10 additions & 5 deletions llvm/lib/CodeGen/MachineVerifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1769,7 +1769,7 @@ void MachineVerifier::verifyPreISelGenericInstruction(const MachineInstr *MI) {
}

if (!SrcTy.isVector()) {
report("First source must be a vector", MI);
report("Source must be a vector", MI);
break;
}

Expand All @@ -1783,6 +1783,12 @@ void MachineVerifier::verifyPreISelGenericInstruction(const MachineInstr *MI) {
break;
}

if (ElementCount::isKnownGT(DstTy.getElementCount(),
SrcTy.getElementCount())) {
report("Destination vector must be smaller than source vector", MI);
break;
}

uint64_t Idx = IndexOp.getImm();
uint64_t DstMinLen = DstTy.getElementCount().getKnownMinValue();
if (Idx % DstMinLen != 0) {
Expand All @@ -1793,10 +1799,9 @@ void MachineVerifier::verifyPreISelGenericInstruction(const MachineInstr *MI) {
}

uint64_t SrcMinLen = SrcTy.getElementCount().getKnownMinValue();
if (SrcTy.isScalable() == DstTy.isScalable() &&
(Idx >= SrcMinLen || Idx + DstMinLen > SrcMinLen)) {
report("Source type and index must not cause extract to overrun to the "
"destination type",
if (Idx >= SrcMinLen || Idx + DstMinLen > SrcMinLen) {
report("Destination type and index must not cause extract to overrun the "
"source vector",
MI);
break;
}
Expand Down
17 changes: 10 additions & 7 deletions llvm/test/MachineVerifier/test_g_extract_subvector.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ body: |
%1:_(<vscale x 2 x s32>) = G_IMPLICIT_DEF
%2:_(<vscale x 1 x s32>) = G_IMPLICIT_DEF

; CHECK: generic instruction must use register operands
; CHECK: G_EXTRACT_SUBVECTOR first source must be a register
%3:_(<vscale x 2 x s32>) = G_EXTRACT_SUBVECTOR 1, 0

Expand All @@ -19,35 +20,35 @@ body: |
; CHECK: Destination type must be a vector
%5:_(s32) = G_EXTRACT_SUBVECTOR %2, 0

; CHECK: First source must be a vector
; CHECK: Source must be a vector
%6:_(<vscale x 2 x s32>) = G_EXTRACT_SUBVECTOR %0, 0

%7:_(<vscale x 1 x s16>) = G_IMPLICIT_DEF

; CHECK: Element type of vectors must be the same
%8:_(<vscale x 2 x s32>) = G_EXTRACT_SUBVECTOR %7, 0

; CHECK: Index must be a multiple of the destination vector's minimum vector length
; CHECK: Destination vector must be smaller than source vector
%9:_(<vscale x 4 x s32>) = G_EXTRACT_SUBVECTOR %1, 3

; CHECK: Index must be a multiple of the destination vector's minimum vector length
; CHECK: Destination vector must be smaller than source vector
%10:_(<vscale x 4 x s32>) = G_EXTRACT_SUBVECTOR %1, 2

; CHECK: Source type and index must not cause extract to overrun to the destination type
; CHECK: Destination type and index must not cause extract to overrun the source vector
%11:_(<vscale x 1 x s32>) = G_EXTRACT_SUBVECTOR %1, 4

%12:_(<vscale x 4 x s32>) = G_IMPLICIT_DEF

; CHECK: Source type and index must not cause extract to overrun to the destination type
; CHECK: Destination type and index must not cause extract to overrun the source vector
%13:_(<vscale x 3 x s32>) = G_EXTRACT_SUBVECTOR %12, 3

%14:_(<2 x s32>) = G_IMPLICIT_DEF
%15:_(<4 x s32>) = G_IMPLICIT_DEF

; CHECK: Source type and index must not cause extract to overrun to the destination type
; CHECK: Destination type and index must not cause extract to overrun the source vector
%16:_(<2 x s32>) = G_EXTRACT_SUBVECTOR %14, 4

; CHECK: Source type and index must not cause extract to overrun to the destination type
; CHECK: Destination type and index must not cause extract to overrun the source vector
%17:_(<3 x s32>) = G_EXTRACT_SUBVECTOR %15, 3

; CHECK: Vector types must both be fixed or both be scalable
Expand All @@ -56,5 +57,7 @@ body: |
; CHECK: Vector types must both be fixed or both be scalable
%19:_(<2 x s32>) = G_EXTRACT_SUBVECTOR %12, 0

; CHECK: Index must be a multiple of the destination vector's minimum vector length
%20:_(<vscale x 2 x s32>) = G_EXTRACT_SUBVECTOR %12, 1

...
Loading