8342011: Conditionally compile ReservedHeapSpace compressed heap support #21484

kimbarrett · 2024-10-14T00:29:36Z

Please review this change to ReservedHeapSpace to conditionally include the
support for compressed oops only in 64bit builds. This code is unused and
inapplicable in 32bit builds. Further, it contains code that is problematic
in a 32bit build. See the JBS issue for details.

Testing: mach5 tier1, GHA 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-8342011: Conditionally compile ReservedHeapSpace compressed heap support (Enhancement - P4)

Reviewers

David Holmes (@dholmes-ora - Reviewer) Review applies to d9b0a011
Stefan Karlsson (@stefank - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21484

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2024-10-14T00:30:21Z

👋 Welcome back kbarrett! 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 · 2024-10-14T00:30:45Z

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

8342011: Conditionally compile ReservedHeapSpace compressed heap support

Reviewed-by: stefank, dholmes

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

680dc5d: 8342496: C2/Shenandoah: SEGV in compiled code when running jcstress
8f2b23b: 8341407: C2: assert(main_limit == cl->limit() || get_ctrl(main_limit) == new_limit_ctrl) failed: wrong control for added limit
21682bc: 8342612: Increase memory usage of compiler/c2/TestScalarReplacementMaxLiveNodes.java
d61f56a: 8342287: C2 fails with "assert(is_IfTrue()) failed: invalid node class: IfFalse" due to Template Assertion Predicate with two UCTs
76ae072: 8342579: RISC-V: C2: Cleanup effect of killing flag register for call instructs
309b929: 8336401: Remove the option onjcmd from the jdwp agent
401d0d6: 8335662: [AArch64] C1: guarantee(val < (1ULL << nbits)) failed: Field too big for insn
8591109: 8340698: JVMTI FRAME_POP event is sometimes missed if NotifyFramePop is called as a method is returning
0784011: 8340488: Clarify LocaleServiceProvider deployment on application module path
4dcc7f3: 8337536: AArch64: Enable BTI branch protection for runtime part
... and 38 more: https://git.openjdk.org/jdk/compare/4e703b285b5b34fdfb342d194cd744660d4c2be1...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 · 2024-10-14T00:31:23Z

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

hotspot-runtime

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 · 2024-10-14T00:34:23Z

Webrevs

dholmes-ora

One nit but looks good.

Thanks

dholmes-ora · 2024-10-16T06:47:23Z

src/hotspot/share/memory/virtualspace.cpp

+    NOT_LP64(ShouldNotReachHere();)
+#ifdef _LP64


#ifndef ... else ... would look marginally better IMO.

Yeah, you're right. Fixed.

stefank · 2024-10-16T07:59:52Z

src/hotspot/share/memory/virtualspace.cpp

+#ifndef _LP64
+    NOT_LP64(ShouldNotReachHere();)
+#else


Suggested change

#ifndef _LP64

NOT_LP64(ShouldNotReachHere();)

#else

#ifndef _LP64

ShouldNotReachHere();

#else

With that said, I think it would be nicer to invert the code:

#ifdef _LP64 ... All the code we typically care of up front #else ... Code we typically ignore ShouldNotReachHere(); #endif

Yeah, forgot to remove the NOT_LP64.

Flipping the order seemed like it made the 32bit case coverage easy to miss. But maybe that's okay.
And it's not really all that far apart. So okay, I've made that change.

stefank · 2024-10-16T08:01:01Z

src/hotspot/share/memory/virtualspace.hpp

+
+  // Compressed oop support is not relevant in 32bit builds.
+#ifdef _LP64


Suggested change

// Compressed oop support is not relevant in 32bit builds.

#ifdef _LP64

// Compressed oop support is not relevant in 32bit builds.

#ifdef _LP64

The #endif // _LP64 below have blank lines before and after, so it seems more consistent to also have it here.

Could you indicate if you saw this comment?

Oops, missed that. Fixed.

dholmes-ora

LGTM

Thanks

stefank

Looks good. Thanks.

kimbarrett · 2024-10-21T18:41:27Z

Thanks for reviews @dholmes-ora and @stefank

kimbarrett · 2024-10-21T18:41:44Z

/integrate

openjdk · 2024-10-21T18:42:26Z

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

e0c6480: 8338570: sun/font/HBShaper - mismatch in return type of FFM upcall function description and native invocation
7158322: 8340477: Remove JDK1.1 compatible behavior for "EST", "MST", and "HST" time zones
97c9212: 8342698: Fix order of @param tags in module java.base
51a7ff6: 8335271: Specify the MessageFormat ArgumentIndex Implementation Limit
52d752c: 8339507: Test generation tool and gtest for testing APX encoding of extended gpr instructions
37aa320: 8342376: More reliable OOM handling in ExceptionDuringDumpAtObjectsInitPhase test
18bcbf7: 8341052: SHA-512 implementation using SHA-NI
54a744b: 8340553: ZipEntry field validation does not take into account the size of a CEN header
18b55ce: 8342653: Fix minor doc issues in AnnotatedElement
153ad91: 8338126: C2 SuperWord: VectorCastF2HF / vcvtps2ph produces wrong results for vector length 2
... and 57 more: https://git.openjdk.org/jdk/compare/4e703b285b5b34fdfb342d194cd744660d4c2be1...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-10-21T18:42:34Z

@kimbarrett Pushed as commit 5a4b180.

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

disable coops setup for 32bit

627b75e

openjdk bot added the rfr Pull request is ready for review label Oct 14, 2024

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Oct 14, 2024

dholmes-ora approved these changes Oct 16, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 16, 2024

improve conditionalization

82c6846

openjdk bot removed the ready Pull request is ready to be integrated label Oct 16, 2024

stefank suggested changes Oct 16, 2024

View reviewed changes

kimbarrett added 2 commits October 16, 2024 22:36

swap cond block

7ced10d

Merge branch 'master' into conditional-compile-compressed-heap-support

d9b0a01

dholmes-ora approved these changes Oct 17, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 17, 2024

add separator line

03ed127

openjdk bot removed the ready Pull request is ready to be integrated label Oct 18, 2024

stefank approved these changes Oct 21, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 21, 2024

openjdk bot added the integrated Pull request has been integrated label Oct 21, 2024

openjdk bot closed this Oct 21, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 21, 2024

kimbarrett deleted the conditional-compile-compressed-heap-support branch October 21, 2024 22:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8342011: Conditionally compile ReservedHeapSpace compressed heap support #21484

8342011: Conditionally compile ReservedHeapSpace compressed heap support #21484

kimbarrett commented Oct 14, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Oct 14, 2024

openjdk bot commented Oct 14, 2024 •

edited

Loading

openjdk bot commented Oct 14, 2024

mlbridge bot commented Oct 14, 2024 •

edited

Loading

dholmes-ora left a comment

dholmes-ora Oct 16, 2024

kimbarrett Oct 16, 2024

stefank Oct 16, 2024

kimbarrett Oct 16, 2024

stefank Oct 17, 2024

stefank Oct 16, 2024 •

edited

Loading

stefank Oct 17, 2024

kimbarrett Oct 18, 2024

dholmes-ora left a comment

stefank left a comment

kimbarrett commented Oct 21, 2024

kimbarrett commented Oct 21, 2024

openjdk bot commented Oct 21, 2024

openjdk bot commented Oct 21, 2024


		// Compressed oop support is not relevant in 32bit builds.
		#ifdef _LP64

8342011: Conditionally compile ReservedHeapSpace compressed heap support #21484

8342011: Conditionally compile ReservedHeapSpace compressed heap support #21484

Conversation

kimbarrett commented Oct 14, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Oct 14, 2024

openjdk bot commented Oct 14, 2024 • edited Loading

openjdk bot commented Oct 14, 2024

mlbridge bot commented Oct 14, 2024 • edited Loading

Webrevs

dholmes-ora left a comment

Choose a reason for hiding this comment

dholmes-ora Oct 16, 2024

Choose a reason for hiding this comment

kimbarrett Oct 16, 2024

Choose a reason for hiding this comment

stefank Oct 16, 2024

Choose a reason for hiding this comment

kimbarrett Oct 16, 2024

Choose a reason for hiding this comment

stefank Oct 17, 2024

Choose a reason for hiding this comment

stefank Oct 16, 2024 • edited Loading

Choose a reason for hiding this comment

stefank Oct 17, 2024

Choose a reason for hiding this comment

kimbarrett Oct 18, 2024

Choose a reason for hiding this comment

dholmes-ora left a comment

Choose a reason for hiding this comment

stefank left a comment

Choose a reason for hiding this comment

kimbarrett commented Oct 21, 2024

kimbarrett commented Oct 21, 2024

openjdk bot commented Oct 21, 2024

openjdk bot commented Oct 21, 2024

kimbarrett commented Oct 14, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Oct 14, 2024 •

edited

Loading

mlbridge bot commented Oct 14, 2024 •

edited

Loading

stefank Oct 16, 2024 •

edited

Loading