[GR-42435] Enable NFI tests on Windows

PullRequest: graal/13142

Author: rudihorn

sulong/ci/ci.jsonnet

@@ -48,7 +48,8 @@ local sc = (import "ci_common/sulong-common.jsonnet");
 
     sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.darwin_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk17-darwin-aarch64", timelimit: "30:00" },
 
-    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,sulongStandalone,interop") + { name: "gate-sulong-standalone-interop-jdk17-windows-amd64", timelimit: "30:00" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,sulongStandalone") + { name: "gate-sulong-standalone-jdk17-windows-amd64", timelimit: "30:00" },
+    sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.windows_amd64 + sc.llvmBundled + sc.gateTags("build,sulongWinSupport") + { name: "gate-sulong-winsupport-jdk17-windows-amd64", timelimit: "30:00" },
   ],
 
   coverage_builds::

sulong/mx.sulong/mx_sulong_gate.py

@@ -200,8 +200,8 @@ def _unittest(title, test_suite, tags=None, testClasses=None, unittestArgs=None,
     _unittest('GCC_CPP', 'SULONG_GCC_CPP_TEST_SUITE', description="GCC 5.2 test suite (C++ tests)", testClasses=['GccCppSuite'], tags=['gcc_cpp'])
     _unittest('GCC_Fortran', 'SULONG_GCC_FORTRAN_TEST_SUITE', description="GCC 5.2 test suite (Fortran tests)", testClasses=['GccFortranSuite'], tags=['gcc_fortran'])
     _unittest('Sulong', 'SULONG_STANDALONE_TEST_SUITES', description="Sulong's internal tests", testClasses='SulongSuite', tags=['sulongStandalone', 'sulongBasic'])
-    _unittest('Interop', 'SULONG_EMBEDDED_TEST_SUITES', description="Truffle Language interoperability tests", testClasses=['com.oracle.truffle.llvm.tests.interop.'], tags=['interop', 'sulongBasic'])
-    _unittest('SulongNFI', 'SULONG_NFI_TESTS', description="Truffle NFI test suite with the Sulong NFI backend", testClasses=['com.oracle.truffle.nfi.test'], tags=['sulongNFI', 'sulongBasic'],
+    _unittest('Interop', 'SULONG_EMBEDDED_TEST_SUITES', description="Truffle Language interoperability tests", testClasses=['com.oracle.truffle.llvm.tests.interop.'], tags=['interop', 'sulongBasic', 'sulongWinSupport'])
+    _unittest('SulongNFI', 'SULONG_NFI_TESTS', description="Truffle NFI test suite with the Sulong NFI backend", testClasses=['com.oracle.truffle.nfi.test'], tags=['sulongNFI', 'sulongBasic', 'sulongWinSupport'],
             extraUnittestArgs=['-Dnative.test.backend=llvm', '-Dnative.test.path.llvm=<path:SULONG_NFI_TESTS>'])
     _unittest('Linker', 'SULONG_EMBEDDED_TEST_SUITES', description=None, testClasses=['com.oracle.truffle.llvm.tests.linker.'], tags=['linker', 'sulongBasic'])
     _unittest('Debug', 'SULONG_EMBEDDED_TEST_SUITES', description="Debug support test suite", testClasses=['com.oracle.truffle.llvm.tests.debug.LLVMDebugTest'], tags=['debug', 'sulongBasic'])

sulong/mx.sulong/mx_sulong_suite_constituents.py

@@ -374,6 +374,9 @@ def _quote_windows(arg):
     return '"{}"'.format(arg)
 
 
+def _ninja_escape_string(val):
+    return val.replace(':', '$:')
+
 class BootstrapToolchainLauncherBuildTask(mx.BuildTask):
     def __str__(self):
         return "Generating " + self.subject.name
@@ -440,10 +443,10 @@ def ninja_toolchain_contents(self):
 CXX = {CXX}
 AR = {AR}
 
-""".format(gcc_toolchain=os.path.join(gcc_ninja_toolchain.get_output(), 'toolchain.ninja'),
-           CC=self.subject.suite.toolchain.get_toolchain_tool('CC'),
-           CXX=self.subject.suite.toolchain.get_toolchain_tool('CXX'),
-           AR=self.subject.suite.toolchain.get_toolchain_tool('AR'))
+""".format(gcc_toolchain=_ninja_escape_string(os.path.join(gcc_ninja_toolchain.get_output(), 'toolchain.ninja')),
+           CC=_ninja_escape_string(self.subject.suite.toolchain.get_toolchain_tool('CC')),
+           CXX=_ninja_escape_string(self.subject.suite.toolchain.get_toolchain_tool('CXX')),
+           AR=_ninja_escape_string(self.subject.suite.toolchain.get_toolchain_tool('AR')))
 
 
 class AbstractSulongNativeProject(mx.NativeProject):  # pylint: disable=too-many-ancestors

sulong/mx.sulong/suite.py

@@ -407,6 +407,14 @@
       "testProject" : True,
       "defaultBuild" : False,
       "jacoco" : "exclude",
+      "os_arch" : {
+        "windows" : {
+          "<others>" : {
+            "ldflags" : ["-shared"]
+          },
+        },
+        "<others>" : {"<others" : {}},
+      },
     },
 
     "com.oracle.truffle.llvm.nfi.test.native.isolation" : {
@@ -421,6 +429,14 @@
       "testProject" : True,
       "defaultBuild" : False,
       "jacoco" : "exclude",
+      "os_arch" : {
+        "windows" : {
+          "<others>" : {
+            "ldflags" : ["-shared"]
+          },
+        },
+        "<others>" : {"<others" : {}},
+      },
     },
 
     "com.oracle.truffle.llvm.nativemode" : {

sulong/projects/com.oracle.truffle.llvm.runtime/src/com/oracle/truffle/llvm/runtime/LLVMDebugPointer.java

@@ -36,6 +36,10 @@
 import com.oracle.truffle.llvm.runtime.nodes.memory.load.LLVMI64LoadNodeGen.LLVMI64OffsetLoadNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.memory.load.LLVMI8LoadNodeGen.LLVMI8OffsetLoadNodeGen;
 import com.oracle.truffle.llvm.runtime.nodes.memory.load.LLVMPointerLoadNodeGen.LLVMPointerOffsetLoadNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.memory.store.LLVMI16StoreNodeGen.LLVMI16OffsetStoreNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.memory.store.LLVMI32StoreNodeGen.LLVMI32OffsetStoreNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.memory.store.LLVMI64StoreNodeGen.LLVMI64OffsetStoreNodeGen;
+import com.oracle.truffle.llvm.runtime.nodes.memory.store.LLVMI8StoreNodeGen.LLVMI8OffsetStoreNodeGen;
 import com.oracle.truffle.llvm.runtime.pointer.LLVMNativePointer;
 import com.oracle.truffle.llvm.runtime.pointer.LLVMPointer;
 
@@ -106,6 +110,38 @@ public long readI64(long offset) throws UnexpectedResultException {
         return LLVMI64OffsetLoadNodeGen.getUncached().executeWithTarget(pointer, offset);
     }
 
+    public void writeI8(long offset, byte value) {
+        LLVMI8OffsetStoreNodeGen.getUncached().executeWithTarget(pointer, offset, value);
+    }
+
+    public void writeI8(byte value) {
+        writeI8(0, value);
+    }
+
+    public void writeI16(long offset, short value) {
+        LLVMI16OffsetStoreNodeGen.getUncached().executeWithTarget(pointer, offset, value);
+    }
+
+    public void writeI16(short value) {
+        writeI16(0, value);
+    }
+
+    public void writeI32(long offset, int value) {
+        LLVMI32OffsetStoreNodeGen.getUncached().executeWithTarget(pointer, offset, value);
+    }
+
+    public void writeI32(int value) {
+        writeI32(0, value);
+    }
+
+    public void writeI64(long offset, long value) {
+        LLVMI64OffsetStoreNodeGen.getUncached().executeWithTarget(pointer, offset, value);
+    }
+
+    public void writeI64(long value) {
+        writeI64(0, value);
+    }
+
     public LLVMPointer readPointer() {
         return readPointer(0);
     }

truffle/src/com.oracle.truffle.nfi.native/src/lookup_win32.c

@@ -102,7 +102,7 @@ JNIEXPORT jlong JNICALL Java_com_oracle_truffle_nfi_backend_libffi_LibFFIContext
     }
     (*env)->ReleaseStringUTFChars(env, name, utfName);
 
-    return (jlong) ret;
+    return (jlong) (intptr_t) check_intrinsify(ctx, ret);
 }
 
 #endif