Skip to content

Commit e122321

Browse files
author
Vladimir Kozlov
committed
8295844: jdk/test/whitebox/CPUInfoTest.java failed with "not all features are known: expected true, was false"
Reviewed-by: tschatzl, dnsimon
1 parent df81b3c commit e122321

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/hotspot/cpu/x86/vm_version_x86.hpp

+5
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,11 @@ class VM_Version : public Abstract_VM_Version {
311311
static address _cpuinfo_segv_addr; // address of instruction which causes SEGV
312312
static address _cpuinfo_cont_addr; // address of instruction after the one which causes SEGV
313313

314+
/*
315+
* Update following files when declaring new flags:
316+
* test/lib-test/jdk/test/whitebox/CPUInfoTest.java
317+
* src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.amd64/src/jdk/vm/ci/amd64/AMD64.java
318+
*/
314319
enum Feature_Flag : uint64_t {
315320
#define CPU_FEATURE_FLAGS(decl) \
316321
decl(CX8, "cx8", 0) /* next bits are from cpuid 1 (EDX) */ \

test/lib-test/jdk/test/whitebox/CPUInfoTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public class CPUInfoTest {
6464
"avx512_vnni", "clflush", "clflushopt", "clwb",
6565
"avx512_vbmi2", "avx512_vbmi", "rdtscp", "rdpid",
6666
"hv", "fsrm", "avx512_bitalg", "gfni",
67-
"f16c"
67+
"f16c", "pku", "ospke", "cet_ibt",
68+
"cet_ss"
6869
);
6970
// @formatter:on
7071
// Checkstyle: resume

0 commit comments

Comments
 (0)