[GR-70865] Make separate PGO profile for bytecode DSL

PullRequest: graalpython/4060

Author: msimacek

ci.jsonnet

@@ -75,16 +75,15 @@
     local bench_task(bench=null, benchmarks=BENCHMARKS) = super.bench_task(bench=bench, benchmarks=benchmarks),
     local bisect_bench_task     = self.bisect_bench_task,
 
-    local bytecode_dsl_gate(name) = task_spec({
+    local bytecode_dsl_env = task_spec({
         environment +: {
             BYTECODE_DSL_INTERPRETER: "true"
         },
+    }),
+    local bytecode_dsl_gate(name) = bytecode_dsl_env + task_spec({
         tags :: name,
     }),
-    local bytecode_dsl_bench = task_spec({
-        environment +: {
-            BYTECODE_DSL_INTERPRETER: "true"
-        },
+    local bytecode_dsl_bench = bytecode_dsl_env + task_spec({
         name_suffix +:: ["bytecode-dsl"],
     }),
 
@@ -212,6 +211,15 @@
                 ],
             }),
         }),
+        "python-pgo-profile-bytecode-dsl": gpgate_ee + bytecode_dsl_env + platform_spec(no_jobs) + platform_spec({
+            "linux:amd64:jdk-latest"     : post_merge + t("01:30:00") + task_spec({
+                run: [["mx", "python-native-pgo"]],
+                logs+: [
+                    "default-bytecode-dsl.iprof.gz",
+                    "default-bytecode-dsl.lcov",
+                ],
+            }),
+        }),
         "python-svm-unittest": gpgate + platform_spec(no_jobs) + platform_spec({
             "linux:amd64:jdk-latest"     : tier2                     + require(GPY_NATIVE_STANDALONE),
             "linux:aarch64:jdk-latest"   : tier3                     + require(GPY_NATIVE_STANDALONE),

mx.graalpython/mx_graalpython.py

@@ -282,15 +282,16 @@ def libpythonvm_build_args():
         vc = SUITE.vc
         commit = str(vc.tip(SUITE.dir)).strip()
         branch = str(vc.active_branch(SUITE.dir, abortOnError=False) or 'master').strip()
+        dsl_suffix = '' if not BYTECODE_DSL_INTERPRETER else '-bytecode-dsl'
 
         if script := os.environ.get("ARTIFACT_DOWNLOAD_SCRIPT"):
             # This is always available in the GraalPy CI
-            profile = "cached_profile.iprof.gz"
+            profile = f"cached_profile{dsl_suffix}.iprof.gz"
             run(
                 [
                     sys.executable,
                     script,
-                    f"graalpy/{commit}",
+                    f"graalpy/pgo{dsl_suffix}-{commit}",
                     profile,
                 ],
                 nonZeroIsFatal=False,
@@ -299,21 +300,23 @@ def libpythonvm_build_args():
             # Locally, we try to get a reasonable profile
             get_profile = mx.command_function('python-get-latest-profile', fatalIfMissing=False)
             if get_profile:
-                for b in set([branch, "master"]):
+                for b in [branch, "master"]:
                     if not profile:
                         try:
                             profile = get_profile(["--branch", b])
+                            if profile and dsl_suffix not in profile:
+                                mx.warn("PGO profile seems mismatched, you need newer graal-enterprise")
                         except BaseException:
                             pass
 
-        if CI and not os.path.isfile(profile or ""):
+        if CI and (not profile or not os.path.isfile(profile)):
             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", ""))
+                    or os.environ.get('BUILD_NAME', '').startswith('pybench-')
             ):
                 mx.warn("PGO profile must exist for benchmarking and release, creating one now...")
                 profile = graalpy_native_pgo_build_and_test()
@@ -361,10 +364,13 @@ def graalpy_native_pgo_build_and_test(args=None):
                 GRAALPY_HOME=instrumented_home,
         ):
             graalpytest(["--python", instrumented_launcher, "test_venv.py"])
-            mx.command_function('benchmark')(["meso-small:*", "--", "--python-vm", "graalpython", "--python-vm-config", "custom"])
-
-        iprof_path = Path(SUITE.dir) / 'default.iprof'
-        lcov_path = Path(SUITE.dir) / 'default.lcov'
+            python_vm_config = 'custom'
+            if BYTECODE_DSL_INTERPRETER:
+                python_vm_config += '-bc-dsl'
+            mx.command_function('benchmark')(["meso-small:*", "--", "--python-vm", "graalpython", "--python-vm-config", python_vm_config])
+        dsl_suffix = '' if not BYTECODE_DSL_INTERPRETER else '-bytecode-dsl'
+        iprof_path = Path(SUITE.dir) / f'default{dsl_suffix}.iprof'
+        lcov_path = Path(SUITE.dir) / f'default{dsl_suffix}.lcov'
 
         run([
             os.path.join(
@@ -411,17 +417,19 @@ def graalpy_native_pgo_build_and_test(args=None):
     mx.log(mx.colorize(f"[PGO] Gzipped profile at: {iprof_gz_path}", color="yellow"))
 
     if script := os.environ.get("ARTIFACT_UPLOADER_SCRIPT"):
+        commit = str(SUITE.vc.tip(SUITE.dir)).strip()
         run(
             [
                 sys.executable,
                 script,
                 iprof_gz_path,
-                str(SUITE.vc.tip(SUITE.dir)).strip(),
+                f"pgo{dsl_suffix}-{commit}",
                 "graalpy",
                 "--lifecycle",
                 "cache",
                 "--artifact-repo-key",
                 os.environ.get("ARTIFACT_REPO_KEY_LOCATION"),
+                '--skip-existing',
             ],
         )
 

mx.graalpython/mx_graalpython_benchmark.py

@@ -284,7 +284,7 @@ def launcher_type(self):
     @property
     @functools.lru_cache
     def interpreter(self):
-        if self.config_name() == CONFIGURATION_CUSTOM:
+        if self.config_name().startswith(CONFIGURATION_CUSTOM):
             home = mx.get_env("GRAALPY_HOME")
             if not home:
                 mx.abort("The custom benchmark config for graalpy is to run with a custom GRAALPY_HOME locally")
@@ -1081,8 +1081,8 @@ def add_graalpy_vm(name, *extra_polyglot_args):
         python_vm_registry.add_vm(GraalPythonVm(config_name=name, extra_polyglot_args=extra_polyglot_args), suite, 10)
 
     # GraalPy VMs:
-    add_graalpy_vm(CONFIGURATION_CUSTOM)
     add_graalpy_vm(CONFIGURATION_DEFAULT)
+    add_graalpy_vm(CONFIGURATION_CUSTOM)
     add_graalpy_vm(CONFIGURATION_INTERPRETER, '--experimental-options', '--engine.Compilation=false')
     add_graalpy_vm(CONFIGURATION_DEFAULT_MULTI, '--experimental-options', '-multi-context')
     add_graalpy_vm(CONFIGURATION_INTERPRETER_MULTI, '--experimental-options', '-multi-context', '--engine.Compilation=false')