From 91cb312015bfb2bc12583b8d97c8faa78ec8e82f Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 15 Nov 2020 17:26:53 +0100 Subject: [PATCH] Add missing checks for AVX512VL. There is one variant of VPCLMULQDQ which requires AVX512F instead. Couldn't be bothered to find which one it is. --- tools/cpuBench/cpuBench.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/cpuBench/cpuBench.py b/tools/cpuBench/cpuBench.py index bfb4120..969cac0 100755 --- a/tools/cpuBench/cpuBench.py +++ b/tools/cpuBench/cpuBench.py @@ -2591,8 +2591,16 @@ def filterInstructions(XMLRoot): if extension == 'WAITPKG' and not cpuid.get_bit(ecx7, 5): instrSet.discard(XMLInstr) if isaSet.startswith('AVX512_VBMI2') and not cpuid.get_bit(ecx7, 6): instrSet.discard(XMLInstr) if category == 'GFNI' and not cpuid.get_bit(ecx7, 8): instrSet.discard(XMLInstr) - if 'VAES' in isaSet and not cpuid.get_bit(ecx7, 9): instrSet.discard(XMLInstr) - if 'VPCLMULQDQ' in isaSet and not cpuid.get_bit(ecx7, 10): instrSet.discard(XMLInstr) + if 'VAES' in isaSet: + if not cpuid.get_bit(ecx7, 9): + instrSet.discard(XMLInstr) + else: + if 'AVX512' in isaSet and not cpuid.get_bit(ebx7, 31): instrSet.discard(XMLInstr) + if 'VPCLMULQDQ' in isaSet: + if not cpuid.get_bit(ecx7, 10): + instrSet.discard(XMLInstr) + else: + if 'AVX512' in isaSet and not cpuid.get_bit(ebx7, 31): instrSet.discard(XMLInstr) if isaSet.startswith('AVX512_VNNI') and not cpuid.get_bit(ecx7, 11): instrSet.discard(XMLInstr) if isaSet.startswith('AVX512_BITALG') and not cpuid.get_bit(ecx7, 12): instrSet.discard(XMLInstr) if isaSet.startswith('AVX512_VPOPCNTDQ') and not cpuid.get_bit(ecx7, 14): instrSet.discard(XMLInstr)