8321515: ARM32: Move method resolution information out of the cpCache properly #17017

voitylov · 2023-12-07T10:25:05Z

Thanks to @matias9927, JDK-8320278 fixed the JDK build for ARM32 after JDK-8301997. This PR introduces some additional fixes that enable the ARM32 port to actually work.

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-8321515: ARM32: Move method resolution information out of the cpCache properly (Bug - P2)

Reviewers

Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17017

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-12-07T10:26:38Z

👋 Welcome back avoitylov! 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 · 2023-12-07T10:28:30Z

@voitylov The following label will be automatically applied to this pull request:

hotspot

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 · 2023-12-07T10:31:52Z

Webrevs

bulasevich · 2023-12-09T04:59:02Z

Thanks for fixing the ARM32 build!
I see the change fixes wrong offset and register usage and does some cleanup. It is OK for me.
Thanks again!

voitylov · 2023-12-11T15:31:45Z

thanks @bulasevich. Any Reviewers, please? I'd like to to get the ARM32 port to work again.

shipilev

Looks okay, but I have suggestions.

shipilev · 2023-12-11T15:54:04Z

src/hotspot/cpu/arm/interp_masm_arm.cpp

-  ldr(cache, Address(cache, ConstantPoolCache::method_entries_offset()));
-  add(cache, cache, Array<ResolvedMethodEntry>::base_offset_in_bytes());
-  add(cache, cache, index);
+  if (is_power_of_2(sizeof(ResolvedMethodEntry))) {


I usually dislike introducing split like these, because one of the branches is effectively dead. Which also means it is effectively untested. Given this interpreter code, can we just leave the generic version unconditionally?

Yes, it's gone in the new version.

shipilev · 2023-12-11T15:54:21Z

src/hotspot/cpu/arm/interp_masm_arm.cpp

+  }
+  else {


Suggested change

}

