infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8357143: New test AOTCodeCompressedOopsTest.java fails on platforms without AOT Code Cache support

Browse Source 
Reviewed-by: asmehra, fyang, shade, mdoerr
This commit is contained in:
Vladimir Kozlov 2025-05-19 15:00:54 +00:00
parent 84a98ab43f
commit 6a58af310a
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/hotspot/jtreg/TEST.ROOT
View File

@ -81,6 +81,7 @@ requires.properties= \
vm.cds \
vm.cds.custom.loaders \
vm.cds.supports.aot.class.linking \
vm.cds.supports.aot.code.caching \
vm.cds.write.archived.java.heap \
vm.continuations \
vm.jvmti \

4
test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeCompressedOopsTest.java
View File

@ -25,10 +25,8 @@
/**
* @test
* @summary Sanity test of AOT Code Cache with compressed oops configurations
* @requires vm.cds
* @requires vm.cds.supports.aot.class.linking
* @requires vm.cds.supports.aot.code.caching
* @requires vm.flagless
* @requires !vm.jvmci.enabled
* @library /test/lib /test/setup_aot
* @build AOTCodeCompressedOopsTest JavacBenchApp
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar

7
test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java
View File

@ -25,13 +25,8 @@
/**
* @test
* @summary Sanity test of combinations of the AOT Code Caching diagnostic flags
* @requires vm.cds
* @requires vm.cds.supports.aot.class.linking
* @requires vm.flavor != "zero"
* @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
* @requires vm.cds.supports.aot.code.caching
* @requires vm.flagless
* @comment work around JDK-8345635
* @requires !vm.jvmci.enabled
* @library /test/lib /test/setup_aot
* @build AOTCodeFlags JavacBenchApp
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar

15
test/jtreg-ext/requires/VMProps.java
View File

@ -124,6 +124,7 @@ public class VMProps implements Callable<Map<String, String>> {
map.put("vm.cds", this::vmCDS);
map.put("vm.cds.custom.loaders", this::vmCDSForCustomLoaders);
map.put("vm.cds.supports.aot.class.linking", this::vmCDSSupportsAOTClassLinking);
map.put("vm.cds.supports.aot.code.caching", this::vmCDSSupportsAOTCodeCaching);
map.put("vm.cds.write.archived.java.heap", this::vmCDSCanWriteArchivedJavaHeap);
map.put("vm.continuations", this::vmContinuations);
// vm.graal.enabled is true if Graal is used as JIT
@ -472,6 +473,20 @@ public class VMProps implements Callable<Map<String, String>> {
return vmCDSCanWriteArchivedJavaHeap();
}
/**
* @return true if this VM can support the AOT Code Caching
*/
protected String vmCDSSupportsAOTCodeCaching() {
if ("true".equals(vmCDSSupportsAOTClassLinking()) &&
!"zero".equals(vmFlavor()) &&
"false".equals(vmJvmciEnabled()) &&
(Platform.isX64() || Platform.isAArch64())) {
return "true";
} else {
return "false";
}
}
/**
* @return true if the VM options specified via the "test.cds.runtime.options"
* property is compatible with writing Java heap objects into the CDS archive