Skip to content

8358655: AArch64: Simplify Interpreter::profile_taken_branch #25906

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

Conversation

chadrako
Copy link
Contributor

@chadrako chadrako commented Jun 19, 2025

JDK-8358655

The aarch64 version of JDK-8357434

The counter is 64-bit, never practically overflows, and no other code cares about it so it is safe to remove

Additional Testing:

  • Linux aarch64 fastdebug tier 1
  • Linux aarch64 fastdebug tier 2
  • Linux aarch64 fastdebug tier 3
  • Linux aarch64 fastdebug tier 4

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-8358655: AArch64: Simplify Interpreter::profile_taken_branch (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25906

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

Using diff file

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

Using Webrev

Link to Webrev Comment

Sorry, something went wrong.

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 19, 2025

👋 Welcome back chadrako! 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 Jun 19, 2025

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

8358655: AArch64: Simplify Interpreter::profile_taken_branch

Reviewed-by: shade, 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 1 new commit pushed to the master branch:

  • 6df0f5e: 8360281: VMError::error_string has incorrect format usage

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

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 (@theRealAph, @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).

@openjdk
Copy link

openjdk bot commented Jun 19, 2025

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

@chadrako chadrako force-pushed the JDK-8358655-profile_taken_branch branch from 46d9652 to ae31d0f Compare June 19, 2025 21:20
@chadrako chadrako changed the title Simplify profile_taken_branch 8358655: AArch64: Simplify Interpreter::profile_taken_branch Jun 19, 2025
@chadrako chadrako marked this pull request as ready for review June 19, 2025 21:36
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 19, 2025
@mlbridge
Copy link

mlbridge bot commented Jun 19, 2025

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 20, 2025
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine. I also think r1 saves are now unnecessary, right, @theRealAph?

    // ECN: FIXME: This code smells
    // check if MethodCounters exists
    Label has_counters;
    __ ldr(rscratch1, Address(rmethod, Method::method_counters_offset()));
    __ cbnz(rscratch1, has_counters);
    __ push(r0);
    __ push(r1); // <--- here
    __ push(r2);
    __ call_VM(noreg, CAST_FROM_FN_PTR(address,
            InterpreterRuntime::build_method_counters), rmethod);
    __ pop(r2);
    __ pop(r1);  // <--- here
    __ pop(r0);

@theRealAph
Copy link
Contributor

Looks fine. I also think r1 saves are now unnecessary, right, @theRealAph?

    // ECN: FIXME: This code smells
    // check if MethodCounters exists
    Label has_counters;
    __ ldr(rscratch1, Address(rmethod, Method::method_counters_offset()));
    __ cbnz(rscratch1, has_counters);
    __ push(r0);
    __ push(r1); // <--- here
    __ push(r2);
    __ call_VM(noreg, CAST_FROM_FN_PTR(address,
            InterpreterRuntime::build_method_counters), rmethod);
    __ pop(r2);
    __ pop(r1);  // <--- here
    __ pop(r0);

I thinks so, but at a first glance r1 seems to be clobbered on all code paths immediately after this, so I don't think it's needed anyway,

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jun 20, 2025
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks okay, as long as it still passes testing.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 23, 2025
@chadrako
Copy link
Contributor Author

chadrako commented Jun 23, 2025

Looks okay, as long as it still passes testing.

Linux jtreg tests I ran passed. Windows GHA actions is failing but seems unrelated

configure:110212: error: Could not find a C compiler.

@shipilev
Copy link
Member

Windows GHA is fixed by 72679c9, you can pull from master, and it should fix it.

…_taken_branch
@chadrako
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 23, 2025
@openjdk
Copy link

openjdk bot commented Jun 23, 2025

@chadrako
Your change (at version 29cd004) is now ready to be sponsored by a Committer.

@sendaoYan
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 24, 2025

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

  • bcad87e: 8358697: TextLayout/MyanmarTextTest.java passes if no Myanmar font is found
  • 2a70a6d: 8346886: Add since checker test to jdk.management.jfr
  • 6df0f5e: 8360281: VMError::error_string has incorrect format usage

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 24, 2025

@sendaoYan @chadrako Pushed as commit a350a11.

💡 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 [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

None yet

4 participants