Benchmark bisect: use ';' as re-run commands separator & style fix

Author: steve-s

bisect-benchmark.ini

@@ -30,6 +30,10 @@ benchmark_command = mx --dy /compiler benchmark micro:try-except-simple
 # Once the good and bad commits are identified, the tool will run all the
 # following benchmark commands on both the good and bad revisions. One can
 # run the benchmarks again with some extra logging, IGV dumping, ...
+#
+# Individual commands can be separated by ';'. Trailing whitespace including
+# newlines is removed from the commands.
+#
 # The example commands below are good default that should provide good insight
 # into the regression at hand:
 #   * "--checkup" runs the benchmark with extra iterations, and extra compilation
@@ -39,9 +43,9 @@ benchmark_command = mx --dy /compiler benchmark micro:try-except-simple
 #   * "--cputracer" and IGV dumping: they filter the roots with name "*measure*",
 #       adjust that to the benchmark main function(s)
 rerun_with_commands =
-    mx --dy /compiler benchmark micro:try-except-simple -- --checkup |
-    mx --dy /compiler benchmark micro:try-except-simple -- --cpusampler --cpusampler.Delay=10000 |
-    mx --dy /compiler benchmark micro:try-except-simple -- --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=measure |
+    mx --dy /compiler benchmark micro:try-except-simple -- --checkup ;
+    mx --dy /compiler benchmark micro:try-except-simple -- --cpusampler --cpusampler.Delay=10000 ;
+    mx --dy /compiler benchmark micro:try-except-simple -- --cputracer --cputracer.TraceStatements --cputracer.FilterRootName=measure ;
     mx --dy /compiler benchmark micro:try-except-simple -- --vm.Dgraal.Dump=Truffle:2 --vm.Dgraal.MethodFilter="*measure*"
 
 # The first known "bad" merge commit for bisection. Try to use long commit

mx.graalpython/mx_graalpython_bisect.py

@@ -47,9 +47,10 @@
 import mx
 
 
-def hr(l):
+def print_line(l):
     print('=' * l)
 
+
 def get_suite(name):
     suite_name = name.lstrip('/')
     suite = mx.suite(suite_name, fatalIfMissing=False)
@@ -199,7 +200,7 @@ def _bisect_benchmark(argv, bisect_id, email_to):
                             help="Command to run in order to run the benchmark. Output needs to be in mx's format")
         parser.add_argument('--rerun-with-commands',
                             help="Re-run the bad and good commits with this benchmark command(s) "
-                                 "(multiple commands separated by '|')")
+                                 "(multiple commands separated by ';')")
         parser.add_argument('--benchmark-criterion', default='BEST',
                             help="Which result parameter should be used for comparisons")
         parser.add_argument('--enterprise', action='store_true', help="Whether to checkout graal-enterprise")
@@ -283,11 +284,11 @@ def benchmark_callback(suite, commit, bench_command=args.benchmark_command):
             current_result = next_result
             current_suite = downstream_suite
         for commit in [current_result.good_commit, current_result.bad_commit]:
-            hr(80)
+            print_line(80)
             print("Commit: {}".format(commit))
             checkout_and_build_suite(current_suite, commit)
-            for cmd in args.rerun_with_commands.split("|"):
-                hr(40)
+            for cmd in args.rerun_with_commands.split(";"):
+                print_line(40)
                 mx.run(shlex.split(cmd.strip()), nonZeroIsFatal=False)
 
     send_email(