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

[24.1] October CPU sync #800

Merged
merged 50 commits into from
Oct 17, 2024
Merged

Conversation

zakkak
Copy link
Collaborator

@zakkak zakkak commented Oct 15, 2024

Merge upstream changes from vm-24.1.1 tag.

  • Avoid getHostBackend when instantiating UnimplementedGraalIntrinsics.
  • [GR-57295] Aarch: Move setConservativeLabelRange after resetting crb.
  • [GR-56104] Fix --bundle-create option and bundle-launcher feature on Windows.
  • Start 24.1.1 dev cycle.
  • Update js and graalpython imports.
  • Update GraalVM versions used by simplelanguage and simpletool.
  • Do not include TruffleJfrFeature if PGO config is specified.
  • Eagerly initialize caches in ValueConversions
  • Reset Provider.Service.constructorCache field
  • Fix Addr part alignment in Truffle compilation logs.
  • update JVMCI to 23.0.1+9-jvmci-b01
  • Prevent emission of typeReachable in reachability-metadata.json
  • Ensure correct condition format during metadata emission
  • Parse constant resource patterns as globs
  • Enable "type" to register reflective elements unconditionally when parsing in the agent or configure tool
  • Pretty print legacy configuration files
  • Add changelog entry for reachability-metadata.json
  • [GR-57970] Backport to 24.1: Make js.webassembly option stable.
  • [GR-57799] Backport to 24.1: Deprecate exposed truffle filesystem spi in VirtualFileSystem.
  • update JVMCI to 23.0.1+10-jvmci-b01
  • Remove constant memory buffer assumption and simplify ByteArrayWasmMemory.
  • Check that memory 0 size >= initial size at the start of a wasm function.
  • Only perform initial memory 0 bounds check if the wasm function uses memory 0.
  • Work around for nullary benchmarkTeardownEach() in photon benchmark.
  • Fix TraceTransferToInterpreter in WasmFunctionNode.profileCondition.
  • Try to read WebAssembly.Module bytes via Buffer Interop.
  • support different JDK version between CE and EE for labsjdk-latest
  • deploy snapshots
  • update JVMCI CE to 23.0.1+10-jvmci-b01
  • revert : support different JDK version between CE and EE for labsjdk-latest
  • Update mx import.
  • [GR-57721] Backport to 24.1: Create Gradle plugin with similar features as our Maven plugin.
  • labsjdk respin : adopt jdk-23.0.1+11
  • [GR-57975] Backport to 24.1: Update bouncycastle dependency
  • Release GraalVM 24.1.1.

The merge was clean, but there are two open issues for properly testing this branch:

  1. Missing tag 7.27.5.1 mx#285
  2. The branch depends on a newer JVMCI version which is not satisfied by JDK 23+37, which is still the latest build returned by https://api.adoptium.net/v3/binary/latest/23/ea/linux/x64/jdk/hotspot/normal/eclipse

mur47x111 and others added 30 commits August 13, 2024 12:18
PullRequest: graal/18779
…config is specified.

PullRequest: graal/18796
… in VirtualFileSystem.

PullRequest: graalpython/3475
…UnimplementedGraalIntrinsics.

PullRequest: graal/18563
…ion.

This allows hoisting bounds checks for memory accesses that are guaranteed to stay within the initial bounds.

(cherry picked from commit 7b622f6)
marwan-hallaoui and others added 17 commits September 19, 2024 10:06
…uncher feature on Windows.

PullRequest: graal/18683
… and simplify ByteArrayWasmMemory.

PullRequest: graal/18855
…chability-metadata.json

PullRequest: graal/18819
…es as our Maven plugin.

PullRequest: graalpython/3476
PullRequest: graal/18905
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Oct 15, 2024
@zakkak zakkak requested a review from jerboaa October 15, 2024 17:34
@jerboaa
Copy link
Collaborator

jerboaa commented Oct 15, 2024

I'll take a look tomorrow. Thanks!

@jerboaa
Copy link
Collaborator

jerboaa commented Oct 16, 2024

Build fails with:

Exception in thread "main" java.lang.IllegalArgumentException: Version should be of the form MAJOR.MINOR.PATCH not 7.27.5.1
	at MxVersion.<init>(build.java:1536)
	at Mx.<init>(build.java:933)
	at build.main(build.java:62)

... which should be fixed with this backport graalvm/mandrel-packaging#458

@jerboaa
Copy link
Collaborator

jerboaa commented Oct 16, 2024

2. The branch depends on a newer JVMCI version which is not satisfied by JDK 23+37, which is still the latest build returned by https://api.adoptium.net/v3/binary/latest/23/ea/linux/x64/jdk/hotspot/normal/eclipse

@zakkak Is this an actual problem? This PR builds fine for me on 23+37.

native-image 23-beta 2024-09-17
OpenJDK Runtime Environment Mandrel-24.1.1.0-dev4f15dffa4267 (build 23-beta+37-ea)
OpenJDK 64-Bit Server VM Mandrel-24.1.1.0-dev4f15dffa4267 (build 23-beta+37-ea, mixed mode)

So does this block this PR from getting merged?

Copy link
Collaborator

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

This seems fine.

@jerboaa
Copy link
Collaborator

jerboaa commented Oct 16, 2024

I'd suggest trying to merge graalvm/mandrel-packaging#458 and trigger another CI build with this.

@zakkak
Copy link
Collaborator Author

zakkak commented Oct 16, 2024

The CI is now fetching 23.0.1-beta+37-202410051216 and seems to build fine with that version (let's see what the integration tests will look like).

When building locally I was getting a JVMCI version mismatch with 23+37, interesting that you don't get that :|

In any case, there is indeed nothing blocking this PR any more. Once the CI completes I will merge it (probably tomorrow morning) unless there is some major issue.

@zakkak zakkak marked this pull request as ready for review October 16, 2024 19:32
@zakkak
Copy link
Collaborator Author

zakkak commented Oct 17, 2024

CI failure is Karm/mandrel-integration-tests#290 and is not related to this specific version.

@zakkak zakkak merged commit edb81b5 into graalvm:mandrel/24.1 Oct 17, 2024
45 of 46 checks passed
@zakkak zakkak deleted the 2024-10-15-oct-cpu-sync branch October 17, 2024 06:00
@jerboaa
Copy link
Collaborator

jerboaa commented Oct 17, 2024

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.