<div dir="ltr">Merged to 6.0 in r323741.</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jan 11, 2018 at 2:37 AM, Craig Topper via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ctopper<br>
Date: Wed Jan 10 17:37:59 2018<br>
New Revision: 322245<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=322245&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=322245&view=rev</a><br>
Log:<br>
[X86] Make -mavx512f imply -mfma and -mf16c in the frontend like it does in the backend.<br>
<br>
Similarly, make -mno-fma and -mno-f16c imply -mno-avx512f.<br>
<br>
Withou this  "-mno-sse -mavx512f" ends up with avx512f being enabled in the frontend but disabled in the backend.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Basic/Targets/<wbr>X86.cpp<br>
<br>
Modified: cfe/trunk/lib/Basic/Targets/<wbr>X86.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/X86.cpp?rev=322245&r1=322244&r2=322245&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Basic/<wbr>Targets/X86.cpp?rev=322245&r1=<wbr>322244&r2=322245&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Basic/Targets/<wbr>X86.cpp (original)<br>
+++ cfe/trunk/lib/Basic/Targets/<wbr>X86.cpp Wed Jan 10 17:37:59 2018<br>
@@ -430,7 +430,7 @@ void X86TargetInfo::setSSELevel(<wbr>llvm::St<br>
   if (Enabled) {<br>
     switch (Level) {<br>
     case AVX512F:<br>
-      Features["avx512f"] = true;<br>
+      Features["avx512f"] = Features["fma"] = Features["f16c"] = true;<br>
       LLVM_FALLTHROUGH;<br>
     case AVX2:<br>
       Features["avx2"] = true;<br>
@@ -644,6 +644,8 @@ void X86TargetInfo::<wbr>setFeatureEnabledImp<br>
   } else if (Name == "fma") {<br>
     if (Enabled)<br>
       setSSELevel(Features, AVX, Enabled);<br>
+    else<br>
+      setSSELevel(Features, AVX512F, Enabled);<br>
   } else if (Name == "fma4") {<br>
     setXOPLevel(Features, FMA4, Enabled);<br>
   } else if (Name == "xop") {<br>
@@ -653,6 +655,8 @@ void X86TargetInfo::<wbr>setFeatureEnabledImp<br>
   } else if (Name == "f16c") {<br>
     if (Enabled)<br>
       setSSELevel(Features, AVX, Enabled);<br>
+    else<br>
+      setSSELevel(Features, AVX512F, Enabled);<br>
   } else if (Name == "sha") {<br>
     if (Enabled)<br>
       setSSELevel(Features, SSE2, Enabled);<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>