diff --git a/lib/Target/X86/X86InstrSSE.td b/lib/Target/X86/X86InstrSSE.td index 8ffb8e8cd37..e5e9d59e344 100644 --- a/lib/Target/X86/X86InstrSSE.td +++ b/lib/Target/X86/X86InstrSSE.td @@ -672,29 +672,25 @@ let Constraints = "$src1 = $dst" in { multiclass basic_sse12_fp_binop_rm opc, string OpcodeStr, SDNode OpNode, bit Commutable = 0> { - let Constraints = "", isAsmParserOnly = 1, hasVEX_4VPrefix = 1 in { + let Constraints = "", isAsmParserOnly = 1 in { // Scalar operation, reg+reg. - let Prefix = 12 /* XS */ in - defm V#NAME#SS : sse12_fp_scalar; + OpNode, FR32, f32mem>, XS, VEX_4V; - let Prefix = 11 /* XD */ in - defm V#NAME#SD : sse12_fp_scalar; + OpNode, FR64, f64mem>, XD, VEX_4V; } let Constraints = "$src1 = $dst" in { // Scalar operation, reg+reg. - let Prefix = 12 /* XS */ in - defm SS : sse12_fp_scalar; - let Prefix = 11 /* XD */ in - defm SD : sse12_fp_scalar; + defm SS : sse12_fp_scalar, XS; + defm SD : sse12_fp_scalar, XD; } // Vector operation, reg+reg. @@ -857,29 +853,25 @@ let Constraints = "$src1 = $dst" in { multiclass sse12_fp_binop_rm opc, string OpcodeStr, SDNode OpNode, bit Commutable = 0> { - let Constraints = "", isAsmParserOnly = 1, hasVEX_4VPrefix = 1 in { + let Constraints = "", isAsmParserOnly = 1 in { // Scalar operation, reg+reg. - let Prefix = 12 /* XS */ in - defm V#NAME#SS : sse12_fp_scalar; + defm V#NAME#SS : sse12_fp_scalar, XS, VEX_4V; - let Prefix = 11 /* XD */ in - defm V#NAME#SD : sse12_fp_scalar; + defm V#NAME#SD : sse12_fp_scalar, XD, VEX_4V; } let Constraints = "$src1 = $dst" in { // Scalar operation, reg+reg. - let Prefix = 12 /* XS */ in - defm SS : sse12_fp_scalar; - let Prefix = 11 /* XD */ in - defm SD : sse12_fp_scalar; + defm SS : sse12_fp_scalar, XS; + defm SD : sse12_fp_scalar, XD; } // Vector operation, reg+reg.