<div class="gmail_quote">On Tue, May 29, 2012 at 10:54 PM, Craig Topper <span dir="ltr"><<a href="mailto:craig.topper@gmail.com" target="_blank">craig.topper@gmail.com</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 May 30 00:54:54 2012<br>
New Revision: 157680<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=157680&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=157680&view=rev</a><br>
Log:<br>
SSE4A should not imply LZCNT and POPCNT. FMA4 should imply SSE4A. Add missing break at the end of btver1 feature list.<br></blockquote><div><br></div><div>I feel like all of these should have some tests... Maybe the preprocessor predefines that result? Is there a more direct way to test?</div>
<div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    cfe/trunk/lib/Basic/Targets.cpp<br>
<br>
Modified: cfe/trunk/lib/Basic/Targets.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=157680&r1=157679&r2=157680&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=157680&r1=157679&r2=157680&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/lib/Basic/Targets.cpp (original)<br>
+++ cfe/trunk/lib/Basic/Targets.cpp Wed May 30 00:54:54 2012<br>
@@ -1689,6 +1689,7 @@<br>
   case CK_BTVER1:<br>
     setFeatureEnabled(Features, "ssse3", true);<br>
     setFeatureEnabled(Features, "sse4a", true);<br>
+    break;<br>
   case CK_BDVER1:<br>
   case CK_BDVER2:<br>
     setFeatureEnabled(Features, "avx", true);<br>
@@ -1750,10 +1751,11 @@<br>
     else if (Name == "fma4")<br>
         Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =<br>
         Features["ssse3"] = Features["sse41"] = Features["sse42"] =<br>
-        Features["popcnt"] = Features["avx"] = Features["fma4"] = true;<br>
+        Features["popcnt"] = Features["avx"] = Features["sse4a"] =<br>
+        Features["fma4"] = true;<br>
     else if (Name == "sse4a")<br>
       Features["mmx"] = Features["sse"] = Features["sse2"] = Features["sse3"] =<br>
-        Features["lzcnt"] = Features["popcnt"] = Features["sse4a"] = true;<br>
+        Features["sse4a"] = true;<br>
     else if (Name == "lzcnt")<br>
       Features["lzcnt"] = true;<br>
     else if (Name == "bmi")<br>
@@ -1792,7 +1794,7 @@<br>
     else if (Name == "avx2")<br>
       Features["avx2"] = false;<br>
     else if (Name == "sse4a")<br>
-      Features["sse4a"] = false;<br>
+      Features["sse4a"] = Features["fma4"] = false;<br>
     else if (Name == "lzcnt")<br>
       Features["lzcnt"] = false;<br>
     else if (Name == "bmi")<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br>