Skip to content

8360641: TestCompilerCounts fails after 8354727 #26024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+48 −15
Open

8360641: TestCompilerCounts fails after 8354727 #26024

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53530bd
Fix test
mhaessig Jun 27, 2025
ab1c7d9
Make it work for product and address review comments
mhaessig Jun 30, 2025
3cfb1f3
Add copyright
mhaessig Jun 30, 2025
8beb589
Remove superfluous newline
mhaessig Jun 30, 2025
7176780
Fix whitespace
mhaessig Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 48 additions & 15 deletions test/hotspot/jtreg/compiler/arguments/TestCompilerCounts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
* Copyright (c) 2025, 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
Expand Down Expand Up @@ -27,7 +28,18 @@
* @bug 8356000
* @requires vm.flagless
* @requires vm.bits == "64"
* @run driver compiler.arguments.TestCompilerCounts
* @requires vm.debug
* @run driver compiler.arguments.TestCompilerCounts debug
*/

/*
* @test
* @library /test/lib /
* @bug 8356000
* @requires vm.flagless
* @requires vm.bits == "64"
* @requires !vm.debug
* @run driver compiler.arguments.TestCompilerCounts product
*/

package compiler.arguments;
Expand Down Expand Up @@ -55,6 +67,8 @@ public class TestCompilerCounts {
static final int MAX_LINEAR_CPUS = Math.min(16, MAX_CPUS);

public static void main(String[] args) throws Throwable {
final boolean debug = args[0].startsWith("debug");

// CICompilerCount=0 is incorrect in default modes.
fail("-XX:CICompilerCount=0");

Expand Down Expand Up @@ -133,31 +147,51 @@ public static void main(String[] args) throws Throwable {
pass(0, opt, "-XX:TieredStopAtLevel=0");

// Non-tiered modes
int nonTieredCount = heuristicCount(cpus, false);
pass(nonTieredCount, opt, "-XX:TieredStopAtLevel=1");
pass(nonTieredCount, opt, "-XX:TieredStopAtLevel=2");
pass(nonTieredCount, opt, "-XX:TieredStopAtLevel=3");
pass(nonTieredCount, opt, "-XX:-TieredCompilation");
int c1OnlyCount = heuristicCount(cpus, Compilation.C1Only, debug);
pass(c1OnlyCount, opt, "-XX:TieredStopAtLevel=1", "-XX:NonNMethodCodeHeapSize=" + NonNMethodCodeHeapSize);
pass(c1OnlyCount, opt, "-XX:TieredStopAtLevel=2", "-XX:NonNMethodCodeHeapSize=" + NonNMethodCodeHeapSize);
pass(c1OnlyCount, opt, "-XX:TieredStopAtLevel=3", "-XX:NonNMethodCodeHeapSize=" + NonNMethodCodeHeapSize);
int c2OnlyCount = heuristicCount(cpus, Compilation.C2Only, debug);
pass(c2OnlyCount, opt, "-XX:-TieredCompilation", "-XX:NonNMethodCodeHeapSize=" + NonNMethodCodeHeapSize);

// Tiered modes
int tieredCount = heuristicCount(cpus, true);
pass(tieredCount, opt);
pass(tieredCount, opt, "-XX:TieredStopAtLevel=4");
int tieredCount = heuristicCount(cpus, Compilation.Tiered, debug);
pass(tieredCount, opt, "-XX:NonNMethodCodeHeapSize=" + NonNMethodCodeHeapSize);
pass(tieredCount, opt, "-XX:TieredStopAtLevel=4", "-XX:NonNMethodCodeHeapSize=" + NonNMethodCodeHeapSize);

// Also check that heuristics did not set up more threads than CPUs available
Asserts.assertTrue(nonTieredCount <= cpus,
"Non-tiered count is larger than number of CPUs: " + nonTieredCount + " > " + cpus);
Asserts.assertTrue(c1OnlyCount <= cpus,
"Non-tiered count is larger than number of CPUs: " + c1OnlyCount + " > " + cpus);
Asserts.assertTrue(tieredCount <= cpus,
"Tiered count is larger than number of CPUs: " + tieredCount + " > " + cpus);
}
}

enum Compilation {
C1Only,
C2Only,
Tiered,
}

// Buffer sizes for calculating the maximum number of compiler threads.
static final int NonNMethodCodeHeapSize = 5 * 1024 * 1024;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the NonNMethodCodeHeapSize value chosen "on purpose"?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really. We could choose it to be larger. That would just make the cutoff be at a higher CPU count. With 5 MiB, this will also perform a cutoff with less CPUs and should test both code paths on more machines.

static final int CodeCacheMinimumUseSpace = 400 * 1024;
static final int C1BufSize = 64 * 1024 * 8 + (64 * 1024 * 8 / 10);
static final int C2BufSize = 6544;
static final int TieredBufSize = C1BufSize / 3 + 2 * C2BufSize / 3;

// Direct translation from CompilationPolicy::initialize:
public static int heuristicCount(int cpus, boolean tiered) {
public static int heuristicCount(int cpus, Compilation comp, boolean debug) {
int log_cpu = log2(cpus);
int loglog_cpu = log2(Math.max(log_cpu, 1));
int min_count = tiered ? 2 : 1;
return Math.max(log_cpu * loglog_cpu * 3 / 2, min_count);
int min_count = comp == Compilation.C1Only || comp == Compilation.C2Only ? 1 : 2;
int count = Math.max(log_cpu * loglog_cpu * 3 / 2, min_count);
int max_count = (NonNMethodCodeHeapSize - (debug ? 3 : 1) * CodeCacheMinimumUseSpace) / switch (comp) {
case C1Only -> C1BufSize;
case C2Only -> C2BufSize;
case Tiered -> TieredBufSize;
};
return Math.max(Math.min(count, max_count), min_count);
}

public static int log2(int v) {
Expand All @@ -173,5 +207,4 @@ public static void fail(String... args) throws Throwable {
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldNotHaveExitValue(0);
}

}