There's a missing break in the BDVER1 case isn't there?<br><br><div class="gmail_quote">On Fri, Nov 16, 2012 at 5:43 PM, Eli Friedman <span dir="ltr"><<a href="mailto:eli.friedman@gmail.com" target="_blank">eli.friedman@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: efriedma<br>
Date: Fri Nov 16 19:43:10 2012<br>
New Revision: 168239<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=168239&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=168239&view=rev</a><br>
Log:<br>
Add missing features for misc x86 CPUs to CPU feature translation. Patch by Jung-uk Kim.<br>
<br>
<br>
Modified:<br>
cfe/trunk/lib/Basic/Targets.cpp<br>
cfe/trunk/test/Preprocessor/predefined-arch-macros.c<br>
<br>
Modified: cfe/trunk/lib/Basic/Targets.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=168239&r1=168238&r2=168239&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=168239&r1=168238&r2=168239&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Basic/Targets.cpp (original)<br>
+++ cfe/trunk/lib/Basic/Targets.cpp Fri Nov 16 19:43:10 2012<br>
@@ -1889,6 +1889,7 @@<br>
setFeatureEnabled(Features, "aes", true);<br>
setFeatureEnabled(Features, "pclmul", true);<br>
setFeatureEnabled(Features, "rdrnd", true);<br>
+ setFeatureEnabled(Features, "f16c", true);<br>
break;<br>
case CK_CoreAVX2:<br>
setFeatureEnabled(Features, "avx2", true);<br>
@@ -1896,6 +1897,7 @@<br>
setFeatureEnabled(Features, "pclmul", true);<br>
setFeatureEnabled(Features, "lzcnt", true);<br>
setFeatureEnabled(Features, "rdrnd", true);<br>
+ setFeatureEnabled(Features, "f16c", true);<br>
setFeatureEnabled(Features, "bmi", true);<br>
setFeatureEnabled(Features, "bmi2", true);<br>
setFeatureEnabled(Features, "rtm", true);<br>
@@ -1939,17 +1941,28 @@<br>
setFeatureEnabled(Features, "sse3", true);<br>
setFeatureEnabled(Features, "sse4a", true);<br>
setFeatureEnabled(Features, "3dnowa", true);<br>
+ setFeatureEnabled(Features, "lzcnt", true);<br>
+ setFeatureEnabled(Features, "popcnt", true);<br>
break;<br>
case CK_BTVER1:<br>
setFeatureEnabled(Features, "ssse3", true);<br>
setFeatureEnabled(Features, "sse4a", true);<br>
+ setFeatureEnabled(Features, "lzcnt", true);<br>
+ setFeatureEnabled(Features, "popcnt", true);<br>
break;<br>
case CK_BDVER1:<br>
+ setFeatureEnabled(Features, "xop", true);<br>
+ setFeatureEnabled(Features, "lzcnt", true);<br>
+ setFeatureEnabled(Features, "aes", true);<br>
+ setFeatureEnabled(Features, "pclmul", true);<br>
case CK_BDVER2:<br>
- setFeatureEnabled(Features, "avx", true);<br>
setFeatureEnabled(Features, "xop", true);<br>
+ setFeatureEnabled(Features, "lzcnt", true);<br>
setFeatureEnabled(Features, "aes", true);<br>
setFeatureEnabled(Features, "pclmul", true);<br>
+ setFeatureEnabled(Features, "bmi", true);<br>
+ setFeatureEnabled(Features, "fma", true);<br>
+ setFeatureEnabled(Features, "f16c", true);<br>
break;<br>
case CK_C3_2:<br>
setFeatureEnabled(Features, "sse", true);<br>
<br>
Modified: cfe/trunk/test/Preprocessor/predefined-arch-macros.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/predefined-arch-macros.c?rev=168239&r1=168238&r2=168239&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/predefined-arch-macros.c?rev=168239&r1=168238&r2=168239&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Preprocessor/predefined-arch-macros.c (original)<br>
+++ cfe/trunk/test/Preprocessor/predefined-arch-macros.c Fri Nov 16 19:43:10 2012<br>
@@ -464,6 +464,7 @@<br>
// RUN: | FileCheck %s -check-prefix=CHECK_CORE_AVX_I_M32<br>
// CHECK_CORE_AVX_I_M32: #define __AES__ 1<br>
// CHECK_CORE_AVX_I_M32: #define __AVX__ 1<br>
+// CHECK_CORE_AVX_I_M32: #define __F16C__ 1<br>
// CHECK_CORE_AVX_I_M32: #define __MMX__ 1<br>
// CHECK_CORE_AVX_I_M32: #define __PCLMUL__ 1<br>
// CHECK_CORE_AVX_I_M32: #define __RDRND__ 1<br>
@@ -484,6 +485,7 @@<br>
// RUN: | FileCheck %s -check-prefix=CHECK_CORE_AVX_I_M64<br>
// CHECK_CORE_AVX_I_M64: #define __AES__ 1<br>
// CHECK_CORE_AVX_I_M64: #define __AVX__ 1<br>
+// CHECK_CORE_AVX_I_M64: #define __F16C__ 1<br>
// CHECK_CORE_AVX_I_M64: #define __MMX__ 1<br>
// CHECK_CORE_AVX_I_M64: #define __PCLMUL__ 1<br>
// CHECK_CORE_AVX_I_M64: #define __RDRND__ 1<br>
@@ -510,6 +512,7 @@<br>
// CHECK_CORE_AVX2_M32: #define __AVX__ 1<br>
// CHECK_CORE_AVX2_M32: #define __BMI2__ 1<br>
// CHECK_CORE_AVX2_M32: #define __BMI__ 1<br>
+// CHECK_CORE_AVX2_M32: #define __F16C__ 1<br>
// CHECK_CORE_AVX2_M32: #define __FMA__ 1<br>
// CHECK_CORE_AVX2_M32: #define __LZCNT__ 1<br>
// CHECK_CORE_AVX2_M32: #define __MMX__ 1<br>
@@ -536,6 +539,7 @@<br>
// CHECK_CORE_AVX2_M64: #define __AVX__ 1<br>
// CHECK_CORE_AVX2_M64: #define __BMI2__ 1<br>
// CHECK_CORE_AVX2_M64: #define __BMI__ 1<br>
+// CHECK_CORE_AVX2_M64: #define __F16C__ 1<br>
// CHECK_CORE_AVX2_M64: #define __FMA__ 1<br>
// CHECK_CORE_AVX2_M64: #define __LZCNT__ 1<br>
// CHECK_CORE_AVX2_M64: #define __MMX__ 1<br>
@@ -1008,12 +1012,33 @@<br>
// CHECK_ATHLON_FX_M64: #define __tune_k8__ 1<br>
// CHECK_ATHLON_FX_M64: #define __x86_64 1<br>
// CHECK_ATHLON_FX_M64: #define __x86_64__ 1<br>
+// RUN: %clang -march=amdfam10 -m32 -E -dM %s -o - 2>&1 \<br>
+// RUN: -target i386-unknown-linux \<br>
+// RUN: | FileCheck %s -check-prefix=CHECK_AMDFAM10_M32<br>
+// CHECK_AMDFAM10_M32: #define __3dNOW_A__ 1<br>
+// CHECK_AMDFAM10_M32: #define __3dNOW__ 1<br>
+// CHECK_AMDFAM10_M32: #define __LZCNT__ 1<br>
+// CHECK_AMDFAM10_M32: #define __MMX__ 1<br>
+// CHECK_AMDFAM10_M32: #define __POPCNT__ 1<br>
+// CHECK_AMDFAM10_M32: #define __SSE2_MATH__ 1<br>
+// CHECK_AMDFAM10_M32: #define __SSE2__ 1<br>
+// CHECK_AMDFAM10_M32: #define __SSE3__ 1<br>
+// CHECK_AMDFAM10_M32: #define __SSE4A__ 1<br>
+// CHECK_AMDFAM10_M32: #define __SSE_MATH__ 1<br>
+// CHECK_AMDFAM10_M32: #define __SSE__ 1<br>
+// CHECK_AMDFAM10_M32: #define __amdfam10 1<br>
+// CHECK_AMDFAM10_M32: #define __amdfam10__ 1<br>
+// CHECK_AMDFAM10_M32: #define __i386 1<br>
+// CHECK_AMDFAM10_M32: #define __i386__ 1<br>
+// CHECK_AMDFAM10_M32: #define __tune_amdfam10__ 1<br>
// RUN: %clang -march=amdfam10 -m64 -E -dM %s -o - 2>&1 \<br>
// RUN: -target i386-unknown-linux \<br>
// RUN: | FileCheck %s -check-prefix=CHECK_AMDFAM10_M64<br>
// CHECK_AMDFAM10_M64: #define __3dNOW_A__ 1<br>
// CHECK_AMDFAM10_M64: #define __3dNOW__ 1<br>
+// CHECK_AMDFAM10_M64: #define __LZCNT__ 1<br>
// CHECK_AMDFAM10_M64: #define __MMX__ 1<br>
+// CHECK_AMDFAM10_M64: #define __POPCNT__ 1<br>
// CHECK_AMDFAM10_M64: #define __SSE2_MATH__ 1<br>
// CHECK_AMDFAM10_M64: #define __SSE2__ 1<br>
// CHECK_AMDFAM10_M64: #define __SSE3__ 1<br>
@@ -1027,15 +1052,87 @@<br>
// CHECK_AMDFAM10_M64: #define __tune_amdfam10__ 1<br>
// CHECK_AMDFAM10_M64: #define __x86_64 1<br>
// CHECK_AMDFAM10_M64: #define __x86_64__ 1<br>
+// RUN: %clang -march=btver1 -m32 -E -dM %s -o - 2>&1 \<br>
+// RUN: -target i386-unknown-linux \<br>
+// RUN: | FileCheck %s -check-prefix=CHECK_BTVER1_M32<br>
+// CHECK_BTVER1_M32-NOT: #define __3dNOW_A__ 1<br>
+// CHECK_BTVER1_M32-NOT: #define __3dNOW__ 1<br>
+// CHECK_BTVER1_M32: #define __LZCNT__ 1<br>
+// CHECK_BTVER1_M32: #define __MMX__ 1<br>
+// CHECK_BTVER1_M32: #define __POPCNT__ 1<br>
+// CHECK_BTVER1_M32: #define __SSE2_MATH__ 1<br>
+// CHECK_BTVER1_M32: #define __SSE2__ 1<br>
+// CHECK_BTVER1_M32: #define __SSE3__ 1<br>
+// CHECK_BTVER1_M32: #define __SSE4A__ 1<br>
+// CHECK_BTVER1_M32: #define __SSE_MATH__ 1<br>
+// CHECK_BTVER1_M32: #define __SSE__ 1<br>
+// CHECK_BTVER1_M32: #define __SSSE3__ 1<br>
+// CHECK_BTVER1_M32: #define __btver1 1<br>
+// CHECK_BTVER1_M32: #define __btver1__ 1<br>
+// CHECK_BTVER1_M32: #define __i386 1<br>
+// CHECK_BTVER1_M32: #define __i386__ 1<br>
+// CHECK_BTVER1_M32: #define __tune_btver1__ 1<br>
+// RUN: %clang -march=btver1 -m64 -E -dM %s -o - 2>&1 \<br>
+// RUN: -target i386-unknown-linux \<br>
+// RUN: | FileCheck %s -check-prefix=CHECK_BTVER1_M64<br>
+// CHECK_BTVER1_M64-NOT: #define __3dNOW_A__ 1<br>
+// CHECK_BTVER1_M64-NOT: #define __3dNOW__ 1<br>
+// CHECK_BTVER1_M64: #define __LZCNT__ 1<br>
+// CHECK_BTVER1_M64: #define __MMX__ 1<br>
+// CHECK_BTVER1_M64: #define __POPCNT__ 1<br>
+// CHECK_BTVER1_M64: #define __SSE2_MATH__ 1<br>
+// CHECK_BTVER1_M64: #define __SSE2__ 1<br>
+// CHECK_BTVER1_M64: #define __SSE3__ 1<br>
+// CHECK_BTVER1_M64: #define __SSE4A__ 1<br>
+// CHECK_BTVER1_M64: #define __SSE_MATH__ 1<br>
+// CHECK_BTVER1_M64: #define __SSE__ 1<br>
+// CHECK_BTVER1_M64: #define __SSSE3__ 1<br>
+// CHECK_BTVER1_M64: #define __amd64 1<br>
+// CHECK_BTVER1_M64: #define __amd64__ 1<br>
+// CHECK_BTVER1_M64: #define __btver1 1<br>
+// CHECK_BTVER1_M64: #define __btver1__ 1<br>
+// CHECK_BTVER1_M64: #define __tune_btver1__ 1<br>
+// CHECK_BTVER1_M64: #define __x86_64 1<br>
+// CHECK_BTVER1_M64: #define __x86_64__ 1<br>
+// RUN: %clang -march=bdver1 -m32 -E -dM %s -o - 2>&1 \<br>
+// RUN: -target i386-unknown-linux \<br>
+// RUN: | FileCheck %s -check-prefix=CHECK_BDVER1_M32<br>
+// CHECK_BDVER1_M32-NOT: #define __3dNOW_A__ 1<br>
+// CHECK_BDVER1_M32-NOT: #define __3dNOW__ 1<br>
+// CHECK_BDVER1_M32: #define __AES__ 1<br>
+// CHECK_BDVER1_M32: #define __AVX__ 1<br>
+// CHECK_BDVER1_M32: #define __FMA4__ 1<br>
+// CHECK_BDVER1_M32: #define __LZCNT__ 1<br>
+// CHECK_BDVER1_M32: #define __MMX__ 1<br>
+// CHECK_BDVER1_M32: #define __PCLMUL__ 1<br>
+// CHECK_BDVER1_M32: #define __POPCNT__ 1<br>
+// CHECK_BDVER1_M32: #define __SSE2_MATH__ 1<br>
+// CHECK_BDVER1_M32: #define __SSE2__ 1<br>
+// CHECK_BDVER1_M32: #define __SSE3__ 1<br>
+// CHECK_BDVER1_M32: #define __SSE4A__ 1<br>
+// CHECK_BDVER1_M32: #define __SSE4_1__ 1<br>
+// CHECK_BDVER1_M32: #define __SSE4_2__ 1<br>
+// CHECK_BDVER1_M32: #define __SSE_MATH__ 1<br>
+// CHECK_BDVER1_M32: #define __SSE__ 1<br>
+// CHECK_BDVER1_M32: #define __SSSE3__ 1<br>
+// CHECK_BDVER1_M32: #define __XOP__ 1<br>
+// CHECK_BDVER1_M32: #define __bdver1 1<br>
+// CHECK_BDVER1_M32: #define __bdver1__ 1<br>
+// CHECK_BDVER1_M32: #define __i386 1<br>
+// CHECK_BDVER1_M32: #define __i386__ 1<br>
+// CHECK_BDVER1_M32: #define __tune_bdver1__ 1<br>
// RUN: %clang -march=bdver1 -m64 -E -dM %s -o - 2>&1 \<br>
// RUN: -target i386-unknown-linux \<br>
// RUN: | FileCheck %s -check-prefix=CHECK_BDVER1_M64<br>
-// CHECK_BDVER1_M64: #define __AVX__ 1<br>
// CHECK_BDVER1_M64-NOT: #define __3dNOW_A__ 1<br>
// CHECK_BDVER1_M64-NOT: #define __3dNOW__ 1<br>
+// CHECK_BDVER1_M64: #define __AES__ 1<br>
+// CHECK_BDVER1_M64: #define __AVX__ 1<br>
// CHECK_BDVER1_M64: #define __FMA4__ 1<br>
+// CHECK_BDVER1_M64: #define __LZCNT__ 1<br>
// CHECK_BDVER1_M64: #define __MMX__ 1<br>
// CHECK_BDVER1_M64: #define __PCLMUL__ 1<br>
+// CHECK_BDVER1_M64: #define __POPCNT__ 1<br>
// CHECK_BDVER1_M64: #define __SSE2_MATH__ 1<br>
// CHECK_BDVER1_M64: #define __SSE2__ 1<br>
// CHECK_BDVER1_M64: #define __SSE3__ 1<br>
@@ -1053,5 +1150,67 @@<br>
// CHECK_BDVER1_M64: #define __tune_bdver1__ 1<br>
// CHECK_BDVER1_M64: #define __x86_64 1<br>
// CHECK_BDVER1_M64: #define __x86_64__ 1<br>
+// RUN: %clang -march=bdver2 -m32 -E -dM %s -o - 2>&1 \<br>
+// RUN: -target i386-unknown-linux \<br>
+// RUN: | FileCheck %s -check-prefix=CHECK_BDVER2_M32<br>
+// CHECK_BDVER2_M32-NOT: #define __3dNOW_A__ 1<br>
+// CHECK_BDVER2_M32-NOT: #define __3dNOW__ 1<br>
+// CHECK_BDVER2_M32: #define __AES__ 1<br>
+// CHECK_BDVER2_M32: #define __AVX__ 1<br>
+// CHECK_BDVER2_M32: #define __BMI__ 1<br>
+// CHECK_BDVER2_M32: #define __F16C__ 1<br>
+// CHECK_BDVER2_M32: #define __FMA4__ 1<br>
+// CHECK_BDVER2_M32: #define __FMA__ 1<br>
+// CHECK_BDVER2_M32: #define __LZCNT__ 1<br>
+// CHECK_BDVER2_M32: #define __MMX__ 1<br>
+// CHECK_BDVER2_M32: #define __PCLMUL__ 1<br>
+// CHECK_BDVER2_M32: #define __POPCNT__ 1<br>
+// CHECK_BDVER2_M32: #define __SSE2_MATH__ 1<br>
+// CHECK_BDVER2_M32: #define __SSE2__ 1<br>
+// CHECK_BDVER2_M32: #define __SSE3__ 1<br>
+// CHECK_BDVER2_M32: #define __SSE4A__ 1<br>
+// CHECK_BDVER2_M32: #define __SSE4_1__ 1<br>
+// CHECK_BDVER2_M32: #define __SSE4_2__ 1<br>
+// CHECK_BDVER2_M32: #define __SSE_MATH__ 1<br>
+// CHECK_BDVER2_M32: #define __SSE__ 1<br>
+// CHECK_BDVER2_M32: #define __SSSE3__ 1<br>
+// CHECK_BDVER2_M32: #define __XOP__ 1<br>
+// CHECK_BDVER2_M32: #define __bdver2 1<br>
+// CHECK_BDVER2_M32: #define __bdver2__ 1<br>
+// CHECK_BDVER2_M32: #define __i386 1<br>
+// CHECK_BDVER2_M32: #define __i386__ 1<br>
+// CHECK_BDVER2_M32: #define __tune_bdver2__ 1<br>
+// RUN: %clang -march=bdver2 -m64 -E -dM %s -o - 2>&1 \<br>
+// RUN: -target i386-unknown-linux \<br>
+// RUN: | FileCheck %s -check-prefix=CHECK_BDVER2_M64<br>
+// CHECK_BDVER2_M64-NOT: #define __3dNOW_A__ 1<br>
+// CHECK_BDVER2_M64-NOT: #define __3dNOW__ 1<br>
+// CHECK_BDVER2_M64: #define __AES__ 1<br>
+// CHECK_BDVER2_M64: #define __AVX__ 1<br>
+// CHECK_BDVER2_M64: #define __BMI__ 1<br>
+// CHECK_BDVER2_M64: #define __F16C__ 1<br>
+// CHECK_BDVER2_M64: #define __FMA4__ 1<br>
+// CHECK_BDVER2_M64: #define __FMA__ 1<br>
+// CHECK_BDVER2_M64: #define __LZCNT__ 1<br>
+// CHECK_BDVER2_M64: #define __MMX__ 1<br>
+// CHECK_BDVER2_M64: #define __PCLMUL__ 1<br>
+// CHECK_BDVER2_M64: #define __POPCNT__ 1<br>
+// CHECK_BDVER2_M64: #define __SSE2_MATH__ 1<br>
+// CHECK_BDVER2_M64: #define __SSE2__ 1<br>
+// CHECK_BDVER2_M64: #define __SSE3__ 1<br>
+// CHECK_BDVER2_M64: #define __SSE4A__ 1<br>
+// CHECK_BDVER2_M64: #define __SSE4_1__ 1<br>
+// CHECK_BDVER2_M64: #define __SSE4_2__ 1<br>
+// CHECK_BDVER2_M64: #define __SSE_MATH__ 1<br>
+// CHECK_BDVER2_M64: #define __SSE__ 1<br>
+// CHECK_BDVER2_M64: #define __SSSE3__ 1<br>
+// CHECK_BDVER2_M64: #define __XOP__ 1<br>
+// CHECK_BDVER2_M64: #define __amd64 1<br>
+// CHECK_BDVER2_M64: #define __amd64__ 1<br>
+// CHECK_BDVER2_M64: #define __bdver2 1<br>
+// CHECK_BDVER2_M64: #define __bdver2__ 1<br>
+// CHECK_BDVER2_M64: #define __tune_bdver2__ 1<br>
+// CHECK_BDVER2_M64: #define __x86_64 1<br>
+// CHECK_BDVER2_M64: #define __x86_64__ 1<br>
//<br>
// End X86/GCC/Linux tests ------------------<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><br>-- <br>~Craig<br>