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

Improve core count detection #4933

Merged
merged 1 commit into from
Dec 22, 2023
Merged

Improve core count detection #4933

merged 1 commit into from
Dec 22, 2023

Conversation

sxa
Copy link
Member

@sxa sxa commented Dec 21, 2023

I drafted and tested this a few months for the RISC-V case (everything was getting concurrency:1) but since we're paying more attention to the AQA test jobs for RISC-V now I want to get this in so we can make use of the multicore machines that we have.

Ref: adoptium/temurin-build#3591

Machine With this fix Result
sxa-unl1 No concurrency:1
test-plct-1 Yes concurrency:3
test-plct-3 Yes concurrency:3
build-plct-0 No ?
test-plct-7 No ?
test-plct-6 Yes concurrency:3
odroid-2 Yes concurrency:1 (2Gb RAM)
odroid-2 No concurrency:1 (2Gb RAM)
odroid-1 Yes concurrency:1
docker-2004-armv7l-1 No concurrency:4
docker-2004-armv7l-1 Yes concurrency:81 [*]
aix72-2 Yes concurrency:1
aix72-5 No concurrency:1
win2022-1 No concurrency:2
win2022-2 Yes concurrency:3

[*] - This value of 81 suggests that the detection in a docker container is not working as it should and will need to be revised before this is merged, hence the draft status at present.

@sxa
Copy link
Member Author

sxa commented Dec 21, 2023

The latest commit in this PR fixes the core count detection for CGROUPS (It was using GB instead of MB) so now has the desired effect.
The run which tried to use concurrency:81 above is now using 4: https://ci.adoptium.net/job/Grinder/8344/consoleText

This is now ready for review.

These commits are going to need a good squashing ...
Once approved, I'm happy to do the squash & merge myself to remove the erroneous commit messages.

@sxa sxa marked this pull request as ready for review December 21, 2023 17:20
@sxa sxa marked this pull request as draft December 21, 2023 18:11
@sxa
Copy link
Member Author

sxa commented Dec 22, 2023

Right I believe it's working well in all cases now, these runs are all with the new branch:

Machine Result
win2016-1 concurrency:2
odroid-2 concurrency:1
docker-armv7-3 concurrency:4
aix72-1 concurrency:1
win2022-1 concurrency:3
lm4a concurrency:3
TC-aix72-4 concurrency: 1
TC-aix72-3 concurrency: 1
TC-aarch64 (altra) concurrency: 81

NOTE: The TC-aix72 figures probably shouldn't be 1 but that can be raised separately since it's doing that without this PR too.

I've squashed the commits so this should be ready to go live as soon as is practical.

@sxa sxa self-assigned this Dec 22, 2023
@sxa sxa marked this pull request as ready for review December 22, 2023 12:39
@smlambert smlambert merged commit e37ba10 into adoptium:master Dec 22, 2023
3 of 14 checks passed
sophia-guo pushed a commit to sophia-guo/openjdk-tests that referenced this pull request Jan 11, 2024
smlambert added a commit that referenced this pull request Jan 11, 2024
* Use all cores for jtreg instead of halving (#4933)

Signed-off-by: Stewart X Addison <[email protected]>

* Enable headless mode on RISC-V (#4935)

* Exclude java/lang/StringBuilder/HugeCapacity.java on OpenJ9 zlinux (#4940)

It's already excluded on jdk17+ for other reasons.

Issue eclipse-openj9/openj9#17323

Signed-off-by: Peter Shipton <[email protected]>

* Move custom targets to special level (#4941)

Signed-off-by: Shelley Lambert <[email protected]>

* Add 21 and 22 as supported versions in external tests (#4950)

related: #4949

Signed-off-by: Lan Xia <[email protected]>

* cherry-pick

e37ba10 c5e7de8 0d7c837 76695ca 37b48e3 a45c03c

Signed-off-by: Sophia Guo <[email protected]>

---------

Signed-off-by: Stewart X Addison <[email protected]>
Signed-off-by: Peter Shipton <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Lan Xia <[email protected]>
Signed-off-by: Sophia Guo <[email protected]>
Co-authored-by: Stewart X Addison <[email protected]>
Co-authored-by: Ludovic Henry <[email protected]>
Co-authored-by: Peter Shipton <[email protected]>
Co-authored-by: Shelley Lambert <[email protected]>
Co-authored-by: Lan Xia <[email protected]>
@sxa sxa mentioned this pull request Feb 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants