update --config flags

Signed-off-by: Jack Luar <[email protected]>

Author: luarss

docs/user/InstructionsForAutoTuner.md

@@ -133,8 +133,8 @@ Example:
 
 ```shell
 openroad_autotuner --design gcd --platform sky130hd \
+                       tune --samples 5 \
                        --config ../../flow/designs/sky130hd/gcd/autotuner.json \
-                       tune --samples 5
 ```
 #### Sweep only 
 
@@ -144,8 +144,8 @@ Example:
 
 ```shell
 openroad_autotuner --design gcd --platform sky130hd \
-                       --config src/autotuner/distributed-sweep-example.json \
-                       sweep
+                       sweep \
+                       --config src/autotuner/distributed-sweep-example.json
 ```
 
 #### Plot images

tools/AutoTuner/src/autotuner/distributed.py

@@ -59,7 +59,7 @@
                        sweep
 """
 
-import argparse
+import jsonargparse
 import json
 import os
 import sys
@@ -260,13 +260,13 @@ def parse_arguments():
     """
     Parse arguments from command line.
     """
-    parser = argparse.ArgumentParser()
+    parser = jsonargparse.ArgumentParser()
+    tune_parser = jsonargparse.ArgumentParser()
+    sweep_parser = jsonargparse.ArgumentParser()
 
-    subparsers = parser.add_subparsers(
-        help="mode of execution", dest="mode", required=True
-    )
-    tune_parser = subparsers.add_parser("tune")
-    _ = subparsers.add_parser("sweep")
+    subcommands = parser.add_subcommands(dest="mode")
+    subcommands.add_subcommand("tune", tune_parser)
+    subcommands.add_subcommand("sweep", sweep_parser)
 
     # DUT
     parser.add_argument(
@@ -285,13 +285,6 @@ def parse_arguments():
     )
 
     # Experiment Setup
-    parser.add_argument(
-        "--config",
-        type=str,
-        metavar="<path>",
-        required=True,
-        help="Configuration file that sets which knobs to use for Autotuning.",
-    )
     parser.add_argument(
         "--experiment",
         type=str,
@@ -307,14 +300,30 @@ def parse_arguments():
         default=None,
         help="Time limit (in hours) for each trial run. Default is no limit.",
     )
+
+    # Sweep-specific
+    sweep_parser.add_argument(
+        "--config",
+        type=str,
+        metavar="<path>",
+        required=True,
+        help="Configuration file that sets which knobs to use for Autotuning.",
+    )
+
+    # Tune-Specific
     tune_parser.add_argument(
         "--resume",
         action="store_true",
         help="Resume previous run. Note that you must also set a unique experiment\
                 name identifier via `--experiment NAME` to be able to resume.",
     )
-
-    # ML
+    tune_parser.add_argument(
+        "--config",
+        type=str,
+        metavar="<path>",
+        required=True,
+        help="Configuration file that sets which knobs to use for Autotuning.",
+    )
     tune_parser.add_argument(
         "--algorithm",
         type=str,

tools/AutoTuner/test/ref_file_check.py

@@ -59,7 +59,7 @@ def setUp(self):
     def _execute_autotuner(self, platform, design, config_file, error_code=None):
         full_path = os.path.abspath(os.path.join(self._cur_dir, config_file))
 
-        cmd = f"{self._exec} --design {design} --platform {platform} --config {full_path} tune --samples 1"
+        cmd = f"{self._exec} --design {design} --platform {platform} tune --samples 1 --config {full_path}"
 
         out = subprocess.run(cmd, shell=True, text=True, capture_output=True)
         failed = out.returncode != 0

tools/AutoTuner/test/resume_check.py

@@ -85,10 +85,10 @@ def setUp(self):
             f"{self.exec}"
             f" --design {self.design}"
             f" --platform {self.platform}"
-            f" --config {self.config}"
             f" --jobs {self.jobs}"
             f" --experiment test-resume"
             f" tune --iterations {self.iterations} --samples {self.samples}"
+            f" --config {self.config}"
             f" --resources_per_trial {res_per_trial}"
             f" {c}"
             for c in options

tools/AutoTuner/test/smoke_test_algo_eval.py

@@ -60,8 +60,8 @@ def setUp(self):
             f" --design {self.design}"
             f" --platform {self.platform}"
             f" --experiment {self.experiment}"
-            f" --config {self.config}"
             f" tune --samples 5"
+            f" --config {self.config}"
             f" --algorithm {a} --eval {e}"
             f" --reference {self.reference}"
             for a, e in self.matrix

tools/AutoTuner/test/smoke_test_sample_iteration.py

@@ -57,8 +57,8 @@ def setUp(self):
             f" --design {self.design}"
             f" --platform {self.platform}"
             f" --experiment {self.experiment}"
-            f" --config {self.config}"
             f" tune --samples {s} --iterations {i}"
+            f" --config {self.config}"
             for s, i in self.matrix
         ]
 

tools/AutoTuner/test/smoke_test_sweep.py

@@ -71,9 +71,9 @@ def setUp(self):
             f" --design {self.design}"
             f" --platform {self.platform}"
             f" --experiment {self.experiment}"
-            f" --config {self.config}"
             f" --jobs {self.jobs}"
             f" sweep"
+            f" --config {self.config}"
         )
 
     def test_sweep(self):

tools/AutoTuner/test/smoke_test_tune.py

@@ -56,8 +56,8 @@ def setUp(self):
             f" --design {self.design}"
             f" --platform {self.platform}"
             f" --experiment {self.experiment}"
-            f" --config {self.config}"
             f" tune --samples 5"
+            f" --config {self.config}"
         )
 
     def test_tune(self):