-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8336489: Track scoped accesses in JVMCI compiled code #20256
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
Conversation
|
Hi @c-refice, welcome to this OpenJDK project and thanks for contributing! We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user c-refice" as summary for the issue. If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing |
|
@c-refice 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 78 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. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@tkrodriguez, @dougxc) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
|
/covered |
|
Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated! |
Webrevs
|
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java
Outdated
Show resolved
Hide resolved
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
Show resolved
Hide resolved
tkrodriguez
left a comment
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.
Looks good to me
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java
Outdated
Show resolved
Hide resolved
1f60dae to
9620670
Compare
|
@c-refice Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
tkrodriguez
left a comment
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.
New version looks good.
|
I figured out what went wrong with the private int getConstMethodFlags() {
return UNSAFE.getChar(getConstMethod() + config().constMethodFlagsOffset);
}
public boolean isScoped() {
// constMethodFlagsIsScoped == 1 << 16
return (getConstMethodFlags() & config().constMethodFlagsIsScoped) != 0;
}However, I suppose we didn't really care about flags with bit indexes past 8 before now, hence why the tests never failed before. Nevertheless, I fixed both and |
59c4fa7 to
8fabb8b
Compare
|
@c-refice Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
|
Apologies for the second force push, I involuntarily rebased my branch on top of |
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethod.java
Outdated
Show resolved
Hide resolved
...compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
Show resolved
Hide resolved
dougxc
left a comment
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.
Still looks good to me.
|
/integrate |
|
/sponsor |
|
Going to push as commit c095c0e.
Your commit was automatically rebased without conflicts. |
This PR adds JVMCI support to scoped access tracking introduced in #20158.
In this PR:
Method::is_scopedflag is now exposed in JVMCI asHotSpotResolvedJavaMethod.isScoped(), and serialized to / deserialized from the JVMCI compiled code stream as a boolean flag.HotSpotResolvedJavaMethod.isScoped()returnstruefor the root method or any of the methods that were inlined in the compilation.HotSpotCompiledNMethod.hasScopedAccess(), instead of as an explicit flag set in a the constructor ofHotSpotCompiledNMethod. This keeps the change isolated to JVMCI, without requiring coordinated changes to the Graal compiler. No other changes in the compiler are necessary to benefit from the optimization.Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/20256/head:pull/20256$ git checkout pull/20256Update a local copy of the PR:
$ git checkout pull/20256$ git pull https://git.openjdk.org/jdk.git pull/20256/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 20256View PR using the GUI difftool:
$ git pr show -t 20256Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/20256.diff
Webrev
Link to Webrev Comment