avoid eager initialization of sulong context

Author: timfel

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/debug/test_charptr.py

@@ -210,7 +210,7 @@ def test_charptr_write_ptr(compiler, python_subprocess):
         assert result.stderr == b""
 
 
-@pytest.mark.xfail(__graalpython__.platform_id == "managed", reason="unaligned memcpy is not supported")
+@pytest.mark.xfail(__graalpython__.get_platform_id() == "managed", reason="unaligned memcpy is not supported")
 def test_charptr_correct_usage(compiler):
     mod = compiler.make_module("""
         #include <string.h>

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/support.py

@@ -32,8 +32,8 @@
 
 PY2 = sys.version_info[0] == 2
 GRAALPYTHON = sys.implementation.name == 'graalpy'
-GRAALPYTHON_NATIVE = GRAALPYTHON and __graalpython__.platform_id == 'native'
-DARWIN_NATIVE = sys.platform == 'darwin' and (not GRAALPYTHON or __graalpython__.platform_id == 'native')
+GRAALPYTHON_NATIVE = GRAALPYTHON and __graalpython__.get_platform_id() == 'native'
+DARWIN_NATIVE = sys.platform == 'darwin' and (not GRAALPYTHON or __graalpython__.get_platform_id() == 'native')
 
 HPY_ROOT = Path(__file__).parent.parent
 LOCK = FileLock(HPY_ROOT / ".hpy.lock")

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/test_hpybuildvalue.py

@@ -107,7 +107,7 @@ def test_formats(self):
             actual = mod.f(i)
             assert actual == expected, code
 
-    @pytest.mark.xfail(__graalpython__.platform_id == "managed", reason="GR-38126")
+    @pytest.mark.xfail(__graalpython__.get_platform_id() == "managed", reason="GR-38126")
     def test_bad_formats(self):
         test_cases = [
             ('return HPy_BuildValue(ctx, "(q)", 42);',

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_gc.py

@@ -43,7 +43,7 @@
 from . import CPyExtTestCase, CPyExtFunction, CPyExtType
 __dir__ = __file__.rpartition("/")[0]
 
-GRAALPYTHON_NATIVE = sys.implementation.name == 'graalpy' and __graalpython__.platform_id == 'native'
+GRAALPYTHON_NATIVE = sys.implementation.name == 'graalpy' and __graalpython__.get_platform_id() == 'native'
 
 # typedef PyObject * (*unaryfunc)(PyObject *);
 # typedef PyObject * (*binaryfunc)(PyObject *, PyObject *);
@@ -92,7 +92,7 @@
             // printf("free\\n");
             free_cnt++;
             PyObject_Del(a);
-        }            
+        }
         static int dealloc_cnt = 0;
         void test_dealloc(PyObject *self) {
             // printf("dealloc\\n");
@@ -116,9 +116,9 @@
         tp_dealloc = "test_dealloc",
         tp_methods='{"getCounters", (PyCFunction)getCounters, METH_NOARGS | METH_STATIC, ""}, {"resetCounters", (PyCFunction)resetCounters, METH_NOARGS | METH_STATIC, ""}',
 )
-            
+
 class TestGC1():
-    
+
     def test_native_class(self):
         if GRAALPYTHON_NATIVE:
             gc.enable()
@@ -152,13 +152,13 @@ def test_native_class(self):
 #             Py_ssize_t r2 = Py_REFCNT(o);
 #             Py_DecRef(o);
 #             Py_ssize_t r3 = Py_REFCNT(o);
-#             return Py_BuildValue("(ii)", r2 - r1, r3 - r1); 
+#             return Py_BuildValue("(ii)", r2 - r1, r3 - r1);
 #         }''',
 #         resultspec="O",
 #         argspec='O',
 #         arguments=("PyObject* o", ),
 #         callfunction="wrap_simple",
-#     )    
+#     )
 #
 #
 #     test_create = CPyExtFunction(
@@ -171,10 +171,10 @@ def test_native_class(self):
 #             Py_ssize_t r2 = Py_REFCNT(o);
 #             Py_DecRef(o);
 #             Py_ssize_t r3 = Py_REFCNT(o);
-#             return Py_BuildValue("(ii)", r2 - r1, r3 - r1); 
+#             return Py_BuildValue("(ii)", r2 - r1, r3 - r1);
 #         }''',
 #         resultspec="O",
 #         argspec='O',
 #         arguments=("PyObject* o", ),
 #         callfunction="wrap_simple",
-#     )    
+#     )

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -243,14 +243,12 @@ public void postInitialize(Python3Core core) {
         TruffleString capiHome = context.getCAPIHome();
         Env env = context.getEnv();
         LanguageInfo llvmInfo = env.getInternalLanguages().get(J_LLVM_LANGUAGE);
-        Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
         mod.setAttribute(tsLiteral("jython_emulation_enabled"), language.getEngineOption(PythonOptions.EmulateJython));
         mod.setAttribute(tsLiteral("host_import_enabled"), context.getEnv().isHostLookupAllowed());
         mod.setAttribute(tsLiteral("core_home"), coreHome);
         mod.setAttribute(tsLiteral("stdlib_home"), stdlibHome);
         mod.setAttribute(tsLiteral("capi_home"), capiHome);
         mod.setAttribute(tsLiteral("jni_home"), context.getJNIHome());
-        mod.setAttribute(tsLiteral("platform_id"), toTruffleStringUncached(toolchain.getIdentifier()));
         Object[] arr = convertToObjectArray(PythonOptions.getExecutableList(context));
         PList executableList = PythonObjectFactory.getUncached().createList(arr);
         mod.setAttribute(tsLiteral("executable_list"), executableList);
@@ -647,6 +645,18 @@ protected Object getToolPath(TruffleString tool) {
         }
     }
 
+    @Builtin(name = "get_platform_id", minNumOfPositionalArgs = 0)
+    @TypeSystemReference(PythonArithmeticTypes.class)
+    @GenerateNodeFactory
+    public abstract static class GetPlatformId extends PythonBuiltinNode {
+        @Specialization
+        @TruffleBoundary
+        protected TruffleString getPlatformId() {
+            return getContext().getPlatformId();
+        }
+
+    }
+
     @Builtin(name = "get_toolchain_paths", minNumOfPositionalArgs = 1)
     @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -2534,9 +2534,7 @@ public TruffleString getSoAbi() {
             // sys.implementation._multiarch
             TruffleString multiArch = (TruffleString) PInteropGetAttributeNode.executeUncached(implementationObj, T__MULTIARCH);
 
-            LanguageInfo llvmInfo = env.getInternalLanguages().get(J_LLVM_LANGUAGE);
-            Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
-            TruffleString toolchainId = toTruffleStringUncached(toolchain.getIdentifier());
+            TruffleString toolchainId = getPlatformId();
 
             // only use '.pyd' if we are on 'Win32-native'
             TruffleString soExt;
@@ -2555,6 +2553,16 @@ public TruffleString getSoAbi() {
         return soABI;
     }
 
+    public TruffleString getPlatformId() {
+        if (!getOption(PythonOptions.NativeModules)) {
+            LanguageInfo llvmInfo = env.getInternalLanguages().get(J_LLVM_LANGUAGE);
+            Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
+            return toTruffleStringUncached(toolchain.getIdentifier());
+        } else {
+            return T_NATIVE;
+        }
+    }
+
     public Thread getMainThread() {
         if (mainThread != null) {
             return mainThread.get();

graalpython/lib-graalpython/_sysconfig.py

@@ -43,11 +43,11 @@ def _get_posix_vars():
     import _imp
     import sys
     import os
-    darwin_native = sys.platform == "darwin" and __graalpython__.platform_id == "native"
-    win32_native = sys.platform == "win32" and __graalpython__.platform_id == "native"
+    darwin_native = sys.platform == "darwin" and __graalpython__.get_platform_id() == "native"
+    win32_native = sys.platform == "win32" and __graalpython__.get_platform_id() == "native"
 
     # note: this must be kept in sync with _imp.extension_suffixes
-    so_abi = sys.implementation.cache_tag + "-" + __graalpython__.platform_id + "-" + sys.implementation._multiarch
+    so_abi = sys.implementation.cache_tag + "-" + __graalpython__.get_platform_id() + "-" + sys.implementation._multiarch
     if win32_native:
         so_ext = ".pyd"
     else:

graalpython/lib-python/3/distutils/command/build_ext.py

@@ -721,7 +721,7 @@ def get_libraries(self, ext):
                 pythonlib = (template %
                        (sys.hexversion >> 24, (sys.hexversion >> 16) & 0xff))
                 # Begin Truffle change
-                pythonlib = f"python-{__graalpython__.platform_id}"
+                pythonlib = f"python-{__graalpython__.get_platform_id()}"
                 # End Truffle change
                 # don't extend ext.libraries, it may be shared with other
                 # extensions, it is a reference to the original list

mx.graalpython/mx_graalpython.py

@@ -1108,7 +1108,7 @@ def run_python_unittests(python_binary, args=None, paths=None, aot_compatible=Fa
     # just to be able to verify, print C ext mode (also works for CPython)
     mx.run([python_binary,
             "-c",
-            "import sys; print('C EXT MODE: ' + (__graalpython__.platform_id if sys.implementation.name == 'graalpy' else 'cpython'))"],
+            "import sys; print('C EXT MODE: ' + (__graalpython__.get_platform_id() if sys.implementation.name == 'graalpy' else 'cpython'))"],
             nonZeroIsFatal=True, env=env, out=out, err=err)
 
     # list all 1st-level tests and exclude the SVM-incompatible ones