[GR-39046] HPy unit tests: use 'gcc' without a full path.

PullRequest: graalpython/2298

Author: steve-s

graalpython/com.oracle.graal.python.jni/src/hpy_jni.c

@@ -280,10 +280,12 @@ static long augment_Long_AsLong(HPyContext *ctx, HPy h) {
 static unsigned long augment_Long_AsUnsignedLong(HPyContext *ctx, HPy h) {
     uint64_t bits = toBits(h);
     if (isBoxedInt(bits)) {
-        return unboxInt(bits);
-    } else {
-        return original_Long_AsUnsignedLong(ctx, h);
+        int32_t unboxed = unboxInt(bits);
+        if (unboxed >= 0) {
+            return unboxed;
+        }
     }
+    return original_Long_AsUnsignedLong(ctx, h);
 }
 
 static double augment_Long_AsDouble(HPyContext *ctx, HPy h) {
@@ -296,36 +298,32 @@ static double augment_Long_AsDouble(HPyContext *ctx, HPy h) {
 }
 
 static HPy augment_Long_FromLong(HPyContext *ctx, long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromLong(ctx, l);
     }
 }
 
 static HPy augment_Long_FromUnsignedLong(HPyContext *ctx, unsigned long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableUnsignedInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromUnsignedLong(ctx, l);
     }
 }
 
 static HPy augment_Long_FromLongLong(HPyContext *ctx, long long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromLongLong(ctx, l);
     }
 }
 
 static HPy augment_Long_FromUnsignedLongLong(HPyContext *ctx, unsigned long long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableUnsignedInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromUnsignedLongLong(ctx, l);
     }

graalpython/com.oracle.graal.python.jni/src/hpy_jni.h

@@ -47,6 +47,7 @@
 
 #include <hpy.h>
 #include <jni.h>
+#include <stdint.h>
 
 //*************************
 // BOXING
@@ -65,6 +66,8 @@
 #define unboxHandle(value) (value)
 #define boxHandle(handle) (handle)
 
+#define isBoxableInt(value) (INT32_MIN < (value) && (value) < INT32_MAX)
+#define isBoxableUnsignedInt(value) ((value) < INT32_MAX)
 #define unboxInt(value) ((int32_t) ((value) - NAN_BOXING_INT))
 #define boxInt(value) ((((uint64_t) (value)) & NAN_BOXING_INT_MASK) + NAN_BOXING_INT)
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -83,10 +83,10 @@
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers;
 import com.oracle.graal.python.builtins.objects.cext.common.CArrayWrappers.CStringWrapper;
-import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodesFactory.AsNativePrimitiveNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.common.CExtContext;
 import com.oracle.graal.python.builtins.objects.cext.common.LoadCExtException.ApiInitException;
 import com.oracle.graal.python.builtins.objects.cext.common.LoadCExtException.ImportException;
