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

8252237: C2: Call to compute_separating_interferences has wrong argument order #3820

Closed
wants to merge 1 commit into from

Conversation

@r-v-raghav
Copy link
Member

@r-v-raghav r-v-raghav commented Apr 30, 2021

https://bugs.openjdk.java.net/browse/JDK-8252237

<Copying details from Old PR - https://github.com/openjdk/jdk/pull/1533>
(**NOTE: This old PR was approved then.
But we did not commit the changes then because of last stage of JDK 16
and waited for more tests, performance runs.
Results of multiple test run, performance benchmarks are available now and confirmed no issues)

[src/hotspot/share/opto/coalesce.hpp] -
112 uint compute_separating_interferences(Node *dst_copy, Node *src_copy, Block *b, uint bindex, RegMask &rm, uint rm_size, uint reg_degree, uint lr1, uint lr2);

[src/hotspot/share/opto/coalesce.cpp] -

..........
538 uint PhaseConservativeCoalesce::compute_separating_interferences(Node *dst_copy, Node *src_copy, Block *b, uint bindex, RegMask &rm, uint reg_degree, uint rm_size, uint lr1, uint lr2 ) {
.................
747 reg_degree = compute_separating_interferences(dst_copy, src_copy, b, bindex, rm, rm_size, reg_degree, lr1, lr2 );

So fixing the argument order - [/src/hotspot/share/opto/coalesce.cpp]

-uint PhaseConservativeCoalesce::compute_separating_interferences(Node *dst_copy, Node *src_copy, Block *b, uint bindex, RegMask &rm, uint reg_degree, uint rm_size, uint lr1, uint lr2 ) {
+uint PhaseConservativeCoalesce::compute_separating_interferences(Node *dst_copy, Node *src_copy, Block *b, uint bindex, RegMask &rm, uint rm_size, uint reg_degree, uint lr1, uint lr2 ) {

Progress

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

Issue

  • JDK-8252237: C2: Call to compute_separating_interferences has wrong argument order

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3820/head:pull/3820
$ git checkout pull/3820

Update a local copy of the PR:
$ git checkout pull/3820
$ git pull https://git.openjdk.java.net/jdk pull/3820/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3820

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3820.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 30, 2021

👋 Welcome back rraghavan! 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.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 30, 2021

@r-v-raghav 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.

Loading

@r-v-raghav
Copy link
Member Author

@r-v-raghav r-v-raghav commented Apr 30, 2021

/reviewer credit thartmann

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 30, 2021

@r-v-raghav
Reviewer thartmann successfully credited.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 30, 2021

@r-v-raghav Could not parse vnkozlov as a valid reviewer.
Syntax: /reviewer (credit|remove) [@user | openjdk-user]+. For example:

  • /reviewer credit @openjdk-bot
  • /reviewer credit duke
  • /reviewer credit @user1 @user2

Loading

@r-v-raghav r-v-raghav marked this pull request as ready for review Apr 30, 2021
@openjdk openjdk bot added the rfr label Apr 30, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 30, 2021

Webrevs

Loading

@r-v-raghav
Copy link
Member Author

@r-v-raghav r-v-raghav commented Apr 30, 2021

/reviewer credit @vnkozlov

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 30, 2021

@r-v-raghav
Reviewer kvn successfully credited.

Loading

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Good.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Apr 30, 2021

@r-v-raghav 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:

8252237: C2: Call to compute_separating_interferences has wrong argument order

Reviewed-by: kvn, 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 262 new commits pushed to the master branch:

  • 50fa162: 8266389: ProblemList java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java on generic-all
  • dd05158: 8266155: Convert java.base to use Stream.toList()
  • c36c63a: 8260560: convert jdeps and jdeprscan tools to use Stream.toList()
  • 096e9e5: 8266318: Switch to macos prefix for macOS bundles
  • 0544a73: 8255227: java/net/httpclient/FlowAdapterPublisherTest.java intermittently failing with TestServer: start exception: java.io.IOException: Invalid preface
  • 48bb996: 8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified
  • 87de5b7: 8266040: Lanai: Incorrect calculations of clipping boundaries
  • eb8db12: 8263396: Atomic::CmpxchgByteUsingInt::set_byte_in_int needs an explicit cast
  • 07ecd42: 8258602: JavaDoc field summary does not indicate final modifier
  • 276a1bf: 8236671: NullPointerException in JKS keystore
  • ... and 252 more: https://git.openjdk.java.net/jdk/compare/cb8394a841023b2cf4a9103f47f50e3fd28c5b04...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.

Loading

@openjdk openjdk bot added the ready label Apr 30, 2021
@r-v-raghav
Copy link
Member Author

@r-v-raghav r-v-raghav commented Apr 30, 2021

/integrate

Loading

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

@openjdk openjdk bot commented Apr 30, 2021

@r-v-raghav Since your change was applied there have been 262 commits pushed to the master branch:

  • 50fa162: 8266389: ProblemList java/awt/Graphics2D/DrawString/DrawRotatedStringUsingRotatedFont.java on generic-all
  • dd05158: 8266155: Convert java.base to use Stream.toList()
  • c36c63a: 8260560: convert jdeps and jdeprscan tools to use Stream.toList()
  • 096e9e5: 8266318: Switch to macos prefix for macOS bundles
  • 0544a73: 8255227: java/net/httpclient/FlowAdapterPublisherTest.java intermittently failing with TestServer: start exception: java.io.IOException: Invalid preface
  • 48bb996: 8266220: keytool still prompt for store password on a password-less pkcs12 file if -storetype pkcs12 is specified
  • 87de5b7: 8266040: Lanai: Incorrect calculations of clipping boundaries
  • eb8db12: 8263396: Atomic::CmpxchgByteUsingInt::set_byte_in_int needs an explicit cast
  • 07ecd42: 8258602: JavaDoc field summary does not indicate final modifier
  • 276a1bf: 8236671: NullPointerException in JKS keystore
  • ... and 252 more: https://git.openjdk.java.net/jdk/compare/cb8394a841023b2cf4a9103f47f50e3fd28c5b04...master

Your commit was automatically rebased without conflicts.

Pushed as commit 928d632.

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

Loading

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