Skip to content

Conversation

@eastig
Copy link
Member

@eastig eastig commented Mar 28, 2022

AArch64 instructions size is 4 bytes. Two lowest bits of relocInfo offsets can be discarded.
Tested with release and fastdebug builds:

  • gtest: Passed.
  • tier1...tier4: Passed

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8283626: AArch64: Set relocInfo::offset_unit to 4

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7991/head:pull/7991
$ git checkout pull/7991

Update a local copy of the PR:
$ git checkout pull/7991
$ git pull https://git.openjdk.java.net/jdk pull/7991/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7991

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7991.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 28, 2022

👋 Welcome back eastig! 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 openjdk bot added the rfr Pull request is ready for review label Mar 28, 2022
@openjdk
Copy link

openjdk bot commented Mar 28, 2022

@eastig 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.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Mar 28, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 28, 2022

Webrevs

Comment on lines 32 to 33
// AArch64 instructions size is 4 bytes.
// Two lowest offset bits can always be discarded.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// AArch64 instructions size is 4 bytes.
// Two lowest offset bits can always be discarded.
// AArch64 instructions are always 4 bytes long and 4-aligned, so the
// two lowest offset bits can always be discarded.

Copy link
Member Author

Choose a reason for hiding this comment

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

@theRealAph Thank you for reviewing and comments.

@theRealAph
Copy link
Contributor

Looks good. I remember this being suggested a long time ago, but we were close to release and I was worried something might break unexpectedly.

Copy link
Member

@simonis simonis left a 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.

This also fixes the issue that currently OptoLoopAlignment can be set to 1 although it should be a multiple of NOP size according to OptoLoopAlignmentConstraintFunc().

@openjdk
Copy link

openjdk bot commented Mar 28, 2022

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

8283626: AArch64: Set relocInfo::offset_unit to 4

Reviewed-by: simonis, aph

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

  • cc598e0: 8283774: TestZoneOffset::test_immutable should ignore ZoneOffset::rules
  • 0e788e0: 8283781: Avoid allocating unused lastRulesCaches
  • 043b0a7: 8273355: Flickering on tooltip appearance IntelliJ IDEA 2021.2.1
  • 2367228: 8283834: Unmappable character for US-ASCII encoding in TestPredicateInputBelowLoopPredicate
  • 2e9fd56: 8283670: gtest os.release_multi_mappings_vm is still racy
  • f01cce2: 8264160: Regex \b is not consistent with \w without UNICODE_CHARACTER_CLASS
  • 634800a: 8283806: [BACKOUT] JDK 19 L10n resource files update - msgdrop 10
  • 9b49900: 8283603: Remove redundant qualifier in Windows specific Attach Operation
  • d8fd222: 8282538: PKCS11 tests fail on CentOS Stream 9
  • d472c01: 8283711: Remove redundant 'new String' calls after concatenation
  • ... and 26 more: https://git.openjdk.java.net/jdk/compare/70648a6a153e5d321f78cf6445a9703f41083725...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 (@simonis, @theRealAph) 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).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 28, 2022
@eastig
Copy link
Member Author

eastig commented Mar 29, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 29, 2022
@openjdk
Copy link

openjdk bot commented Mar 29, 2022

@eastig
Your change (at version 9b040c3) is now ready to be sponsored by a Committer.

@simonis
Copy link
Member

simonis commented Mar 29, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 29, 2022

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

  • c3d903a: 8282936: Write a regression test for JDK-4615365
  • cc598e0: 8283774: TestZoneOffset::test_immutable should ignore ZoneOffset::rules
  • 0e788e0: 8283781: Avoid allocating unused lastRulesCaches
  • 043b0a7: 8273355: Flickering on tooltip appearance IntelliJ IDEA 2021.2.1
  • 2367228: 8283834: Unmappable character for US-ASCII encoding in TestPredicateInputBelowLoopPredicate
  • 2e9fd56: 8283670: gtest os.release_multi_mappings_vm is still racy
  • f01cce2: 8264160: Regex \b is not consistent with \w without UNICODE_CHARACTER_CLASS
  • 634800a: 8283806: [BACKOUT] JDK 19 L10n resource files update - msgdrop 10
  • 9b49900: 8283603: Remove redundant qualifier in Windows specific Attach Operation
  • d8fd222: 8282538: PKCS11 tests fail on CentOS Stream 9
  • ... and 27 more: https://git.openjdk.java.net/jdk/compare/70648a6a153e5d321f78cf6445a9703f41083725...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 29, 2022
@openjdk openjdk bot closed this Mar 29, 2022
@openjdk 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 Mar 29, 2022
@openjdk
Copy link

openjdk bot commented Mar 29, 2022

@simonis @eastig Pushed as commit ab17f88.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants