Skip to content

[AArch64] Fix tryToConvertShuffleOfTbl2ToTbl4 with non-buildvector input operands. #135961

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

Merged
merged 1 commit into from
Apr 23, 2025
Merged
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
24 changes: 13 additions & 11 deletions llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13871,25 +13871,27 @@ static SDValue tryToConvertShuffleOfTbl2ToTbl4(SDValue Op,
DAG.getTargetConstant(Intrinsic::aarch64_neon_tbl2, dl, MVT::i64);

EVT VT = Op.getValueType();
if (Tbl1->getOpcode() != ISD::INTRINSIC_WO_CHAIN ||
Tbl1->getOperand(0) != Tbl2ID ||
Tbl2->getOpcode() != ISD::INTRINSIC_WO_CHAIN ||
Tbl2->getOperand(0) != Tbl2ID)
if (Tbl1.getOpcode() != ISD::INTRINSIC_WO_CHAIN ||
Tbl1.getOperand(0) != Tbl2ID ||
Tbl2.getOpcode() != ISD::INTRINSIC_WO_CHAIN ||
Tbl2.getOperand(0) != Tbl2ID)
return SDValue();

if (Tbl1->getValueType(0) != MVT::v16i8 ||
Tbl2->getValueType(0) != MVT::v16i8)
if (Tbl1.getValueType() != MVT::v16i8 || Tbl2.getValueType() != MVT::v16i8)
return SDValue();

SDValue Mask1 = Tbl1.getOperand(3);
SDValue Mask2 = Tbl2.getOperand(3);
if (Mask1.getOpcode() != ISD::BUILD_VECTOR ||
Mask2.getOpcode() != ISD::BUILD_VECTOR)
return SDValue();

SDValue Mask1 = Tbl1->getOperand(3);
SDValue Mask2 = Tbl2->getOperand(3);
SmallVector<SDValue, 16> TBLMaskParts(16, SDValue());
for (unsigned I = 0; I < 16; I++) {
if (ShuffleMask[I] < 16)
TBLMaskParts[I] = Mask1->getOperand(ShuffleMask[I]);
TBLMaskParts[I] = Mask1.getOperand(ShuffleMask[I]);
else {
auto *C =
dyn_cast<ConstantSDNode>(Mask2->getOperand(ShuffleMask[I] - 16));
auto *C = dyn_cast<ConstantSDNode>(Mask2.getOperand(ShuffleMask[I] - 16));
if (!C)
return SDValue();
TBLMaskParts[I] = DAG.getConstant(C->getSExtValue() + 32, dl, MVT::i32);
Expand Down
30 changes: 30 additions & 0 deletions llvm/test/CodeGen/AArch64/arm64-tbl.ll
Original file line number Diff line number Diff line change
Expand Up @@ -1254,6 +1254,36 @@ define <16 x i8> @tbx4_16b(<16 x i8> %A, <16 x i8> %B, <16 x i8> %C, <16 x i8> %
ret <16 x i8> %tmp3
}

define <16 x i8> @pr135950(<16 x i8> %A, <16 x i8> %B, <16 x i8> %M) {
; CHECK-SD-LABEL: pr135950:
; CHECK-SD: // %bb.0:
; CHECK-SD-NEXT: mov.16b v3, v1
; CHECK-SD-NEXT: movi.2d v1, #0000000000000000
; CHECK-SD-NEXT: mov.16b v4, v0
; CHECK-SD-NEXT: mov.16b v5, v3
; CHECK-SD-NEXT: tbl.16b v1, { v3, v4 }, v1
; CHECK-SD-NEXT: tbl.16b v0, { v4, v5 }, v2
; CHECK-SD-NEXT: zip1.16b v0, v0, v1
; CHECK-SD-NEXT: ret
;
; CHECK-GI-LABEL: pr135950:
; CHECK-GI: // %bb.0:
; CHECK-GI-NEXT: // kill: def $q0 killed $q0 killed $q0_q1_q2 def $q0_q1_q2
; CHECK-GI-NEXT: mov.16b v3, v2
; CHECK-GI-NEXT: movi.2d v4, #0000000000000000
; CHECK-GI-NEXT: // kill: def $q1 killed $q1 killed $q0_q1_q2 def $q0_q1_q2
; CHECK-GI-NEXT: tbl.16b v3, { v0, v1 }, v3
; CHECK-GI-NEXT: mov.16b v2, v0
; CHECK-GI-NEXT: tbl.16b v0, { v1, v2 }, v4
; CHECK-GI-NEXT: zip1.16b v0, v3, v0
; CHECK-GI-NEXT: ret
%t1 = call <16 x i8> @llvm.aarch64.neon.tbl2.v16i8(<16 x i8> %A, <16 x i8> %B, <16 x i8> %M)
%t2 = call <16 x i8> @llvm.aarch64.neon.tbl2.v16i8(<16 x i8> %B, <16 x i8> %A, <16 x i8> zeroinitializer)
%s = shufflevector <16 x i8> %t1, <16 x i8> %t2, <16 x i32> <i32 0, i32 16, i32 1, i32 17, i32 2, i32 18, i32 3, i32 19, i32 4, i32 20, i32 5, i32 21, i32 6, i32 22, i32 7, i32 23>
ret <16 x i8> %s
}


declare <8 x i8> @llvm.aarch64.neon.tbx1.v8i8(<8 x i8>, <16 x i8>, <8 x i8>) nounwind readnone
declare <16 x i8> @llvm.aarch64.neon.tbx1.v16i8(<16 x i8>, <16 x i8>, <16 x i8>) nounwind readnone
declare <8 x i8> @llvm.aarch64.neon.tbx2.v8i8(<8 x i8>, <16 x i8>, <16 x i8>, <8 x i8>) nounwind readnone
Expand Down
Loading