Update OpenROAD + Cleanup Fallout (The-OpenROAD-Project#1169)

+ new `openlane-and-push-tools` target added to root Makefile to enable easier updating of tools ~ antenna check results now extracted from log ~ `droute.tcl` updates to read guides before `detailed_route` Co-authored-by: Mohamed Gaber <me@donn.website>
MrShaTr · Jul 18, 2022 · 1c5db85 · 1c5db85
1 parent ebbb579
commit 1c5db85
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -86,6 +86,10 @@ all: get-openlane pdk
 openlane: venv/created
 	@PYTHON_BIN=$(PWD)/venv/bin/$(PYTHON_BIN) $(MAKE) -C docker openlane
 
+.PHONY: openlane-and-push-tools
+openlane-and-push-tools: venv/created
+	@PYTHON_BIN=$(PWD)/venv/bin/$(PYTHON_BIN) BUILD_IF_CANT_PULL=1 BUILD_IF_CANT_PULL_THEN_PUSH=1 $(MAKE) -C docker openlane
+
 pull-openlane:
 	@docker pull "$(OPENLANE_IMAGE_NAME)"
 

diff --git a/dependencies/tool_metadata.yml b/dependencies/tool_metadata.yml
@@ -58,7 +58,7 @@
   in_install: false
 - name: openroad_app
   repo: https://github.com/The-OpenROAD-Project/OpenROAD
-  commit: 0b8b7ae255f8fbbbefa57d443949b84e73eed757
+  commit: 475ff5e827b8937f4810ecae75973ee74e457816
   build: ""
   in_install: false
 - name: git

diff --git a/scripts/extract_antenna_count.py b/scripts/extract_antenna_count.py
@@ -3,4 +3,4 @@
 import sys
 
 in_data = sys.stdin.read()
-print(re.findall(r"[Aa]ntenna violations:\s*(\d+)", in_data)[-1], end="")
+print(re.findall(r"s*(\d+) antenna violations.", in_data)[-1], end="")
diff --git a/scripts/openroad/antenna_check.tcl b/scripts/openroad/antenna_check.tcl
@@ -23,4 +23,4 @@ if {[catch {read_def $::env(CURRENT_DEF)} errmsg]} {
 }
 
 # start checking antennas and generate a detail report
-check_antennas -report_file $::env(_tmp_antenna_checker_rpt)
+check_antennas -verbose
diff --git a/scripts/openroad/droute.tcl b/scripts/openroad/droute.tcl
@@ -34,8 +34,9 @@ if { [info exists ::env(DRT_MAX_LAYER)] } {
     set max_layer $::env(DRT_MAX_LAYER)
 }
 
+read_guides $::env(CURRENT_GUIDE)
+
 detailed_route\
-    -guide $::env(CURRENT_GUIDE)\
     -bottom_routing_layer $min_layer\
     -top_routing_layer $max_layer\
     -output_guide $::env(TRITONROUTE_FILE_PREFIX).guide\

diff --git a/scripts/tcl_commands/all.tcl b/scripts/tcl_commands/all.tcl
@@ -1043,7 +1043,7 @@ proc run_or_antenna_check {args} {
 
     try_catch $::env(OPENROAD_BIN) -python $::env(SCRIPTS_DIR)/extract_antenna_violators.py\
         --output $antenna_violators_rpt\
-        $antenna_checker_rpt
+        $log
 
     set ::env(ANTENNA_VIOLATOR_LIST) $antenna_violators_rpt