<div dir="ltr">Thanks for catching that.<div><br clear="all"><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature">~Craig</div></div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, May 25, 2020 at 3:12 PM Benjamin Kramer via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Benjamin Kramer<br>
Date: 2020-05-25T15:18:04+02:00<br>
New Revision: 82bee922afd65bf884abb9ea3db3fc7fede4e1cf<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/82bee922afd65bf884abb9ea3db3fc7fede4e1cf" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/82bee922afd65bf884abb9ea3db3fc7fede4e1cf</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/82bee922afd65bf884abb9ea3db3fc7fede4e1cf.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/82bee922afd65bf884abb9ea3db3fc7fede4e1cf.diff</a><br>
<br>
LOG: Make FEATURE_AVX512VP2INTERSECT match between compiler-rt and LLVM<br>
<br>
compiler-rt also doesn't support bits >= 64 as far as I know.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    llvm/include/llvm/Support/X86TargetParser.def<br>
    llvm/lib/Support/Host.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/llvm/include/llvm/Support/X86TargetParser.def b/llvm/include/llvm/Support/X86TargetParser.def<br>
index f4780c7d113e..c826f590b71f 100644<br>
--- a/llvm/include/llvm/Support/X86TargetParser.def<br>
+++ b/llvm/include/llvm/Support/X86TargetParser.def<br>
@@ -162,7 +162,7 @@ X86_FEATURE_COMPAT(33, FEATURE_VPCLMULQDQ,      "vpclmulqdq")<br>
 X86_FEATURE_COMPAT(34, FEATURE_AVX512VNNI,      "avx512vnni")<br>
 X86_FEATURE_COMPAT(35, FEATURE_AVX512BITALG,    "avx512bitalg")<br>
 X86_FEATURE_COMPAT(36, FEATURE_AVX512BF16,      "avx512bf16")<br>
-X86_FEATURE_COMPAT(69, FEATURE_AVX512VP2INTERSECT, "avx512vp2intersect")<br>
+X86_FEATURE_COMPAT(37, FEATURE_AVX512VP2INTERSECT, "avx512vp2intersect")<br>
 // Features below here are not in libgcc/compiler-rt.<br>
 X86_FEATURE       (64, FEATURE_MOVBE)<br>
 X86_FEATURE       (65, FEATURE_ADX)<br>
<br>
diff  --git a/llvm/lib/Support/Host.cpp b/llvm/lib/Support/Host.cpp<br>
index d9187efafbc1..d9b3cac5e8dc 100644<br>
--- a/llvm/lib/Support/Host.cpp<br>
+++ b/llvm/lib/Support/Host.cpp<br>
@@ -776,7 +776,7 @@ getIntelProcessorTypeAndSubtype(unsigned Family, unsigned Model,<br>
<br>
     default: // Unknown family 6 CPU, try to guess.<br>
       // TODO detect tigerlake host<br>
-      if (Features3 & (1 << (X86::FEATURE_AVX512VP2INTERSECT - 64))) {<br>
+      if (Features2 & (1 << (X86::FEATURE_AVX512VP2INTERSECT - 32))) {<br>
         *Type = X86::INTEL_COREI7;<br>
         *Subtype = X86::INTEL_COREI7_TIGERLAKE;<br>
         break;<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>