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

Author: oharboe

flow/.bazelversion

@@ -1 +1 @@
-7.2.1
+7.4.0rc3

flow/BUILD.bazel

@@ -10,7 +10,7 @@ filegroup(
 
 orfs_flow(
     name = "gcd",
-    stage_args = {
+    stage_arguments = {
         "synth": {
             "SDC_FILE": "$(location :constraints-gcd)",
         },
@@ -64,7 +64,7 @@ all_sources = [":additional_lefs", ":additional_libs"]
 
 orfs_flow(
     name = "swerv_wrapper",
-    stage_args = {
+    stage_arguments = {
         "synth": SWERV_ALL | {
             "SYNTH_HIERARCHICAL": "1",
             "SDC_FILE": "$(location :constraints-swerv)",
@@ -153,7 +153,7 @@ MOCK_ARRAY_FLOORPLAN_PLACE = {
 orfs_flow(
     name = "MockArray",
     macros = ["Element_generate_abstract"],
-    stage_args = {
+    stage_arguments = {
         "synth": {
             "SDC_FILE": "$(location :mock-array-constraints)",
         },
@@ -222,7 +222,7 @@ mock_array_all_sources = ["designs/src/mock-array/util.tcl"]
 orfs_flow(
     name = "Element",
     abstract_stage = "route",
-    stage_args = {
+    stage_arguments = {
         "synth": MOCK_ARRAY_ELEMENT_ALL | {
             "SDC_FILE": "$(location :mock-array-constraints)",
         },

flow/MODULE.bazel

@@ -7,7 +7,7 @@ module(
 bazel_dep(name = "bazel-orfs")
 git_override(
     module_name = "bazel-orfs",
-    commit = "16eb5dd5b31bdeacc0b3006a71dbce29076e9850",
+    commit = "b12fc7a172d4211315ec36214f872595e084ab25",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 

flow/MODULE.bazel.lock

@@ -437,7 +437,7 @@ synth-report: synth
 
 .PHONY: do-synth-report
 do-synth-report:
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/synth_metrics.tcl) 2>&1 | tee $(LOG_DIR)/1_1_yosys_metrics.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/synth_metrics.tcl) 2>&1 | tee $(abspath $(LOG_DIR)/1_1_yosys_metrics.log)
 
 .PHONY: memory
 memory:
@@ -860,7 +860,7 @@ generate_abstract: $(RESULTS_DIR)/6_final.gds $(RESULTS_DIR)/6_final.def  $(RESU
 .PHONY: do-generate_abstract
 do-generate_abstract:
 	mkdir -p $(LOG_DIR) $(REPORTS_DIR)
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/generate_abstract.tcl -metrics $(LOG_DIR)/generate_abstract.json) 2>&1 | tee $(LOG_DIR)/generate_abstract.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/generate_abstract.tcl -metrics $(LOG_DIR)/generate_abstract.json) 2>&1 | tee $(abspath $(LOG_DIR)/generate_abstract.log)
 
 .PHONY: clean_abstract
 clean_abstract:
@@ -878,7 +878,7 @@ $(WRAPPED_GDSOAS): $(OBJECTS_DIR)/klayout_wrap.lyt $(WRAPPED_LEFS)
 	        -rd out_file=$@ \
 	        -rd tech_file=$(OBJECTS_DIR)/klayout_wrap.lyt \
 	        -rd layer_map=$(GDS_LAYER_MAP) \
-	        -r $(UTILS_DIR)/def2stream.py) 2>&1 | tee $(LOG_DIR)/6_merge_$(basename $(notdir $@)).log
+	        -r $(UTILS_DIR)/def2stream.py) 2>&1 | tee $(abspath $(LOG_DIR)/6_merge_$(basename $(notdir $@)).log)
 
 # Merge GDS using Klayout
 #-------------------------------------------------------------------------------
@@ -896,7 +896,7 @@ do-gds-merged:
 	        -rd out_file=$(GDS_MERGED_FILE) \
 	        -rd tech_file=$(OBJECTS_DIR)/klayout.lyt \
 	        -rd layer_map=$(GDS_LAYER_MAP) \
-	        -r $(UTILS_DIR)/def2stream.py) 2>&1 | tee $(LOG_DIR)/6_1_merge.log
+	        -r $(UTILS_DIR)/def2stream.py) 2>&1 | tee $(abspath $(LOG_DIR)/6_1_merge.log)
 
 $(RESULTS_DIR)/6_final.v: $(LOG_DIR)/6_report.log
 
@@ -916,15 +916,15 @@ ifneq ($(KLAYOUT_DRC_FILE),)
 	$(call KLAYOUT_FOUND)
 	($(TIME_CMD) $(KLAYOUT_CMD) -zz -rd in_gds="$<" \
 	        -rd report_file=$(abspath $@) \
-	        -r $(KLAYOUT_DRC_FILE)) 2>&1 | tee $(LOG_DIR)/6_drc.log
+	        -r $(KLAYOUT_DRC_FILE)) 2>&1 | tee $(abspath $(LOG_DIR)/6_drc.log)
 	# Hacky way of getting DRV count (don't error on no matches)
 	grep -c "<value>" $@ > $(REPORTS_DIR)/6_drc_count.rpt || [[ $$? == 1 ]]
 else
 	echo "DRC not supported on this platform" > $@
 endif
 
 $(RESULTS_DIR)/6_final.cdl: $(RESULTS_DIR)/6_final.v
-	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/cdl.tcl) 2>&1 | tee $(LOG_DIR)/6_cdl.log
+	($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/cdl.tcl) 2>&1 | tee $(abspath $(LOG_DIR)/6_cdl.log)
 
 $(OBJECTS_DIR)/6_final_concat.cdl: $(RESULTS_DIR)/6_final.cdl $(CDL_FILE)
 	cat $^ > $@
@@ -938,7 +938,7 @@ ifneq ($(KLAYOUT_LVS_FILE),)
 	($(TIME_CMD) $(KLAYOUT_CMD) -b -rd in_gds="$<" \
 	        -rd cdl_file=$(abspath $(OBJECTS_DIR)/6_final_concat.cdl) \
 	        -rd report_file=$(abspath $@) \
-	        -r $(KLAYOUT_LVS_FILE)) 2>&1 | tee $(LOG_DIR)/6_lvs.log
+	        -r $(KLAYOUT_LVS_FILE)) 2>&1 | tee $(abspath $(LOG_DIR)/6_lvs.log)
 else
 	echo "LVS not supported on this platform" > $@
 endif

flow/Makefile

@@ -66,7 +66,9 @@ export ROUTING_LAYER_ADJUSTMENT = 0.45
 export MACRO_HALO_X            = 0.5
 export MACRO_HALO_Y            = 0.5
 
-export ADDITIONAL_FILES = designs/src/mock-array/util.tcl
+export ADDITIONAL_FILES = \
+ designs/src/mock-array/util.tcl \
+ designs/asap7/mock-array/macro-placement.tcl
 
 export IO_PLACER_V = M5 M7
 export IO_PLACER_H = M4 M6