stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8295844: jdk/test/whitebox/CPUInfoTest.java failed with "not all features are known: expected true, was false"

Browse Source 
Reviewed-by: tschatzl, dnsimon
This commit is contained in:
Vladimir Kozlov 2022-10-24 19:11:56 +00:00
parent df81b3c66a
commit e122321cb5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hotspot/cpu/x86/vm_version_x86.hpp
View File

@ -311,6 +311,11 @@ protected:
static address _cpuinfo_segv_addr; // address of instruction which causes SEGV static address _cpuinfo_segv_addr; // address of instruction which causes SEGV
static address _cpuinfo_cont_addr; // address of instruction after the one which causes SEGV static address _cpuinfo_cont_addr; // address of instruction after the one which causes SEGV
/*
* Update following files when declaring new flags:
* test/lib-test/jdk/test/whitebox/CPUInfoTest.java
* src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java
*/
enum Feature_Flag : uint64_t { enum Feature_Flag : uint64_t {
#define CPU_FEATURE_FLAGS(decl) \ #define CPU_FEATURE_FLAGS(decl) \
decl(CX8, "cx8", 0) /* next bits are from cpuid 1 (EDX) */ \ decl(CX8, "cx8", 0) /* next bits are from cpuid 1 (EDX) */ \

3
test/lib-test/jdk/test/whitebox/CPUInfoTest.java
View File

@ -64,7 +64,8 @@ public class CPUInfoTest {
"avx512_vnni", "clflush", "clflushopt", "clwb", "avx512_vnni", "clflush", "clflushopt", "clwb",
"avx512_vbmi2", "avx512_vbmi", "rdtscp", "rdpid", "avx512_vbmi2", "avx512_vbmi", "rdtscp", "rdpid",
"hv", "fsrm", "avx512_bitalg", "gfni", "hv", "fsrm", "avx512_bitalg", "gfni",
"f16c" "f16c", "pku", "ospke", "cet_ibt",
"cet_ss"
); );
// @formatter:on // @formatter:on
// Checkstyle: resume // Checkstyle: resume