Merge remote-tracking branch 'origin/master' into HEAD

oharboe · oharboe · commit ca4c456b3af1 · 2024-10-11T17:50:06.000+02:00
diff --git a/flow/Makefile b/flow/Makefile
@@ -570,9 +570,11 @@ open_$(1): open_$(2)
 endef
 
 define OPEN_GUI
-.PHONY: $(1)_$(2)
-$(1)_$(2):
-	$(3)=$(RESULTS_DIR)/$(2) $(4) $(SCRIPTS_DIR)/gui.tcl
+.PHONY: open_$(1) gui_$(1)
+open_$(1):
+	$(2)=$(RESULTS_DIR)/$(1) $(OPENROAD_NO_EXIT_CMD) $(SCRIPTS_DIR)/open.tcl
+gui_$(1):
+	$$(UNSET_AND_MAKE) GUI_SHOW=1 open_$(1)
 endef
 
 # Separate dependency checking and doing a step. This can
@@ -1024,10 +1026,8 @@ $(eval $(call OPEN_GUI_SHORTCUT,route,5_route.odb))
 $(eval $(call OPEN_GUI_SHORTCUT,grt,5_1_grt.odb))
 $(eval $(call OPEN_GUI_SHORTCUT,final,6_final.odb))
 
-$(foreach file,$(RESULTS_DEF),$(eval $(call OPEN_GUI,gui,$(file),DEF_FILE,$(OPENROAD_GUI_CMD))))
-$(foreach file,$(RESULTS_ODB),$(eval $(call OPEN_GUI,gui,$(file),ODB_FILE,$(OPENROAD_GUI_CMD))))
-$(foreach file,$(RESULTS_DEF),$(eval $(call OPEN_GUI,open,$(file),DEF_FILE,$(OPENROAD_NO_EXIT_CMD))))
-$(foreach file,$(RESULTS_ODB),$(eval $(call OPEN_GUI,open,$(file),ODB_FILE,$(OPENROAD_NO_EXIT_CMD))))
+$(foreach file,$(RESULTS_DEF),$(eval $(call OPEN_GUI,$(file),DEF_FILE)))
+$(foreach file,$(RESULTS_ODB),$(eval $(call OPEN_GUI,$(file),ODB_FILE)))
 
 # Write a def for the corresponding odb
 $(foreach file,$(RESULTS_ODB),$(file).def): %.def:
diff --git a/flow/designs/asap7/aes-block/autotuner.json b/flow/designs/asap7/aes-block/autotuner.json
@@ -35,15 +35,15 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
diff --git a/flow/designs/asap7/gcd/autotuner.json b/flow/designs/asap7/gcd/autotuner.json
@@ -19,15 +19,15 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
diff --git a/flow/designs/asap7/jpeg/autotuner.json b/flow/designs/asap7/jpeg/autotuner.json
@@ -35,15 +35,15 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
diff --git a/flow/designs/asap7/mock-array/autotuner.json b/flow/designs/asap7/mock-array/autotuner.json
@@ -27,15 +27,15 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
@@ -73,4 +73,4 @@
         "step": 1
     },
     "_FR_FILE_PATH": "fastroute.tcl"
-}
+}
diff --git a/flow/designs/gf180/ibex/autotuner.json b/flow/designs/gf180/ibex/autotuner.json
@@ -35,16 +35,16 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
diff --git a/flow/designs/gf180/jpeg/autotuner.json b/flow/designs/gf180/jpeg/autotuner.json
@@ -35,16 +35,16 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
diff --git a/flow/designs/ihp-sg13g2/aes/autotuner.json b/flow/designs/ihp-sg13g2/aes/autotuner.json
@@ -35,15 +35,15 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
diff --git a/flow/designs/ihp-sg13g2/gcd/autotuner.json b/flow/designs/ihp-sg13g2/gcd/autotuner.json
@@ -35,15 +35,15 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
diff --git a/flow/designs/ihp-sg13g2/ibex/autotuner.json b/flow/designs/ihp-sg13g2/ibex/autotuner.json
@@ -35,16 +35,16 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
diff --git a/flow/designs/ihp-sg13g2/jpeg/autotuner.json b/flow/designs/ihp-sg13g2/jpeg/autotuner.json
@@ -35,15 +35,15 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
diff --git a/flow/designs/ihp-sg13g2/spi/autotuner.json b/flow/designs/ihp-sg13g2/spi/autotuner.json
@@ -35,15 +35,15 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
+            1,
             5
         ],
         "step": 1
diff --git a/flow/designs/sky130hd/aes/autotuner.json b/flow/designs/sky130hd/aes/autotuner.json
@@ -35,16 +35,16 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
diff --git a/flow/designs/sky130hd/gcd/autotuner.json b/flow/designs/sky130hd/gcd/autotuner.json
@@ -36,16 +36,16 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
diff --git a/flow/designs/sky130hd/ibex/autotuner.json b/flow/designs/sky130hd/ibex/autotuner.json
@@ -35,16 +35,16 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
diff --git a/flow/designs/sky130hd/jpeg/autotuner.json b/flow/designs/sky130hd/jpeg/autotuner.json
@@ -35,16 +35,16 @@
     "CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
     "CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
         "type": "int",
         "minmax": [
-            0,
-            2
+            1,
+            3
         ],
         "step": 1
     },
diff --git a/flow/scripts/open.tcl b/flow/scripts/open.tcl
@@ -53,3 +53,9 @@ if {[env_var_equals GUI_TIMING 1]} {
   puts "GUI_TIMING=1 reading timing, takes a little while for large designs..."
   read_timing $input_file
 }
+
+if {[env_var_equals GUI_SHOW 1]} {
+  # Show the GUI when it is ready; it is unresponsive(with modal requesters
+  # saying it is unresponsive) until everything is loaded
+  gui::show
+}
diff --git a/tools/AutoTuner/test/smoke_test_algo_eval.py b/tools/AutoTuner/test/smoke_test_algo_eval.py
@@ -27,7 +27,7 @@ def setUp(self):
             f" --platform {self.platform}"
             f" --experiment {self.experiment}"
             f" --config {self.config}"
-            f" tune --samples 1"
+            f" tune --samples 5"
             f" --algorithm {a} --eval {e}"
             f" --reference {self.reference}"
             for a, e in self.matrix
diff --git a/tools/AutoTuner/test/smoke_test_tune.py b/tools/AutoTuner/test/smoke_test_tune.py
@@ -23,7 +23,7 @@ def setUp(self):
             f" --platform {self.platform}"
             f" --experiment {self.experiment}"
             f" --config {self.config}"
-            f" tune --samples 1"
+            f" tune --samples 5"
         )
 
     def test_tune(self):
