Merge jdk:jdk-28+0#324
Conversation
Reviewed-by: jsjolen, shade, pchilanomate
Reviewed-by: vlivanov, dlong, jrose
Reviewed-by: jlu, naoto
Reviewed-by: fyang, gcao
Reviewed-by: epeter, vlivanov, xgong
Reviewed-by: phubner, aartemov, dholmes
…w feature enabled Co-authored-by: David Beaumont <dbeaumont@openjdk.org> Reviewed-by: jpai, coleenp, sgehwolf
Reviewed-by: rkennke, mdoerr
Reviewed-by: kdnilsen, rkennke
…void type when annotating void as a generic bound Reviewed-by: jlahoda
Reviewed-by: weijun
…ization.java Reviewed-by: mchevalier, epeter
Reviewed-by: naoto
Reviewed-by: serb, azvegint
Reviewed-by: jdv, azvegint
…CardBarrier.java fails with -Xcomp after JDK-8369013 Reviewed-by: cslucas, wkemper
Reviewed-by: mullan
…at is returned when socket is closed Reviewed-by: dfuchs, michaelm
…sages could be improved Reviewed-by: clanger, alanb
…med out Reviewed-by: cjplummer, lmesnik, kevinw
…le as local 0 Reviewed-by: dlong, sspitsyn
Reviewed-by: kvn, qamai, jbhateja
Reviewed-by: abimpoudis, liach
Reviewed-by: dfuchs, alanb
Reviewed-by: mcimadamore
…last Reviewed-by: mcimadamore
Reviewed-by: jlu, iris
Reviewed-by: dholmes, sspitsyn
Reviewed-by: kizune, azvegint, serb
…ound Reviewed-by: kcr, prr, aivanov
Added tag jdk-28+0 for changeset f8f7ad2
|
👋 Welcome back tpushkin! A progress list of the required criteria for merging this PR into |
|
The CI failures are unrelated:
|
|
@TimPushkin 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: 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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
|
@jankratochvil, almost all conflicts are CPU-features-related, please review. Also I didn't run the manual |
openjdk
Bot
added
ready
Webrevs
|
Why have you introduced
It does not matter much, it is being updated by #321 . |
|
@jankratochvil, Correct me if I'm wrong, without the check if the user passed a CPUFeatures string that does not include SSE and SSE2, which are now mandatory in OpenJDK, SSE and SSE2 will be disabled in glibc. But in OpenJDK they cannot be disabled, so they will continue to be used, even though they will not be present in |
|
OK, so the new OpenJDK version makes And I see now that you have removed So yes, I am fine with it, thanks. |
|
Agree, I should make this an error instead. I made it the way it is because it's now just impossible to launch a JVM on a machine that does not support these two features. But the user may try do disable them for a machine that does support them for some reason, and that should be an error. |
|
Made missing mandatory features a error. The error messages now look like this: BTW, the "If you are sure it will not crash you can override this check by -XX:+UnlockExperimentalVMOptions -XX:CheckCPUFeatures=skip ." suggestion seems misleading, it does not override the CPUFeatures check that prints it. Since this is pre-existing I reported it as ZULU-92005. |
|
Noticed |
|
@jankratochvil, please re-review. The CI failures are the same as before. |
Fine with me, thanks. |
|
Thanks. I pushed a micro-optimization, it's small so I won't ask for another review. Will integrate once CI passes. |
|
/integrate |
|
Going to push as commit 97b5a70. |
openjdk
Bot
removed
ready
|
@TimPushkin Pushed as commit 97b5a70. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
20 participants
Merges
jdk-28+0.Notable parts:
CPU_FLUSH,CPU_MMX, madeCPU_SSE,CPU_SSE2mandatory (FLUSHis also now mandatory but without an enum) — I dropped CRaC code that usedCPU_FLUSH, inlined the onlyCPU_MMXcheck we had, madeCPU_SSE,CPU_SSE2mandatory in-XX:CPUFeatures, updated hardcoded CPU features values in testsIgnoreCPUFeaturesthat expires in this releaseOutput of
git show --remerge-diff: https://gist.github.com/TimPushkin/1af925f55f841431c87aa31099925b43 — I dropped contents of JVMCI files that were fully removed because they are huge and of no interest.Progress
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/crac.git pull/324/head:pull/324$ git checkout pull/324Update a local copy of the PR:
$ git checkout pull/324$ git pull https://git.openjdk.org/crac.git pull/324/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 324View PR using the GUI difftool:
$ git pr show -t 324Using diff file
Download this PR as a diff file:
https://git.openjdk.org/crac/pull/324.diff
Using Webrev
Link to Webrev Comment