From: Simon Pilgrim Date: Wed, 6 Dec 2017 13:14:44 +0000 (+0000) Subject: [X86][AVX512] Drop default NoItinerary arguments that aren't needed X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=804f2f6c200764a893fcd6709da5096548362890;p=llvm [X86][AVX512] Drop default NoItinerary arguments that aren't needed Requires reordering of AVX512_maskable_common arguments, but helps track what is still missing itinerary tags git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319890 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/X86/X86InstrAVX512.td b/lib/Target/X86/X86InstrAVX512.td index 867b35d93ec..3a8d98be9cf 100644 --- a/lib/Target/X86/X86InstrAVX512.td +++ b/lib/Target/X86/X86InstrAVX512.td @@ -252,9 +252,9 @@ multiclass AVX512_maskable_common O, Format F, X86VectorVTInfo _, string OpcodeStr, string AttSrcAsm, string IntelSrcAsm, dag RHS, dag MaskingRHS, + InstrItinClass itin, SDNode Select = vselect, string MaskingConstraint = "", - InstrItinClass itin = NoItinerary, bit IsCommutable = 0, bit IsKCommutable = 0> : AVX512_maskable_custom O, Format F, X86VectorVTInfo _, !con((ins _.RC:$src0, _.KRCWM:$mask), Ins), !con((ins _.KRCWM:$mask), Ins), OpcodeStr, AttSrcAsm, IntelSrcAsm, RHS, - (Select _.KRCWM:$mask, RHS, _.RC:$src0), Select, - "$src0 = $dst", itin, IsCommutable, IsKCommutable>; + (Select _.KRCWM:$mask, RHS, _.RC:$src0), itin, + Select, "$src0 = $dst", IsCommutable, IsKCommutable>; // This multiclass generates the unconditional/non-masking, the masking and // the zero-masking variant of the scalar instruction. @@ -323,7 +323,7 @@ multiclass AVX512_maskable_scalar O, Format F, X86VectorVTInfo _, multiclass AVX512_maskable_3src O, Format F, X86VectorVTInfo _, dag Outs, dag NonTiedIns, string OpcodeStr, string AttSrcAsm, string IntelSrcAsm, - dag RHS, InstrItinClass itin = NoItinerary, + dag RHS, InstrItinClass itin, bit IsCommutable = 0, bit IsKCommutable = 0, SDNode Select = vselect, @@ -334,8 +334,8 @@ multiclass AVX512_maskable_3src O, Format F, X86VectorVTInfo _, !con((ins _.RC:$src1, _.KRCWM:$mask), NonTiedIns), OpcodeStr, AttSrcAsm, IntelSrcAsm, !if(MaskOnly, (null_frag), RHS), - (Select _.KRCWM:$mask, RHS, _.RC:$src1), - Select, "", itin, IsCommutable, IsKCommutable>; + (Select _.KRCWM:$mask, RHS, _.RC:$src1), itin, + Select, "", IsCommutable, IsKCommutable>; multiclass AVX512_maskable_3src_scalar O, Format F, X86VectorVTInfo _, dag Outs, dag NonTiedIns, string OpcodeStr,