diff options
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td | 231 | 
1 files changed, 96 insertions, 135 deletions
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td b/llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td index 26bb53e72d8..a2c5e61685b 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td +++ b/llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td @@ -18,51 +18,6 @@ def ImmI#SIZE : ImmLeaf<i32, "return (Imm & ((1UL << "#SIZE#") - 1)) == Imm;">;  foreach SIZE = [2, 4, 8, 16, 32] in  def LaneIdx#SIZE : ImmLeaf<i32, "return 0 <= Imm && Imm < "#SIZE#";">; - -multiclass SIMDBinaryFP<SDNode node, string name, bits<32> baseInst> { -  defm _F32x4 : SIMD_I<(outs V128:$dst), (ins V128:$lhs, V128:$rhs), -                       (outs), (ins), -                       [(set (v4f32 V128:$dst), (node V128:$lhs, V128:$rhs))], -                       !strconcat("f32x4.", -                         !strconcat(name, "\t$dst, $lhs, $rhs")), -                       !strconcat("f32x4.", name), baseInst>; -  defm _F64x2 : SIMD_I<(outs V128:$dst), (ins V128:$lhs, V128:$rhs), -                       (outs), (ins), -                       [(set (v2f64 V128:$dst), (node V128:$lhs, V128:$rhs))], -                       !strconcat("f64x2.", -                         !strconcat(name, "\t$dst, $lhs, $rhs")), -                       !strconcat("f64x2.", name), !add(baseInst, 1)>; -} -multiclass SIMDBinaryIntNoI64x2<SDNode node, string name, bits<32> baseInst> { -  defm _I8x16 : SIMD_I<(outs V128:$dst), (ins V128:$lhs, V128:$rhs), -                       (outs), (ins), -                       [(set (v16i8 V128:$dst), (node V128:$lhs, V128:$rhs))], -                       !strconcat("i8x16.", -                         !strconcat(name, "\t$dst, $lhs, $rhs")), -                       !strconcat("i8x16.", name), baseInst>; -  defm _I16x8 : SIMD_I<(outs V128:$dst), (ins V128:$lhs, V128:$rhs), -                       (outs), (ins), -                       [(set (v8i16 V128:$dst), (node V128:$lhs, V128:$rhs))], -                       !strconcat("i16x8.", -                         !strconcat(name, "\t$dst, $lhs, $rhs")), -                       !strconcat("i16x8.", name), !add(baseInst, 1)>; -  defm _I32x4 : SIMD_I<(outs V128:$dst), (ins V128:$lhs, V128:$rhs), -                       (outs), (ins), -                       [(set (v4i32 V128:$dst), (node V128:$lhs, V128:$rhs))], -                       !strconcat("i32x4.", -                         !strconcat(name, "\t$dst, $lhs, $rhs")), -                       !strconcat("i32x4.", name), !add(baseInst, 2)>; -} -multiclass SIMDBinaryInt<SDNode node, string name, bits<32> baseInst> { -  defm "" : SIMDBinaryIntNoI64x2<node, name, baseInst>; -  defm _I64x2 : SIMD_I<(outs V128:$dst), (ins V128:$lhs, V128:$rhs), -                       (outs), (ins), -                       [(set (v2i64 V128:$dst), (node V128:$lhs, V128:$rhs))], -                       !strconcat("i64x2.", -                         !strconcat(name, "\t$dst, $lhs, $rhs")), -                       !strconcat("i64x2.", name), !add(baseInst, 3)>; -} -  // const vectors  multiclass ConstVec<ValueType vec_t, dag ops, dag pat, string args> {    defm CONST_V128_#vec_t : SIMD_I<(outs V128:$dst), ops, (outs), ops, @@ -70,52 +25,6 @@ multiclass ConstVec<ValueType vec_t, dag ops, dag pat, string args> {                                    "v128.const\t$dst, "#args,                                    "v128.const\t"#args, 0>;  } -defm "" : ConstVec<v16i8, -                   (ins vec_i8imm_op:$i0, vec_i8imm_op:$i1, -                        vec_i8imm_op:$i2, vec_i8imm_op:$i3, -                        vec_i8imm_op:$i4, vec_i8imm_op:$i5, -                        vec_i8imm_op:$i6, vec_i8imm_op:$i7, -                        vec_i8imm_op:$i8, vec_i8imm_op:$i9, -                        vec_i8imm_op:$iA, vec_i8imm_op:$iB, -                        vec_i8imm_op:$iC, vec_i8imm_op:$iD, -                        vec_i8imm_op:$iE, vec_i8imm_op:$iF), -                   (build_vector ImmI8:$i0, ImmI8:$i1, ImmI8:$i2, ImmI8:$i3, -                                 ImmI8:$i4, ImmI8:$i5, ImmI8:$i6, ImmI8:$i7, -                                 ImmI8:$i8, ImmI8:$i9, ImmI8:$iA, ImmI8:$iB, -                                 ImmI8:$iC, ImmI8:$iD, ImmI8:$iE, ImmI8:$iF), -                   !strconcat("$i0, $i1, $i2, $i3, $i4, $i5, $i6, $i7, ", -                              "$i8, $i9, $iA, $iB, $iC, $iD, $iE, $iF")>; -defm "" : ConstVec<v8i16, -                   (ins vec_i16imm_op:$i0, vec_i16imm_op:$i1, -                        vec_i16imm_op:$i2, vec_i16imm_op:$i3, -                        vec_i16imm_op:$i4, vec_i16imm_op:$i5, -                        vec_i16imm_op:$i6, vec_i16imm_op:$i7), -                   (build_vector -                     ImmI16:$i0, ImmI16:$i1, ImmI16:$i2, ImmI16:$i3, -                     ImmI16:$i4, ImmI16:$i5, ImmI16:$i6, ImmI16:$i7), -                   "$i0, $i1, $i2, $i3, $i4, $i5, $i6, $i7">; -defm "" : ConstVec<v4i32, -                   (ins vec_i32imm_op:$i0, vec_i32imm_op:$i1, -                        vec_i32imm_op:$i2, vec_i32imm_op:$i3), -                   (build_vector (i32 imm:$i0), (i32 imm:$i1), -                                 (i32 imm:$i2), (i32 imm:$i3)), -                   "$i0, $i1, $i2, $i3">; -defm "" : ConstVec<v2i64, -                  (ins vec_i64imm_op:$i0, vec_i64imm_op:$i1), -                  (build_vector (i64 imm:$i0), (i64 imm:$i1)), -                  "$i0, $i1">; -defm "" : ConstVec<v4f32, -                   (ins f32imm_op:$i0, f32imm_op:$i1, -                        f32imm_op:$i2, f32imm_op:$i3), -                   (build_vector (f32 fpimm:$i0), (f32 fpimm:$i1), -                                 (f32 fpimm:$i2), (f32 fpimm:$i3)), -                   "$i0, $i1, $i2, $i3">; -defm "" : ConstVec<v2f64, -                  (ins f64imm_op:$i0, f64imm_op:$i1), -                  (build_vector (f64 fpimm:$i0), (f64 fpimm:$i1)), -                  "$i0, $i1">; - -// lane extraction  multiclass ExtractLane<ValueType vec_t, string vec, ImmLeaf imm_t,                         WebAssemblyRegClass reg_t, bits<32> simdop,                         string suffix = "", SDNode extract = vector_extract> { @@ -152,24 +61,9 @@ multiclass ExtractLaneExtended<string sign, bits<32> baseInst> {    defm "" : ExtractLane<v8i16, "i16x8", LaneIdx8, I32, !add(baseInst, 2), sign,                          !cast<PatFrag>("extract_i16x8"#sign)>;  } -let Defs = [ARGUMENTS] in { -defm "" : ExtractLaneExtended<"_s", 9>; -defm "" : ExtractLaneExtended<"_u", 10>; -defm "" : ExtractLane<v4i32, "i32x4", LaneIdx4, I32, 13>; -defm "" : ExtractLane<v2i64, "i64x2", LaneIdx2, I64, 14>; -defm "" : ExtractLane<v4f32, "f32x4", LaneIdx4, F32, 15>; -defm "" : ExtractLane<v2f64, "f64x2", LaneIdx2, F64, 16>; -} // Defs = [ARGUMENTS] - -// follow convention of making implicit expansions unsigned -def : Pat<(i32 (vector_extract (v16i8 V128:$vec), (i32 LaneIdx16:$idx))), -          (EXTRACT_LANE_v16i8_u V128:$vec, (i32 LaneIdx16:$idx))>; -def : Pat<(i32 (vector_extract (v8i16 V128:$vec), (i32 LaneIdx8:$idx))), -          (EXTRACT_LANE_v8i16_u V128:$vec, (i32 LaneIdx8:$idx))>; - -// lane replacement -multiclass ReplaceLane<ValueType vec_t, string vec, WebAssemblyRegClass reg_t, -                       ValueType lane_t, ImmLeaf imm_t, bits<32> simdop> { +multiclass ReplaceLane<ValueType vec_t, string vec, ImmLeaf imm_t, +                       WebAssemblyRegClass reg_t, ValueType lane_t, +                       bits<32> simdop> {    defm REPLACE_LANE_#vec_t :        SIMD_I<(outs V128:$dst), (ins V128:$vec, i32imm_op:$idx, reg_t:$x),               (outs), (ins i32imm_op:$idx), @@ -178,16 +72,6 @@ multiclass ReplaceLane<ValueType vec_t, string vec, WebAssemblyRegClass reg_t,               vec#".replace_lane\t$dst, $vec, $idx, $x",               vec#".replace_lane\t$idx", simdop>;  } -let Defs = [ARGUMENTS] in { -defm "" : ReplaceLane<v16i8, "i8x16", I32, i32, LaneIdx16, 17>; -defm "" : ReplaceLane<v8i16, "i16x8", I32, i32, LaneIdx8, 18>; -defm "" : ReplaceLane<v4i32, "i32x4", I32, i32, LaneIdx4, 19>; -defm "" : ReplaceLane<v2i64, "i64x2", I64, i64, LaneIdx2, 20>; -defm "" : ReplaceLane<v4f32, "f32x4", F32, f32, LaneIdx4, 21>; -defm "" : ReplaceLane<v2f64, "f64x2", F64, f64, LaneIdx2, 22>; -} // Defs = [ARGUMENTS] - -// splats  def splat2 : PatFrag<(ops node:$x), (build_vector node:$x, node:$x)>;  def splat4 : PatFrag<(ops node:$x), (build_vector                         node:$x, node:$x, node:$x, node:$x)>; @@ -205,15 +89,108 @@ multiclass Splat<ValueType vec_t, string vec, WebAssemblyRegClass reg_t,                               [(set (vec_t V128:$dst), (splat_pat reg_t:$x))],                               vec#".splat\t$dst, $x", vec#".splat", simdop>;  } +multiclass SIMDBinary<ValueType vec_t, string vec, SDNode node, string name, +                      bits<32> simdop> { +  defm _#vec_t : SIMD_I<(outs V128:$dst), (ins V128:$lhs, V128:$rhs), +                        (outs), (ins), +                        [(set (vec_t V128:$dst), (node V128:$lhs, V128:$rhs))], +                        vec#"."#name#"\t$dst, $lhs, $rhs", vec#"."#name, +                        simdop>; +} +multiclass SIMDBinaryIntNoI64x2<SDNode node, string name, bits<32> baseInst> { +  defm "" : SIMDBinary<v16i8, "i8x16", node, name, baseInst>; +  defm "" : SIMDBinary<v8i16, "i16x8", node, name, !add(baseInst, 1)>; +  defm "" : SIMDBinary<v4i32, "i32x4", node, name, !add(baseInst, 2)>; +} +multiclass SIMDBinaryInt<SDNode node, string name, bits<32> baseInst> { +  defm "" : SIMDBinaryIntNoI64x2<node, name, baseInst>; +  defm "" : SIMDBinary<v2i64, "i64x2", node, name, !add(baseInst, 3)>; +} +multiclass SIMDBinaryFP<SDNode node, string name, bits<32> baseInst> { +  defm "" : SIMDBinary<v4f32, "f32x4", node, name, baseInst>; +  defm "" : SIMDBinary<v2f64, "f64x2", node, name, !add(baseInst, 1)>; +} +  let Defs = [ARGUMENTS] in { +defm "" : ConstVec<v16i8, +                   (ins vec_i8imm_op:$i0, vec_i8imm_op:$i1, +                        vec_i8imm_op:$i2, vec_i8imm_op:$i3, +                        vec_i8imm_op:$i4, vec_i8imm_op:$i5, +                        vec_i8imm_op:$i6, vec_i8imm_op:$i7, +                        vec_i8imm_op:$i8, vec_i8imm_op:$i9, +                        vec_i8imm_op:$iA, vec_i8imm_op:$iB, +                        vec_i8imm_op:$iC, vec_i8imm_op:$iD, +                        vec_i8imm_op:$iE, vec_i8imm_op:$iF), +                   (build_vector ImmI8:$i0, ImmI8:$i1, ImmI8:$i2, ImmI8:$i3, +                                 ImmI8:$i4, ImmI8:$i5, ImmI8:$i6, ImmI8:$i7, +                                 ImmI8:$i8, ImmI8:$i9, ImmI8:$iA, ImmI8:$iB, +                                 ImmI8:$iC, ImmI8:$iD, ImmI8:$iE, ImmI8:$iF), +                   !strconcat("$i0, $i1, $i2, $i3, $i4, $i5, $i6, $i7, ", +                              "$i8, $i9, $iA, $iB, $iC, $iD, $iE, $iF")>; +defm "" : ConstVec<v8i16, +                   (ins vec_i16imm_op:$i0, vec_i16imm_op:$i1, +                        vec_i16imm_op:$i2, vec_i16imm_op:$i3, +                        vec_i16imm_op:$i4, vec_i16imm_op:$i5, +                        vec_i16imm_op:$i6, vec_i16imm_op:$i7), +                   (build_vector +                     ImmI16:$i0, ImmI16:$i1, ImmI16:$i2, ImmI16:$i3, +                     ImmI16:$i4, ImmI16:$i5, ImmI16:$i6, ImmI16:$i7), +                   "$i0, $i1, $i2, $i3, $i4, $i5, $i6, $i7">; +defm "" : ConstVec<v4i32, +                   (ins vec_i32imm_op:$i0, vec_i32imm_op:$i1, +                        vec_i32imm_op:$i2, vec_i32imm_op:$i3), +                   (build_vector (i32 imm:$i0), (i32 imm:$i1), +                                 (i32 imm:$i2), (i32 imm:$i3)), +                   "$i0, $i1, $i2, $i3">; +defm "" : ConstVec<v2i64, +                  (ins vec_i64imm_op:$i0, vec_i64imm_op:$i1), +                  (build_vector (i64 imm:$i0), (i64 imm:$i1)), +                  "$i0, $i1">; +defm "" : ConstVec<v4f32, +                   (ins f32imm_op:$i0, f32imm_op:$i1, +                        f32imm_op:$i2, f32imm_op:$i3), +                   (build_vector (f32 fpimm:$i0), (f32 fpimm:$i1), +                                 (f32 fpimm:$i2), (f32 fpimm:$i3)), +                   "$i0, $i1, $i2, $i3">; +defm "" : ConstVec<v2f64, +                  (ins f64imm_op:$i0, f64imm_op:$i1), +                  (build_vector (f64 fpimm:$i0), (f64 fpimm:$i1)), +                  "$i0, $i1">; +defm "" : ExtractLaneExtended<"_s", 9>; +defm "" : ExtractLaneExtended<"_u", 10>; +defm "" : ExtractLane<v4i32, "i32x4", LaneIdx4, I32, 13>; +defm "" : ExtractLane<v2i64, "i64x2", LaneIdx2, I64, 14>; +defm "" : ExtractLane<v4f32, "f32x4", LaneIdx4, F32, 15>; +defm "" : ExtractLane<v2f64, "f64x2", LaneIdx2, F64, 16>; +defm "" : ReplaceLane<v16i8, "i8x16", LaneIdx16, I32, i32, 17>; +defm "" : ReplaceLane<v8i16, "i16x8", LaneIdx8, I32, i32, 18>; +defm "" : ReplaceLane<v4i32, "i32x4", LaneIdx4, I32, i32, 19>; +defm "" : ReplaceLane<v2i64, "i64x2", LaneIdx2, I64, i64, 20>; +defm "" : ReplaceLane<v4f32, "f32x4", LaneIdx4, F32, f32, 21>; +defm "" : ReplaceLane<v2f64, "f64x2", LaneIdx2, F64, f64, 22>;  defm "" : Splat<v16i8, "i8x16", I32, splat16, 3>;  defm "" : Splat<v8i16, "i16x8", I32, splat8, 4>;  defm "" : Splat<v4i32, "i32x4", I32, splat4, 5>;  defm "" : Splat<v2i64, "i64x2", I64, splat2, 6>;  defm "" : Splat<v4f32, "f32x4", F32, splat4, 7>;  defm "" : Splat<v2f64, "f64x2", F64, splat2, 8>; +let isCommutable = 1 in { +defm ADD : SIMDBinaryInt<add, "add", 24>; +defm ADD : SIMDBinaryFP<fadd, "add", 122>; +defm MUL : SIMDBinaryIntNoI64x2<mul, "mul", 32>; +defm MUL : SIMDBinaryFP<fmul, "mul", 128>; +} // isCommutable = 1 +defm SUB : SIMDBinaryInt<sub, "sub", 28>; +defm SUB : SIMDBinaryFP<fsub, "sub", 124>; +defm DIV : SIMDBinaryFP<fdiv, "div", 126>;  } // Defs = [ARGUMENTS] +// follow convention of making implicit expansions unsigned +def : Pat<(i32 (vector_extract (v16i8 V128:$vec), (i32 LaneIdx16:$idx))), +          (EXTRACT_LANE_v16i8_u V128:$vec, (i32 LaneIdx16:$idx))>; +def : Pat<(i32 (vector_extract (v8i16 V128:$vec), (i32 LaneIdx8:$idx))), +          (EXTRACT_LANE_v8i16_u V128:$vec, (i32 LaneIdx8:$idx))>; +  // arbitrary other BUILD_VECTOR patterns  def : Pat<(v16i8 (build_vector              (i32 I32:$x0), (i32 I32:$x1), (i32 I32:$x2), (i32 I32:$x3), @@ -325,19 +302,3 @@ def : Pat<(v4f32 (build_vector  def : Pat<(v2f64 (build_vector (f64 F64:$x0), (f64 F64:$x1))),            (v2f64 (REPLACE_LANE_v2f64              (v2f64 (SPLAT_v2f64 (f64 F64:$x0))), 1, F64:$x1))>; - -// arithmetic -let Defs = [ARGUMENTS] in { -let isCommutable = 1 in -defm ADD : SIMDBinaryInt<add, "add ", 24>; -defm SUB : SIMDBinaryInt<sub, "sub ", 28>; -let isCommutable = 1 in -defm MUL : SIMDBinaryIntNoI64x2<mul, "mul ", 32>; - -let isCommutable = 1 in -defm ADD : SIMDBinaryFP<fadd, "add ", 122>; -defm SUB : SIMDBinaryFP<fsub, "sub ", 124>; -defm DIV : SIMDBinaryFP<fdiv, "div ", 126>; -let isCommutable = 1 in -defm MUL : SIMDBinaryFP<fmul, "mul ", 128>; -} // Defs = [ARGUMENTS]  | 

