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

8295191: IR framework timeout options expect ms instead of s #14649

Conversation

enothum
Copy link
Contributor

@enothum enothum commented Jun 26, 2023

The flags -DTestCompilationTimeout and -DWaitForCompilationTimeout expect values in ms. The example in the README was misleading as one could infer from "default: 10s" that the flag expects values in ms. Therefore I changed the values and units in the example to ms.


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-8295191: IR framework timeout options expect ms instead of s (Bug - P5)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14649

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 26, 2023

👋 Welcome back enothum! 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 Jun 26, 2023

@enothum 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 Jun 26, 2023
Update default and example time values
@enothum enothum marked this pull request as ready for review June 26, 2023 10:53
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 26, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 26, 2023

Webrevs

@chhagedorn
Copy link
Member

chhagedorn commented Jun 26, 2023

I think it's better to actually change the flags to accept seconds instead of milliseconds. I don't think we need a more fine-grained control than seconds and it makes it easier to use these flags.

@enothum
Copy link
Contributor Author

enothum commented Jun 28, 2023

Reverted the changes in README.
Changed the code to now expect a value in seconds from the user.
The timing itself is still implemented in milliseconds, which is why I added MS to the internal variable name.

Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

That looks good but you also need to update the new variable names here:

timeout = Math.max(WAIT_FOR_COMPILATION_TIMEOUT, TEST_COMPILATION_TIMEOUT) + 5000;
} else if (anyWaitForCompilation) {
timeout = WAIT_FOR_COMPILATION_TIMEOUT + 5000;
} else {
timeout = TEST_COMPILATION_TIMEOUT + 5000;

@enothum
Copy link
Contributor Author

enothum commented Jun 28, 2023

True good catch, thank you!

Copy link
Member

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

openjdk bot commented Jun 28, 2023

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

8295191: IR framework timeout options expect ms instead of s

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

  • af319d9: 8311064: Windows builds fail without precompiled headers after JDK-8310728
  • cbf418a: 8311020: Typo cleanup in Classfile API
  • f4b900b: 8310902: (fc) FileChannel.transferXXX async close and interrupt issues
  • cf8d706: 8308463: Refactor regenerated class handling in lambdaFormInvokers.cpp
  • 6f58ab2: 8301569: jmod list option and jimage list --help not interpreted correctly on turkish locale
  • 8f5a384: 8311032: Empty value for java.protocol.handler.pkgs system property can lead to unnecessary classloading attempts of protocol handlers
  • ded1370: 8309811: BytecodePrinter cannot handle unlinked classes
  • 02b17d7: 8310264: In PhaseChaitin::Split defs and phis are leaked
  • a63afa4: 8294427: Check boxes and radio buttons have rendering issues on Windows in High DPI env
  • 3df36c4: 8310061: Note if implicit annotation processing is being used
  • ... and 136 more: https://git.openjdk.org/jdk/compare/f8f8bfbea15de0a57415ba27ad5722b6a4add07a...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 (@chhagedorn, @vnkozlov, @TobiHartmann) 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 Jun 28, 2023
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.

Good.

Copy link
Member

@TobiHartmann TobiHartmann 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.

@enothum
Copy link
Contributor Author

enothum commented Jun 29, 2023

Thanks for the reviews everyone!

@enothum
Copy link
Contributor Author

enothum commented Jun 29, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 29, 2023
@openjdk
Copy link

openjdk bot commented Jun 29, 2023

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

@TobiHartmann
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 29, 2023

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

  • af319d9: 8311064: Windows builds fail without precompiled headers after JDK-8310728
  • cbf418a: 8311020: Typo cleanup in Classfile API
  • f4b900b: 8310902: (fc) FileChannel.transferXXX async close and interrupt issues
  • cf8d706: 8308463: Refactor regenerated class handling in lambdaFormInvokers.cpp
  • 6f58ab2: 8301569: jmod list option and jimage list --help not interpreted correctly on turkish locale
  • 8f5a384: 8311032: Empty value for java.protocol.handler.pkgs system property can lead to unnecessary classloading attempts of protocol handlers
  • ded1370: 8309811: BytecodePrinter cannot handle unlinked classes
  • 02b17d7: 8310264: In PhaseChaitin::Split defs and phis are leaked
  • a63afa4: 8294427: Check boxes and radio buttons have rendering issues on Windows in High DPI env
  • 3df36c4: 8310061: Note if implicit annotation processing is being used
  • ... and 136 more: https://git.openjdk.org/jdk/compare/f8f8bfbea15de0a57415ba27ad5722b6a4add07a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 29, 2023

@TobiHartmann @enothum Pushed as commit b2eae16.

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