8362515: RISC-V: cleanup NativeFarCall #26370

Hamlin-Li · 2025-07-17T14:17:45Z

Hi,
Can you help to review this patch?

By https://github.com/openjdk/jdk/blob/master/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp#L1270, there are far call, indirect call, reloc call.
~~NativeFarCall is in fact a reloc call, the name is confusing, better to rename it to RelocCall.~~
Finally, choose to remove the NativeFarCall and delegation from NativeCall to NativeFarCall, and move all the implementation to NativeCall itself.
Also add some comments and do some other simple cleanup.

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-8362515: RISC-V: cleanup NativeFarCall (Enhancement - P4)

Reviewers

Fei Yang (@RealFYang - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26370

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

Using diff file

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

Using Webrev

Link to Webrev Comment

bridgekeeper · 2025-07-17T14:18:19Z

👋 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 · 2025-07-17T14:18:49Z

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

8362515: RISC-V: cleanup NativeFarCall

Reviewed-by: fyang

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

518d5f4: 8361871: [GCC static analyzer] complains about use of uninitialized value ckpObject in p11_util.c
f79bd54: 8362882: Update SubmissionPublisher() specification to reflect use of ForkJoinPool.asyncCommonPool()
52155db: 8364082: jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSParOld.java Eden should be placed first in young
... and 57 more: https://git.openjdk.org/jdk/compare/62a58062e5f3d0a723608d98d2412ea779f73897...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 · 2025-07-17T14:19:10Z

@Hamlin-Li this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout cleanup-NativeFarCall
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2025-07-17T14:19:32Z

@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 · 2025-07-17T14:22:24Z

Webrevs

src/hotspot/cpu/riscv/nativeInst_riscv.cpp

RealFYang

It's great to see that NativeFarCall class is factored out. Thanks for the update!
Overall looks good. Would you mind two minor tweaks about code comment?

src/hotspot/cpu/riscv/nativeInst_riscv.hpp

RealFYang · 2025-07-25T03:13:34Z

src/hotspot/cpu/riscv/nativeInst_riscv.cpp

@@ -46,44 +46,12 @@ bool NativeInstruction::is_call_at(address addr) {
 }

 //-----------------------------------------------------------------------------
-// NativeFarCall
+// NativeCall
 //
 // Implements direct far calling loading an address from the stub section version of reloc call.


Suggestion: // Implements indirect far call loading an address from the stub section of reloc call.

And I think this comment should be moved to immediately before definition of MacroAssembler::reloc_call [1].

[1] https://github.com/openjdk/jdk/blob/master/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp#L4982

As it still has "far call" which is what we want to cleanup in this pr, and [1] explain the different types of call in more details, I'll just remove this comment to avoid misleading.

[1] https://github.com/openjdk/jdk/blob/master/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp#L1313

RealFYang

Thanks!

Hamlin-Li · 2025-07-25T09:03:24Z

Thanks!

Thank you for reviewing!

feilongjiang

Thanks for the cleanup! I have one minor comment.

feilongjiang · 2025-07-25T15:33:56Z

src/hotspot/cpu/riscv/nativeInst_riscv.hpp

@@ -111,41 +111,52 @@ NativeCall* nativeCall_before(address return_address);
 // The NativeCall is an abstraction for accessing/manipulating native
 // call instructions (used to manipulate inline caches, primitive &
 // DSO calls, etc.).
+// NativeCall is reloc call on RISC-V. See MacroAssembler::reloc_call.
 class NativeCall: private NativeInstruction {
 // private: when common code is using byte_size()
 private:
  enum {


I see the enum of NativeFarCall was named as RISCV_specific_constants, do we need this for NativeCall?

Thank you having a look.

Seems not, there is no name for this enum in orignal code . And in this file some enums have names, some not, but seems either way is fine, although I think the names are all redundant here.

initial commit

da2500b

openjdk bot added merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review labels Jul 17, 2025

openjdk bot added the hotspot-compiler [email protected] label Jul 17, 2025

RealFYang reviewed Jul 21, 2025

View reviewed changes

src/hotspot/cpu/riscv/nativeInst_riscv.cpp Show resolved Hide resolved

src/hotspot/cpu/riscv/nativeInst_riscv.cpp Outdated Show resolved Hide resolved

merge master

1099e13

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Jul 21, 2025

hamlin added 2 commits July 21, 2025 08:40

fix

f72db24

remove NativeFarCall/RelocCall

3782022

RealFYang reviewed Jul 25, 2025

View reviewed changes

comments

724c44d

RealFYang approved these changes Jul 25, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 25, 2025

feilongjiang reviewed Jul 25, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8362515: RISC-V: cleanup NativeFarCall #26370

8362515: RISC-V: cleanup NativeFarCall #26370

Hamlin-Li commented Jul 17, 2025 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Jul 17, 2025

Uh oh!

openjdk bot commented Jul 17, 2025 •

edited

Loading

Uh oh!

openjdk bot commented Jul 17, 2025

Uh oh!

openjdk bot commented Jul 17, 2025

Uh oh!

mlbridge bot commented Jul 17, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

RealFYang left a comment •

edited

Loading

Uh oh!

Uh oh!

RealFYang Jul 25, 2025

Uh oh!

Hamlin-Li Jul 25, 2025

Uh oh!

RealFYang left a comment

Uh oh!

Hamlin-Li commented Jul 25, 2025

Uh oh!

feilongjiang left a comment

Uh oh!

feilongjiang Jul 25, 2025

Uh oh!

Hamlin-Li Jul 25, 2025

Uh oh!

Uh oh!

8362515: RISC-V: cleanup NativeFarCall #26370

Are you sure you want to change the base?

8362515: RISC-V: cleanup NativeFarCall #26370

Conversation

Hamlin-Li commented Jul 17, 2025 • 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 Jul 17, 2025

Uh oh!

openjdk bot commented Jul 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Jul 17, 2025

Uh oh!

openjdk bot commented Jul 17, 2025

Uh oh!

mlbridge bot commented Jul 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

Uh oh!

Uh oh!

RealFYang left a comment • 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!

Uh oh!

RealFYang Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

Hamlin-Li Jul 25, 2025

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 Jul 25, 2025

Uh oh!

feilongjiang left a comment

Choose a reason for hiding this comment

Uh oh!

feilongjiang Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

Hamlin-Li Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Hamlin-Li commented Jul 17, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Jul 17, 2025 •

edited

Loading

mlbridge bot commented Jul 17, 2025 •

edited

Loading

RealFYang left a comment •

edited

Loading