8344387: RISC-V: C2: Improve encoding of LoadNKlass for compact headers #22203

Hamlin-Li · 2024-11-18T11:32:27Z

Hi,
Can you help to review this patch? This is a follow-up of 8340453 on riscv.
Thanks!

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-8344387: RISC-V: C2: Improve encoding of LoadNKlass for compact headers (Enhancement - P4)

Reviewers

Fei Yang (@RealFYang - Reviewer)
Ludovic Henry (@luhenry - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22203

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2024-11-18T11:33:26Z

👋 Welcome back mli! 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-11-18T11:33:57Z

@Hamlin-Li 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:

8344387: RISC-V: C2: Improve encoding of LoadNKlass for compact headers

Reviewed-by: fyang, luhenry

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

1717946: 8344302: G1: Refactor G1CMTask::do_marking_step to use smaller wrapper methods
fea5f2b: 8344415: Restruct jpackage utility classes
a28e4d8: 8342299: Document that jpackage includes (possibly old) VC Redistributable MSVCP140.dll from JDK
0714114: 8344322: Improve capabilities of jpackage test lib to validate error output of jpackage
41436bb: 8336087: Doccheck: the jpackage command page doesn't show the correct command-line options
cc8bd63: 8344036: Tests tools/jlink/runtimeImage fail on AIX after JDK-8311302
2359736: 8344534: Remove leftover import of java.security.AccessControlContext in JavaLangAccess
0d66689: 8344393: RISC-V: Remove option UseRVVForBigIntegerShiftIntrinsics
7540fa2: 8343884: [s390x] Disallow OptoScheduling
9d60300: 8344199: Incorrect excluded field value set by getEventWriter intrinsic
... and 30 more: https://git.openjdk.org/jdk/compare/b9c6ce900b512adfcaccd2341be3eb0003a28b87...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-11-18T11:34:42Z

@Hamlin-Li 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 · 2024-11-18T11:38:42Z

Webrevs

00: Full (89bb7684)

RealFYang · 2024-11-18T12:53:52Z

src/hotspot/cpu/riscv/riscv.ad

  ins_encode %{
-    __ load_narrow_klass_compact_c2(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+    __ lwu(as_Register($dst$$reg), Address(as_Register($mem$$base), $mem$$disp));
+    __ srli(as_Register($dst$$reg), as_Register($dst$$reg), (unsigned) markWord::klass_shift_at_offset);


Do we need this explicit unsigned type conversion?
(PS: I didn't see any issue when building without this type conversion)

Yes, you're right here, the int will be converted to unsigned int implicitly.
I added the explicit conversion because it makes the code more clear, and in riscv.ad similar conversions are explicit (e.g. LShiftI and so on)

All right then ;-)

RealFYang

Looks good. Thanks.

Hamlin-Li · 2024-11-19T15:58:21Z

Thanks for your reviewing!

/integrate

openjdk · 2024-11-19T15:59:33Z

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

ded01e4: 8344327: SM cleanup in jdk.unsupported ReflectionFactory
59fcfae: 8343129: Disable unstable check of ThreadsListHandle.sanity_vm ThreadList values
1717946: 8344302: G1: Refactor G1CMTask::do_marking_step to use smaller wrapper methods
fea5f2b: 8344415: Restruct jpackage utility classes
a28e4d8: 8342299: Document that jpackage includes (possibly old) VC Redistributable MSVCP140.dll from JDK
0714114: 8344322: Improve capabilities of jpackage test lib to validate error output of jpackage
41436bb: 8336087: Doccheck: the jpackage command page doesn't show the correct command-line options
cc8bd63: 8344036: Tests tools/jlink/runtimeImage fail on AIX after JDK-8311302
2359736: 8344534: Remove leftover import of java.security.AccessControlContext in JavaLangAccess
0d66689: 8344393: RISC-V: Remove option UseRVVForBigIntegerShiftIntrinsics
... and 32 more: https://git.openjdk.org/jdk/compare/b9c6ce900b512adfcaccd2341be3eb0003a28b87...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-11-19T15:59:44Z

@Hamlin-Li Pushed as commit dc940ec.

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

…xperimental) Fixes: 44ec501 ("8305895: Implement JEP 450: Compact Object Headers (Experimental)") Fixes: ff12ff5 ("8340453: C2: Improve encoding of LoadNKlass for compact headers") Follow-up: 44ec501 ("8305895: Implement JEP 450: Compact Object Headers (Experimental)") Follow-up: ff12ff5 ("8340453: C2: Improve encoding of LoadNKlass for compact headers") Link: openjdk#20677 Link: openjdk#22203 Signed-off-by: Bingwu Zhang <[email protected]>

…rimental) Fixes: 44ec501 ("8305895: Implement JEP 450: Compact Object Headers (Experimental)") Fixes: ff12ff5 ("8340453: C2: Improve encoding of LoadNKlass for compact headers") Follow-up: 44ec501 ("8305895: Implement JEP 450: Compact Object Headers (Experimental)") Follow-up: ff12ff5 ("8340453: C2: Improve encoding of LoadNKlass for compact headers") Link: openjdk#20677 Link: openjdk#22203 Signed-off-by: Bingwu Zhang <[email protected]>

initial commit

89bb768

openjdk bot added the rfr Pull request is ready for review label Nov 18, 2024

openjdk bot added the hotspot-compiler [email protected] label Nov 18, 2024

RealFYang reviewed Nov 18, 2024

View reviewed changes

RealFYang approved these changes Nov 19, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 19, 2024

luhenry approved these changes Nov 19, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Nov 19, 2024

openjdk bot closed this Nov 19, 2024

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

Hamlin-Li deleted the cleanup-LoadNKlass-encoding branch November 19, 2024 20:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8344387: RISC-V: C2: Improve encoding of LoadNKlass for compact headers #22203

8344387: RISC-V: C2: Improve encoding of LoadNKlass for compact headers #22203

Uh oh!

Hamlin-Li commented Nov 18, 2024 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Nov 18, 2024

Uh oh!

openjdk bot commented Nov 18, 2024 •

edited

Loading

Uh oh!

openjdk bot commented Nov 18, 2024

Uh oh!

mlbridge bot commented Nov 18, 2024

Uh oh!

RealFYang Nov 18, 2024 •

edited

Loading

Uh oh!

Hamlin-Li Nov 19, 2024

Uh oh!

RealFYang Nov 19, 2024

Uh oh!

RealFYang left a comment

Uh oh!

Hamlin-Li commented Nov 19, 2024

Uh oh!

openjdk bot commented Nov 19, 2024

Uh oh!

openjdk bot commented Nov 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

8344387: RISC-V: C2: Improve encoding of LoadNKlass for compact headers #22203

8344387: RISC-V: C2: Improve encoding of LoadNKlass for compact headers #22203

Uh oh!

Conversation

Hamlin-Li commented Nov 18, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Nov 18, 2024

Uh oh!

openjdk bot commented Nov 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Nov 18, 2024

Uh oh!

mlbridge bot commented Nov 18, 2024

Webrevs

Uh oh!

RealFYang Nov 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Hamlin-Li Nov 19, 2024

Choose a reason for hiding this comment

Uh oh!

RealFYang Nov 19, 2024

Choose a reason for hiding this comment

Uh oh!

RealFYang left a comment

Choose a reason for hiding this comment

Uh oh!

Hamlin-Li commented Nov 19, 2024

Uh oh!

openjdk bot commented Nov 19, 2024

Uh oh!

openjdk bot commented Nov 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

Hamlin-Li commented Nov 18, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Nov 18, 2024 •

edited

Loading

RealFYang Nov 18, 2024 •

edited

Loading