Skip to content

Commit 4df707f

Browse files
committed
Merge remote-tracking branch 'origin/master' into secure-remove-wrappers
Signed-off-by: Osama <[email protected]>
2 parents 651b316 + 6a47bb8 commit 4df707f

File tree

129 files changed

+56634
-284829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+56634
-284829
lines changed

flow/.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.1
1+
7.4.0rc3

flow/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ filegroup(
1010

1111
orfs_flow(
1212
name = "gcd",
13-
stage_args = {
13+
stage_arguments = {
1414
"synth": {
1515
"SDC_FILE": "$(location :constraints-gcd)",
1616
},
@@ -64,7 +64,7 @@ all_sources = [":additional_lefs", ":additional_libs"]
6464

6565
orfs_flow(
6666
name = "swerv_wrapper",
67-
stage_args = {
67+
stage_arguments = {
6868
"synth": SWERV_ALL | {
6969
"SYNTH_HIERARCHICAL": "1",
7070
"SDC_FILE": "$(location :constraints-swerv)",
@@ -153,7 +153,7 @@ MOCK_ARRAY_FLOORPLAN_PLACE = {
153153
orfs_flow(
154154
name = "MockArray",
155155
macros = ["Element_generate_abstract"],
156-
stage_args = {
156+
stage_arguments = {
157157
"synth": {
158158
"SDC_FILE": "$(location :mock-array-constraints)",
159159
},
@@ -222,7 +222,7 @@ mock_array_all_sources = ["designs/src/mock-array/util.tcl"]
222222
orfs_flow(
223223
name = "Element",
224224
abstract_stage = "route",
225-
stage_args = {
225+
stage_arguments = {
226226
"synth": MOCK_ARRAY_ELEMENT_ALL | {
227227
"SDC_FILE": "$(location :mock-array-constraints)",
228228
},

flow/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module(
77
bazel_dep(name = "bazel-orfs")
88
git_override(
99
module_name = "bazel-orfs",
10-
commit = "16eb5dd5b31bdeacc0b3006a71dbce29076e9850",
10+
commit = "b12fc7a172d4211315ec36214f872595e084ab25",
1111
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
1212
)
1313

flow/MODULE.bazel.lock

Lines changed: 16 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flow/Makefile

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,6 @@ include $(PLATFORM_DIR)/config.mk
178178
# is no way to escape space in defaults.py and get "foreach" to work.
179179
$(foreach line,$(shell $(SCRIPTS_DIR)/defaults.py),$(eval export $(subst __SPACE__, ,$(line))))
180180

181-
# Enables hierarchical yosys
182-
export SYNTH_STATS = $(RESULTS_DIR)/synth_stats.txt
183-
export SYNTH_STATS_SCRIPT = $(SCRIPTS_DIR)/synth_stats.tcl
184181
# If the design, nor $(PLATFORM_DIR)/config.mk provided a default, provide one here
185182
export MAX_UNGROUP_SIZE ?= 0
186183

@@ -454,13 +451,6 @@ memory:
454451

455452
export SYNTH_SCRIPT ?= $(SCRIPTS_DIR)/synth.tcl
456453
export SYNTH_MEMORY_MAX_BITS ?= 4096
457-
458-
.PHONY: do-yosys-stats
459-
do-yosys-stats:
460-
mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR)
461-
(export VERILOG_FILES=$(RESULTS_DIR)/1_synth.rtlil; \
462-
$(TIME_CMD) $(YOSYS_EXE) $(YOSYS_FLAGS) -c $(SYNTH_STATS_SCRIPT)) 2>&1 | tee $(abspath $(LOG_DIR)/1_1_yosys_stats.log)
463-
464454
export SDC_FILE_CLOCK_PERIOD = $(RESULTS_DIR)/clock_period.txt
465455

466456
$(SDC_FILE_CLOCK_PERIOD): $(SDC_FILE)
@@ -487,7 +477,7 @@ $(RESULTS_DIR)/1_synth.rtlil: $(YOSYS_DEPENDENCIES)
487477
$(UNSET_AND_MAKE) do-yosys-canonicalize
488478

489479
$(RESULTS_DIR)/1_1_yosys.v: $(RESULTS_DIR)/1_synth.rtlil
490-
$(UNSET_AND_MAKE) do-yosys-stats do-yosys
480+
$(UNSET_AND_MAKE) do-yosys
491481

492482
.PHONY: do-synth
493483
do-synth:
@@ -553,7 +543,7 @@ define OPEN_GUI
553543
open_$(1):
554544
$(2)=$(RESULTS_DIR)/$(1) $(OPENROAD_NO_EXIT_CMD) $(SCRIPTS_DIR)/open.tcl
555545
gui_$(1):
556-
$(2)=$(RESULTS_DIR)/$(1) GUI_SHOW=1 $(OPENROAD_GUI_CMD) -minimize $(SCRIPTS_DIR)/open.tcl
546+
$(2)=$(RESULTS_DIR)/$(1) $(OPENROAD_GUI_CMD) $(SCRIPTS_DIR)/open.tcl
557547
endef
558548

559549
# Separate dependency checking and doing a step. This can
@@ -1053,7 +1043,8 @@ klayout:
10531043

10541044
.phony: run
10551045
run:
1056-
$(OPENROAD_CMD) -no_splash $(if $(filter %.py,$(RUN_SCRIPT)),-python) $(RUN_SCRIPT)
1046+
@mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR) $(OBJECTS_DIR)
1047+
($(OPENROAD_CMD) -no_splash $(if $(filter %.py,$(RUN_SCRIPT)),-python) $(RUN_SCRIPT) 2>&1 | tee $(abspath $(LOG_DIR)/$(RUN_LOG_NAME_STEM).log))
10571048

10581049
# Utilities
10591050
#-------------------------------------------------------------------------------

flow/designs/asap7/aes-block/config.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@ export PWR_NETS_VOLTAGES =
2828

2929
# The macros are very small so use a smaller halo
3030
export MACRO_PLACE_HALO ?= 5 5
31+
32+
export ROUTING_LAYER_ADJUSTMENT = 0.3

0 commit comments

Comments
 (0)