Enable amdfam15,amdfam15h, and amdfam10h support

[erichkeane]

Summary

buildin_cpu_is already supports amdfam10h and amdfam15h, the 'sans-h'
version to the check and enable it.

Addtionally, add amdfam15 as an alias for bdver1, like amdfam10 is for
barcelona.

[erichkeane]

Talking to Craig, this is just wrong for these features. Attribute-target does some funky things in order to make this work, so I'll just bring those 'hacks' into my other patch.

lib/Basic/Targets/X86.cpp

 
 // We can't use a generic validation scheme for the cpus accepted here
 // versus subtarget cpus accepted in the target attribute because the
 // variables intitialized by the runtime only support the below currently
 // rather than the full range of cpus.
 bool X86TargetInfo::validateCpuIs(StringRef FeatureStr) const {
   return llvm::StringSwitch<bool>(FeatureStr)
       .Case("amd", true)
-      .Case("amdfam10h", true)
-      .Case("amdfam15h", true)
+      .Cases("amdfam10h", "amdfam10", true)
+      .Cases("amdfam15h", "amdfam15", true)
       .Case("atom", true)
       .Case("barcelona", true)
       .Case("bdver1", true)
       .Case("bdver2", true)
       .Case("bdver3", true)
       .Case("bdver4", true)
       .Case("bonnell", true)
       .Case("broadwell", true)
return llvm::StringSwitch<CPUKind>(CPU)
       .Case("k6-3", CK_K6_3)
       .Cases("athlon", "athlon-tbird", CK_Athlon)
       .Cases("athlon-xp", "athlon-mp", "athlon-4", CK_AthlonXP)
       .Cases("k8", "athlon64", "athlon-fx", "opteron", CK_K8)
       .Cases("k8-sse3", "athlon64-sse3", "opteron-sse3", CK_K8SSE3)
       .Cases("amdfam10", "barcelona", CK_AMDFAM10)
       .Case("btver1", CK_BTVER1)
       .Case("btver2", CK_BTVER2)
-      .Case("bdver1", CK_BDVER1)
+      .Cases("amdfam15", "bdver1", CK_BDVER1)
       .Case("bdver2", CK_BDVER2)
       .Case("bdver3", CK_BDVER3)
       .Case("bdver4", CK_BDVER4)
       .Case("znver1", CK_ZNVER1)
       .Case("x86-64", CK_x86_64)
       .Case("geode", CK_Geode)
       .Default(CK_Generic);
 }

test/CodeGen/target-builtin-noerror.c

void verifyfeaturestrings() {
   (void)__builtin_cpu_supports("avx5124vnniw");
   (void)__builtin_cpu_supports("avx5124fmaps");
   (void)__builtin_cpu_supports("avx512vpopcntdq");
 }
 
 void verifycpustrings() {
   (void)__builtin_cpu_is("amd");
   (void)__builtin_cpu_is("amdfam10h");
+  (void)__builtin_cpu_is("amdfam10");
   (void)__builtin_cpu_is("amdfam15h");
+  (void)__builtin_cpu_is("amdfam15");
   (void)__builtin_cpu_is("atom");
   (void)__builtin_cpu_is("barcelona");
   (void)__builtin_cpu_is("bdver1");
   (void)__builtin_cpu_is("bdver2");
   (void)__builtin_cpu_is("bdver3");
   (void)__builtin_cpu_is("bdver4");
   (void)__builtin_cpu_is("bonnell");
   (void)__builtin_cpu_is("broadwell");

test/Preprocessor/predefined-arch-macros.c

 // CHECK_BTVER2_M64: #define __btver2 1
 // CHECK_BTVER2_M64: #define __btver2__ 1
 // CHECK_BTVER2_M64: #define __tune_btver2__ 1
 // CHECK_BTVER2_M64: #define __x86_64 1
 // CHECK_BTVER2_M64: #define __x86_64__ 1
 // RUN: %clang -march=bdver1 -m32 -E -dM %s -o - 2>&1 \
 // RUN:     -target i386-unknown-linux \
 // RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER1_M32
+// RUN: %clang -march=amdfam15 -m32 -E -dM %s -o - 2>&1 \
+// RUN:     -target i386-unknown-linux \
+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER1_M32
 // CHECK_BDVER1_M32-NOT: #define __3dNOW_A__ 1
 // CHECK_BDVER1_M32-NOT: #define __3dNOW__ 1
 // CHECK_BDVER1_M32: #define __AES__ 1
 // CHECK_BDVER1_M32: #define __AVX__ 1
 // CHECK_BDVER1_M32: #define __FMA4__ 1
 // CHECK_BDVER1_M32: #define __LWP__ 1
 // CHECK_BDVER1_M32: #define __LZCNT__ 1
 // CHECK_BDVER1_M32: #define __MMX__ 1

 // CHECK_BDVER1_M32: #define __bdver1 1
 // CHECK_BDVER1_M32: #define __bdver1__ 1
 // CHECK_BDVER1_M32: #define __i386 1
 // CHECK_BDVER1_M32: #define __i386__ 1
 // CHECK_BDVER1_M32: #define __tune_bdver1__ 1
 // RUN: %clang -march=bdver1 -m64 -E -dM %s -o - 2>&1 \
 // RUN:     -target i386-unknown-linux \
 // RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER1_M64
+// RUN: %clang -march=amdfam15 -m64 -E -dM %s -o - 2>&1 \
+// RUN:     -target i386-unknown-linux \
+// RUN:   | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER1_M64
 // CHECK_BDVER1_M64-NOT: #define __3dNOW_A__ 1
 // CHECK_BDVER1_M64-NOT: #define __3dNOW__ 1
 // CHECK_BDVER1_M64: #define __AES__ 1
 // CHECK_BDVER1_M64: #define __AVX__ 1
 // CHECK_BDVER1_M64: #define __FMA4__ 1
 // CHECK_BDVER1_M64: #define __LWP__ 1
 // CHECK_BDVER1_M64: #define __LZCNT__ 1
 // CHECK_BDVER1_M64: #define __MMX__ 1