Skip to content

8353041: NeverBranchNode causes incorrect block frequency calculation #24390

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

Closed
wants to merge 2 commits into from

Conversation

dean-long
Copy link
Member

@dean-long dean-long commented Apr 2, 2025

This fixes a quality of implementation issue for infinite loops using a NeverBranch node. We need Block::succ_prob() to return 1.0f for the 100% successful back-edge so that block frequencies are computed correctly. I also fixed Block_Stack::most_frequent_successor() to choose the correct successor. I verified that this corrects the huge frequency ratio that was detected and clamped by JDK-8346888.

Currently this bug is labeled noreg-hard with no new regression test, as it's not obvious how to write such as test.


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-8353041: NeverBranchNode causes incorrect block frequency calculation (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24390

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 2, 2025

👋 Welcome back dlong! 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 Apr 2, 2025

@dean-long 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:

8353041: NeverBranchNode causes incorrect block frequency calculation

Reviewed-by: thartmann, rcastanedalo

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 183 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 openjdk bot added the rfr Pull request is ready for review label Apr 2, 2025
@openjdk
Copy link

openjdk bot commented Apr 2, 2025

@dean-long 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 Apr 2, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 2, 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 to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 8, 2025
@robcasloz
Copy link
Contributor

Currently this bug is labeled noreg-hard with no new regression test, as it's not obvious how to write such as test.

The only idea I can think of would be matching and asserting on the output of -XX:+PrintCFGBlockFreq, e.g. for the first test in compiler/loopopts/TestPhaseCFGNeverBranchToGotoMain.java I get the line

   Loop: 1  trip_count: 1000000 freq:      0

before this fix, and the line

   Loop: 1  trip_count: 1000000 freq: 900000

after the fix. You could assert that you expect a freq greater than 0 for every encountered loop, or something similar. But I guess such a test would be quite fragile.

Co-authored-by: Roberto Castañeda Lozano <robcasloz@users.noreply.github.com>
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Apr 8, 2025
@dean-long
Copy link
Member Author

@robcasloz , that's a good suggestion to use -XX:+PrintCFGBlockFreq to check the result, but I agree, writing a test based on it does seem fragile. Given that this code rarely changes (the bug has existed for 15+ years before it was noticed), I would expect the cost of the test (maintenance to prevent false positives) would exceed its value in finding actual regressions in this code. Are reviewers OK with pushing this as-is w/o a regression test?

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.

Are reviewers OK with pushing this as-is w/o a regression test?

Fine with me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 9, 2025
@robcasloz
Copy link
Contributor

@robcasloz , that's a good suggestion to use -XX:+PrintCFGBlockFreq to check the result, but I agree, writing a test based on it does seem fragile. Given that this code rarely changes (the bug has existed for 15+ years before it was noticed), I would expect the cost of the test (maintenance to prevent false positives) would exceed its value in finding actual regressions in this code. Are reviewers OK with pushing this as-is w/o a regression test?

Sure, I agree with your cost/benefit analysis. If we ever find more bugs in the future due to unexpected successor order for NeverBranch or other node classes, we should consider enforcing a canonical successor order during or right after control-flow graph construction.

@dean-long
Copy link
Member Author

Thanks Roberto and Tobias.

@dean-long
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 9, 2025

Going to push as commit 776e1cf.
Since your change was applied there have been 202 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 Apr 9, 2025
@openjdk openjdk bot closed this Apr 9, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 9, 2025
@openjdk
Copy link

openjdk bot commented Apr 9, 2025

@dean-long Pushed as commit 776e1cf.

💡 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