RFR: 8182729: [AOT] remove UseConcMarkSweepGC check when loading libraries
Christian Thalinger
cthalinger at twitter.com
Thu Jun 22 20:55:00 UTC 2017
What are the chances for 9? Is AOT still considered an experimental feature?
> On Jun 22, 2017, at 10:56 AM, Vladimir Kozlov <vladimir.kozlov at oracle.com> wrote:
>
> Looks good. I will push it.
>
> Vladimir
>
> On 6/22/17 1:50 PM, Christian Thalinger wrote:
>> https://bugs.openjdk.java.net/browse/JDK-8182729
>> It seems the useCMSGC check was added by mistake. Compiling AOT libraries with e.g. ParallelGC and using them with CMS is perfectly fine. I did a bunch of tests but someone else should definitely verify.
>> (Patch is also attached to the bug.)
>> diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java
>> --- a/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java
>> +++ b/src/jdk.aot/share/classes/jdk.tools.jaotc.binformat/src/jdk/tools/jaotc/binformat/BinaryContainer.java
>> @@ -308,7 +308,6 @@
>> graalHotSpotVMConfig.useCompressedClassPointers,
>> graalHotSpotVMConfig.compactFields,
>> graalHotSpotVMConfig.useG1GC,
>> - graalHotSpotVMConfig.useCMSGC,
>> graalHotSpotVMConfig.useTLAB,
>> graalHotSpotVMConfig.useBiasedLocking,
>> TieredAOT.getValue(graalOptions),
>> diff --git a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
>> --- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
>> +++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java
>> @@ -212,7 +212,6 @@
>> }
>> public final boolean useG1GC = getFlag("UseG1GC", Boolean.class);
>> - public final boolean useCMSGC = getFlag("UseConcMarkSweepGC", Boolean.class);
>> public final int allocatePrefetchStyle = getFlag("AllocatePrefetchStyle", Integer.class);
>> public final int allocatePrefetchInstr = getFlag("AllocatePrefetchInstr", Integer.class);
>> diff --git a/src/share/vm/aot/aotCodeHeap.cpp b/src/share/vm/aot/aotCodeHeap.cpp
>> --- a/src/share/vm/aot/aotCodeHeap.cpp
>> +++ b/src/share/vm/aot/aotCodeHeap.cpp
>> @@ -152,7 +152,6 @@
>> verify_flag(_config->_useCompressedOops, UseCompressedOops, "UseCompressedOops");
>> verify_flag(_config->_useCompressedClassPointers, UseCompressedClassPointers, "UseCompressedClassPointers");
>> verify_flag(_config->_useG1GC, UseG1GC, "UseG1GC");
>> - verify_flag(_config->_useCMSGC, UseConcMarkSweepGC, "UseConcMarkSweepGC");
>> verify_flag(_config->_useTLAB, UseTLAB, "UseTLAB");
>> verify_flag(_config->_useBiasedLocking, UseBiasedLocking, "UseBiasedLocking");
>> verify_flag(_config->_objectAlignment, ObjectAlignmentInBytes, "ObjectAlignmentInBytes");
>> diff --git a/src/share/vm/aot/aotCodeHeap.hpp b/src/share/vm/aot/aotCodeHeap.hpp
>> --- a/src/share/vm/aot/aotCodeHeap.hpp
>> +++ b/src/share/vm/aot/aotCodeHeap.hpp
>> @@ -88,7 +88,8 @@
>> } AOTHeader;
>> typedef struct {
>> - enum { CONFIG_SIZE = 12 + 7 * 4 };
>> + enum { CONFIG_SIZE = 7 * jintSize + 11 };
>> + // 7 int values
>> int _config_size;
>> int _narrowOopShift;
>> int _narrowKlassShift;
>> @@ -102,7 +103,6 @@
>> bool _useCompressedClassPointers;
>> bool _compactFields;
>> bool _useG1GC;
>> - bool _useCMSGC;
>> bool _useTLAB;
>> bool _useBiasedLocking;
>> bool _tieredAOT;
More information about the hotspot-compiler-dev
mailing list