Skip to content

[AArch64] Treat single-vector ext as legal shuffle masks. #151909

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13477,15 +13477,15 @@ static bool isEXTMask(ArrayRef<int> M, EVT VT, bool &ReverseEXT,
// Look for the first non-undef element.
const int *FirstRealElt = find_if(M, [](int Elt) { return Elt >= 0; });

// Benefit form APInt to handle overflow when calculating expected element.
// Benefit from APInt to handle overflow when calculating expected element.
unsigned NumElts = VT.getVectorNumElements();
unsigned MaskBits = APInt(32, NumElts * 2).logBase2();
APInt ExpectedElt = APInt(MaskBits, *FirstRealElt + 1, /*isSigned=*/false,
/*implicitTrunc=*/true);
// The following shuffle indices must be the successive elements after the
// first real element.
bool FoundWrongElt = std::any_of(FirstRealElt + 1, M.end(), [&](int Elt) {
return Elt != ExpectedElt++ && Elt != -1;
return Elt != ExpectedElt++ && Elt >= 0;
});
if (FoundWrongElt)
return false;
Expand Down Expand Up @@ -15772,6 +15772,7 @@ bool AArch64TargetLowering::isShuffleMaskLegal(ArrayRef<int> M, EVT VT) const {
isREVMask(M, EltSize, NumElts, 32) ||
isREVMask(M, EltSize, NumElts, 16) ||
isEXTMask(M, VT, DummyBool, DummyUnsigned) ||
isSingletonEXTMask(M, VT, DummyUnsigned) ||
isTRNMask(M, NumElts, DummyUnsigned) ||
isUZPMask(M, NumElts, DummyUnsigned) ||
isZIPMask(M, NumElts, DummyUnsigned) ||
Expand Down
10 changes: 4 additions & 6 deletions llvm/test/CodeGen/AArch64/arm64-ext.ll
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,8 @@ define <2 x ptr> @test_v2p0(<2 x ptr> %a, <2 x ptr> %b) {
define <16 x i8> @reverse_vector_s8x16b(<16 x i8> noundef %x) {
; CHECK-SD-LABEL: reverse_vector_s8x16b:
; CHECK-SD: // %bb.0: // %entry
; CHECK-SD-NEXT: rev64 v1.16b, v0.16b
; CHECK-SD-NEXT: ext v0.16b, v1.16b, v1.16b, #8
; CHECK-SD-NEXT: mov v0.d[1], v1.d[0]
; CHECK-SD-NEXT: rev64 v0.16b, v0.16b
; CHECK-SD-NEXT: ext v0.16b, v0.16b, v0.16b, #8
; CHECK-SD-NEXT: ret
;
; CHECK-GI-LABEL: reverse_vector_s8x16b:
Expand All @@ -161,9 +160,8 @@ entry:
define <8 x i16> @reverse_vector_s16x8b(<8 x i16> noundef %x) {
; CHECK-SD-LABEL: reverse_vector_s16x8b:
; CHECK-SD: // %bb.0: // %entry
; CHECK-SD-NEXT: rev64 v1.8h, v0.8h
; CHECK-SD-NEXT: ext v0.16b, v1.16b, v1.16b, #8
; CHECK-SD-NEXT: mov v0.d[1], v1.d[0]
; CHECK-SD-NEXT: rev64 v0.8h, v0.8h
; CHECK-SD-NEXT: ext v0.16b, v0.16b, v0.16b, #8
; CHECK-SD-NEXT: ret
;
; CHECK-GI-LABEL: reverse_vector_s16x8b:
Expand Down