Index: llvm/test/CodeGen/X86/cpus-amd.test
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/X86/cpus-amd.test
@@ -0,0 +1,25 @@
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=k6 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=k6-2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=k6-3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon-tbird 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon-4 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon-xp 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon-mp 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k8 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=opteron 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon64 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-fx 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k8-sse3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=opteron-sse3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon64-sse3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=amdfam10 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=barcelona 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bdver1 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bdver2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bdver3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bdver4 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=btver1 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=btver2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=znver1 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
Index: llvm/test/CodeGen/X86/cpus-intel.test
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/X86/cpus-intel.test
@@ -0,0 +1,45 @@
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=i386 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=i486 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=i586 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium-mmx 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=i686 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentiumpro 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium3m 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium-m 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium4 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium4m 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=yonah 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=prescott 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=lakemont 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=nocona 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=core2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=penryn 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=nehalem 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=corei7 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=westmere 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=sandybridge 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=corei7-avx 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=ivybridge 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=core-avx-i 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=haswell 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=core-avx2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=broadwell 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=skylake 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=skylake-avx512 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=skx 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=cannonlake 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=icelake-client 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=icelake-server 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=atom 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bonnell 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=silvermont 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=slm 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=goldmont 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=goldmont-plus 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=tremont 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=knl 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=knm 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
Index: llvm/test/CodeGen/X86/cpus-no-x86_64.test
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/X86/cpus-no-x86_64.test
@@ -0,0 +1,32 @@
+Check that we reject 64-bit mode on 32-bit only CPUs.
+CHECK-ERROR64: LLVM ERROR: 64-bit code requested on a subtarget that doesn't support it!
+
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=i386 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=i486 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=i586 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium-mmx 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=i686 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentiumpro 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium3m 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium-m 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium4 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium4m 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=yonah 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=prescott 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=lakemont 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k6 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k6-2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k6-3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-tbird 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-4 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-xp 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-mp 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=geode 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=winchip-c6 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=winchip2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=c3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-ERROR64
+RUN: not llc < %S/cpus.ll -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=c3-2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR
Index: llvm/test/CodeGen/X86/cpus-other.test
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/X86/cpus-other.test
@@ -0,0 +1,5 @@
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=geode 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=winchip-c6 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=winchip2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=c3 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
+RUN: llc < %S/cpus.ll -o /dev/null -mtriple=i686-unknown-unknown -mcpu=c3-2 2>&1 | FileCheck %S/cpus.ll --check-prefix=CHECK-NO-ERROR --allow-empty
Index: llvm/test/CodeGen/X86/cpus.ll
===================================================================
--- llvm/test/CodeGen/X86/cpus.ll
+++ llvm/test/CodeGen/X86/cpus.ll
@@ -1,136 +1,18 @@
 ; Test that the CPU names work.
-;
+; The bulk of the tests live in cpus-*.test
+
 ; First ensure the error message matches what we expect.
 ; CHECK-ERROR: not a recognized processor for this target
+
 ; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=foobar 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
-;
+
 ; Now ensure the error message doesn't occur for valid CPUs.
 ; CHECK-NO-ERROR-NOT: not a recognized processor for this target
 
 ; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=generic 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
 
-;
-; Intel Targets
-;
-
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=i386 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=i486 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=i586 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium-mmx 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=i686 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentiumpro 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium3 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium3m 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium-m 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium4 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=pentium4m 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=yonah 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=prescott 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=lakemont 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=nocona 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=core2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=penryn 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=nehalem 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=corei7 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=westmere 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=sandybridge 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=corei7-avx 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=ivybridge 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=core-avx-i 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=haswell 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=core-avx2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=broadwell 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=skylake 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=skylake-avx512 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=skx 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=cannonlake 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=icelake-client 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=icelake-server 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=atom 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bonnell 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=silvermont 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=slm 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=goldmont 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=goldmont-plus 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=tremont 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=knl 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=knm 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-
-;
-; AMD Targets
-;
-
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=k6 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=k6-2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=k6-3 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon-tbird 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon-4 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon-xp 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=athlon-mp 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k8 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=opteron 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon64 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-fx 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k8-sse3 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=opteron-sse3 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon64-sse3 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=amdfam10 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=barcelona 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bdver1 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bdver2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bdver3 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=bdver4 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=btver1 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=btver2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=znver1 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-
-;
-; Other Targets
-;
-
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=geode 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=winchip-c6 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=winchip2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=c3 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-; RUN: llc < %s -o /dev/null -mtriple=i686-unknown-unknown -mcpu=c3-2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR --allow-empty
-
-
 ; Check that we reject 64-bit mode on 32-bit only CPUs.
 ; CHECK-ERROR64: LLVM ERROR: 64-bit code requested on a subtarget that doesn't support it!
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=i386 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=i486 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=i586 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium-mmx 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=i686 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentiumpro 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium2 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium3 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium3m 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium-m 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium4 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=pentium4m 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=yonah 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=prescott 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=lakemont 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k6 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k6-2 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=k6-3 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-tbird 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-4 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-xp 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=athlon-mp 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=geode 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=winchip-c6 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=winchip2 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=c3 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR64
-; RUN: not llc < %s -o /dev/null -mtriple=x86_64-unknown-unknown -mcpu=c3-2 2>&1 | FileCheck %s --check-prefix=CHECK-NO-ERROR
 
 define void @foo() {
   ret void