Skip to content

Revert "[llvm][LoongArch] Improve loongarch_lasx_xvpermi_q instrinsic" #84708

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
Mar 13, 2024
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
25 changes: 1 addition & 24 deletions llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -968,28 +968,6 @@ static SDValue checkIntrinsicImmArg(SDValue Op, unsigned ImmOp,
return SDValue();
}

static SDValue checkAndModifyXVPERMI_QIntrinsicImmArg(SDValue Op,
SelectionDAG &DAG) {
SDValue Op3 = Op->getOperand(3);
uint64_t Imm = Op3->getAsZExtVal();
// Check the range of ImmArg.
if (!isUInt<8>(Imm)) {
DAG.getContext()->emitError(Op->getOperationName(0) +
": argument out of range.");
return DAG.getNode(ISD::UNDEF, SDLoc(Op), Op.getValueType());
}

// For instruction xvpermi.q, only [1:0] and [5:4] bits of operands[3]
// are used. The unused bits in operands[3] need to be set to 0 to avoid
// causing undefined behavior on LA464.
if ((Imm & 0x33) != Imm) {
Op3 = DAG.getTargetConstant(Imm & 0x33, SDLoc(Op), Op3.getValueType());
DAG.UpdateNodeOperands(Op.getNode(), Op->getOperand(0), Op->getOperand(1),
Op->getOperand(2), Op3);
}
return SDValue();
}

SDValue
LoongArchTargetLowering::lowerINTRINSIC_WO_CHAIN(SDValue Op,
SelectionDAG &DAG) const {
Expand Down Expand Up @@ -1247,14 +1225,13 @@ LoongArchTargetLowering::lowerINTRINSIC_WO_CHAIN(SDValue Op,
case Intrinsic::loongarch_lsx_vextrins_d:
case Intrinsic::loongarch_lasx_xvshuf4i_d:
case Intrinsic::loongarch_lasx_xvpermi_w:
case Intrinsic::loongarch_lasx_xvpermi_q:
case Intrinsic::loongarch_lasx_xvbitseli_b:
case Intrinsic::loongarch_lasx_xvextrins_b:
case Intrinsic::loongarch_lasx_xvextrins_h:
case Intrinsic::loongarch_lasx_xvextrins_w:
case Intrinsic::loongarch_lasx_xvextrins_d:
return checkIntrinsicImmArg<8>(Op, 3, DAG);
case Intrinsic::loongarch_lasx_xvpermi_q:
return checkAndModifyXVPERMI_QIntrinsicImmArg(Op, DAG);
case Intrinsic::loongarch_lsx_vrepli_b:
case Intrinsic::loongarch_lsx_vrepli_h:
case Intrinsic::loongarch_lsx_vrepli_w:
Expand Down
30 changes: 0 additions & 30 deletions llvm/test/CodeGen/LoongArch/lasx/intrinsic-permi.ll
Original file line number Diff line number Diff line change
Expand Up @@ -36,33 +36,3 @@ entry:
%res = call <32 x i8> @llvm.loongarch.lasx.xvpermi.q(<32 x i8> %va, <32 x i8> %vb, i32 1)
ret <32 x i8> %res
}

define <32 x i8> @lasx_xvpermi_q_204(<32 x i8> %va, <32 x i8> %vb) nounwind {
; CHECK-LABEL: lasx_xvpermi_q_204:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: xvpermi.q $xr0, $xr1, 0
; CHECK-NEXT: ret
entry:
%res = call <32 x i8> @llvm.loongarch.lasx.xvpermi.q(<32 x i8> %va, <32 x i8> %vb, i32 204)
ret <32 x i8> %res
}

define <32 x i8> @lasx_xvpermi_q_221(<32 x i8> %va, <32 x i8> %vb) nounwind {
; CHECK-LABEL: lasx_xvpermi_q_221:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: xvpermi.q $xr0, $xr1, 17
; CHECK-NEXT: ret
entry:
%res = call <32 x i8> @llvm.loongarch.lasx.xvpermi.q(<32 x i8> %va, <32 x i8> %vb, i32 221)
ret <32 x i8> %res
}

define <32 x i8> @lasx_xvpermi_q_255(<32 x i8> %va, <32 x i8> %vb) nounwind {
; CHECK-LABEL: lasx_xvpermi_q_255:
; CHECK: # %bb.0: # %entry
; CHECK-NEXT: xvpermi.q $xr0, $xr1, 51
; CHECK-NEXT: ret
entry:
%res = call <32 x i8> @llvm.loongarch.lasx.xvpermi.q(<32 x i8> %va, <32 x i8> %vb, i32 255)
ret <32 x i8> %res
}