Skip to content

Conversation

@chhagedorn
Copy link
Member

@chhagedorn chhagedorn commented Oct 15, 2025

This patch splits jtreg tests with multiple @run statements in one @test block into different blocks. This allows jtreg to do better parallelization.

I walked through all compiler/valhalla/inlinetypes tests. Whenever we had 3 or more @run statements in a single @test block, I compared the test with execution times on Mach5, mainly tier1. If the test needed more time to execute, I split the block into separate blocks. Otherwise, I left them untouched (we can repeat this process if necessary when we see some more opportunities). Note: I did not change anything else in the tests themselves like loop iterations etc.

Changes

  • Split into separate @test blocks.
  • Added packages where we missed them for consistency.
  • Changed othervm/main into main when there was no flag passed (could be left-over from runs that had -XX:+EnableValhalla before).
  • Introduced ids for the different @test blocks.

Test Execution Time

Since I changed quite a lot of tests and there is no simple way to run tier1-4 only with compiler/valhalla/inlinetypes tests without also running them with flag combos that they normally do not run, I ran it once through these tiers separately. There were no timeouts reported anymore after the timeout factor change back to 4 in Valhalla. Here are the results for the total machine times compared to the last CI run jdk-26-valhalla+1-83 (could of course have some variance but the numbers are just an indication):

lworld lworld + patch improvement
tier1 1d 00h 45m 31s 14h 37m 43s ~ - 10 h
tier2 1d 06h 16m 54s 1d 02h 50m 17s ~ - 3h 30min
tier3 2d 19h 08m 57s 2d 15h 25m 58s ~ - 3h 45min
tier4 2d 12h 13m 12s 2d 01h 28m 00s ~ - 10h 45min

We can see quite some improvements by simply doing that. Note that JDK-8369530 explores improvement opportunities for the actual testing code.

Thanks,
Christian


Progress

  • Change must not contain extraneous whitespace

Issue

  • JDK-8369437: [lworld] Split multiple @run statements in compiler tests into separate @test blocks (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1681

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/valhalla/pull/1681.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 15, 2025

👋 Welcome back chagedorn! A progress list of the required criteria for merging this PR into lworld 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 Oct 15, 2025

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

8369437: [lworld] Split multiple @run statements in compiler tests into separate @test blocks

Reviewed-by: thartmann, phubner

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 102 new commits pushed to the lworld branch:

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 lworld branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 15, 2025
@mlbridge
Copy link

mlbridge bot commented Oct 15, 2025

Webrevs

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.

Nice improvements! Looks good to me.

@chhagedorn
Copy link
Member Author

Thanks Tobias for your review!

Copy link
Member

@Arraying Arraying 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, thank you for doing this! I left some nitpicks, as always feel free to disregard.

*/

/*
* @test id=nAVF
Copy link
Member

Choose a reason for hiding this comment

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

Nitpick/FYI: switching from kebab case to camel case. I don't think this matters at all but wanted to point it out just in case.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good observation! I used it for "non-atomic" because it still belongs to the "A" and I did not want to confuse it with "N" for Nullable. It's a little unfortunate, though.

*/

/*
* @test id=AII-
Copy link
Member

Choose a reason for hiding this comment

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

I think trailing - are awkward? Or is there a convention/reason for this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Good catch! Fixed.

@chhagedorn
Copy link
Member Author

Thanks Paul for your review! Pushed a small update.

Copy link
Member

@Arraying Arraying left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks again.

@chhagedorn
Copy link
Member Author

Thanks for your reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Oct 16, 2025

Going to push as commit c42a95f.
Since your change was applied there have been 104 commits pushed to the lworld branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 16, 2025
@openjdk openjdk bot closed this Oct 16, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 16, 2025
@openjdk
Copy link

openjdk bot commented Oct 16, 2025

@chhagedorn Pushed as commit c42a95f.

💡 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

integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants