-
Notifications
You must be signed in to change notification settings - Fork 6.1k
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
base: master
Are you sure you want to change the base?
Conversation
👋 Welcome back mli! A progress list of the required criteria for merging this PR into |
@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:
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
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 |
@Hamlin-Li this pull request can not be integrated into 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 |
@Hamlin-Li The following label will be automatically applied to this pull request:
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. |
Webrevs
|
There was a problem hiding this 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. |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Thank you for reviewing! |
There was a problem hiding this 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 { |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
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
Issue
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