commit b7a95d2941869f2dfd0d2f0e805f794b46dd4b55
author Craig Topper <craig.topper@gmail.com> Wed Aug 21 03:59:22 2013 +0000
committer Craig Topper <craig.topper@gmail.com> Wed Aug 21 03:59:22 2013 +0000
tree 64375d1fa8b17016116f4d941d34554fb711f908
parent f3693889e7567992cfd2dfb57cd4f01c41badd21

Replace avx-512 with avx512f to match llvm side and what gcc patches appear to be using.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@188860 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Basic/Targets.cpp

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 9d6406b..8816ac3 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -1538,7 +1538,7 @@
 // most of the implementation can be shared.
 class X86TargetInfo : public TargetInfo {
   enum X86SSEEnum {
-    NoSSE, SSE1, SSE2, SSE3, SSSE3, SSE41, SSE42, AVX, AVX2, AVX512
+    NoSSE, SSE1, SSE2, SSE3, SSSE3, SSE41, SSE42, AVX, AVX2, AVX512F
   } SSELevel;
   enum MMX3DNowEnum {
     NoMMX3DNow, MMX, AMD3DNow, AMD3DNowAthlon
@@ -2072,8 +2072,8 @@
                                 X86SSEEnum Level, bool Enabled) const {
   if (Enabled) {
     switch (Level) {
-    case AVX512:
-      Features["avx-512"] = true;
+    case AVX512F:
+      Features["avx512f"] = true;
     case AVX2:
       Features["avx2"] = true;
     case AVX:
@@ -2118,8 +2118,8 @@
     setXOPLevel(Features, SSE4A, false);
   case AVX2:
     Features["avx2"] = false;
-  case AVX512:
-    Features["avx-512"] = false;
+  case AVX512F:
+    Features["avx512f"] = false;
   }
 }
 
@@ -2222,7 +2222,7 @@
   else if (Name == "avx2")
     setSSELevel(Features, AVX2, Enabled);
   else if (Name == "avx-512")
-    setSSELevel(Features, AVX512, Enabled);
+    setSSELevel(Features, AVX512F, Enabled);
   else if (Name == "fma") {
     if (Enabled)
       setSSELevel(Features, AVX, Enabled);
@@ -2308,7 +2308,7 @@
 
     assert(Features[i][0] == '+' && "Invalid target feature!");
     X86SSEEnum Level = llvm::StringSwitch<X86SSEEnum>(Feature)
-      .Case("avx-512", AVX512)
+      .Case("avx-512", AVX512F)
       .Case("avx2", AVX2)
       .Case("avx", AVX)
       .Case("sse42", SSE42)
@@ -2543,7 +2543,7 @@
 
   // Each case falls through to the previous one here.
   switch (SSELevel) {
-  case AVX512:
+  case AVX512F:
     Builder.defineMacro("__AVX512F__");
   case AVX2:
     Builder.defineMacro("__AVX2__");
@@ -2569,7 +2569,7 @@
 
   if (Opts.MicrosoftExt && getTriple().getArch() == llvm::Triple::x86) {
     switch (SSELevel) {
-    case AVX512:
+    case AVX512F:
     case AVX2:
     case AVX:
     case SSE42:
@@ -2613,7 +2613,7 @@
       .Case("aes", HasAES)
       .Case("avx", SSELevel >= AVX)
       .Case("avx2", SSELevel >= AVX2)
-      .Case("avx512", SSELevel >= AVX512)
+      .Case("avx512f", SSELevel >= AVX512F)
       .Case("bmi", HasBMI)
       .Case("bmi2", HasBMI2)
       .Case("fma", HasFMA)