summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@intel.com>2017-10-11 21:42:02 +0000
committerCraig Topper <craig.topper@intel.com>2017-10-11 21:42:02 +0000
commit9563977e8bce81b1dd88ce7579e36a055e3ff90b (patch)
tree012c8b9bacc5bd62613d2d95582ed4fa1cb3ad04
parentadf2c165d942ae953c7c52e04fc94e6c35185a18 (diff)
[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
-rw-r--r--lib/Basic/Targets/X86.cpp1
-rw-r--r--lib/CodeGen/CGBuiltin.cpp2
-rw-r--r--test/CodeGen/target-builtin-noerror.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/lib/Basic/Targets/X86.cpp b/lib/Basic/Targets/X86.cpp
index c1bdf66a81..8e2f5940bb 100644
--- 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 a4e6452a7d..f25a70a853 100644
--- 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 fcf9bc945d..63fc7c965d 100644
--- 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");