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

8282142: [TestCase] compiler/inlining/ResolvedClassTest.java will fail when --with-jvm-features=-compiler1 #7541

Closed
wants to merge 3 commits into from

Conversation

haominw
Copy link
Contributor

@haominw haominw commented Feb 19, 2022

…l when --with-jvm-features=-compiler1


Progress

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

Issue

  • JDK-8282142: [TestCase] compiler/inlining/ResolvedClassTest.java will fail when --with-jvm-features=-compiler1

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7541

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

Using diff file

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

@bridgekeeper bridgekeeper bot added the oca Needs verification of OCA signatory status label Feb 19, 2022
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 19, 2022

Hi @haominw, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user haominw" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@openjdk openjdk bot changed the title 8282142: [TestCase] compiler/inlining/ResolvedClassTest.java will fai… 8282142: [TestCase] compiler/inlining/ResolvedClassTest.java will fail when --with-jvm-features=-compiler1 Feb 19, 2022
@openjdk
Copy link

openjdk bot commented Feb 19, 2022

@haominw 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 Feb 19, 2022
@haominw
Copy link
Contributor Author

haominw commented Feb 19, 2022

/covered
I am a Loongson employee

@bridgekeeper bridgekeeper bot added the oca-verify Needs verification of OCA signatory status label Feb 19, 2022
@bridgekeeper
Copy link

bridgekeeper bot commented Feb 19, 2022

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

@bridgekeeper bridgekeeper bot removed oca Needs verification of OCA signatory status oca-verify Needs verification of OCA signatory status labels Feb 24, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 24, 2022
@mlbridge
Copy link

mlbridge bot commented Feb 24, 2022

Webrevs

@dean-long
Copy link
Member

Should we consider updating the test so that it works when only C2 is present?

@haominw
Copy link
Contributor Author

haominw commented Feb 25, 2022

Hi, Dean. Just like you said, "The test was written to test a C1 issue," https://github.com/openjdk/jdk18/pull/80/files Should we update it When only C2 is present? I dont know the answer. I prefer to test it when only C1 enabled.

@haominw
Copy link
Contributor Author

haominw commented Feb 28, 2022

@DamonFool Please review

@DamonFool
Copy link
Member

I would suggest something like this

diff --git a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
index dfeee6c..b7977d0 100644
--- a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
+++ b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8279515
  *
- * @requires vm.flagless
+ * @requires vm.flagless & vm.compMode != "Xint" & vm.compiler1.enabled & vm.compiler2.enabled
  * @modules java.base/jdk.internal.misc
  * @library /test/lib /
  *

This is because the test fails with C1-only too (I tested it with the minimal VM).
Also I don't think it would pass with interpreter-only mode.
Thanks.

Copy link
Member

@DamonFool DamonFool 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
Copy link

openjdk bot commented Feb 28, 2022

⚠️ @haominw the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout jdk-8282142
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk
Copy link

openjdk bot commented Feb 28, 2022

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

8282142: [TestCase] compiler/inlining/ResolvedClassTest.java will fail when --with-jvm-features=-compiler1

Reviewed-by: jiefu, kvn

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

  • bae0d5e: 8236907: JTable added to nested panels does not paint last visible row
  • b0028a4: 8272853: improve JavadocTester.runTests
  • e07fd39: 8281181: Do not use CPU Shares to compute active processor count
  • 9c817d3: 8015854: [macosx] JButton's HTML ImageView adding unwanted padding
  • 733c790: 8282081: java.time.DateTimeFormatter: wrong definition of symbol F
  • f9f9c0a: 8252769: Warn in configure if git config autocrlf has invalid value
  • 603050b: 8282661: [BACKOUT] ByteBufferTest.java: replace endless recursion with RuntimeException in void ck(double x, double y)
  • 5247153: 8282615: G1: Fix some includes
  • a584c90: 8282573: ByteBufferTest.java: replace endless recursion with RuntimeException in void ck(double x, double y)
  • d5e8e52: 8282532: Allow explicitly setting build platform alongside --openjdk-target
  • ... and 130 more: https://git.openjdk.java.net/jdk/compare/d3749de47832c6de4bcee9cf64a0b698e796b2f2...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.

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 (@DamonFool, @vnkozlov) 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 openjdk bot added the ready Pull request is ready to be integrated label Feb 28, 2022
@haominw
Copy link
Contributor Author

haominw commented Feb 28, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 28, 2022
@openjdk
Copy link

openjdk bot commented Feb 28, 2022

@haominw
Your change (at version 5e28f5f) is now ready to be sponsored by a Committer.

@DamonFool
Copy link
Member

/integrate

Let's wait for two days to see if @dean-long and others have better solution.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Did you investigated why C2 compilation failed to produce expected message? And produces instead: failed initial checks

@haominw
Copy link
Contributor Author

haominw commented Mar 2, 2022

Did you investigated why C2 compilation failed to produce expected message? And produces instead: failed initial checks

Hi @vnkozlov ,

testStaticInit() want to get expected error analyzer.shouldContain("TestStaticInit$A::m (1 bytes) no static binding");
But only C1 can print this.

grep -nr "no static binding" src/hotspot/
src/hotspot/share/c1/c1_GraphBuilder.cpp:2101: print_inlining(target, "no static binding", /success/ false);
src/hotspot/share/gc/parallel/mutableNUMASpace.cpp:834: // Make the page allocation happen here if there is no static binding.

So, I think It should be tested when c1-only. Thanks.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Okay.

@vnkozlov
Copy link
Contributor

vnkozlov commented Mar 5, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 5, 2022

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

  • bae0d5e: 8236907: JTable added to nested panels does not paint last visible row
  • b0028a4: 8272853: improve JavadocTester.runTests
  • e07fd39: 8281181: Do not use CPU Shares to compute active processor count
  • 9c817d3: 8015854: [macosx] JButton's HTML ImageView adding unwanted padding
  • 733c790: 8282081: java.time.DateTimeFormatter: wrong definition of symbol F
  • f9f9c0a: 8252769: Warn in configure if git config autocrlf has invalid value
  • 603050b: 8282661: [BACKOUT] ByteBufferTest.java: replace endless recursion with RuntimeException in void ck(double x, double y)
  • 5247153: 8282615: G1: Fix some includes
  • a584c90: 8282573: ByteBufferTest.java: replace endless recursion with RuntimeException in void ck(double x, double y)
  • d5e8e52: 8282532: Allow explicitly setting build platform alongside --openjdk-target
  • ... and 130 more: https://git.openjdk.java.net/jdk/compare/d3749de47832c6de4bcee9cf64a0b698e796b2f2...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 5, 2022

@vnkozlov @haominw Pushed as commit c459f8f.

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

@haominw haominw deleted the jdk-8282142 branch June 9, 2022 06:46
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
4 participants