Skip to content

Commit 82bee92

Browse files
committed
Make FEATURE_AVX512VP2INTERSECT match between compiler-rt and LLVM
compiler-rt also doesn't support bits >= 64 as far as I know.
1 parent 6ade4eb commit 82bee92

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

llvm/include/llvm/Support/X86TargetParser.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ X86_FEATURE_COMPAT(33, FEATURE_VPCLMULQDQ, "vpclmulqdq")
162162
X86_FEATURE_COMPAT(34, FEATURE_AVX512VNNI, "avx512vnni")
163163
X86_FEATURE_COMPAT(35, FEATURE_AVX512BITALG, "avx512bitalg")
164164
X86_FEATURE_COMPAT(36, FEATURE_AVX512BF16, "avx512bf16")
165-
X86_FEATURE_COMPAT(69, FEATURE_AVX512VP2INTERSECT, "avx512vp2intersect")
165+
X86_FEATURE_COMPAT(37, FEATURE_AVX512VP2INTERSECT, "avx512vp2intersect")
166166
// Features below here are not in libgcc/compiler-rt.
167167
X86_FEATURE (64, FEATURE_MOVBE)
168168
X86_FEATURE (65, FEATURE_ADX)

llvm/lib/Support/Host.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ getIntelProcessorTypeAndSubtype(unsigned Family, unsigned Model,
776776

777777
default: // Unknown family 6 CPU, try to guess.
778778
// TODO detect tigerlake host
779-
if (Features3 & (1 << (X86::FEATURE_AVX512VP2INTERSECT - 64))) {
779+
if (Features2 & (1 << (X86::FEATURE_AVX512VP2INTERSECT - 32))) {
780780
*Type = X86::INTEL_COREI7;
781781
*Subtype = X86::INTEL_COREI7_TIGERLAKE;
782782
break;

0 commit comments

Comments
 (0)