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

8263354: Accumulated C2 code cleanups #2934

Closed
wants to merge 2 commits into from
Closed

Conversation

pfustc
Copy link
Member

@pfustc pfustc commented Mar 11, 2021

This is a trivial patch to cleanup C2 code at several places, including

  • Remove duplicated node enumerations of MinV & MaxV in adlc functions
  • Use "1<<X" to define LoopNode flags, like other C2 flag definitions
  • Unify macro names in aarch64_sve_ad.m4: UNPREDICATE -> UNPREDICATED
  • Delete redundant empty lines in aarch64_sve.ad

Tier1 tests passed.


Progress

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

Issue

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2934/head:pull/2934
$ git checkout pull/2934

This is a trivial patch to cleanup C2 code at several places, including

- Remove duplicated node enumerations of MinV & MaxV in adlc functions
- Use "1<<X" to define LoopNode flags, like other C2 flag definitions
- Unify macro names in aarch64_sve_ad.m4: UNPREDICATE -> UNPREDICATED
- Delete redundant empty lines in aarch64_sve.ad

Tier1 tests passed.
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 11, 2021

👋 Welcome back pli! 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 label Mar 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 11, 2021

@pfustc 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 label Mar 11, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 11, 2021

Webrevs

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Looks good to me.

@openjdk
Copy link

@openjdk openjdk bot commented Mar 11, 2021

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

8263354: Accumulated C2 code cleanups

Reviewed-by: thartmann, redestad

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

  • aa33443: 8262454: Handshake timeout improvements, single target, kill unfinished thread
  • ff25939: 8263426: Reflow JfrNetworkUtilization::send_events
  • e25ad73: 8263430: Uninitialized Method* variables after JDK-8233913
  • 9f6b1d7: 8263436: Silly array comparison in GaloisCounterMode.overlapDetection
  • ad1f605: 8263353: assert(CompilerOracle::option_matches_type(option, value)) failed: Value must match option type
  • cf1c021: 8263480: ProblemList two jpackage tests on Windows
  • f3bd801: 8263403: [JVMCI] output written to tty via HotSpotJVMCIRuntime can be garbled
  • b92abac: 8263433: Shenandoah: Don't expect forwarded objects in set_concurrent_mark_in_progress()
  • 15dacca: 8263465: JDK-8236847 causes tier1 build failure on linux-aarch64
  • 7ed46bd: 8241716: Jpackage functionality to let users choose whether to create shortcuts
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/7988c1d9aa7e3b990c17fdf5e31195e66e7fc5f2...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 openjdk bot added the ready label Mar 11, 2021
@pfustc
Copy link
Member Author

@pfustc pfustc commented Mar 12, 2021

/reviewer credit redestad

@openjdk
Copy link

@openjdk openjdk bot commented Mar 12, 2021

@pfustc
Reviewer redestad successfully credited.

@pfustc
Copy link
Member Author

@pfustc pfustc commented Mar 12, 2021

/integrate

@openjdk openjdk bot closed this Mar 12, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 12, 2021

@pfustc Since your change was applied there have been 15 commits pushed to the master branch:

  • aa33443: 8262454: Handshake timeout improvements, single target, kill unfinished thread
  • ff25939: 8263426: Reflow JfrNetworkUtilization::send_events
  • e25ad73: 8263430: Uninitialized Method* variables after JDK-8233913
  • 9f6b1d7: 8263436: Silly array comparison in GaloisCounterMode.overlapDetection
  • ad1f605: 8263353: assert(CompilerOracle::option_matches_type(option, value)) failed: Value must match option type
  • cf1c021: 8263480: ProblemList two jpackage tests on Windows
  • f3bd801: 8263403: [JVMCI] output written to tty via HotSpotJVMCIRuntime can be garbled
  • b92abac: 8263433: Shenandoah: Don't expect forwarded objects in set_concurrent_mark_in_progress()
  • 15dacca: 8263465: JDK-8236847 causes tier1 build failure on linux-aarch64
  • 7ed46bd: 8241716: Jpackage functionality to let users choose whether to create shortcuts
  • ... and 5 more: https://git.openjdk.java.net/jdk/compare/7988c1d9aa7e3b990c17fdf5e31195e66e7fc5f2...master

Your commit was automatically rebased without conflicts.

Pushed as commit 0bbe064.

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

@pfustc pfustc deleted the cleanup branch Mar 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler integrated
3 participants