Skip to content

8362515: RISC-V: cleanup NativeFarCall #26370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

Hamlin-Li
Copy link

@Hamlin-Li Hamlin-Li commented Jul 17, 2025

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

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
Copy link

bridgekeeper bot commented Jul 17, 2025

👋 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
Copy link

openjdk bot commented Jul 17, 2025

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

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
Copy link

openjdk bot commented Jul 17, 2025

@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 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
Copy link

openjdk bot commented Jul 17, 2025

@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
Copy link

mlbridge bot commented Jul 17, 2025

Webrevs

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

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

@@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Hamlin-Li
Copy link
Author

Thanks!

Thank you for reviewing!

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

@feilongjiang feilongjiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the cleanup! I have one minor comment.

@@ -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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler [email protected] ready Pull request is ready to be integrated rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

3 participants