On Wed, 18 Oct 2023 17:38:24 GMT, Jorn Vernee <jver...@openjdk.org> wrote:
>> Add the ability to pass heap segments to native code. This requires using >> `Linker.Option.critical(true)` as a linker option. It has the same >> limitations as normal critical calls, namely: upcalls into Java are not >> allowed, and the native function should return relatively quickly. Heap >> segments are exposed to native code through temporary native addresses that >> are valid for the duration of the native call. >> >> The motivation for this is supporting existing Java array-based APIs that >> might have to pass multi-megabyte size arrays to native code, and are >> current relying on Get-/ReleasePrimitiveArrayCritical from JNI. Where making >> a copy of the array would be overly prohibitive. >> >> Components of this patch: >> >> - New binding operator `SegmentBase`, which gets the base object of a >> `MemorySegment`. >> - Rename `UnboxAddress` to `SegmentOffset`. Add flag to specify whether >> processing heap segments should be allowed. >> - `CallArranger` impls use new binding operators when >> `Linker.Option.critical(/* allowHeap= */ true)` is specified. >> - `NativeMethodHandle`/`NativeEntryPoint` allow `Object` in their signatures. >> - The object/oop + offset is exposed as temporary address to native code. >> - Since we stay in the `_thread_in_Java` state, we can safely expose the >> oops passed to the downcall stub to native code, without needing GCLocker. >> These oops are valid until we poll for safepoint, which we never do >> (invoking pure native code). >> - Only x64 and AArch64 for now. >> - I've refactored `ArgumentShuffle` in the C++ code to no longer rely on >> callbacks to get the set of source and destination registers (using >> `CallingConventionClosure`), but instead just rely on 2 equal size arrays >> with source and destination registers. This allows filtering the input java >> registers before passing them to `ArgumentShuffle`, which is required to >> filter out registers holding segment offsets. Replacing placeholder >> registers is also done as a separate pre-processing step now. See changes >> in: >> https://github.com/openjdk/jdk/pull/16201/commits/d2b40f1117d63cc6d74e377bf88cdcf6d15ff866 >> - I've factored out `DowncallStubGenerator` in the x64 and AArch64 code to >> use a common `DowncallLinker::StubGenerator`. >> - Fallback linker is also supported using JNI's >> `GetPrimitiveArrayCritical`/`ReleasePrimitiveArrayCritical` >> >> Aside: fixed existing issue with `DowncallLinker` not properly acquiring >> segments in interpreted mode. >> >> Numbers for the included benchmark on my machine are: >> >> >> Benchmar... > > Jorn Vernee has updated the pull request incrementally with one additional > commit since the last revision: > > add s390 support See inline comments for s390 part. I didn't review all the other code. src/hotspot/cpu/s390/downcallLinker_s390.cpp line 100: > 98: Address offset_addr(callerSP, FP_BIAS + reg_offset.offset()); > 99: __ mem2reg_opt(r_tmp1, offset_addr, true); > 100: __ z_agr(reg_oop_reg, r_tmp1); Please note that s390 is a CISC architecture. It provides instructions for almost everything. :-) Here, I would suggest to add the offset to reg_oop_reg directly from memory - without first loading the offset into a temp register (that is RISC style). It's shorter and faster: ` __ z_ag(reg_oop_reg, offset_addr);` src/hotspot/cpu/s390/downcallLinker_s390.cpp line 112: > 110: __ mem2reg_opt(r_tmp2, oop_addr, true); > 111: __ z_agr(r_tmp1, r_tmp2); > 112: __ reg2mem_opt(r_tmp1, oop_addr, true); Similar to above. You need to load only one operand into a register. __ mem2reg_opt(r_tmp2, oop_addr, true); __ z_ag(r_tmp2, offset_addr); __ reg2mem_opt(r_tmp2, oop_addr, true); ------------- Changes requested by lucy (Reviewer). PR Review: https://git.openjdk.org/jdk/pull/16201#pullrequestreview-1687765628 PR Review Comment: https://git.openjdk.org/jdk/pull/16201#discussion_r1365554460 PR Review Comment: https://git.openjdk.org/jdk/pull/16201#discussion_r1365560688
