Fix Make Test Sets (The-OpenROAD-Project#1683)

+ Add an option for `get_test_matrix` to return plaintext ~ Fix `Makefile` to use `get_test_matrix`
MrShaTr · Mar 16, 2023 · 2857b63 · 2857b63
1 parent 735c148
commit 2857b63
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/test_sets/get_test_matrix.py b/.github/test_sets/get_test_matrix.py
@@ -28,8 +28,14 @@
 @click.option(
     "--pdk", "pdks", multiple=True, default=["sky130A"], help="Specify which PDK to use"
 )
+@click.option(
+    "--json/--plain",
+    "use_json",
+    default=True,
+    help="Print as plain text joined by whitespace instead of a JSON file. Omits PDKs.",
+)
 @click.argument("test_sets", nargs=-1)
-def main(pdks, test_sets):
+def main(pdks, use_json, test_sets):
 
     data_str = open(TEST_SETS_FILE).read()
     data = yaml.safe_load(data_str)
@@ -40,7 +46,10 @@ def main(pdks, test_sets):
         for design in test_set["designs"]:
             designs.append({"name": design, "pdk": test_set["pdk"]})
 
-    print(json.dumps({"design": designs}), end="")
+    if use_json:
+        print(json.dumps({"design": designs}), end="")
+    else:
+        print(" ".join([design["name"] for design in designs]), end="")
 
 
 if __name__ == "__main__":

diff --git a/Makefile b/Makefile
@@ -150,10 +150,10 @@ venv/created: ./requirements.txt ./requirements_dev.txt ./requirements_lint.txt
 
 DLTAG=custom_design_List
 .PHONY: test_design_list fastest_test_set extended_test_set
-fastest_test_set: DESIGN_LIST=$(shell cat ./.github/test_sets/fastest_test_set)
+fastest_test_set: DESIGN_LIST=$(shell python3 ./.github/test_sets/get_test_matrix.py --plain --pdk $(PDK) fastest_test_set)
 fastest_test_set: DLTAG=$(FASTEST_TEST_SET_TAG)
 fastest_test_set: test_design_list
-extended_test_set: DESIGN_LIST=$(shell cat ./.github/test_sets/extended_test_set)
+extended_test_set: DESIGN_LIST=$(shell python3 ./.github/test_sets/get_test_matrix.py --plain --pdk $(PDK) extended_test_set)
 extended_test_set: DLTAG=$(EXTENDED_TEST_SET_TAG)
 extended_test_set: test_design_list
 test_design_list:

diff --git a/designs/.gitignore b/designs/.gitignore
@@ -8,4 +8,6 @@
 !*/script.tcl
 */run_*.json
 */run_*.tcl
-*/matrix_*.json
+*/matrix_*.json
+*/*_config.json
+*/*_config.tcl