From e7ef0c817bea36137266334a7f80084587fa60e3 Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Wed, 30 Oct 2013 13:07:44 +0000 Subject: [PATCH] [mips][msa] Added support for matching splat.[bhw] from normal IR (i.e. not intrinsics) splat.d is implemented but this subtest is currently disabled. This is because it is difficult to match the appropriate IR on MIPS32. There is a patch under review that should help with this so I hope to enable the subtest soon. llvm-svn: 193680 --- llvm/lib/Target/Mips/MSA.txt | 10 ++++ llvm/lib/Target/Mips/MipsMSAInstrInfo.td | 62 +++++++++++++---------- llvm/lib/Target/Mips/MipsSEISelLowering.cpp | 11 +++++ llvm/test/CodeGen/Mips/msa/3r_splat.ll | 77 ++++++++++++++++------------- 4 files changed, 101 insertions(+), 59 deletions(-) diff --git a/llvm/lib/Target/Mips/MSA.txt b/llvm/lib/Target/Mips/MSA.txt index a6a7dda..f7c42c0 100644 --- a/llvm/lib/Target/Mips/MSA.txt +++ b/llvm/lib/Target/Mips/MSA.txt @@ -21,6 +21,12 @@ vshf.w: unknown at compile-time due to the definition of shufflevector in LLVM IR. +vshf.[bhwd] + When the shuffle description describes a splat operation, splat.[bhwd] + instructions will be selected instead of vshf.[bhwd]. Unlike the ilv*, + and pck* instructions, this is matched from MipsISD::VSHF instead of + a special-case MipsISD node. + ilvl.d, pckev.d: It is not possible to emit ilvl.d, or pckev.d since ilvev.d covers the same shuffle. ilvev.d will be emitted instead. @@ -29,6 +35,10 @@ ilvr.d, ilvod.d, pckod.d: It is not possible to emit ilvr.d, or pckod.d since ilvod.d covers the same shuffle. ilvod.d will be emitted instead. +splat.[bhwd] + The intrinsic will work as expected. However, unlike other intrinsics + it lowers directly to MipsISD::VSHF instead of using common IR. + splati.w: It is not possible to emit splati.w since shf.w covers the same cases. shf.w will be emitted instead. diff --git a/llvm/lib/Target/Mips/MipsMSAInstrInfo.td b/llvm/lib/Target/Mips/MipsMSAInstrInfo.td index 25b3283..65d85e3 100644 --- a/llvm/lib/Target/Mips/MipsMSAInstrInfo.td +++ b/llvm/lib/Target/Mips/MipsMSAInstrInfo.td @@ -224,6 +224,15 @@ def vsplatf32 : PatFrag<(ops node:$e0), def vsplatf64 : PatFrag<(ops node:$e0), (v2f64 (build_vector node:$e0, node:$e0))>; +def vsplati8_elt : PatFrag<(ops node:$v, node:$i), + (MipsVSHF (vsplati8 node:$i), node:$v, node:$v)>; +def vsplati16_elt : PatFrag<(ops node:$v, node:$i), + (MipsVSHF (vsplati16 node:$i), node:$v, node:$v)>; +def vsplati32_elt : PatFrag<(ops node:$v, node:$i), + (MipsVSHF (vsplati32 node:$i), node:$v, node:$v)>; +def vsplati64_elt : PatFrag<(ops node:$v, node:$i), + (MipsVSHF (vsplati64 node:$i), node:$v, node:$v)>; + class SplatPatLeaf : PatLeaf { @@ -1212,6 +1221,16 @@ class MSA_3R_DESC_BASE { + dag OutOperandList = (outs ROWD:$wd); + dag InOperandList = (ins ROWS:$ws, GPR32:$rt); + string AsmString = !strconcat(instr_asm, "\t$wd, $ws[$rt]"); + list Pattern = [(set ROWD:$wd, (OpNode ROWS:$ws, GPR32:$rt))]; + InstrItinClass Itinerary = itin; +} + class MSA_3R_VSHF_DESC_BASE { +class MSA_3R_SLD_DESC_BASE { dag OutOperandList = (outs ROWD:$wd); - dag InOperandList = (ins ROWS:$ws, RORT:$rt); + dag InOperandList = (ins ROWS:$ws, GPR32:$rt); string AsmString = !strconcat(instr_asm, "\t$wd, $ws[$rt]"); - list Pattern = [(set ROWD:$wd, (OpNode ROWS:$ws, RORT:$rt))]; + list Pattern = [(set ROWD:$wd, (OpNode ROWS:$ws, GPR32:$rt))]; InstrItinClass Itinerary = itin; } @@ -2271,14 +2289,10 @@ class SHF_B_DESC : MSA_I8_SHF_DESC_BASE<"shf.b", MSA128BOpnd>; class SHF_H_DESC : MSA_I8_SHF_DESC_BASE<"shf.h", MSA128HOpnd>; class SHF_W_DESC : MSA_I8_SHF_DESC_BASE<"shf.w", MSA128WOpnd>; -class SLD_B_DESC : MSA_3R_INDEX_DESC_BASE<"sld.b", int_mips_sld_b, MSA128BOpnd, - MSA128BOpnd, GPR32Opnd>; -class SLD_H_DESC : MSA_3R_INDEX_DESC_BASE<"sld.h", int_mips_sld_h, MSA128HOpnd, - MSA128HOpnd, GPR32Opnd>; -class SLD_W_DESC : MSA_3R_INDEX_DESC_BASE<"sld.w", int_mips_sld_w, MSA128WOpnd, - MSA128WOpnd, GPR32Opnd>; -class SLD_D_DESC : MSA_3R_INDEX_DESC_BASE<"sld.d", int_mips_sld_d, MSA128DOpnd, - MSA128DOpnd, GPR32Opnd>; +class SLD_B_DESC : MSA_3R_SLD_DESC_BASE<"sld.b", int_mips_sld_b, MSA128BOpnd>; +class SLD_H_DESC : MSA_3R_SLD_DESC_BASE<"sld.h", int_mips_sld_h, MSA128HOpnd>; +class SLD_W_DESC : MSA_3R_SLD_DESC_BASE<"sld.w", int_mips_sld_w, MSA128WOpnd>; +class SLD_D_DESC : MSA_3R_SLD_DESC_BASE<"sld.d", int_mips_sld_d, MSA128DOpnd>; class SLDI_B_DESC : MSA_ELM_DESC_BASE<"sldi.b", int_mips_sldi_b, MSA128BOpnd>; class SLDI_H_DESC : MSA_ELM_DESC_BASE<"sldi.h", int_mips_sldi_h, MSA128HOpnd>; @@ -2299,18 +2313,14 @@ class SLLI_W_DESC : MSA_BIT_SPLAT_DESC_BASE<"slli.w", shl, vsplati32_uimm5, class SLLI_D_DESC : MSA_BIT_SPLAT_DESC_BASE<"slli.d", shl, vsplati64_uimm6, MSA128DOpnd>; -class SPLAT_B_DESC : MSA_3R_INDEX_DESC_BASE<"splat.b", int_mips_splat_b, - MSA128BOpnd, MSA128BOpnd, - GPR32Opnd>; -class SPLAT_H_DESC : MSA_3R_INDEX_DESC_BASE<"splat.h", int_mips_splat_h, - MSA128HOpnd, MSA128HOpnd, - GPR32Opnd>; -class SPLAT_W_DESC : MSA_3R_INDEX_DESC_BASE<"splat.w", int_mips_splat_w, - MSA128WOpnd, MSA128WOpnd, - GPR32Opnd>; -class SPLAT_D_DESC : MSA_3R_INDEX_DESC_BASE<"splat.d", int_mips_splat_d, - MSA128DOpnd, MSA128DOpnd, - GPR32Opnd>; +class SPLAT_B_DESC : MSA_3R_SPLAT_DESC_BASE<"splat.b", vsplati8_elt, + MSA128BOpnd>; +class SPLAT_H_DESC : MSA_3R_SPLAT_DESC_BASE<"splat.h", vsplati16_elt, + MSA128HOpnd>; +class SPLAT_W_DESC : MSA_3R_SPLAT_DESC_BASE<"splat.w", vsplati32_elt, + MSA128WOpnd>; +class SPLAT_D_DESC : MSA_3R_SPLAT_DESC_BASE<"splat.d", vsplati64_elt, + MSA128DOpnd>; class SPLATI_B_DESC : MSA_ELM_SPLAT_DESC_BASE<"splati.b", vsplati8_uimm4, MSA128BOpnd>; diff --git a/llvm/lib/Target/Mips/MipsSEISelLowering.cpp b/llvm/lib/Target/Mips/MipsSEISelLowering.cpp index 6c89424..c1f9a1f 100644 --- a/llvm/lib/Target/Mips/MipsSEISelLowering.cpp +++ b/llvm/lib/Target/Mips/MipsSEISelLowering.cpp @@ -1561,6 +1561,17 @@ SDValue MipsSETargetLowering::lowerINTRINSIC_WO_CHAIN(SDValue Op, case Intrinsic::mips_slli_d: return DAG.getNode(ISD::SHL, DL, Op->getValueType(0), Op->getOperand(1), lowerMSASplatImm(Op, 2, DAG)); + case Intrinsic::mips_splat_b: + case Intrinsic::mips_splat_h: + case Intrinsic::mips_splat_w: + case Intrinsic::mips_splat_d: + // We can't lower via VECTOR_SHUFFLE because it requires constant shuffle + // masks, nor can we lower via BUILD_VECTOR & EXTRACT_VECTOR_ELT because + // EXTRACT_VECTOR_ELT can't extract i64's on MIPS32. + // Instead we lower to MipsISD::VSHF and match from there. + return DAG.getNode(MipsISD::VSHF, DL, Op->getValueType(0), + lowerMSASplatImm(Op, 2, DAG), Op->getOperand(1), + Op->getOperand(1)); case Intrinsic::mips_splati_b: case Intrinsic::mips_splati_h: case Intrinsic::mips_splati_w: diff --git a/llvm/test/CodeGen/Mips/msa/3r_splat.ll b/llvm/test/CodeGen/Mips/msa/3r_splat.ll index 2e604a4..a10cf5c 100644 --- a/llvm/test/CodeGen/Mips/msa/3r_splat.ll +++ b/llvm/test/CodeGen/Mips/msa/3r_splat.ll @@ -1,81 +1,92 @@ ; Test the MSA splat intrinsics that are encoded with the 3R instruction ; format. -; RUN: llc -march=mips -mattr=+msa,+fp64 < %s | FileCheck %s +; RUN: llc -march=mips -mattr=+msa,+fp64 < %s | \ +; RUN: FileCheck -check-prefix=MIPS32 %s @llvm_mips_splat_b_ARG1 = global <16 x i8> , align 16 @llvm_mips_splat_b_RES = global <16 x i8> , align 16 -define void @llvm_mips_splat_b_test() nounwind { +define void @llvm_mips_splat_b_test(i32 %a) nounwind { entry: %0 = load <16 x i8>* @llvm_mips_splat_b_ARG1 - %1 = tail call <16 x i8> @llvm.mips.splat.b(<16 x i8> %0, i32 3) + %1 = tail call <16 x i8> @llvm.mips.splat.b(<16 x i8> %0, i32 %a) store <16 x i8> %1, <16 x i8>* @llvm_mips_splat_b_RES ret void } declare <16 x i8> @llvm.mips.splat.b(<16 x i8>, i32) nounwind -; CHECK: llvm_mips_splat_b_test: -; CHECK: ld.b -; CHECK: splat.b -; CHECK: st.b -; CHECK: .size llvm_mips_splat_b_test -; +; MIPS32: llvm_mips_splat_b_test: +; MIPS32-DAG: lw [[R1:\$[0-9]+]], %got(llvm_mips_splat_b_ARG1)( +; MIPS32-DAG: lw [[R2:\$[0-9]+]], %got(llvm_mips_splat_b_RES)( +; MIPS32-DAG: ld.b [[R3:\$w[0-9]+]], 0([[R1]]) +; MIPS32-DAG: splat.b [[R4:\$w[0-9]+]], [[R3]][$4] +; MIPS32-DAG: st.b [[R4]], 0([[R2]]) +; MIPS32: .size llvm_mips_splat_b_test + @llvm_mips_splat_h_ARG1 = global <8 x i16> , align 16 @llvm_mips_splat_h_RES = global <8 x i16> , align 16 -define void @llvm_mips_splat_h_test() nounwind { +define void @llvm_mips_splat_h_test(i32 %a) nounwind { entry: %0 = load <8 x i16>* @llvm_mips_splat_h_ARG1 - %1 = tail call <8 x i16> @llvm.mips.splat.h(<8 x i16> %0, i32 3) + %1 = tail call <8 x i16> @llvm.mips.splat.h(<8 x i16> %0, i32 %a) store <8 x i16> %1, <8 x i16>* @llvm_mips_splat_h_RES ret void } declare <8 x i16> @llvm.mips.splat.h(<8 x i16>, i32) nounwind -; CHECK: llvm_mips_splat_h_test: -; CHECK: ld.h -; CHECK: splat.h -; CHECK: st.h -; CHECK: .size llvm_mips_splat_h_test -; +; MIPS32: llvm_mips_splat_h_test: +; MIPS32-DAG: lw [[R1:\$[0-9]+]], %got(llvm_mips_splat_h_ARG1)( +; MIPS32-DAG: lw [[R2:\$[0-9]+]], %got(llvm_mips_splat_h_RES)( +; MIPS32-DAG: ld.h [[R3:\$w[0-9]+]], 0([[R1]]) +; MIPS32-DAG: splat.h [[R4:\$w[0-9]+]], [[R3]][$4] +; MIPS32-DAG: st.h [[R4]], 0([[R2]]) +; MIPS32: .size llvm_mips_splat_h_test + @llvm_mips_splat_w_ARG1 = global <4 x i32> , align 16 @llvm_mips_splat_w_RES = global <4 x i32> , align 16 -define void @llvm_mips_splat_w_test() nounwind { +define void @llvm_mips_splat_w_test(i32 %a) nounwind { entry: %0 = load <4 x i32>* @llvm_mips_splat_w_ARG1 - %1 = tail call <4 x i32> @llvm.mips.splat.w(<4 x i32> %0, i32 3) + %1 = tail call <4 x i32> @llvm.mips.splat.w(<4 x i32> %0, i32 %a) store <4 x i32> %1, <4 x i32>* @llvm_mips_splat_w_RES ret void } declare <4 x i32> @llvm.mips.splat.w(<4 x i32>, i32) nounwind -; CHECK: llvm_mips_splat_w_test: -; CHECK: ld.w -; CHECK: splat.w -; CHECK: st.w -; CHECK: .size llvm_mips_splat_w_test -; +; MIPS32: llvm_mips_splat_w_test: +; MIPS32-DAG: lw [[R1:\$[0-9]+]], %got(llvm_mips_splat_w_ARG1)( +; MIPS32-DAG: lw [[R2:\$[0-9]+]], %got(llvm_mips_splat_w_RES)( +; MIPS32-DAG: ld.w [[R3:\$w[0-9]+]], 0([[R1]]) +; MIPS32-DAG: splat.w [[R4:\$w[0-9]+]], [[R3]][$4] +; MIPS32-DAG: st.w [[R4]], 0([[R2]]) +; MIPS32: .size llvm_mips_splat_w_test + @llvm_mips_splat_d_ARG1 = global <2 x i64> , align 16 @llvm_mips_splat_d_RES = global <2 x i64> , align 16 -define void @llvm_mips_splat_d_test() nounwind { +define void @llvm_mips_splat_d_test(i32 %a) nounwind { entry: %0 = load <2 x i64>* @llvm_mips_splat_d_ARG1 - %1 = tail call <2 x i64> @llvm.mips.splat.d(<2 x i64> %0, i32 3) + %1 = tail call <2 x i64> @llvm.mips.splat.d(<2 x i64> %0, i32 %a) store <2 x i64> %1, <2 x i64>* @llvm_mips_splat_d_RES ret void } declare <2 x i64> @llvm.mips.splat.d(<2 x i64>, i32) nounwind -; CHECK: llvm_mips_splat_d_test: -; CHECK: ld.d -; CHECK: splat.d -; CHECK: st.d -; CHECK: .size llvm_mips_splat_d_test -; +; MIPS32: llvm_mips_splat_d_test: +; FIXME: This test is currently disabled for MIPS32 because the indices are +; difficult to match. This is because 64-bit values cannot be stored in +; GPR32. +; MIPS64-DAG: lw [[R1:\$[0-9]+]], %got(llvm_mips_splat_d_ARG1)( +; MIPS64-DAG: lw [[R2:\$[0-9]+]], %got(llvm_mips_splat_d_RES)( +; MIPS64-DAG: ld.d [[R3:\$w[0-9]+]], 0([[R1]]) +; MIPS64-DAG: splat.d [[R4:\$w[0-9]+]], [[R3]][$4] +; MIPS64-DAG: st.d [[R4]], 0([[R2]]) +; MIPS32: .size llvm_mips_splat_d_test -- 2.7.4