8360641: TestCompilerCounts fails after 8354727

[mhaessig]

After integrating #25872 the calculation of theCICompilerCount ergonomic became dependent on the size of NonNMethodCodeHeapSize, which itself is an ergonomic based on the available memory. Thus, depending on the system, the test compiler/arguments/TestCompilerCounts.java failed, i.e. locally this failed, but not on CI servers.

This PR changes the test to reflect the changes introduced in #25872.

Testing:

• Github Actions
• tier1,tier2 plus Oracle internal testing

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8360641: TestCompilerCounts fails after 8354727 (Bug - P4)

Reviewers

• Damon Fenacci (@dafedafe - Committer) Review applies to 8beb5898
• Martin Doerr (@TheRealMDoerr - Reviewer) Review applies to 8beb5898
• Vladimir Kozlov (@vnkozlov - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26024/head:pull/26024
$ git checkout pull/26024

Update a local copy of the PR:
$ git checkout pull/26024
$ git pull https://git.openjdk.org/jdk.git pull/26024/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26024

View PR using the GUI difftool:
$ git pr show -t 26024

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26024.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back mhaessig! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@mhaessig This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8360641: TestCompilerCounts fails after 8354727

Reviewed-by: kvn, dfenacci, mdoerr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 47 new commits pushed to the master branch:

• 38f59f8: 8358179: Performance regression in Math.cbrt
• e1681c4: 8359477: com/sun/net/httpserver/Test12.java appears to have a temp file race
• e138297: 8359436: AOTCompileEagerly should not be diagnostic
• ... and 44 more: https://git.openjdk.org/jdk/compare/5a1301df19553c7ba04c746b4002164f3b833e70...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[openjdk]

@mhaessig The following label will be automatically applied to this pull request:

• hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 03: Full - Incremental (71767802)
• 02: Full - Incremental (8beb5898)
• 01: Full - Incremental (ab1c7d9a)
• 00: Full (53530bda)

[dafedafe]

Thanks a lot for fixing this @mhaessig!
I left a couple of inline comments and just noticed you might want to add the copyright note as well 🙂

[dafedafe]

Is the NonNMethodCodeHeapSize value chosen "on purpose"?

[mhaessig]

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.

[TheRealMDoerr]

Thank you for fixing it! I have tested it successfully. Looks good besides what other reviewers have already commented.

[mhaessig]

@vnkozlov, @dafedafe, and @TheRealMDoerr, thank you for having a look! I addressed all your comments in ab1c7d9.

[TheRealMDoerr]

Thanks!

[dafedafe]

Looks good to me. Thanks!

[vnkozlov]

Good.

[mhaessig]

Thank you for your reviews!

/integrate

[openjdk]

Going to push as commit 2304044.
Since your change was applied there have been 60 commits pushed to the master branch:

• 0f1cd98: 8284016: Normalize handshake closure names
• 1ac7489: 8361180: Disable CompiledDirectCall verification with -VerifyInlineCaches
• 055d2ff: 8361215: Add AOT test case: verification constraint classes are excluded
• ... and 57 more: https://git.openjdk.org/jdk/compare/5a1301df19553c7ba04c746b4002164f3b833e70...master

Your commit was automatically rebased without conflicts.

[openjdk]

@mhaessig Pushed as commit 2304044.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.