Merge branch 'The-OpenROAD-Project:master' into update-docker-docs

habibayassin · Jul 27, 2024 · 96a9c24 · 96a9c24
2 parents 03212b7 + 5fb54cd
commit 96a9c24
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 140 deletions.
diff --git a/.github/workflows/github-actions-update-rules.yml b/.github/workflows/github-actions-update-rules.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           git config --add remote.origin.fetch "+refs/pull/*/head:refs/remotes/origin/pr/*"
           git fetch
-          git checkout ${{ github.event.client_payload.branch }}
+          git checkout "origin/pr/${{ github.event.client_payload.branch }}"
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
@@ -53,7 +53,7 @@ jobs:
         name: update rules pr
         id: remote-update-pr
         run: |
-          git push origin ${{ github.event.client_payload.branch }}
+          git push origin "HEAD:refs/pull/${{ github.event.client_payload.branch }}/head"
       - if: "steps.remote-update.outputs.has_update == 'true' && github.event.client_payload.branch == 'master'"
         name: Create Draft PR
         uses: peter-evans/create-pull-request@v5

diff --git a/flow/Makefile b/flow/Makefile
@@ -287,7 +287,7 @@ endif
 export OPENROAD_EXE      ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/openroad)
 export OPENSTA_EXE       ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/sta)
 
-OPENROAD_ARGS            = -no_init $(OR_ARGS)
+OPENROAD_ARGS            = -no_init -threads $(NUM_CORES) $(OR_ARGS)
 OPENROAD_CMD             = $(OPENROAD_EXE) -exit $(OPENROAD_ARGS)
 OPENROAD_NO_EXIT_CMD     = $(OPENROAD_EXE) $(OPENROAD_ARGS)
 OPENROAD_GUI_CMD         = $(OPENROAD_EXE) -gui $(OR_ARGS)
@@ -490,7 +490,7 @@ $(SDC_FILE_CLOCK_PERIOD): $(SDC_FILE)
 	echo $(ABC_CLOCK_PERIOD_IN_PS) > $@
 
 .PHONY: yosys-dependencies
-yosys-dependencies: $(DONT_USE_LIBS) $(WRAPPED_LIBS) $(DONT_USE_SC_LIB) $(DFF_LIB_FILE) $(VERILOG_FILES) $(CACHED_NETLIST) $(LATCH_MAP_FILE) $(ADDER_MAP_FILE)
+yosys-dependencies: $(DONT_USE_LIBS) $(WRAPPED_LIBS) $(DONT_USE_SC_LIB) $(DFF_LIB_FILE) $(VERILOG_FILES) $(CACHED_NETLIST) $(LATCH_MAP_FILE) $(ADDER_MAP_FILE) $(SDC_FILE_CLOCK_PERIOD)
 
 .PHONY: do-yosys
 do-yosys:
@@ -503,10 +503,10 @@ do-yosys-canonicalize: yosys-dependencies
 	mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR) $(OBJECTS_DIR)
 	($(TIME_CMD) $(YOSYS_CMD) $(YOSYS_FLAGS) -c $(SCRIPTS_DIR)/synth_canonicalize.tcl) 2>&1 | tee $(LOG_DIR)/1_1_yosys.log
 
-$(RESULTS_DIR)/1_synth.rtlil: $(SDC_FILE_CLOCK_PERIOD)
+$(RESULTS_DIR)/1_synth.rtlil:
 	$(UNSET_AND_MAKE) do-yosys-canonicalize
 
-$(RESULTS_DIR)/1_1_yosys.v: $(RESULTS_DIR)/1_synth.rtlil $(SDC_FILE_CLOCK_PERIOD)
+$(RESULTS_DIR)/1_1_yosys.v: $(RESULTS_DIR)/1_synth.rtlil
 	$(UNSET_AND_MAKE) do-yosys
 
 $(RESULTS_DIR)/1_synth.sdc: $(SDC_FILE)

diff --git a/flow/designs/asap7/mock-alu/metadata-base-ok.json b/flow/designs/asap7/mock-alu/metadata-base-ok.json
diff --git a/flow/designs/asap7/mock-alu/rules-base.json b/flow/designs/asap7/mock-alu/rules-base.json
@@ -40,7 +40,7 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -723.08,
+        "value": -782.56,
         "compare": ">="
     },
     "finish__design__instance__area": {
@@ -59,4 +59,4 @@
         "value": -97.42,
         "compare": ">="
     }
-}
+}
diff --git a/flow/scripts/detail_route.tcl b/flow/scripts/detail_route.tcl
@@ -8,8 +8,6 @@ if { [info exists ::env(USE_WXL)]} {
 load_design $db_file 4_cts.sdc
 set_propagated_clock [all_clocks]
 
-set_thread_count $::env(NUM_CORES)
-
 set additional_args ""
 if { [info exists ::env(dbProcessNode)]} {
   append additional_args " -db_process_node $::env(dbProcessNode)"

diff --git a/flow/scripts/global_place.tcl b/flow/scripts/global_place.tcl
@@ -2,6 +2,9 @@ utl::set_metrics_stage "globalplace__{}"
 source $::env(SCRIPTS_DIR)/load.tcl
 load_design 3_2_place_iop.odb 2_floorplan.sdc
 
+# Temporary: remove after fixing instability in GPL with multithreading
+set_thread_count 1
+
 set_dont_use $::env(DONT_USE_CELLS)
 
 # set fastroute layer reduction

diff --git a/flow/scripts/global_place_skip_io.tcl b/flow/scripts/global_place_skip_io.tcl
@@ -1,6 +1,9 @@
 source $::env(SCRIPTS_DIR)/load.tcl
 load_design 2_floorplan.odb 2_floorplan.sdc
 
+# Temporary: remove after fixing instability in GPL with multithreading
+set_thread_count 1
+
 if {
   [info exists ::env(FLOORPLAN_DEF)] ||
   (

diff --git a/flow/scripts/global_route.tcl b/flow/scripts/global_route.tcl
@@ -2,7 +2,8 @@ utl::set_metrics_stage "globalroute__{}"
 source $::env(SCRIPTS_DIR)/load.tcl
 load_design 4_cts.odb 4_cts.sdc
 
-set_thread_count $::env(NUM_CORES)
+# Temporary: remove after fixing instability in ANT with multithreading
+set_thread_count 1
 
 if {[info exist env(PRE_GLOBAL_ROUTE)]} {
   source $env(PRE_GLOBAL_ROUTE)

diff --git a/flow/scripts/load.tcl b/flow/scripts/load.tcl
@@ -2,6 +2,9 @@ source $::env(SCRIPTS_DIR)/util.tcl
 
 source $::env(SCRIPTS_DIR)/report_metrics.tcl
 
+# Temporarily disable sta's threading due to random failures
+sta::set_thread_count 1
+
 proc load_design {design_file sdc_file} {
   # Read liberty files
   source $::env(SCRIPTS_DIR)/read_liberty.tcl

diff --git a/flow/scripts/macro_place_util.tcl b/flow/scripts/macro_place_util.tcl
@@ -1,5 +1,3 @@
-set_thread_count $::env(NUM_CORES)
-
 proc find_macros {} {
   set macros ""