[X86] Fix the spelling of 3dnow and 3dnowa in isValidFeatureName

[mstorsjo]

Summary

These were missed in SVN r316783, which broke compiling mingw-w64 CRT.

isValidFeatureName should use the same spellings as used in initFeatureMap, not the ones used in hasFeature.

[craig.topper]

LGTM

[craig.topper]

Can we just add -Werror to test/CodeGen/3dnow-builtins.c to test this? I believe it should be throwing a warning currently.

Can we also remove mm3dnow and mm3dnowa from the isValidFeatureName?

[mstorsjo]

In D39631#915943, @craig.topper wrote:

Can we just add -Werror to test/CodeGen/3dnow-builtins.c to test this?

That file actually already has got -Werror

I believe it should be throwing a warning currently.

It doesn't. That test enables the feature via -target-feature +3dnowa on the command line, which is accepted even if it isn't matched in isValidFeatureName, and the header declaration doesn't trigger any warnings.

Can we also remove mm3dnow and mm3dnowa from the isValidFeatureName?

The clang tests seem to pass with that removed at least (and nothing in mingw-w64 seems to refer to it in that form so it should probably be fine) - I can update the patch (and retest building mingw-w64) with that change if you want it squashed.

[craig.topper]

Ok then we can keep the new test.

I believe the isValidFeature list was copied from the list in hasFeature. But isValidFeature should match the names used by initFeatureMap since that's what we use to look them up.

[mstorsjo]

Updated based on Craig's comments.

[craig.topper]

LGTM

cfe/trunk/lib/Basic/Targets/X86.cpp

if (CPU >= CK_i586)
     Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8");
 
   if (HasFloat128)
     Builder.defineMacro("__SIZEOF_FLOAT128__", "16");
 }
 
 bool X86TargetInfo::isValidFeatureName(StringRef Name) const {
   return llvm::StringSwitch<bool>(Name)
+      .Case("3dnow", true)
+      .Case("3dnowa", true)
       .Case("aes", true)
       .Case("avx", true)
       .Case("avx2", true)
       .Case("avx512f", true)
       .Case("avx512cd", true)
       .Case("avx512vpopcntdq", true)
       .Case("avx512er", true)
       .Case("avx512pf", true)

cfe/trunk/test/Headers/mm3dnow.c

+// RUN: %clang_cc1 -fsyntax-only -ffreestanding %s -verify
+// RUN: %clang_cc1 -fsyntax-only -ffreestanding -x c++ %s -verify
+// expected-no-diagnostics
+
+#if defined(i386) || defined(__x86_64__)
+#include <mm3dnow.h>
+
+int __attribute__((__target__(("3dnow")))) foo(int a) {
+  _m_femms();
+  return 4;
+}
+
+__m64 __attribute__((__target__(("3dnowa")))) bar(__m64 a) {
+  return _m_pf2iw(a);
+}
+#endif