@@ -1998,7 +1998,7 @@ class MVE_VQxDMULH_Base<string iname, string suffix, bits<2> size, bit rounding,
19981998def MVEvqdmulh : SDNode<"ARMISD::VQDMULH", SDTIntBinOp>;
19991999
20002000multiclass MVE_VQxDMULH_m<string iname, MVEVectorVTInfo VTI,
2001- SDNode Op, Intrinsic unpred_int, Intrinsic pred_int,
2001+ SDPatternOperator Op, Intrinsic unpred_int, Intrinsic pred_int,
20022002 bit rounding> {
20032003 def "" : MVE_VQxDMULH_Base<iname, VTI.Suffix, VTI.Size, rounding>;
20042004 defvar Inst = !cast<Instruction>(NAME);
@@ -2199,7 +2199,7 @@ def subnsw : PatFrag<(ops node:$lhs, node:$rhs),
21992199}]>;
22002200
22012201multiclass MVE_VRHADD_m<MVEVectorVTInfo VTI, SDNode Op,
2202- SDNode unpred_op, Intrinsic PredInt> {
2202+ SDPatternOperator unpred_op, Intrinsic PredInt> {
22032203 def "" : MVE_VRHADD_Base<VTI.Suffix, VTI.Unsigned, VTI.Size>;
22042204 defvar Inst = !cast<Instruction>(NAME);
22052205 defm : MVE_TwoOpPattern<VTI, Op, PredInt, (? (i32 VTI.Unsigned)), !cast<Instruction>(NAME)>;
@@ -2303,7 +2303,7 @@ class MVE_VHSUB_<string suffix, bit U, bits<2> size,
23032303 : MVE_VHADDSUB<"vhsub", suffix, U, 0b1, size, pattern>;
23042304
23052305multiclass MVE_VHADD_m<MVEVectorVTInfo VTI, SDNode Op,
2306- SDNode unpred_op, Intrinsic PredInt, PatFrag add_op,
2306+ SDPatternOperator unpred_op, Intrinsic PredInt, PatFrag add_op,
23072307 SDNode shift_op> {
23082308 def "" : MVE_VHADD_<VTI.Suffix, VTI.Unsigned, VTI.Size>;
23092309 defvar Inst = !cast<Instruction>(NAME);
@@ -2335,7 +2335,7 @@ defm MVE_VHADDu16 : MVE_VHADD<MVE_v8u16, avgflooru, addnuw, ARMvshruImm>;
23352335defm MVE_VHADDu32 : MVE_VHADD<MVE_v4u32, avgflooru, addnuw, ARMvshruImm>;
23362336
23372337multiclass MVE_VHSUB_m<MVEVectorVTInfo VTI,
2338- SDNode unpred_op, Intrinsic pred_int, PatFrag sub_op,
2338+ SDPatternOperator unpred_op, Intrinsic pred_int, PatFrag sub_op,
23392339 SDNode shift_op> {
23402340 def "" : MVE_VHSUB_<VTI.Suffix, VTI.Unsigned, VTI.Size>;
23412341 defvar Inst = !cast<Instruction>(NAME);
@@ -4794,7 +4794,7 @@ class MVE_VxMULH<string iname, string suffix, bit U, bits<2> size, bit round,
47944794 let validForTailPredication = 1;
47954795}
47964796
4797- multiclass MVE_VxMULH_m<string iname, MVEVectorVTInfo VTI, SDNode unpred_op,
4797+ multiclass MVE_VxMULH_m<string iname, MVEVectorVTInfo VTI, SDPatternOperator unpred_op,
47984798 Intrinsic PredInt, bit round> {
47994799 def "" : MVE_VxMULH<iname, VTI.Suffix, VTI.Unsigned, VTI.Size, round>;
48004800 defvar Inst = !cast<Instruction>(NAME);
@@ -5370,8 +5370,8 @@ class MVE_VxADDSUB_qr<string iname, string suffix,
53705370 let validForTailPredication = 1;
53715371}
53725372
5373- multiclass MVE_VHADDSUB_qr_m<string iname, MVEVectorVTInfo VTI, bit subtract, SDNode Op,
5374- Intrinsic unpred_int, Intrinsic pred_int, PatFrag add_op, PatFrag shift_op> {
5373+ multiclass MVE_VHADDSUB_qr_m<string iname, MVEVectorVTInfo VTI, bit subtract, SDPatternOperator Op,
5374+ Intrinsic unpred_int, Intrinsic pred_int, PatFrag add_op, SDNode shift_op> {
53755375 def "" : MVE_VxADDSUB_qr<iname, VTI.Suffix, VTI.Unsigned, VTI.Size, subtract, VTI.Size>;
53765376 defm : MVE_TwoOpPatternDup<VTI, Op, pred_int, (? (i32 VTI.Unsigned)), !cast<Instruction>(NAME)>;
53775377 defm : MVE_vec_scalar_int_pat_m<!cast<Instruction>(NAME),
@@ -5576,7 +5576,7 @@ class MVE_VxxMUL_qr<string iname, string suffix,
55765576}
55775577
55785578multiclass MVE_VxxMUL_qr_m<string iname, MVEVectorVTInfo VTI, bit bit_28,
5579- PatFrag Op, Intrinsic int_unpred, Intrinsic int_pred> {
5579+ SDPatternOperator Op, Intrinsic int_unpred, Intrinsic int_pred> {
55805580 def "" : MVE_VxxMUL_qr<iname, VTI.Suffix, bit_28, VTI.Size, VTI.Size>;
55815581
55825582 let Predicates = [HasMVEInt] in {
0 commit comments