Skip to content
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

8347352: RISC-V: Cleanup bitwise AND assembler routines #23008

Closed
wants to merge 3 commits into from

Conversation

RealFYang
Copy link
Member

@RealFYang RealFYang commented Jan 9, 2025

Hi, Please consider this small refactoring work.

It's a bit strange that we have Assembler::_and_imm12 and MacroAssembler::andi, which is quite different from friends Assembler::ori and Assembler::xori. And it doesn't seem necessary to have this MacroAssembler::andi which checks the immediate range. I find the immediate is within signed 12-bit range for most of the cases. One exception is in file sharedRuntime_riscv.cpp where I think we can do mv + andr instead.

Testing on linux-riscv64:

  • tier1-3 and gtest:all (release)
  • hotspot:tier1 (fastdebug)

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-8347352: RISC-V: Cleanup bitwise AND assembler routines (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23008

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 9, 2025

👋 Welcome back fyang! 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 Jan 9, 2025

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

8347352: RISC-V: Cleanup bitwise AND assembler routines

Reviewed-by: rehn, fjiang, mli

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

  • afc4529: 8346834: Tests failing with -XX:+UseNUMA due to "NUMA support disabled" warning
  • a3be97e: 8347761: Test tools/jimage/JImageExtractTest.java fails after JDK-8303884
  • 28e01e6: 8347762: ClassFile attribute specification refers to non-SE modules
  • be1cdd9: 8344140: Refactor the discovery of AOT cache artifacts
  • 973c630: 8342466: Improve API documentation for java.lang.classfile.attribute
  • 9782bfd: 8347620: Shenandoah: Use 'free' tag for free set related logging
  • 35be4a4: 8347173: java/net/DatagramSocket/InterruptibleDatagramSocket.java fails with virtual thread factory
  • 36b7abd: 8225763: Inflater and Deflater should implement AutoCloseable
  • d6d45c6: 8303884: jlink --add-options plugin does not allow GNU style options to be provided
  • 0ee6ba9: 8347596: Update HSS/LMS public key encoding
  • ... and 90 more: https://git.openjdk.org/jdk/compare/f9b11332eccd8a8ffb4128308f442b209d07a3b1...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.

➡️ 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 Jan 9, 2025

@RealFYang 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 Jan 9, 2025
@RealFYang RealFYang marked this pull request as ready for review January 9, 2025 14:54
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 9, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 9, 2025

Webrevs

Copy link
Member

@feilongjiang feilongjiang left a comment

Choose a reason for hiding this comment

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

Looks more consistent now, thanks!

@RealFYang
Copy link
Member Author

@feilongjiang : Thanks for the review! Could we have a Reviewer please? Maybe @Hamlin-Li @robehn ?

Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

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

Thanks!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 14, 2025
Copy link

@Hamlin-Li Hamlin-Li 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.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jan 14, 2025
@RealFYang
Copy link
Member Author

RealFYang commented Jan 14, 2025

@robehn @Hamlin-Li : Thanks for the review! I have just realized and pushed another commit making the type of immediates more consistent for several macro-assembler routines like subi/subiw. Hope the latest version still looks fine to you.

Copy link

@Hamlin-Li Hamlin-Li left a comment

Choose a reason for hiding this comment

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

Still good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 14, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jan 14, 2025
@RealFYang
Copy link
Member Author

RealFYang commented Jan 15, 2025

Still good.

Could you please re-approve? Fixed a build issue and re-run hs:tier1. Result is still clean.

Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

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

Ship away!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 15, 2025
@RealFYang
Copy link
Member Author

Thanks all for the review!
/integrate

@openjdk
Copy link

openjdk bot commented Jan 15, 2025

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

  • afc4529: 8346834: Tests failing with -XX:+UseNUMA due to "NUMA support disabled" warning
  • a3be97e: 8347761: Test tools/jimage/JImageExtractTest.java fails after JDK-8303884
  • 28e01e6: 8347762: ClassFile attribute specification refers to non-SE modules
  • be1cdd9: 8344140: Refactor the discovery of AOT cache artifacts
  • 973c630: 8342466: Improve API documentation for java.lang.classfile.attribute
  • 9782bfd: 8347620: Shenandoah: Use 'free' tag for free set related logging
  • 35be4a4: 8347173: java/net/DatagramSocket/InterruptibleDatagramSocket.java fails with virtual thread factory
  • 36b7abd: 8225763: Inflater and Deflater should implement AutoCloseable
  • d6d45c6: 8303884: jlink --add-options plugin does not allow GNU style options to be provided
  • 0ee6ba9: 8347596: Update HSS/LMS public key encoding
  • ... and 90 more: https://git.openjdk.org/jdk/compare/f9b11332eccd8a8ffb4128308f442b209d07a3b1...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 15, 2025

@RealFYang Pushed as commit 4f3dc9d.

💡 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 hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants