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.

Sign up for GitHub

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

Jump to bottom

8327098: GTest needs larger combination limit #18083

Closed
wants to merge 10 commits into from
Closed

8327098: GTest needs larger combination limit #18083

wants to merge 10 commits into from

Conversation

kdnilsen
Copy link
Contributor

@kdnilsen kdnilsen commented Mar 1, 2024 •
edited by openjdk bot
Loading

The current value of LogSelectionList::MaxSelections is too small, causing GTest failures. This increases the value from 256 to 320.

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-8327098: GTest needs larger combination limit (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18083

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 1, 2024

👋 Welcome back kdnilsen! 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 changed the title 8327098: GTest needs larger combination limit 8327098: GTest needs larger combination limit Mar 1, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 1, 2024
@openjdk
Copy link

openjdk bot commented Mar 1, 2024

@kdnilsen The following label will be automatically applied to this pull request:

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Mar 1, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 1, 2024

Webrevs

shipilev
shipilev approved these changes Mar 1, 2024
View reviewed changes
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.

It looks okay, but I have questions:

  1. Does it happen in mainline right now?
  2. Why are we hitting it with JDK-8324649 PR? I don't see new logging tags added there.

@openjdk
Copy link

openjdk bot commented Mar 1, 2024 •
edited
Loading

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

8327098: GTest needs larger combination limit

Reviewed-by: shade, phh

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

  • 9e32db2: 8328309: Remove malformed masked shift instruction selection patterns
  • fc0472b: 8328000: Convert /java/awt/im/8154816/bug8154816.java applet test to main
  • 85fc47c: 8327180: Failed: java/io/ObjectStreamClass/ObjectStreamClassCaching.java#G1
  • 569b05a: 8327818: Implement Kerberos debug with sun.security.util.Debug
  • dec68d7: 8328234: Remove unused nativeUtils files
  • 7734466: 8325871: Move StringTable and SymbolTable rehashing calls
  • 9e98118: 8328177: Move LDFLAGS_JDK[LIB/EXE] to JdkNativeCompilation.gmk
  • f3af918: 8327945: Inline HasScavengableOops
  • fb390d2: 8327839: Crash with unboxing and widening primitive conversion in switch
  • 86f1744: 8328248: Convert javax/swing/JSlider/6587742/bug6587742.java applet test to main
  • ... and 223 more: https://git.openjdk.org/jdk/compare/acc0a7436f5345dddff0b14f0098a5423b85e614...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 (@shipilev, @phohensee) 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 Mar 1, 2024
@kdnilsen
Copy link
Contributor Author

kdnilsen commented Mar 1, 2024

@shipilev: @earthling-amzn shares that he has seen this same failure on our Shenandoah repository and have applied a similar fix there. It may be that the new ShenandoahFreeSet introduces more combinations of log tags than had been present previously.

@shipilev
Copy link
Member

shipilev commented Mar 1, 2024 •
edited
Loading

@shipilev: @earthling-amzn shares that he has seen this same failure on our Shenandoah repository and have applied a similar fix there. It may be that the new ShenandoahFreeSet introduces more combinations of log tags than had been present previously.

Weird, I just tried to run all gtests with #17561, and it passes well without these adjustments. Puzzling.

shipilev
shipilev reviewed Mar 1, 2024
View reviewed changes
Copy link
Member

@shipilev shipilev left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Not clear why this is needed, so I am rescinding review for a while.

@kdnilsen
Copy link
Contributor Author

kdnilsen commented Mar 2, 2024

On #17561, commit 42af76b incorporates this change in order to test whether this change addresses the regressions. With this change, we now pass all GHA on that PR.

kdnilsen added a commit to kdnilsen/jdk that referenced this pull request Mar 3, 2024
@kdnilsen
Revert redundant change from openjdk#18083
2526384 
This change was made experimentally in this PR to evaluate whether this
would resolve regressions in GHA tests.  When present, this PR passed
all GHA tests.  When absent, it does not.
@phohensee
Copy link
Member

GHA failures are unrelated.

@xmas92
Copy link
Member

xmas92 commented Mar 5, 2024

Note that there is also: JDK-8325490

@kdnilsen
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 18, 2024
@openjdk
Copy link

openjdk bot commented Mar 18, 2024

@kdnilsen
Your change (at version a515bcd) is now ready to be sponsored by a Committer.

@ysramakrishna
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Mar 18, 2024

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

  • 9e32db2: 8328309: Remove malformed masked shift instruction selection patterns
  • fc0472b: 8328000: Convert /java/awt/im/8154816/bug8154816.java applet test to main
  • 85fc47c: 8327180: Failed: java/io/ObjectStreamClass/ObjectStreamClassCaching.java#G1
  • 569b05a: 8327818: Implement Kerberos debug with sun.security.util.Debug
  • dec68d7: 8328234: Remove unused nativeUtils files
  • 7734466: 8325871: Move StringTable and SymbolTable rehashing calls
  • 9e98118: 8328177: Move LDFLAGS_JDK[LIB/EXE] to JdkNativeCompilation.gmk
  • f3af918: 8327945: Inline HasScavengableOops
  • fb390d2: 8327839: Crash with unboxing and widening primitive conversion in switch
  • 86f1744: 8328248: Convert javax/swing/JSlider/6587742/bug6587742.java applet test to main
  • ... and 223 more: https://git.openjdk.org/jdk/compare/acc0a7436f5345dddff0b14f0098a5423b85e614...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 18, 2024
@openjdk openjdk bot closed this Mar 18, 2024
@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 18, 2024
@openjdk
Copy link

openjdk bot commented Mar 18, 2024

@ysramakrishna @kdnilsen Pushed as commit c901da4.

💡 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
Reviewers

@shipilev shipilev shipilev approved these changes

@phohensee phohensee phohensee approved these changes

Assignees
No one assigned
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@kdnilsen @shipilev @phohensee @xmas92 @ysramakrishna