8388192: [lworld] Some code is not guarded by Arguments::is_valhalla_enabled()

[TobiHartmann]

This PR replaces the Valhalla draft PR 2640, which was already reviewed by @chhagedorn but was not integrated due to the code freeze immediately before the Valhalla mainline integration.

---

Some Valhalla specific code misses an Arguments::is_valhalla_enabled() check.

Thanks,
Tobias

---

• I confirm that I make this contribution in accordance with the OpenJDK Interim AI Policy.

---

Progress

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

Issue

• JDK-8388192: [lworld] Some code is not guarded by Arguments::is_valhalla_enabled() (Enhancement - P4)

Reviewers

• Axel Boldt-Christmas (@xmas92 - Reviewer)
• Christian Hagedorn (@chhagedorn - Reviewer)
• Vladimir Kozlov (@vnkozlov - Reviewer) Review applies to b2684aab

Contributors

• Fei Yang <fyang@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 32123

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

Using diff file

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

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back thartmann! 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]

@TobiHartmann 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:

8388192: [lworld] Some code is not guarded by Arguments::is_valhalla_enabled()

Co-authored-by: Fei Yang <fyang@openjdk.org>
Reviewed-by: aboldtch, chagedorn, kvn

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 20 new commits pushed to the master branch:

• 37ab50a: 8389088: [lworld] C2: assert(false) failed: empty program detected during loop optimization
• ba05044: 8388007: [lworld] [Umbrella] Adressing remaining compiler review comments from the Valhalla PR
• 0ddc887: 8389450: [lworld] Value class adapter generation leaks CodeCache BufferBlob
• ... and 17 more: https://git.openjdk.org/jdk/compare/cc278dbb8a1ca0754d5842708b9029441055d361...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]

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

• hotspot

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.

[openjdk]

The total number of required reviews for this PR has been set to 2 based on the presence of this label: hotspot. This can be overridden with the /reviewers command.

[mlbridge]

Webrevs

• 02: Full - Incremental (48bb341e)
• 01: Full - Incremental (b2684aab)
• 00: Full (28c33e37)

[xmas92]

lgtm. Seems to be relying on some transitive includes, should IWYU and add #include "runtime/arguments.hpp" to the files which do not have it.

[TobiHartmann]

Thanks Axel, good catch. I now also discovered the missing includes in the nopch build. Fixed!

[TobiHartmann]

Thanks Axel!

[chhagedorn]

Still good!

[TobiHartmann]

Thanks Christian!

[RealFYang]

Hi, I have just prepared a similar change for the riscv64 platform. @TobiHartmann : Do you mind having it in this PR? Thanks.

Verified with make test TEST="hotspot_valhalla jdk_valhalla valhalla_adopted" using fastdebug build on linux-riscv64.

riscv64-addon.diff.txt

[vnkozlov]

Good.

[vnkozlov]

@TobiHartmann do you have asserts in Valhalla methods to check if it is enabled? It may help to find other places when check is missing.

[vnkozlov]

This fix solved some AOT code caching failures I see after merge with Valhalla.

[TobiHartmann]

Do you mind having it in this PR? Thanks.

@RealFYang Sure, I added it. Thanks!

[TobiHartmann]

/contributor add @RealFYang

[openjdk]

@TobiHartmann
Contributor Fei Yang <fyang@openjdk.org> successfully added.

[TobiHartmann]

do you have asserts in Valhalla methods to check if it is enabled?

Good point. Most relevant methods either check directly:

jdk/src/hotspot/share/ci/ciInstanceKlass.cpp

Lines 777 to 779 in 5b2d699

	bool ciInstanceKlass::can_be_inline_klass(bool is_exact) {
	if (!Arguments::is_valhalla_enabled()) {
	return false;

Or they assert on some specific flag for an optimization that is only enabled when Valhalla is enabled:

jdk/src/hotspot/share/runtime/signature.cpp

Line 505 in 5b2d699

assert(InlineTypePassFieldsAsArgs || InlineTypeReturnedAsFields, "Not needed");

I think adding more asserts would still be useful, especially in the cases I fixed here. I filed JDK-8389595 to keep track of this.

[TobiHartmann]

Thanks Christian! I'll integrate this to fix the failures that Vladimir mentioned.

[TobiHartmann]

/integrate

[openjdk]

@TobiHartmann This pull request has not yet been marked as ready for integration.

[TobiHartmann]

/integrate

[openjdk]

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

• 93635de: 8346316: compiler/rangechecks/TestLongRangeCheck.java fails intermittently with DeoptimizeALot
• 37ab50a: 8389088: [lworld] C2: assert(false) failed: empty program detected during loop optimization
• ba05044: 8388007: [lworld] [Umbrella] Adressing remaining compiler review comments from the Valhalla PR
• ... and 18 more: https://git.openjdk.org/jdk/compare/cc278dbb8a1ca0754d5842708b9029441055d361...master

Your commit was automatically rebased without conflicts.

[openjdk]

@TobiHartmann Pushed as commit 185c99f.

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

[vnkozlov]

I think adding more asserts would still be useful, especially in the cases I fixed here. I filed JDK-8389595 to keep track of this.

Thank you