Merge commit 'e9ab5c4df898fadaf976d7b014fa38a1b6d595a8' into release/graal-vm/1.0

Author: ansalond

CHANGELOG.md

@@ -3,6 +3,16 @@
 This changelog summarizes major changes between GraalVM versions of the Python
 language runtime. The main focus is on user-observable behavior of the engine.
 
+## Version 1.0.0 RC9
+
+* Support `help` in the builtin Python shell
+* Add `readline` to enable history and autocompletion in the Python shell
+* Add support for the -q, -E, -s, and -S Python launcher flags
+* Improve display of foreign array-like objects
+* Improve support for string and bytes regular expressions using our TRegex engine
+* Support loading site-packages installed with easy_install
+* Initial support for the `binascii` module
+
 ## Version 1.0.0 RC8
 
 * Report allocations when the `--memtracer` option is used

ci.jsonnet

@@ -180,7 +180,7 @@
     dynamicImports:: "sulong,/compiler",
 
     setup +: [
-      ["mx", "sforceimport"],
+      ["mx", "sforceimports"],
       ["mx", "--dynamicimports", self.dynamicImports, "build"],
     ]
   },

graalpython/benchmarks/src/harness.py

@@ -44,8 +44,15 @@
 
 
 _HRULE = '-'.join(['' for i in range(80)])
-ATTR_BENCHMARK = '__benchmark__'
+
+#: this function is used to pre-process the arguments as expected by the __benchmark__ and __setup__ entry points
 ATTR_PROCESS_ARGS = '__process_args__'
+#: gets called with the preprocessed arguments before __benchmark__
+ATTR_SETUP = '__setup__'
+#: gets called with the preprocessed arguments N times
+ATTR_BENCHMARK = '__benchmark__'
+#: performs any teardown needed in the benchmark
+ATTR_TEARDOWN = '__teardown__'
 
 
 def ccompile(name, code):
@@ -131,7 +138,6 @@ def _call_attr(self, attr_name, *args):
             return attr(*args)
 
     def run(self):
-        print(_HRULE)
         if self._run_once:
             print("### %s, exactly one iteration (no warmup curves)" % (self.bench_module.__name__))
         else:
@@ -143,10 +149,15 @@ def run(self):
             # default args processor considers all args as ints
             args = list(map(int, self.bench_args))
 
-        print("### args = %s" % args)
+        print("### args = ", args)
         print(_HRULE)
 
+        print("### setup ... ")
+        self._call_attr(ATTR_SETUP, *args)
+        print("### start benchmark ... ")
+
         bench_func = self._get_attr(ATTR_BENCHMARK)
+        durations = []
         if bench_func and hasattr(bench_func, '__call__'):
             if self.warmup:
                 print("### warming up for %s iterations ... " % self.warmup)
@@ -156,18 +167,31 @@ def run(self):
             for iteration in range(self.iterations):
                 start = time()
                 bench_func(*args)
-                duration = "%.3f" % (time() - start)
+                duration = time() - start
+                durations.append(duration)
+                duration_str = "%.3f" % duration
                 if self._run_once:
-                    print("@@@ name=%s, duration=%s" % (self.bench_module.__name__, duration))
+                    print("@@@ name=%s, duration=%s" % (self.bench_module.__name__, duration_str))
                 else:
-                    print("### iteration=%s, name=%s, duration=%s" % (iteration, self.bench_module.__name__, duration))
+                    print("### iteration=%s, name=%s, duration=%s" % (iteration, self.bench_module.__name__, duration_str))
+
+        print(_HRULE)
+        print("### teardown ... ")
+        self._call_attr(ATTR_TEARDOWN)
+        print("### benchmark complete")
+        print(_HRULE)
+        print("### BEST     duration: %.3f s" % min(durations))
+        print("### WORST    duration: %.3f s" % max(durations))
+        print("### AVG      duration: %.3f" % (sum(durations) / len(durations)))
+        print(_HRULE)
 
 
-def run_benchmark(prog, args):
+def run_benchmark(args):
     warmup = 0
     iterations = 1
     bench_file = None
     bench_args = []
+    paths = []
 
     i = 0
     while i < len(args):
@@ -177,19 +201,36 @@ def run_benchmark(prog, args):
             iterations = _as_int(args[i])
         elif arg.startswith("--iterations"):
             iterations = _as_int(arg.split("=")[1])
