From c38fff4277dea28e1e07955c1ca7379cc2a401df Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Thu, 29 Dec 2011 19:46:19 +0000 Subject: [PATCH] Make FMA3 imply AVX needs to be enabled. Particularly because 256-bit types aren't valid unless AVX is enabled. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147349 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86.td | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Target/X86/X86.td b/lib/Target/X86/X86.td index 88c62543375..d053c76de78 100644 --- a/lib/Target/X86/X86.td +++ b/lib/Target/X86/X86.td @@ -87,7 +87,8 @@ def FeatureAVX2 : SubtargetFeature<"avx2", "HasAVX2", "true", def FeatureCLMUL : SubtargetFeature<"clmul", "HasCLMUL", "true", "Enable carry-less multiplication instructions">; def FeatureFMA3 : SubtargetFeature<"fma3", "HasFMA3", "true", - "Enable three-operand fused multiple-add">; + "Enable three-operand fused multiple-add", + [FeatureAVX]>; def FeatureFMA4 : SubtargetFeature<"fma4", "HasFMA4", "true", "Enable four-operand fused multiple-add">; def FeatureXOP : SubtargetFeature<"xop", "HasXOP", "true", @@ -168,10 +169,10 @@ def : Proc<"core-avx-i", [FeatureSSE42, FeatureCMPXCHG16B, FeaturePOPCNT, FeatureRDRAND, FeatureF16C, FeatureFSGSBase]>; // Haswell -// FIXME: Disabling AVX/AVX2 for now since it's not ready. +// FIXME: Disabling AVX/AVX2/FMA3 for now since it's not ready. def : Proc<"core-avx2", [FeatureSSE42, FeatureCMPXCHG16B, FeaturePOPCNT, FeatureAES, FeatureCLMUL, FeatureRDRAND, - FeatureF16C, FeatureFSGSBase, FeatureFMA3, + FeatureF16C, FeatureFSGSBase, FeatureMOVBE, FeatureLZCNT, FeatureBMI, FeatureBMI2]>; -- 2.34.1