[GR-59039] Fix energy regex patterns

PullRequest: mx/1943

Author: ayman-moustadrif

ci/common.jsonnet

@@ -142,6 +142,11 @@ local common_json = import "../common.json";
 
     common_catch_files: {
       catch_files+: [
+        # There are additional catch_files-like patterns in buildbot/graal/catcher.py for:
+        # * hs_err_pid*.log files
+        # * Dumping IGV graphs to (?P<filename>.+(\.gv\.xml|\.bgv))
+        # * CFGPrinter: Output to file (?P<filename>.*compilations-.+\.cfg)
+        # There are defined there for efficiency reasons.
         # Keep in sync with jdk.graal.compiler.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP
         "Graal diagnostic output saved in '(?P<filename>[^']+)'",
         # Keep in sync with jdk.graal.compiler.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP

common.json

@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+26-3319", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+2-83", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
 
     "oraclejdk24":       {"name": "jpg-jdk",   "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+1", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+1-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+1-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+1-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+1-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+1-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+1-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+2", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+2-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+2-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+2-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+2-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+2-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+2-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

src/mx/_impl/mx_benchmark.py

@@ -3507,9 +3507,9 @@ def get_rules(self, bmSuiteArgs):
         rules = []
 
         energy_patterns = {
-            "total-machine-energy": r"Total system energy consumption (including idle): (?P<total_machine_energy>[0-9]*\.?[0-9]+) Joules",
-            "total-compute-energy": r"Total energy used by the benchmark (excluding idle): (?P<total_compute_energy>[0-9]*\.?[0-9]+) Joules",
-            "avg-machine-power": r"Average system power (including idle): (?P<avg_machine_power>[0-9]*\.?[0-9]+) Watts",
+            "total-machine-energy": r"Total system energy consumption \(including idle\): (?P<total_machine_energy>[0-9]*\.?[0-9]+) Joules",
+            "total-compute-energy": r"Total energy used by the benchmark \(excluding idle\): (?P<total_compute_energy>[0-9]*\.?[0-9]+) Joules",
+            "avg-machine-power": r"Average system power \(including idle\): (?P<avg_machine_power>[0-9]*\.?[0-9]+) Watts",
             "avg-compute-power": r"Average power used by benchmark: (?P<avg_compute_power>[0-9]*\.?[0-9]+) Watts"
         }
         for metric_name, pattern in energy_patterns.items():

src/mx/mx_version.py

@@ -1,2 +1,2 @@
 # The version must be updated for every PR (checked in CI) and the comment should reflect the PR's issue
-version = "7.56.0"  # GR-63250: Fetch-jdk: Add architecture to JDK path
+version = "7.57.0"  # GR-59039 Fix energy regex pattern