[GR-69781] Give more time and also track memory for micro-native benchmarks.

PullRequest: graalpython/4015

Author: timfel

ci.jsonnet

@@ -391,11 +391,15 @@
         for bench in ["warmup"]
     } + {
         [bench]: bench_task(bench) + platform_spec(no_jobs) + bench_variants({
-            "vm_name:graalvm_ee_default_interpreter"                    : {"linux:amd64:jdk-latest" : post_merge     + t("01:00:00")},
-            "vm_name:graalvm_ee_default_interpreter_bc_dsl"             : {"linux:amd64:jdk-latest" : post_merge     + t("01:00:00")},
-            "vm_name:graalpython_enterprise_interpreter"                : {"linux:amd64:jdk-latest" : daily          + t("01:00:00")},
-            "vm_name:graalpython_enterprise_interpreter_bc_dsl"         : {"linux:amd64:jdk-latest" : daily          + t("01:00:00")},
-            "vm_name:cpython"                                           : {"linux:amd64:jdk-latest" : weekly         + t("00:30:00")},
+            "vm_name:graalvm_ee_default_interpreter"                    : {"linux:amd64:jdk-latest" : post_merge     + t("02:00:00")},
+            "vm_name:graalpython_enterprise_interpreter"                : {"linux:amd64:jdk-latest" : weekly         + t("02:00:00")},
+            "vm_name:cpython"                                           : {"linux:amd64:jdk-latest" : weekly         + t("01:00:00")},
+        }),
+        for bench in ["heap", "micro_small_heap"]
+    } + {
+        [bench + "-bytecode-dsl"]: bench_task(bench) + bytecode_dsl_bench + platform_spec(no_jobs) + bench_variants({
+            "vm_name:graalvm_ee_default_interpreter_bc_dsl"             : {"linux:amd64:jdk-latest" : post_merge     + t("02:00:00")},
+            "vm_name:graalpython_enterprise_interpreter_bc_dsl"         : {"linux:amd64:jdk-latest" : weekly         + t("02:00:00")},
         }),
         for bench in ["heap", "micro_small_heap"]
     } + {
@@ -425,7 +429,7 @@
         for bench in ["pyperformance"]
     } + {
         // Bytecode DSL benchmarks with community benchmark suites for external numbers
-        [bench + "-bytecode-dsl"]: bench_task(bench, PY_BENCHMARKS) + platform_spec(no_jobs) + raw_results + bench_variants({
+        [bench + "-bytecode-dsl"]: bench_task(bench, PY_BENCHMARKS) + bytecode_dsl_bench + platform_spec(no_jobs) + raw_results + bench_variants({
             "vm_name:graalvm_ee_default_bc_dsl"                                : {"linux:amd64:jdk-latest" : weekly     + t("08:00:00")},
         }),
         for bench in ["pyperformance"]

ci/python-bench.libsonnet

@@ -37,6 +37,7 @@
         jmh: "python-jmh:GRAALPYTHON_BENCH",
         heap: "heap-graalpython:*",
         micro_small_heap: "micro-small-heap-graalpython:*",
+        micro_native_heap: "micro-native-heap-graalpython:*",
     },
 
     PY_BENCHMARKS:: {

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

@@ -7441,12 +7441,12 @@ GraalPyPrivate_InitNativeDateTime()
     PyMemberDef* members_delta = PyDateTime_DeltaType.tp_members;
 
     static int64_t datetime_types[] = {
-        &PyDateTime_DateType, "datetime.date",
-        &PyDateTime_DateTimeType, "datetime.datetime",
-        &PyDateTime_TimeType, "datetime.time",
-        &PyDateTime_DeltaType, "datetime.timedelta",
-        &PyDateTime_TZInfoType, "datetime.timezone",
-        NULL, NULL
+        (intptr_t)&PyDateTime_DateType, (intptr_t)"datetime.date",
+        (intptr_t)&PyDateTime_DateTimeType, (intptr_t)"datetime.datetime",
+        (intptr_t)&PyDateTime_TimeType, (intptr_t)"datetime.time",
+        (intptr_t)&PyDateTime_DeltaType, (intptr_t)"datetime.timedelta",
+        (intptr_t)&PyDateTime_TZInfoType, (intptr_t)"datetime.timezone",
+        0, 0
     };
     GraalPyPrivate_InitBuiltinTypesAndStructs(datetime_types);
 

graalpython/lib-graalpython/patches/onnxruntime-1.17.1.patch

@@ -140,3 +140,12 @@ index 31f242c..300211b 100644
      if args.use_gdk:
          cmake_args += [
              "-DCMAKE_TOOLCHAIN_FILE=" + os.path.join(source_dir, "cmake", "gdk_toolchain.cmake"),
+@@ -2485,7 +2490,7 @@ def main():
+         args.use_cache = True
+ 
+     if not is_windows():
+-        if not args.allow_running_as_root:
++        if False and not args.allow_running_as_root:
+             is_root_user = os.geteuid() == 0
+             if is_root_user:
+                 raise BuildError(

graalpython/lib-graalpython/patches/onnxruntime-1.22.1.patch

@@ -93,3 +93,12 @@ index 2a06916..c790a21 100644
          if args.use_gdk:
              cmake_args += [
                  "-DCMAKE_TOOLCHAIN_FILE=" + os.path.join(source_dir, "cmake", "gdk_toolchain.cmake"),
+@@ -2167,7 +2173,7 @@ def main():
+         os.environ["ANDROID_NDK_HOME"] = args.android_ndk_path
+ 
+     if not is_windows() and not is_macOS():
+-        if not args.allow_running_as_root:
++        if False and not args.allow_running_as_root:
+             is_root_user = os.geteuid() == 0
+             if is_root_user:
+                 raise BuildError(

mx.graalpython/live_heap_tracker.py

@@ -80,7 +80,10 @@ def main():
     iterations = int(sys.argv[2])
     jmap_binary = sys.argv[3]
     benchmark = sys.argv[4:]
+    # Run the benchmark once to ensure pyc files are generated
+    subprocess.check_call(benchmark)
     with open(output_file, 'w') as f:
+        t0 = time.time()
         for _ in range(iterations):
             proc = subprocess.Popen(benchmark)
             ppid = proc.pid
@@ -89,6 +92,9 @@ def main():
                 uss_bytes = uss(ppid)
                 heap_bytes = jmap(jmap_binary, ppid)
                 f.write(f"{heap_bytes} {uss_bytes}\n")
+            # cut short if this is a long benchmark
+            if time.time() - t0 > 30:
+                break
             if proc.returncode != 0:
                 sys.exit(proc.returncode)
 

mx.graalpython/mx_graalpython.py

@@ -308,15 +308,18 @@ def libpythonvm_build_args():
                             profile = get_profile(["--branch", b])
                         except BaseException:
                             pass
-        if CI and not os.path.isfile(profile or "") and (
-                # When running on a release branch or attempting to merge into
-                # a release branch, make sure we can use a PGO profile
-                any(b.startswith("release/") for b in [branch, os.environ.get("TO_BRANCH", "")])
-                # When running in the CI on a bench runner, use a PGO profile
-                or ",bench," in os.environ.get("LABELS", "")
-        ):
-            mx.warn("PGO profile must exist for benchmarking and release, creating one now...")
-            profile = graalpy_native_pgo_build_and_test()
+
+        if CI and not os.path.isfile(profile or ""):
+            mx.log("No profile in CI job")
+            # When running on a release branch or attempting to merge into
+            # a release branch, make sure we can use a PGO profile, and
+            # when running in the CI on a bench runner, ensure a PGO profile
+            if (
+                    any(b.startswith("release/") for b in [branch, os.environ.get("TO_BRANCH", "")])
+                    or (",bench," in os.environ.get("LABELS", ""))
+            ):
+                mx.warn("PGO profile must exist for benchmarking and release, creating one now...")
+                profile = graalpy_native_pgo_build_and_test()
 
     if os.path.isfile(profile or ""):
         print(invert(f"Automatically chose PGO profile {profile}. To disable this, set GRAALPY_PGO_PROFILE to an empty string'", blinking=True), file=sys.stderr)

mx.graalpython/mx_graalpython_bench_param.py

@@ -342,4 +342,5 @@ def _pickling_benchmarks(module='pickle'):
         "allocate-objects": [],
     }],
     "micro-small-heap": [PATH_MICRO, MICRO_BENCHMARKS_SMALL],
+    "micro-native-heap": [PATH_MICRO, MICRO_NATIVE_BENCHMARKS],
 }

scripts/wheelbuilder/linux/onnxruntime.sh

@@ -0,0 +1,48 @@
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+if [ -n "$GITHUB_RUN_ID" ]; then
+    pip install cmake==3.28.4
+fi
+
+if [ -n "$1" ]; then
+    pip wheel "onnxruntime==$1"
+else
+    pip wheel onnxruntime
+fi