+import com.oracle.graal.python.builtins.objects.cext.common.CExtCommonNodesFactory.AsNativePrimitiveNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyAsIndex;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyAsPyObject;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.GraalHPyBinaryArithmetic;
@@ -169,12 +169,12 @@
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyContextFunctions.ReturnType;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodes.HPyAttachFunctionTypeNode;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodes.PCallHPyFunction;
+import com.oracle.graal.python.builtins.objects.cext.hpy.HPyExternalFunctionNodes.HPyCheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyAsPythonObjectNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyGetNativeSpacePointerNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyRaiseNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.HPyTransformExceptionToNativeNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.hpy.GraalHPyNodesFactory.PCallHPyFunctionNodeGen;
-import com.oracle.graal.python.builtins.objects.cext.hpy.HPyExternalFunctionNodes.HPyCheckFunctionResultNode;
 import com.oracle.graal.python.builtins.objects.common.EmptyStorage;
 import com.oracle.graal.python.builtins.objects.common.HashMapStorage;
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
@@ -349,7 +349,7 @@ public static Object loadHPyModule(Node location, PythonContext context, String
             if (llvmInteropLib.isMemberExisting(llvmLibrary, hpyInitFuncName)) {
                 return hpyContext.initHPyModule(context, llvmLibrary, hpyInitFuncName, name, path, debug, llvmInteropLib, checkResultNode);
             }
-            throw new ImportException(null, name, path, ErrorMessages.CANNOT_INITIALIZE_WITH, path, basename, "");
+            throw new ImportException(null, name, path, ErrorMessages.CANNOT_INITIALIZE_EXT_NO_ENTRY, basename, path, hpyInitFuncName);
         } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
             throw new ImportException(CExtContext.wrapJavaException(e, location), name, path, ErrorMessages.CANNOT_INITIALIZE_WITH, path, basename, "");
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -168,6 +168,7 @@ public abstract class ErrorMessages {
     public static final String CANNOT_IMPORT_NAME = "cannot import name '%s' from '%s' (%s)";
     public static final String CANNOT_IMPORT_NAME_CIRCULAR = "cannot import name '%s' from partially initialized module '%s' (most likely due to a circular import)";
     public static final String CANNOT_INITIALIZE_WITH = "cannot initialize %s with %s%s";
+    public static final String CANNOT_INITIALIZE_EXT_NO_ENTRY = "cannot initialize extension '%s' at path '%s', entry point '%s' not found";
     public static final String CANNOT_LOAD = "cannot load %s: %s";
     public static final String CANNOT_LOAD_M = "cannot load %s: %m";
     public static final String CANNOT_RELEASE_UNAQUIRED_LOCK = "cannot release un-acquired lock";

graalpython/lib-graalpython/modules/hpy/test/debug/test_handles_invalid.py

@@ -175,6 +175,7 @@ def test_keeping_and_reusing_argument_handle(compiler, hpy_debug_capture):
     assert hpy_debug_capture.invalid_handles_count == 1
 
 
+@pytest.mark.xfail(reason="set_handle_stack_trace_limit not implemented yet")
 def test_invalid_handle_crashes_python_if_no_hook(compiler, python_subprocess, fatal_exit_code):
     if not SUPPORTS_SYS_EXECUTABLE:
         pytest.skip("no sys.executable")

graalpython/lib-graalpython/modules/hpy/test/debug/test_handles_leak.py

@@ -135,6 +135,7 @@ def test_leak_from_method(compiler):
     leaks = [dh.obj for dh in _debug.get_open_handles(gen)]
     assert leaks == ["a"]
 
+@pytest.mark.xfail(reason="set_handle_stack_trace_limit not implemented yet")
 def test_DebugHandle_id(compiler, with_alloc_trace):
     from hpy.universal import _debug
     mod = make_leak_module(compiler)
@@ -183,6 +184,7 @@ def test_DebugHandle_compare(compiler):
     with pytest.raises(TypeError):
         a1 < 'hello'
 
+@pytest.mark.xfail(reason="set_handle_stack_trace_limit not implemented yet")
 def test_DebugHandle_repr(compiler, with_alloc_trace):
     from hpy.universal import _debug
     mod = make_leak_module(compiler)
@@ -215,6 +217,7 @@ def test_LeakDetector(compiler):
     assert 'hello' not in msg
     assert 'world' not in msg
 
+@pytest.mark.xfail(reason="set_handle_stack_trace_limit not implemented yet")
 def test_closed_handles(compiler, with_alloc_trace):
     from hpy.universal import _debug
     mod = make_leak_module(compiler)

graalpython/lib-graalpython/modules/hpy/test/support.py

@@ -317,8 +317,8 @@ def change_compiler(conf, cc, cxx, stdlib):
                     cxx = join(llvm_toolchain_vanilla, 'clang++')
                     stdlib = "libc++"
                 else:
-                    cc = join(os.path.sep, 'usr', 'bin', 'gcc')
-                    cxx = join(os.path.sep, 'usr', 'bin', 'g++')
+                    cc = 'gcc'
+                    cxx = 'g++'
                     stdlib = None
             change_compiler(conf, cc, cxx, stdlib)
 

mx.graalpython/mx_graalpython.py

@@ -758,7 +758,7 @@ def patch_batch_launcher(launcher_path, jvm_args):
         launcher.writelines(lines)
 
 
-def run_hpy_unittests(python_binary, args=None):
+def run_hpy_unittests(python_binary, args=None, include_native=True):
     args = [] if args is None else args
     with tempfile.TemporaryDirectory(prefix='hpy-test-site-') as d:
         env = os.environ.copy()
@@ -783,7 +783,10 @@ def run(self):
                 except Exception as e: # pylint: disable=broad-except;
                     self.exc = e
 
-        for abi in ['cpython', 'universal', 'debug', 'nfi']:
+        abi_list = ['cpython', 'universal', 'debug']
+        if include_native:
+            abi_list.append('nfi')
+        for abi in abi_list:
             env["TEST_HPY_ABI"] = abi
             threads.append(RaisingThread(target=run_python_unittests, args=(python_binary, ), kwargs={
                 "args": args, "paths": [_hpy_test_root()], "env": env.copy(), "use_pytest": True, "lock": lock,
@@ -855,7 +858,7 @@ def graalpython_gate_runner(args, tasks):
 
     with Task('GraalPython HPy sandboxed tests', tasks, tags=[GraalPythonTags.unittest_hpy_sandboxed]) as task:
         if task:
-            run_hpy_unittests(python_managed_svm())
+            run_hpy_unittests(python_managed_svm(), include_native=False)
 
     with Task('GraalPython posix module tests', tasks, tags=[GraalPythonTags.unittest_posix]) as task:
         if task: