Update microsoft/setup-msbuild version, fix empty retagger branch, fix rebase

Author: Ariouz

.github/workflows/ci-matrix-gen.yml

@@ -179,7 +179,7 @@ jobs:
 
       - name: Install MSBuild
         if: ${{ runner.os == 'Windows' }}
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v1.0.2
 
       - name: Process matrix downloads
         if: ${{ matrix.downloads_steps }}

.github/workflows/ci-unittest-retagger.yml

@@ -73,6 +73,6 @@ jobs:
       - name: Push updates to a new PR
         working-directory: main
         run: |
-          git push --set-upstream origin weekly_retagger_${{ github.run_id }}
+          [ "$(git diff origin/master...HEAD | wc -l)" -eq 0 ] && echo 'Nothing to push' || git push --set-upstream origin weekly_retagger_${{ github.run_id }}
           gh label create "weekly-retagger" --color "BDDFDF" -d "[DO NOT ADD] Automatically set to weekly retagger PR" || echo "Label 'weekly-retagger' already exists"
           gh pr create -B master --title "[WORKFLOW] Weekly Retagger: Update tags" --body "Applied weekly retags on $os_list" -l "weekly-retagger" || echo "Nothing to push"

ci/graal/ci/ci_common/bench-common.libsonnet

@@ -34,7 +34,7 @@
   # max number of threads to use for benchmarking in general
   # the goal being to limit parallelism on very large servers which may not be respresentative of real-world scenarios
   bench_max_threads:: {
-   restrict_threads:: if self.arch == 'amd64' then 36 else 32,
+   restrict_threads:: 36
   },
 
   bench_no_thread_cap:: {
@@ -99,27 +99,7 @@
       default_numa_node:: 0,
       num_threads:: 160,
       hyperthreading:: false
-    },
-    hr350a:: common.linux_aarch64 + self._bench_machine + {
-      machine_name:: "hr350a",
-      capabilities+: ["tmpfs25g"],
-      numa_nodes:: [0],
-      default_numa_node:: 0,
-      num_threads:: 32,
-      hyperthreading:: false
-    },
-    osprey:: common.linux_aarch64 + self._bench_machine + {
-      machine_name:: "osprey",
-      capabilities+: ["tmpfs25g"],
-      numa_nodes:: [0],
-      default_numa_node:: 0,
-      num_threads:: 32,
-      hyperthreading:: false
-    },
-    local contains(a_str, substr) = std.length(std.findSubstr(substr, a_str)) > 0,
-    # Useful to distribute the benchmark load between two machine types, but always stay consistent for the same benchmark suite
-    # This guarantees comparability of results, whatever the platform/context, for each suite
-    hr350a_or_osprey(suite=null):: if suite != null && std.count([contains(s, suite) for s in ["barista", "renaissance"]], true) > 0 then self.osprey else self.hr350a,
+    }
   },
 
   hwloc_cmd(cmd, num_threads, node, hyperthreading, max_threads_per_node)::

ci/graal/common.json

@@ -4,7 +4,7 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.68.4",
+  "mx_version": "7.68.5",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {

graalpython/com.oracle.graal.python.benchmarks/python/micro/phase_shift_warmup_baseline.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 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
@@ -37,15 +37,31 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-__graalpython__.import_current_as_named_module_with_delegate(
-    module_name="unicodedata",
-    delegate_name="_cpython_unicodedata",
-    delegate_attributes=['ucd_3_2_0'],
-    wrap_methods=False,
-    owner_globals=globals())
-__graalpython__.import_current_as_named_module_with_delegate(
-    module_name="unicodedata",
-    delegate_name="_cpython_unicodedata",
-    delegate_attributes=['ucd_3_2_0'],
-    wrap_methods=False,
-    owner_globals=globals())
+
+import subprocess, sys, re
+
+
+# This benchmark computes the best possible result of the phase_shift_warmup
+# benchmark. It executes the script phase_shift_script_baseline in a subprocess.
+# The phase_shift_script_baseline script runs only the second phase of the 
+# full script phase_shift_script, and so the second phase starts with a clean
+# compilation queue. The second phase runs (phase2it + 200) iterations of a
+# certain workflow consisting of a large number of generated functions and measures
+# the sum of the time of the last 200 iterations. The better the time the better
+# is the code of the tested workflow warmed up.
+def __benchmark__(phase2it=0):
+    orig_vm_argv = sys.orig_argv
+    for i, arg in enumerate(orig_vm_argv):
+        if arg.endswith('harness.py'):
+            orig_vm_argv = orig_vm_argv[:i]
+            break
+    tt: int = 0
+    result = subprocess.run([*orig_vm_argv,
+    "--experimental-options",
+    "--engine.CompilerThreads=1",
+    re.sub(r'harness\.py', "micro/phase_shift_script_baseline.py", sys.argv[0]), str(phase2it)], capture_output=True, text=True, check=False)
+    m = re.search(r"LAST_200_IT_TIME = (\d+) ms", result.stdout)
+    if m:
+        tt = int(m.group(1))
+    print(result.stdout)
+    return tt * 1000000                

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/CodeBuiltins.java

@@ -500,6 +500,8 @@ Object positions(PCode self) {
                                             // 1-based inclusive to 0-based exclusive (-1 + 1 = 0)
                                             section.getEndColumn()
                             }));
