Enable Jtreg test suites for FFI on Power & zLinux in JDK21 #3
Conversation
The changes add Power & zLinux support to these Jtreg test suites in JDK21 plus a few compilation fixes in the test cases to ensure they are executed correctly on all supported platforms. Note: The PR is part of the FFI work at eclipse-openj9/openj9#16951 Signed-off-by: Cheng Jin <jincheng@ca.ibm.com>
|
Reviewer: @keithc-ca |
|
I think we should wait for ed82e91 to be merged into the openj9 branch which will eliminate the need for these changes. #4 and a backport of ibmruntimes/openj9-openjdk-jdk#608 should land soon. |
| @@ -64,13 +65,13 @@ public void testInvalidSymbolLookup() { | |||
|
|
|||
| @Test | |||
| public void testVariableSymbolLookup() { | |||
| MemorySegment segment = SymbolLookup.loaderLookup().find("c").get().reinterpret(1); | |||
| MemorySegment segment = SymbolLookup.loaderLookup().find("c").get().reinterpret(JAVA_INT.byteSize()); | |||
There was a problem hiding this comment.
I think we just want to remove the call to reinterpret(); see https://github.com/ibmruntimes/openj9-openjdk-jdk/blob/openj9/test/jdk/java/foreign/TestClassLoaderFindNative.java#L68; this file should be the same as in jdknext.
There was a problem hiding this comment.
We still need reinterpret()to ensure it works on AIX (BE); otherwise, it will end up with OutOfBoundsException in such case.
| @@ -192,7 +192,7 @@ private static void check(int index, MemorySegment ptr, List<Arg> args) { | |||
| * address in java on the Big-Endian(BE) platforms such as AIX. | |||
| */ | |||
| if (isAixOS && (layout instanceof ValueLayout) && (((ValueLayout)layout).carrier() == float.class)) { | |||
| MemorySegment doubleSegmt = MemorySegment.ofAddress(ptr, JAVA_DOUBLE.byteSize(), session); | |||
| MemorySegment doubleSegmt = MemorySegment.ofAddress(ptr.address()).reinterpret(JAVA_DOUBLE.byteSize()); | |||
There was a problem hiding this comment.
Is this still needed after 8308031: Linkers should reject unpromoted variadic parameters?
There was a problem hiding this comment.
It is hard to determine for the moment given the test suite is not intended for AIX. So I believe it still needed to deal with the conversion on AIX.
|
I'd like to close the PR (which is outdated as compared to the new test suites) given the changed test code in this PR has not yet been verified with the last test changes (just merged) on all supported platform. So we can open another PR with these test changes if they are still required on AIX. |
The changes add Power & zLinux support to these
Jtreg test suites in JDK21 plus a few compilation
fixes in the test cases to ensure they are executed
correctly on all supported platforms.
Note:
The PR is part of the FFI work at
eclipse-openj9/openj9#16951
Signed-off-by: Cheng Jin jincheng@ca.ibm.com