Skip to content

Commit

Permalink
Reland "[LoongArch] Support CTLZ with lsx/lasx"
Browse files Browse the repository at this point in the history 
This patch simultaneously adds tests for `CTPOP`.

This relands 07cec73 with fix tests.
  • Loading branch information
@wangleiat
wangleiat committed Dec 2, 2023
1 parent 63e6bba commit a60a542
Show file tree
Hide file tree
Showing 5 changed files with 255 additions and 10 deletions.
13 changes: 11 additions & 2 deletions llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ LoongArchTargetLowering::LoongArchTargetLowering(const TargetMachine &TM,
VT, Legal);
setOperationAction({ISD::AND, ISD::OR, ISD::XOR}, VT, Legal);
setOperationAction({ISD::SHL, ISD::SRA, ISD::SRL}, VT, Legal);
setOperationAction(ISD::CTPOP, VT, Legal);
setOperationAction({ISD::CTPOP, ISD::CTLZ}, VT, Legal);
}
for (MVT VT : {MVT::v4f32, MVT::v2f64}) {
setOperationAction({ISD::FADD, ISD::FSUB}, VT, Legal);
Expand Down Expand Up @@ -286,7 +286,7 @@ LoongArchTargetLowering::LoongArchTargetLowering(const TargetMachine &TM,
VT, Legal);
setOperationAction({ISD::AND, ISD::OR, ISD::XOR}, VT, Legal);
setOperationAction({ISD::SHL, ISD::SRA, ISD::SRL}, VT, Legal);
setOperationAction(ISD::CTPOP, VT, Legal);
setOperationAction({ISD::CTPOP, ISD::CTLZ}, VT, Legal);
}
for (MVT VT : {MVT::v8f32, MVT::v4f64}) {
setOperationAction({ISD::FADD, ISD::FSUB}, VT, Legal);
Expand Down Expand Up @@ -2827,6 +2827,15 @@ performINTRINSIC_WO_CHAINCombine(SDNode *N, SelectionDAG &DAG,
case Intrinsic::loongarch_lasx_xvsrai_d:
return DAG.getNode(ISD::SRA, DL, N->getValueType(0), N->getOperand(1),
lowerVectorSplatImm<6>(N, 2, DAG));
case Intrinsic::loongarch_lsx_vclz_b:
case Intrinsic::loongarch_lsx_vclz_h:
case Intrinsic::loongarch_lsx_vclz_w:
case Intrinsic::loongarch_lsx_vclz_d:
case Intrinsic::loongarch_lasx_xvclz_b:
case Intrinsic::loongarch_lasx_xvclz_h:
case Intrinsic::loongarch_lasx_xvclz_w:
case Intrinsic::loongarch_lasx_xvclz_d:
return DAG.getNode(ISD::CTLZ, DL, N->getValueType(0), N->getOperand(1));
case Intrinsic::loongarch_lsx_vpcnt_b:
case Intrinsic::loongarch_lsx_vpcnt_h:
case Intrinsic::loongarch_lsx_vpcnt_w:
Expand Down
11 changes: 7 additions & 4 deletions llvm/lib/Target/LoongArch/LoongArchLASXInstrInfo.td
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1273,6 +1273,9 @@ defm : PatXrXr<sra, "XVSRA">;
defm : PatShiftXrXr<sra, "XVSRA">;
defm : PatShiftXrUimm<sra, "XVSRAI">;

// XVCLZ_{B/H/W/D}
defm : PatXr<ctlz, "XVCLZ">;

// XVPCNT_{B/H/W/D}
defm : PatXr<ctpop, "XVPCNT">;

Expand Down Expand Up @@ -1590,26 +1593,26 @@ foreach Inst = ["XVMADDWEV_Q_D", "XVMADDWOD_Q_D", "XVMADDWEV_Q_DU",
// (LAInst vty:$xj)>;
foreach Inst = ["XVEXTH_H_B", "XVEXTH_HU_BU",
"XVMSKLTZ_B", "XVMSKGEZ_B", "XVMSKNZ_B",
"XVCLO_B", "XVCLZ_B", "VEXT2XV_H_B", "VEXT2XV_HU_BU",
"XVCLO_B", "VEXT2XV_H_B", "VEXT2XV_HU_BU",
"VEXT2XV_W_B", "VEXT2XV_WU_BU", "VEXT2XV_D_B",
"VEXT2XV_DU_BU", "XVREPLVE0_B", "XVREPLVE0_Q"] in
def : Pat<(deriveLASXIntrinsic<Inst>.ret (v32i8 LASX256:$xj)),
(!cast<LAInst>(Inst) LASX256:$xj)>;
foreach Inst = ["XVEXTH_W_H", "XVEXTH_WU_HU", "XVMSKLTZ_H",
"XVCLO_H", "XVCLZ_H", "XVFCVTL_S_H", "XVFCVTH_S_H",
"XVCLO_H", "XVFCVTL_S_H", "XVFCVTH_S_H",
"VEXT2XV_W_H", "VEXT2XV_WU_HU", "VEXT2XV_D_H",
"VEXT2XV_DU_HU", "XVREPLVE0_H"] in
def : Pat<(deriveLASXIntrinsic<Inst>.ret (v16i16 LASX256:$xj)),
(!cast<LAInst>(Inst) LASX256:$xj)>;
foreach Inst = ["XVEXTH_D_W", "XVEXTH_DU_WU", "XVMSKLTZ_W",
"XVCLO_W", "XVCLZ_W", "XVFFINT_S_W", "XVFFINT_S_WU",
"XVCLO_W", "XVFFINT_S_W", "XVFFINT_S_WU",
"XVFFINTL_D_W", "XVFFINTH_D_W",
"VEXT2XV_D_W", "VEXT2XV_DU_WU", "XVREPLVE0_W"] in
def : Pat<(deriveLASXIntrinsic<Inst>.ret (v8i32 LASX256:$xj)),
(!cast<LAInst>(Inst) LASX256:$xj)>;
foreach Inst = ["XVEXTH_Q_D", "XVEXTH_QU_DU", "XVMSKLTZ_D",
"XVEXTL_Q_D", "XVEXTL_QU_DU",
"XVCLO_D", "XVCLZ_D", "XVFFINT_D_L", "XVFFINT_D_LU",
"XVCLO_D", "XVFFINT_D_L", "XVFFINT_D_LU",
"XVREPLVE0_D"] in
def : Pat<(deriveLASXIntrinsic<Inst>.ret (v4i64 LASX256:$xj)),
(!cast<LAInst>(Inst) LASX256:$xj)>;
Expand Down
11 changes: 7 additions & 4 deletions llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,9 @@ defm : PatVrVr<sra, "VSRA">;
defm : PatShiftVrVr<sra, "VSRA">;
defm : PatShiftVrUimm<sra, "VSRAI">;

// VCLZ_{B/H/W/D}
defm : PatVr<ctlz, "VCLZ">;

// VPCNT_{B/H/W/D}
defm : PatVr<ctpop, "VPCNT">;

Expand Down Expand Up @@ -1674,21 +1677,21 @@ foreach Inst = ["VMADDWEV_Q_D", "VMADDWOD_Q_D", "VMADDWEV_Q_DU",
// (LAInst vty:$vj)>;
foreach Inst = ["VEXTH_H_B", "VEXTH_HU_BU",
"VMSKLTZ_B", "VMSKGEZ_B", "VMSKNZ_B",
"VCLO_B", "VCLZ_B"] in
"VCLO_B"] in
def : Pat<(deriveLSXIntrinsic<Inst>.ret (v16i8 LSX128:$vj)),
(!cast<LAInst>(Inst) LSX128:$vj)>;
foreach Inst = ["VEXTH_W_H", "VEXTH_WU_HU", "VMSKLTZ_H",
"VCLO_H", "VCLZ_H", "VFCVTL_S_H", "VFCVTH_S_H"] in
"VCLO_H", "VFCVTL_S_H", "VFCVTH_S_H"] in
def : Pat<(deriveLSXIntrinsic<Inst>.ret (v8i16 LSX128:$vj)),
(!cast<LAInst>(Inst) LSX128:$vj)>;
foreach Inst = ["VEXTH_D_W", "VEXTH_DU_WU", "VMSKLTZ_W",
"VCLO_W", "VCLZ_W", "VFFINT_S_W", "VFFINT_S_WU",
"VCLO_W", "VFFINT_S_W", "VFFINT_S_WU",
"VFFINTL_D_W", "VFFINTH_D_W"] in
def : Pat<(deriveLSXIntrinsic<Inst>.ret (v4i32 LSX128:$vj)),
(!cast<LAInst>(Inst) LSX128:$vj)>;
foreach Inst = ["VEXTH_Q_D", "VEXTH_QU_DU", "VMSKLTZ_D",
"VEXTL_Q_D", "VEXTL_QU_DU",
"VCLO_D", "VCLZ_D", "VFFINT_D_L", "VFFINT_D_LU"] in
"VCLO_D", "VFFINT_D_L", "VFFINT_D_LU"] in
def : Pat<(deriveLSXIntrinsic<Inst>.ret (v2i64 LSX128:$vj)),
(!cast<LAInst>(Inst) LSX128:$vj)>;

Expand Down
115 changes: 115 additions & 0 deletions llvm/test/CodeGen/LoongArch/lasx/ctpop-ctlz.ll
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc --mtriple=loongarch64 --mattr=+lasx < %s | FileCheck %s

define void @ctpop_v32i8(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctpop_v32i8:
; CHECK: # %bb.0:
; CHECK-NEXT: xvld $xr0, $a0, 0
; CHECK-NEXT: xvpcnt.b $xr0, $xr0
; CHECK-NEXT: xvst $xr0, $a1, 0
; CHECK-NEXT: ret
%v = load <32 x i8>, ptr %src
%res = call <32 x i8> @llvm.ctpop.v32i8(<32 x i8> %v)
store <32 x i8> %res, ptr %dst
ret void
}

define void @ctpop_v16i16(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctpop_v16i16:
; CHECK: # %bb.0:
; CHECK-NEXT: xvld $xr0, $a0, 0
; CHECK-NEXT: xvpcnt.h $xr0, $xr0
; CHECK-NEXT: xvst $xr0, $a1, 0
; CHECK-NEXT: ret
%v = load <16 x i16>, ptr %src
%res = call <16 x i16> @llvm.ctpop.v16i16(<16 x i16> %v)
store <16 x i16> %res, ptr %dst
ret void
}

define void @ctpop_v8i32(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctpop_v8i32:
; CHECK: # %bb.0:
; CHECK-NEXT: xvld $xr0, $a0, 0
; CHECK-NEXT: xvpcnt.w $xr0, $xr0
; CHECK-NEXT: xvst $xr0, $a1, 0
; CHECK-NEXT: ret
%v = load <8 x i32>, ptr %src
%res = call <8 x i32> @llvm.ctpop.v8i32(<8 x i32> %v)
store <8 x i32> %res, ptr %dst
ret void
}

define void @ctpop_v4i64(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctpop_v4i64:
; CHECK: # %bb.0:
; CHECK-NEXT: xvld $xr0, $a0, 0
; CHECK-NEXT: xvpcnt.d $xr0, $xr0
; CHECK-NEXT: xvst $xr0, $a1, 0
; CHECK-NEXT: ret
%v = load <4 x i64>, ptr %src
%res = call <4 x i64> @llvm.ctpop.v4i64(<4 x i64> %v)
store <4 x i64> %res, ptr %dst
ret void
}

define void @ctlz_v32i8(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctlz_v32i8:
; CHECK: # %bb.0:
; CHECK-NEXT: xvld $xr0, $a0, 0
; CHECK-NEXT: xvclz.b $xr0, $xr0
; CHECK-NEXT: xvst $xr0, $a1, 0
; CHECK-NEXT: ret
%v = load <32 x i8>, ptr %src
%res = call <32 x i8> @llvm.ctlz.v32i8(<32 x i8> %v, i1 false)
store <32 x i8> %res, ptr %dst
ret void
}

define void @ctlz_v16i16(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctlz_v16i16:
; CHECK: # %bb.0:
; CHECK-NEXT: xvld $xr0, $a0, 0
; CHECK-NEXT: xvclz.h $xr0, $xr0
; CHECK-NEXT: xvst $xr0, $a1, 0
; CHECK-NEXT: ret
%v = load <16 x i16>, ptr %src
%res = call <16 x i16> @llvm.ctlz.v16i16(<16 x i16> %v, i1 false)
store <16 x i16> %res, ptr %dst
ret void
}

define void @ctlz_v8i32(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctlz_v8i32:
; CHECK: # %bb.0:
; CHECK-NEXT: xvld $xr0, $a0, 0
; CHECK-NEXT: xvclz.w $xr0, $xr0
; CHECK-NEXT: xvst $xr0, $a1, 0
; CHECK-NEXT: ret
%v = load <8 x i32>, ptr %src
%res = call <8 x i32> @llvm.ctlz.v8i32(<8 x i32> %v, i1 false)
store <8 x i32> %res, ptr %dst
ret void
}

define void @ctlz_v4i64(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctlz_v4i64:
; CHECK: # %bb.0:
; CHECK-NEXT: xvld $xr0, $a0, 0
; CHECK-NEXT: xvclz.d $xr0, $xr0
; CHECK-NEXT: xvst $xr0, $a1, 0
; CHECK-NEXT: ret
%v = load <4 x i64>, ptr %src
%res = call <4 x i64> @llvm.ctlz.v4i64(<4 x i64> %v, i1 false)
store <4 x i64> %res, ptr %dst
ret void
}

declare <32 x i8> @llvm.ctpop.v32i8(<32 x i8>)
declare <16 x i16> @llvm.ctpop.v16i16(<16 x i16>)
declare <8 x i32> @llvm.ctpop.v8i32(<8 x i32>)
declare <4 x i64> @llvm.ctpop.v4i64(<4 x i64>)
declare <32 x i8> @llvm.ctlz.v32i8(<32 x i8>, i1)
declare <16 x i16> @llvm.ctlz.v16i16(<16 x i16>, i1)
declare <8 x i32> @llvm.ctlz.v8i32(<8 x i32>, i1)
declare <4 x i64> @llvm.ctlz.v4i64(<4 x i64>, i1)
115 changes: 115 additions & 0 deletions llvm/test/CodeGen/LoongArch/lsx/ctpop-ctlz.ll
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc --mtriple=loongarch64 --mattr=+lsx < %s | FileCheck %s

define void @ctpop_v16i8(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctpop_v16i8:
; CHECK: # %bb.0:
; CHECK-NEXT: vld $vr0, $a0, 0
; CHECK-NEXT: vpcnt.b $vr0, $vr0
; CHECK-NEXT: vst $vr0, $a1, 0
; CHECK-NEXT: ret
%v = load <16 x i8>, ptr %src
%res = call <16 x i8> @llvm.ctpop.v16i8(<16 x i8> %v)
store <16 x i8> %res, ptr %dst
ret void
}

define void @ctpop_v8i16(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctpop_v8i16:
; CHECK: # %bb.0:
; CHECK-NEXT: vld $vr0, $a0, 0
; CHECK-NEXT: vpcnt.h $vr0, $vr0
; CHECK-NEXT: vst $vr0, $a1, 0
; CHECK-NEXT: ret
%v = load <8 x i16>, ptr %src
%res = call <8 x i16> @llvm.ctpop.v8i16(<8 x i16> %v)
store <8 x i16> %res, ptr %dst
ret void
}

define void @ctpop_v4i32(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctpop_v4i32:
; CHECK: # %bb.0:
; CHECK-NEXT: vld $vr0, $a0, 0
; CHECK-NEXT: vpcnt.w $vr0, $vr0
; CHECK-NEXT: vst $vr0, $a1, 0
; CHECK-NEXT: ret
%v = load <4 x i32>, ptr %src
%res = call <4 x i32> @llvm.ctpop.v4i32(<4 x i32> %v)
store <4 x i32> %res, ptr %dst
ret void
}

define void @ctpop_v2i64(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctpop_v2i64:
; CHECK: # %bb.0:
; CHECK-NEXT: vld $vr0, $a0, 0
; CHECK-NEXT: vpcnt.d $vr0, $vr0
; CHECK-NEXT: vst $vr0, $a1, 0
; CHECK-NEXT: ret
%v = load <2 x i64>, ptr %src
%res = call <2 x i64> @llvm.ctpop.v2i64(<2 x i64> %v)
store <2 x i64> %res, ptr %dst
ret void
}

define void @ctlz_v16i8(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctlz_v16i8:
; CHECK: # %bb.0:
; CHECK-NEXT: vld $vr0, $a0, 0
; CHECK-NEXT: vclz.b $vr0, $vr0
; CHECK-NEXT: vst $vr0, $a1, 0
; CHECK-NEXT: ret
%v = load <16 x i8>, ptr %src
%res = call <16 x i8> @llvm.ctlz.v16i8(<16 x i8> %v, i1 false)
store <16 x i8> %res, ptr %dst
ret void
}

define void @ctlz_v8i16(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctlz_v8i16:
; CHECK: # %bb.0:
; CHECK-NEXT: vld $vr0, $a0, 0
; CHECK-NEXT: vclz.h $vr0, $vr0
; CHECK-NEXT: vst $vr0, $a1, 0
; CHECK-NEXT: ret
%v = load <8 x i16>, ptr %src
%res = call <8 x i16> @llvm.ctlz.v8i16(<8 x i16> %v, i1 false)
store <8 x i16> %res, ptr %dst
ret void
}

define void @ctlz_v4i32(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctlz_v4i32:
; CHECK: # %bb.0:
; CHECK-NEXT: vld $vr0, $a0, 0
; CHECK-NEXT: vclz.w $vr0, $vr0
; CHECK-NEXT: vst $vr0, $a1, 0
; CHECK-NEXT: ret
%v = load <4 x i32>, ptr %src
%res = call <4 x i32> @llvm.ctlz.v4i32(<4 x i32> %v, i1 false)
store <4 x i32> %res, ptr %dst
ret void
}

define void @ctlz_v2i64(ptr %src, ptr %dst) nounwind {
; CHECK-LABEL: ctlz_v2i64:
; CHECK: # %bb.0:
; CHECK-NEXT: vld $vr0, $a0, 0
; CHECK-NEXT: vclz.d $vr0, $vr0
; CHECK-NEXT: vst $vr0, $a1, 0
; CHECK-NEXT: ret
%v = load <2 x i64>, ptr %src
%res = call <2 x i64> @llvm.ctlz.v2i64(<2 x i64> %v, i1 false)
store <2 x i64> %res, ptr %dst
ret void
}

declare <16 x i8> @llvm.ctpop.v16i8(<16 x i8>)
declare <8 x i16> @llvm.ctpop.v8i16(<8 x i16>)
declare <4 x i32> @llvm.ctpop.v4i32(<4 x i32>)
declare <2 x i64> @llvm.ctpop.v2i64(<2 x i64>)
declare <16 x i8> @llvm.ctlz.v16i8(<16 x i8>, i1)
declare <8 x i16> @llvm.ctlz.v8i16(<8 x i16>, i1)
declare <4 x i32> @llvm.ctlz.v4i32(<4 x i32>, i1)
declare <2 x i64> @llvm.ctlz.v2i64(<2 x i64>, i1)

0 comments on commit a60a542

Please sign in to comment.