[llvm] 82bee92 - Make FEATURE_AVX512VP2INTERSECT match between compiler-rt and LLVM

[Benjamin Kramer via llvm-commits]

Author: Benjamin Kramer
Date: 2020-05-25T15:18:04+02:00
New Revision: 82bee922afd65bf884abb9ea3db3fc7fede4e1cf

URL: https://github.com/llvm/llvm-project/commit/82bee922afd65bf884abb9ea3db3fc7fede4e1cf
DIFF: https://github.com/llvm/llvm-project/commit/82bee922afd65bf884abb9ea3db3fc7fede4e1cf.diff

LOG: Make FEATURE_AVX512VP2INTERSECT match between compiler-rt and LLVM

compiler-rt also doesn't support bits >= 64 as far as I know.

Added: 
    

Modified: 
    llvm/include/llvm/Support/X86TargetParser.def
    llvm/lib/Support/Host.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Support/X86TargetParser.def b/llvm/include/llvm/Support/X86TargetParser.def
index f4780c7d113e..c826f590b71f 100644
--- a/llvm/include/llvm/Support/X86TargetParser.def
+++ b/llvm/include/llvm/Support/X86TargetParser.def
@@ -162,7 +162,7 @@ X86_FEATURE_COMPAT(33, FEATURE_VPCLMULQDQ,      "vpclmulqdq")
 X86_FEATURE_COMPAT(34, FEATURE_AVX512VNNI,      "avx512vnni")
 X86_FEATURE_COMPAT(35, FEATURE_AVX512BITALG,    "avx512bitalg")
 X86_FEATURE_COMPAT(36, FEATURE_AVX512BF16,      "avx512bf16")
-X86_FEATURE_COMPAT(69, FEATURE_AVX512VP2INTERSECT, "avx512vp2intersect")
+X86_FEATURE_COMPAT(37, FEATURE_AVX512VP2INTERSECT, "avx512vp2intersect")
 // Features below here are not in libgcc/compiler-rt.
 X86_FEATURE       (64, FEATURE_MOVBE)
 X86_FEATURE       (65, FEATURE_ADX)

diff  --git a/llvm/lib/Support/Host.cpp b/llvm/lib/Support/Host.cpp
index d9187efafbc1..d9b3cac5e8dc 100644
--- a/llvm/lib/Support/Host.cpp
+++ b/llvm/lib/Support/Host.cpp
@@ -776,7 +776,7 @@ getIntelProcessorTypeAndSubtype(unsigned Family, unsigned Model,
 
     default: // Unknown family 6 CPU, try to guess.
       // TODO detect tigerlake host
-      if (Features3 & (1 << (X86::FEATURE_AVX512VP2INTERSECT - 64))) {
+      if (Features2 & (1 << (X86::FEATURE_AVX512VP2INTERSECT - 32))) {
         *Type = X86::INTEL_COREI7;
         *Subtype = X86::INTEL_COREI7_TIGERLAKE;
         break;