Merge branch 'develop' of vault.efabless.com:foss/openroad into develop
diff --git a/docker_build/docker/openroad_flow/Dockerfile b/docker_build/docker/openroad_flow/Dockerfile
index db39ade..657cc2a 100644
--- a/docker_build/docker/openroad_flow/Dockerfile
+++ b/docker_build/docker/openroad_flow/Dockerfile
@@ -44,8 +44,11 @@
RUN yum install -y http://opensource.wandisco.com/centos/6/git/x86_64/wandisco-git-release-6-1.noarch.rpm
RUN yum install -y git
-RUN git clone --recursive --branch gf14_alpha2.1 https://github.com/kareefardi/OpenROAD-1
-WORKDIR /OpenROAD-1/
+#RUN git clone --recursive --branch gf14_alpha2.1 https://github.com/kareefardi/OpenROAD-1
+#WORKDIR /OpenROAD-1/
+RUN git clone --recursive https://github.com/The-OpenROAD-Project/OpenROAD
+WORKDIR /OpenROAD/
+RUN git checkout eec88b45b938e8cff79d7701311546d9f7a49523
# Build
RUN mkdir build && mkdir -p /build/version && mkdir install
diff --git a/docker_build/tar/openroad_flow.tar.gz b/docker_build/tar/openroad_flow.tar.gz
index 29bee61..009ae8b 100644
--- a/docker_build/tar/openroad_flow.tar.gz
+++ b/docker_build/tar/openroad_flow.tar.gz
Binary files differ
diff --git a/scripts/tcl_commands/floorplan.tcl b/scripts/tcl_commands/floorplan.tcl
index f656596..c9b62ec 100644
--- a/scripts/tcl_commands/floorplan.tcl
+++ b/scripts/tcl_commands/floorplan.tcl
@@ -59,21 +59,6 @@
set_def $::env(ioPlacer_tmp_file_tag).openroad.def
}
-proc gen_pdn {args} {
- TIMER::timer_start
- if {![info exists ::env(PDN_CFG)]} {
- set ::env(PDN_CFG) $::env(OPENLANE_ROOT)/pdks/$::env(PDK)/libs.tech/openlane/common_pdn.tcl
- }
- #try_catch apply_pdn $::env(PDN_CFG).old \
- #|& tee $::env(TERMINAL_OUTPUT) $::env(pdn_log_file_tag).log
- try_catch openroad_new -exit $::env(SCRIPTS_DIR)/new_pdn.tcl \
- |& tee $::env(TERMINAL_OUTPUT) $::env(pdn_log_file_tag).log
- #try_catch mv $::env(TMP_DIR)/$::env(CURRENT_STAGE)/$::env(DESIGN_NAME)_post_T8.def $::env(pdn_tmp_file_tag).def
- TIMER::timer_stop
- exec echo "[TIMER::get_runtime]" >> $::env(pdn_log_file_tag)_runtime.txt
- set_def $::env(pdn_tmp_file_tag).def
-}
-
proc tap_decap {args} {
try_catch cp $::env(CURRENT_DEF) $::env(tapcell_result_file_tag).def
TIMER::timer_start
@@ -108,8 +93,8 @@
# place io
place_io
- # pdn generation
- gen_pdn
+# # pdn generation
+# gen_pdn
# tapcell
tap_decap
diff --git a/scripts/tcl_commands/routing.tcl b/scripts/tcl_commands/routing.tcl
index 907f765..6a26862 100644
--- a/scripts/tcl_commands/routing.tcl
+++ b/scripts/tcl_commands/routing.tcl
@@ -59,6 +59,8 @@
# |---------------- 5. ROUTING ----------------------|
# |----------------------------------------------------|
set ::env(CURRENT_STAGE) routing
+ # pdn
+ gen_pdn
# insert fill_cells
ins_fill_cells
# fastroute global 6_routing
@@ -85,4 +87,21 @@
close $runtime_log
}
+proc gen_pdn {args} {
+ TIMER::timer_start
+ if {![info exists ::env(PDN_CFG)]} {
+ set ::env(PDN_CFG) $::env(OPENLANE_ROOT)/pdks/$::env(PDK)/libs.tech/openlane/common_pdn.tcl
+ }
+ #try_catch apply_pdn $::env(PDN_CFG).old \
+ #|& tee $::env(TERMINAL_OUTPUT) $::env(pdn_log_file_tag).log
+ try_catch openroad -exit $::env(SCRIPTS_DIR)/new_pdn.tcl \
+ |& tee $::env(TERMINAL_OUTPUT) $::env(pdn_log_file_tag).log
+ #try_catch mv $::env(TMP_DIR)/$::env(CURRENT_STAGE)/$::env(DESIGN_NAME)_post_T8.def $::env(pdn_tmp_file_tag).def
+ TIMER::timer_stop
+ exec echo "[TIMER::get_runtime]" >> $::env(pdn_log_file_tag)_runtime.txt
+ set_def $::env(pdn_tmp_file_tag).def
+}
+
+
+
package provide openlane 0.9
