Skip to content

Conversation

@marc-chevalier
Copy link
Member

@marc-chevalier marc-chevalier commented May 12, 2025

In the original code, we have an align 32 here.

This alignment is pure optimization: we align the head of the loop to make the CPU happier. But if we set CodeEntryAlignment to 16, the 32 alignment makes an assert fail. Let's align to CodeEntryAlignment instead. It should be 32 by default, but if someone has a different opinion, it's still fine. Anyway, this alignment doesn't seem useful for correctness, so the consequences of an insufficient alignment are small. On the other hand, if someone wants to set CodeEntryAlignment to 64 for instance, it's also ok: 64-bit alignment is also a 32-bit alignment. We just lose a bit of space for no good reason but the user's input stating that we should prefer 64-bit alignment.

It seems questionable to me whether there is any sense in overriding the alignment when using such advanced features, that only exists on modern enough CPUs, so not with a 16-bit alignment, but for consistency, I suppose.


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-8356275: TestCodeEntryAlignment fails with "Alignment must be <= CodeEntryAlignment" (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25180

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 12, 2025

👋 Welcome back mchevalier! 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 May 12, 2025

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

8356275: TestCodeEntryAlignment fails with "Alignment must be <= CodeEntryAlignment"

Reviewed-by: thartmann

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 33 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 May 12, 2025

@marc-chevalier 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.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label May 12, 2025
@marc-chevalier marc-chevalier marked this pull request as ready for review May 12, 2025 12:04
@openjdk openjdk bot added the rfr Pull request is ready for review label May 12, 2025
@mlbridge
Copy link

mlbridge bot commented May 12, 2025

Webrevs

Copy link
Member

@TobiHartmann TobiHartmann 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 and trivial to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 13, 2025
@TobiHartmann
Copy link
Member

The fixVersion in this issue is [26] but the fixVersion in .jcheck/conf is 25, a new backport will be created when this pr is integrated.)

Please make sure to set the fixVersion to 25 or tbd before integrating this.

@marc-chevalier
Copy link
Member Author

Changed the Fix version to 25, and the warning seems to have been edited away. So I think it's good.

@marc-chevalier
Copy link
Member Author

/integrate

Thanks @TobiHartmann review. And my first integrate as committer!

@openjdk
Copy link

openjdk bot commented May 13, 2025

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 13, 2025
@openjdk openjdk bot closed this May 13, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 13, 2025
@openjdk
Copy link

openjdk bot commented May 13, 2025

@marc-chevalier Pushed as commit d930dc5.

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

@dean-long
Copy link
Member

Sorry for getting to this too late, but we also have the align32() function on x86 that would have worked for situations like this. See also JDK-8273459.

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

Labels

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

Development

Successfully merging this pull request may close these issues.

3 participants