8265349: vmTestbase/../stress/compiler/deoptimize/Test.java fails with OOME due to CodeCache exhaustion.
Reviewed-by: iignatyev
diff --git a/test/hotspot/jtreg/ProblemList-Xcomp.txt b/test/hotspot/jtreg/ProblemList-Xcomp.txt
index dc7043a..e221159 100644
--- a/test/hotspot/jtreg/ProblemList-Xcomp.txt
+++ b/test/hotspot/jtreg/ProblemList-Xcomp.txt
@@ -30,5 +30,3 @@
vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/TestDescription.java 8205957 generic-all
vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java 8265295 windows-x64
-
-vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java#id1 8265349 generic-all
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/share/MHTransformationGen.java b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/share/MHTransformationGen.java
index 23bbbca..8d52903 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/share/MHTransformationGen.java
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/share/MHTransformationGen.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,8 @@
import java.util.Optional;
import java.util.function.BiConsumer;
+import jdk.test.lib.Platform;
+
import nsk.share.test.LazyIntArrayToString;
import nsk.share.test.TestUtils;
import vm.mlvm.meth.share.transform.v2.MHArrayEnvelopeTFPair;
@@ -68,47 +70,68 @@
private static final boolean USE_THROW_CATCH = false; // Test bugs
- private static final Optional<MemoryPoolMXBean> NON_SEGMENTED_CODE_CACHE_POOL;
- private static final Optional<MemoryPoolMXBean> NON_NMETHODS_POOL;
- private static final Optional<MemoryPoolMXBean> PROFILED_NMETHODS_POOL;
- private static final Optional<MemoryPoolMXBean> NON_PROFILED_NMETHODS_POOL ;
+ /**
+ * The class is used for periodical checks if a code-cache consuming operation
+ * could be executed (i.e. if code cache has enought free space for a typical operation).
+ */
+ private static class CodeCacheMonitor {
- // Limit numbers are arbitrary, feel free to change if arguably necessary
- private static final int NON_SEGMENTED_CACHE_ALLOWANCE = 2_000_000;
- private static final int SEGMENTED_CACHE_ALLOWANCE = 1_000_000;
+ private static final Optional<MemoryPoolMXBean> NON_SEGMENTED_CODE_CACHE_POOL;
+ private static final Optional<MemoryPoolMXBean> NON_NMETHODS_POOL;
+ private static final Optional<MemoryPoolMXBean> PROFILED_NMETHODS_POOL;
+ private static final Optional<MemoryPoolMXBean> NON_PROFILED_NMETHODS_POOL;
- static {
- var pools = ManagementFactory.getMemoryPoolMXBeans();
- NON_SEGMENTED_CODE_CACHE_POOL = pools.stream()
- .filter(pool -> pool.getName().equals("CodeCache")).findFirst();
- NON_NMETHODS_POOL = pools.stream()
- .filter(pool -> pool.getName().equals("CodeHeap 'non-nmethods'")).findFirst();
- PROFILED_NMETHODS_POOL = pools.stream()
- .filter(pool -> pool.getName().equals("CodeHeap 'profiled nmethods'")).findFirst();
- NON_PROFILED_NMETHODS_POOL = pools.stream()
- .filter(pool -> pool.getName().equals("CodeHeap 'non-profiled nmethods'")).findFirst();
- }
+ // Trial runs show up that maximal increase in code cache consumption between checks (for one
+ // cycle/tree build in MHTransformationGen::createSequence), falls within the following intervals:
+ //
+ // | Threads number | Without Xcomp | With Xcomp |
+ // |----------------|---------------|------------|
+ // | 1 | 100-200 K | 400-500 K |
+ // | 10 | 1 - 2 M | 5-6 M |
+ //
+ // Those numbers are approximate (since trees are generated randomly and the total consumption
+ // between checks depends on how threads are aligned - for example, if all threads finish up their
+ // cycles approximately at one time, the consumption increase will be the highest, like with a
+ // resonance's amplitude)
+ // The 10 threads is chosen as it is a typical number for multi-threaded tests.
+ //
+ // Based on these numbers, values of 10 M for Xcomp and 5 M for non-Xcomp, were suggested.
+ private static final int NON_SEGMENTED_CACHE_ALLOWANCE = Platform.isComp() ? 10_000_000 : 5_000_000;
+ private static final int SEGMENTED_CACHE_ALLOWANCE = Platform.isComp() ? 10_000_000 : 5_000_000;
+
+ static {
+ var pools = ManagementFactory.getMemoryPoolMXBeans();
+ NON_SEGMENTED_CODE_CACHE_POOL = pools.stream()
+ .filter(pool -> pool.getName().equals("CodeCache")).findFirst();
+ NON_NMETHODS_POOL = pools.stream()
+ .filter(pool -> pool.getName().equals("CodeHeap 'non-nmethods'")).findFirst();
+ PROFILED_NMETHODS_POOL = pools.stream()
+ .filter(pool -> pool.getName().equals("CodeHeap 'profiled nmethods'")).findFirst();
+ NON_PROFILED_NMETHODS_POOL = pools.stream()
+ .filter(pool -> pool.getName().equals("CodeHeap 'non-profiled nmethods'")).findFirst();
+ }
+
+ public static final boolean isCodeCacheEffectivelyFull() {
+ var result = new Object() { boolean value = false; };
+
+ BiConsumer<MemoryPoolMXBean, Integer> check = (pool, limit) -> {
+ var usage = pool.getUsage();
+ result.value |= usage.getMax() - usage.getUsed() < limit;
+ };
+
+ NON_SEGMENTED_CODE_CACHE_POOL.ifPresent(pool -> check.accept(pool, NON_SEGMENTED_CACHE_ALLOWANCE));
+ NON_NMETHODS_POOL.ifPresent(pool -> check.accept(pool, SEGMENTED_CACHE_ALLOWANCE));
+ PROFILED_NMETHODS_POOL.ifPresent(pool -> check.accept(pool, SEGMENTED_CACHE_ALLOWANCE));
+ NON_PROFILED_NMETHODS_POOL.ifPresent(pool -> check.accept(pool, SEGMENTED_CACHE_ALLOWANCE));
+
+ return result.value;
+ }
+ };
public static class ThrowCatchTestException extends Throwable {
private static final long serialVersionUID = -6749961303738648241L;
}
- private static final boolean isCodeCacheEffectivelyFull() {
- var result = new Object() { boolean value = false; };
-
- BiConsumer<MemoryPoolMXBean, Integer> check = (pool, limit) -> {
- var usage = pool.getUsage();
- result.value |= usage.getMax() - usage.getUsed() < limit;
- };
-
- NON_SEGMENTED_CODE_CACHE_POOL.ifPresent(pool -> check.accept(pool, NON_SEGMENTED_CACHE_ALLOWANCE));
- NON_NMETHODS_POOL.ifPresent(pool -> check.accept(pool, SEGMENTED_CACHE_ALLOWANCE));
- PROFILED_NMETHODS_POOL.ifPresent(pool -> check.accept(pool, SEGMENTED_CACHE_ALLOWANCE));
- NON_PROFILED_NMETHODS_POOL.ifPresent(pool -> check.accept(pool, SEGMENTED_CACHE_ALLOWANCE));
-
- return result.value;
- }
-
@SuppressWarnings("unused")
public static MHMacroTF createSequence(Argument finalRetVal, Object boundObj, MethodHandle finalMH, Argument[] finalArgs) throws Throwable {
Env.traceDebug("Generating sequence.");
@@ -131,7 +154,7 @@
final int cyclesToBuild = nextInt(MAX_CYCLES);
for ( int i = 0; i < cyclesToBuild; i++) {
- if (isCodeCacheEffectivelyFull()) {
+ if (CodeCacheMonitor.isCodeCacheEffectivelyFull()) {
Env.traceNormal("Not enought code cache to build up MH sequences anymore. " +
" Has only been able to achieve " + i + " out of " + cyclesToBuild);
break;