else {

} else {

shipilev · 2023-12-11T15:57:12Z

Also changed target-version to 23 in JBS, so that we don't create the backports when we push. You might want to pull and merge the new master to get new mainline with jcheck config for 23.

openjdk · 2023-12-11T15:57:47Z

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

8321515: ARM32: Move method resolution information out of the cpCache properly

Reviewed-by: shade

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

8a0a6f8: 8321279: Implement hashCode() in Heap-X-Buffer.java.template
3d9d353: 8321825: Remove runtime/CompressedOops/CompressedClassPointers.java from the ProblemList
1b621f5: 8321474: TestAutoCreateSharedArchiveUpgrade.java should be updated with JDK 21
5463c9c: 8321557: Move SOURCE line verification for OracleJDK out of OpenJDK
ac07355: 8320200: Use Elements predicates for record constructors to improve print output
4fb5c12: 8321180: Condition for non-latin1 string size too large exception is off by one
d5a96e3: 8321621: Update JCov version to 3.0.16
aadf368: 6230751: [Fmt-Ch] Recursive MessageFormats in ChoiceFormats ignore indicated subformats
a3447ec: 8321827: Remove unnecessary suppress warnings annotations from the printing processor
b25ed57: 8270269: Desktop.browse method fails if earlier CoInitialize call as COINIT_MULTITHREADED
... and 2 more: https://git.openjdk.org/jdk/compare/c51685267c7bd5a7cee27ebc2bf0d9899cda9d4c...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.

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 (@shipilev) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

shipilev

Still good.

matias9927 · 2023-12-12T19:35:42Z

Thanks for this fix @voitylov!

voitylov · 2023-12-13T10:59:53Z

/integrate

voitylov · 2023-12-13T11:00:20Z

Thanks again Boris, Matias and Aleksey!

openjdk · 2023-12-13T11:02:17Z

@voitylov
Your change (at version df04613) is now ready to be sponsored by a Committer.

shipilev · 2023-12-13T11:03:07Z

/sponsor

openjdk · 2023-12-13T11:04:12Z

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

8a0a6f8: 8321279: Implement hashCode() in Heap-X-Buffer.java.template
3d9d353: 8321825: Remove runtime/CompressedOops/CompressedClassPointers.java from the ProblemList
1b621f5: 8321474: TestAutoCreateSharedArchiveUpgrade.java should be updated with JDK 21
5463c9c: 8321557: Move SOURCE line verification for OracleJDK out of OpenJDK
ac07355: 8320200: Use Elements predicates for record constructors to improve print output
4fb5c12: 8321180: Condition for non-latin1 string size too large exception is off by one
d5a96e3: 8321621: Update JCov version to 3.0.16
aadf368: 6230751: [Fmt-Ch] Recursive MessageFormats in ChoiceFormats ignore indicated subformats
a3447ec: 8321827: Remove unnecessary suppress warnings annotations from the printing processor
b25ed57: 8270269: Desktop.browse method fails if earlier CoInitialize call as COINIT_MULTITHREADED
... and 2 more: https://git.openjdk.org/jdk/compare/c51685267c7bd5a7cee27ebc2bf0d9899cda9d4c...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-12-13T11:04:19Z

@shipilev @voitylov Pushed as commit f573f6d.

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

voitylov · 2023-12-18T11:49:54Z

/backport jdk22

openjdk · 2023-12-18T11:51:45Z

@voitylov the backport was successfully created on the branch backport-voitylov-f573f6d2 in my personal fork of openjdk/jdk22. To create a pull request with this backport targeting openjdk/jdk22:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit f573f6d2 from the openjdk/jdk repository.

The commit being backported was authored by Aleksei Voitylov on 13 Dec 2023 and was reviewed by Aleksey Shipilev.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22:

$ git fetch https://github.com/openjdk-bots/jdk22.git backport-voitylov-f573f6d2:backport-voitylov-f573f6d2
$ git checkout backport-voitylov-f573f6d2
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22.git backport-voitylov-f573f6d2

JDK-8321515 implementation

79aa66e

openjdk bot added the rfr Pull request is ready for review label Dec 7, 2023

openjdk bot added the hotspot hotspot-dev@openjdk.org label Dec 7, 2023

shipilev approved these changes Dec 11, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 11, 2023

voitylov added 2 commits December 12, 2023 14:31

review comments

f1f7243

Merge branch 'openjdk:master' into JDK-8321515

df04613

shipilev approved these changes Dec 12, 2023

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 13, 2023

openjdk bot added the integrated Pull request has been integrated label Dec 13, 2023

openjdk bot closed this Dec 13, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 13, 2023

8321515: ARM32: Move method resolution information out of the cpCache properly #17017

8321515: ARM32: Move method resolution information out of the cpCache properly #17017

Uh oh!

Conversation

voitylov commented Dec 7, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Dec 7, 2023

Uh oh!

openjdk bot commented Dec 7, 2023

Uh oh!

mlbridge bot commented Dec 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

bulasevich commented Dec 9, 2023

Uh oh!

voitylov commented Dec 11, 2023

Uh oh!

shipilev left a comment

Choose a reason for hiding this comment

Uh oh!

shipilev Dec 11, 2023

Choose a reason for hiding this comment

Uh oh!

voitylov Dec 12, 2023

Choose a reason for hiding this comment

Uh oh!

shipilev Dec 11, 2023

Choose a reason for hiding this comment

Uh oh!

shipilev commented Dec 11, 2023

Uh oh!

openjdk bot commented Dec 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shipilev left a comment

Choose a reason for hiding this comment

Uh oh!

matias9927 commented Dec 12, 2023

Uh oh!

voitylov commented Dec 13, 2023

Uh oh!

voitylov commented Dec 13, 2023

Uh oh!

openjdk bot commented Dec 13, 2023

Uh oh!

shipilev commented Dec 13, 2023

Uh oh!

openjdk bot commented Dec 13, 2023

Uh oh!

openjdk bot commented Dec 13, 2023

Uh oh!

voitylov commented Dec 18, 2023

Uh oh!

openjdk bot commented Dec 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

voitylov commented Dec 7, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Dec 7, 2023 •

edited

Loading

openjdk bot commented Dec 11, 2023 •

edited

Loading