+
         elif arg == '-w':
             i += 1
             warmup = _as_int(args[i])
         elif arg.startswith("--warmup"):
             warmup = _as_int(arg.split("=")[1])
+
+        elif arg == '-p':
+            i += 1
+            paths = args[i].split(",")
+        elif arg.startswith("--path"):
+            paths = arg.split("=")[1].split(",")
+
         elif bench_file is None:
             bench_file = arg
         else:
             bench_args.append(arg)
         i += 1
 
+    # set the paths if specified
+    print(_HRULE)
+    if paths:
+        for pth in paths:
+            print("### adding module path: %s" % pth)
+            sys.path.append(pth)
+    else:
+        print("### no extra module search paths specified")
+
     BenchRunner(bench_file, bench_args=bench_args, iterations=iterations, warmup=warmup).run()
 
 
 if __name__ == '__main__':
-    run_benchmark(sys.argv[0], sys.argv[1:])
+    run_benchmark(sys.argv[1:])

graalpython/benchmarks/src/micro/arith-binop.py

@@ -43,3 +43,8 @@ def measure(num):
 
 def __benchmark__(num=5):
     measure(num)
+
+
+def __teardown__():
+    # teardown example
+    print("arith-binop teardown")

graalpython/benchmarks/src/micro/c-magic-iter.py

@@ -57,20 +57,25 @@
 int ci_init(PyObject* self, PyObject* args, PyObject* kwds);
 
 PyObject* ci_iter(PyObject* self) {
-    return ((NativeCustomIterableObject*)self)->it;
+    PyObject* result = ((NativeCustomIterableObject*)self)->it;
+    Py_INCREF(result);
+    return result;
 }
 
 PyObject* cit_iter(PyObject* self) {
+    Py_INCREF(self);
     return self;
 }
 
 PyObject* cit_next(PyObject* self) {
     NativeCustomIteratorObject* s = (NativeCustomIteratorObject*)self;
-    return PyLong_FromLongLong(ci_item((PyObject*)(s->obj), (s->pos)++));
+    return ci_item((PyObject*)(s->obj), (s->pos)++);
 }
 
 PyObject* ci_item(PyObject* self, Py_ssize_t i) {
-    return ((NativeCustomIterableObject*)self)->scale * i;
+    PyObject* result = PyLong_FromSsize_t(((NativeCustomIterableObject*)self)->scale * i);
+    Py_INCREF(result);
+    return result;
 }
 
 
@@ -177,6 +182,8 @@
 };
 
 int ci_init(PyObject* self, PyObject* args, PyObject* kwds) {
+    Py_XINCREF(args);
+    Py_XINCREF(kwds);
     static char *kwlist[] = {"scale", NULL};
     Py_ssize_t n = 0;
 
@@ -187,7 +194,11 @@
     tself->scale = n + 1;
 
     PyObject *argList = PyTuple_New(0);
+    Py_INCREF(argList);
     PyObject *obj = PyObject_CallObject((PyObject *) &CustomIteratorType, argList);
+    Py_DECREF(argList);
+    Py_INCREF(obj);
+    Py_INCREF(tself);
     ((NativeCustomIteratorObject*)obj)->obj = tself;
     tself->it = obj;
 
@@ -221,6 +232,7 @@
     Py_INCREF(&CustomIteratorType);
     PyModule_AddObject(m, "NativeCustomIterable", (PyObject *)&CustomIterableType);
     PyModule_AddObject(m, "NativeCustomIterator", (PyObject *)&CustomIteratorType);
+    Py_INCREF(m);
     return m;
 }
 

graalpython/com.oracle.graal.python.cext/src/abstract.c

@@ -266,6 +266,11 @@ PyObject * PyMapping_GetItemString(PyObject *o, const char *key) {
     return UPCALL_CEXT_O(_jls_PyObject_GetItem, native_to_java(o), polyglot_from_string(key, SRC_CS));
 }
 