+                        } else {
+                            lines.add(PFactory.createTuple(language, new Object[]{PNone.NONE, PNone.NONE, PNone.NONE, PNone.NONE}));
                         }
                     }
                 } else {
@@ -679,4 +681,4 @@ private static PTuple createStringsTuple(Node inliningTarget, TruffleString[] va
         }
         return PFactory.createTuple(language, PythonUtils.arrayCopyOf(values, values.length));
     }
-}
+}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/compiler/bytecode_dsl/RootNodeCompiler.java

@@ -648,7 +648,7 @@ void beginTraceLineChecked(Builder b) {
     /**
      * Emits a "line" tracing if either no tracing was emitted before, or if line number was
      * updated.
-     * 
+     *
      * @param b Builder for line tracing.
      */
     void endTraceLineChecked(SSTNode node, Builder b) {
@@ -1881,6 +1881,7 @@ public void acceptBoolOpArgs(ExprTy.BoolOp node) {
         @Override
         public Void visit(ExprTy.BoolOp node) {
             boolean newStatement = beginSourceSection(node, b);
+            b.beginBlock();
             emitTraceLineChecked(node, b);
 
             if (node.op == BoolOpTy.And) {
@@ -2054,6 +2055,7 @@ private void emitGetMethod(ExprTy func, BytecodeLocal receiver) {
         @Override
         public Void visit(ExprTy.Call node) {
             boolean newStatement = beginSourceSection(node, b);
+            b.beginBlock();
             emitTraceLineChecked(node, b);
             checkCaller(ctx.errorCallback, node.func);
             emitCall(node.func, node.args, node.keywords);
@@ -2846,7 +2848,7 @@ public void emitYieldFrom(Runnable generatorOrCoroutineProducer, BytecodeLocal r
              *     returnValue = e.value
              *     goto end
              *
-             * end: # Step 4: resultValue local is assigned
+             * end: # Step 4: returnValue local is assigned
              * @formatter:on
              */
             BytecodeLocal generator = b.createLocal();
@@ -4386,6 +4388,7 @@ private void visitMatchCaseRecursively(MatchCaseTy[] cases, int index, PatternCo
              */
             MatchCaseTy c = cases[index];
             boolean newStatement = beginSourceSection(c, b);
+            b.beginBlock();
             emitTraceLineChecked(cases[index], b);
 
             if (index != cases.length - 1) {
@@ -4490,6 +4493,7 @@ private void emitPatternCondition(MatchCaseTy currentCase, PatternContext pc) {
          */
         private void visitPattern(PatternTy pattern, PatternContext pc) {
             boolean newStatement = beginSourceSection(pattern, b);
+            b.beginBlock();
             emitTraceLineChecked(pattern, b);
             if (pattern instanceof PatternTy.MatchAs matchAs) {
                 doVisitPattern(matchAs, pc);
@@ -6504,4 +6508,4 @@ public Void visit(StmtTy.Pass node) {
             return null;
         }
     }
-}
+}

mx.graalpython/suite.py

@@ -53,15 +53,15 @@
             },
             {
                 "name": "tools",
-                "version": "e61a4623b7fc839ee10df84050c120d59056b871",
+                "version": "5975f9f8d7b4621badfdb1152070da848729a211",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "regex",
-                "version": "e61a4623b7fc839ee10df84050c120d59056b871",
+                "version": "5975f9f8d7b4621badfdb1152070da848729a211",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},