[X86] Add support for 'amdfam17h' to __builtin_cpu_is to match gcc.

The compiler-rt implementation already supported it, it just wasn't exposed.

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

diff --git a/lib/Basic/Targets/X86.cpp b/lib/Basic/Targets/X86.cpp
index c1bdf66a8186826752ac0344e76407896e3853cf..8e2f5940bb8682ec7fc01784bdd43fcaf1ddb946 100644 (file)
--- a/lib/Basic/Targets/X86.cpp
+++ b/lib/Basic/Targets/X86.cpp
@@ -1293,6 +1293,7 @@ bool X86TargetInfo::validateCpuIs(StringRef FeatureStr) const {
       .Case("amd", true)
       .Case("amdfam10h", true)
       .Case("amdfam15h", true)
+      .Case("amdfam17h", true)
       .Case("atom", true)
       .Case("barcelona", true)
       .Case("bdver1", true)

diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index a4e6452a7d52ed0a1eab0ab74b238cc4f0775651..f25a70a853783cd0ef765f3e5b2c428ad35901ce 100644 (file)
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -7501,6 +7501,7 @@ Value *CodeGenFunction::EmitX86CpuIs(StringRef CPUStr) {
     INTEL_KNL,
     AMD_BTVER1,
     AMD_BTVER2,
+    AMDFAM17H,
     CPU_SUBTYPE_START,
     INTEL_COREI7_NEHALEM,
     INTEL_COREI7_WESTMERE,
@@ -7527,6 +7528,7 @@ Value *CodeGenFunction::EmitX86CpuIs(StringRef CPUStr) {
       .Case("amdfam10", AMDFAM10H)
       .Case("amdfam15h", AMDFAM15H)
       .Case("amdfam15", AMDFAM15H)
+      .Case("amdfam17h", AMDFAM17H)
       .Case("atom", INTEL_BONNELL)
       .Case("barcelona", AMDFAM10H_BARCELONA)
       .Case("bdver1", AMDFAM15H_BDVER1)

diff --git a/test/CodeGen/target-builtin-noerror.c b/test/CodeGen/target-builtin-noerror.c
index fcf9bc945d2776fcef938a997cac289b4799678c..63fc7c965dce9851ec08f1e01d66154200c0ede2 100644 (file)
--- a/test/CodeGen/target-builtin-noerror.c
+++ b/test/CodeGen/target-builtin-noerror.c
@@ -81,6 +81,7 @@ void verifycpustrings() {
   (void)__builtin_cpu_is("amd");
   (void)__builtin_cpu_is("amdfam10h");
   (void)__builtin_cpu_is("amdfam15h");
+  (void)__builtin_cpu_is("amdfam17h");
   (void)__builtin_cpu_is("atom");
   (void)__builtin_cpu_is("barcelona");
   (void)__builtin_cpu_is("bdver1");