+UPCALL_ID(PyMapping_Keys);
+PyObject * PyMapping_Keys(PyObject *o) {
+    return UPCALL_CEXT_O(_jls_PyMapping_Keys, native_to_java(o));
+}
+
 // taken from CPython "Objects/abstract.c"
 int PyObject_GetBuffer(PyObject *obj, Py_buffer *view, int flags) {
     PyBufferProcs *pb = obj->ob_type->tp_as_buffer;

graalpython/com.oracle.graal.python.cext/src/capi.c

@@ -247,7 +247,7 @@ uint64_t PyTruffle_Wchar_Size() {
     return SIZEOF_WCHAR_T;
 }
 
-void* PyObjectHandle_ForJavaObject(void* cobj, unsigned long flags) {
+void* PyObjectHandle_ForJavaObject(void* cobj) {
     if (truffle_cannot_be_handle(cobj)) {
         return truffle_deref_handle_for_managed(cobj);
     }

graalpython/com.oracle.graal.python.cext/src/longobject.c

@@ -47,15 +47,15 @@ PyTypeObject PyLong_Type = PY_TRUFFLE_TYPE("int", &PyType_Type, Py_TPFLAGS_DEFAU
 
 UPCALL_ID(PyLong_AsPrimitive);
 long PyLong_AsLong(PyObject *obj) {
-    return UPCALL_CEXT_L(_jls_PyLong_AsPrimitive, native_to_java(obj), 1, sizeof(long), polyglot_from_string("long", SRC_CS));
+    return UPCALL_CEXT_L(_jls_PyLong_AsPrimitive, native_to_java(obj), 1, sizeof(long));
 }
 
 long PyLong_AsLongAndOverflow(PyObject *obj, int *overflow) {
     if (obj == NULL) {
         PyErr_BadInternalCall();
         return -1;
     }
-    long result = UPCALL_CEXT_L(_jls_PyLong_AsPrimitive, native_to_java(obj), 1, sizeof(long), polyglot_from_string("long", SRC_CS));
+    long result = UPCALL_CEXT_L(_jls_PyLong_AsPrimitive, native_to_java(obj), 1, sizeof(long));
     *overflow = result == -1L && PyErr_Occurred() != NULL;
     return result;
 }
@@ -79,7 +79,7 @@ unsigned long PyLong_AsUnsignedLong(PyObject *obj) {
         PyErr_BadInternalCall();
         return (unsigned long)-1;
     }
-    return (unsigned long) UPCALL_CEXT_L(_jls_PyLong_AsPrimitive, native_to_java(obj), 0, sizeof(unsigned long), polyglot_from_string("unsigned long", SRC_CS));
+    return (unsigned long) UPCALL_CEXT_L(_jls_PyLong_AsPrimitive, native_to_java(obj), 0, sizeof(unsigned long));
 }
 PyObject * PyLong_FromSsize_t(Py_ssize_t n) {
 	return PyLong_FromLongLong(n);
@@ -90,9 +90,8 @@ PyObject * PyLong_FromDouble(double n) {
     return UPCALL_CEXT_O(_jls_PyLong_FromDouble, n);
 }
 
-UPCALL_ID(ssize_t);
 Py_ssize_t PyLong_AsSsize_t(PyObject *obj) {
-    return UPCALL_CEXT_L(_jls_PyLong_AsPrimitive, native_to_java(obj), 1, sizeof(Py_ssize_t), _jls_ssize_t);
+    return UPCALL_CEXT_L(_jls_PyLong_AsPrimitive, native_to_java(obj), 1, sizeof(Py_ssize_t));
 }
 
 PyObject * PyLong_FromVoidPtr(void *p) {

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/ConsoleHandler.java

@@ -43,6 +43,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.IntConsumer;
+import java.util.function.IntFunction;
+import java.util.function.IntSupplier;
 
 import org.graalvm.polyglot.Context;
 
@@ -59,10 +67,20 @@ public abstract class ConsoleHandler {
 
     public abstract void setPrompt(String prompt);
 
+    public void addCompleter(@SuppressWarnings("unused") Function<String, List<String>> completer) {
+        // ignore by default
+    }
+
     public void setContext(@SuppressWarnings("unused") Context context) {
         // ignore by default
     }
 
+    @SuppressWarnings("unused")
+    public void setHistory(BooleanSupplier shouldRecord, IntSupplier getSize, Consumer<String> addItem, IntFunction<String> getItem, BiConsumer<Integer, String> setItem, IntConsumer removeItem,
+                    Runnable clear) {
+        // ignore by default
+    }
+
     public InputStream createInputStream() {
         return new InputStream() {
             byte[] buffer = null;