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

Author: oharboe

flow/BUILD.bazel

@@ -70,7 +70,6 @@ orfs_flow(
             "SDC_FILE": "$(location :constraints-swerv)",
         },
         "floorplan": SWERV_ALL | {
-            "RTLMP_FLOW": "1",
             "RTLMP_MAX_INST": "30000",
             "RTLMP_MIN_INST": "5000",
             "RTLMP_MAX_MACRO": "30",
@@ -144,7 +143,6 @@ MOCK_ARRAY_FLOORPLAN_PLACE = {
             "CORE_AREA": "2.16 2.16 356.40000000000003 386.64000000000004",
             "MACRO_PLACE_HALO": "0 2.16",
             "RTLMP_BOUNDARY_WT": "0",
-            "RTLMP_FLOW": "1",
             "PDN_TCL": "$(PLATFORM_DIR)/openRoad/pdn/BLOCKS_grid_strategy.tcl",
             "MACRO_HALO_X": "0.5",
             "MACRO_HALO_Y": "0.5",

flow/Makefile

@@ -233,7 +233,6 @@ ifneq ($(BLOCKS),)
   endif
 endif
 
-export RTLMP_FLOW ?= 1
 export RTLMP_RPT_DIR ?= $(OBJECTS_DIR)/rtlmp
 export RTLMP_RPT_FILE ?= partition.txt
 export RTLMP_BLOCKAGE_FILE ?= $(OBJECTS_DIR)/rtlmp/partition.txt.blockage
@@ -642,33 +641,31 @@ endef
 #-------------------------------------------------------------------------------
 $(eval $(call do-step,2_1_floorplan,$(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc $(TECH_LEF) $(SC_LEF) $(ADDITIONAL_LEFS) $(FOOTPRINT) $(SIG_MAP_FILE) $(FOOTPRINT_TCL),floorplan))
 
+# STEP 2: Random IO placement
+#-------------------------------------------------------------------------------
 $(eval $(call do-step,2_2_floorplan_io,$(RESULTS_DIR)/2_1_floorplan.odb $(IO_CONSTRAINTS),io_placement_random))
 
 $(eval $(call do-copy,2_floorplan,2_1_floorplan.sdc,,.sdc))
 
-# STEP 3: Timing Driven Mixed Sized Placement
-#-------------------------------------------------------------------------------
-$(eval $(call do-step,2_3_floorplan_tdms,$(RESULTS_DIR)/2_2_floorplan_io.odb $(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc $(LIB_FILES),tdms_place))
-
-# STEP 4: Macro Placement
+# STEP 3: Macro Placement
 #-------------------------------------------------------------------------------
-$(eval $(call do-step,2_4_floorplan_macro,$(RESULTS_DIR)/2_3_floorplan_tdms.odb $(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc $(MACRO_PLACEMENT) $(MACRO_PLACEMENT_TCL),macro_place))
+$(eval $(call do-step,2_3_floorplan_macro,$(RESULTS_DIR)/2_2_floorplan_io.odb $(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc $(MACRO_PLACEMENT) $(MACRO_PLACEMENT_TCL),macro_place))
 
-# STEP 5: Tapcell and Welltie insertion
+# STEP 4: Tapcell and Welltie insertion
 #-------------------------------------------------------------------------------
-$(eval $(call do-step,2_5_floorplan_tapcell,$(RESULTS_DIR)/2_4_floorplan_macro.odb $(TAPCELL_TCL),tapcell))
+$(eval $(call do-step,2_4_floorplan_tapcell,$(RESULTS_DIR)/2_3_floorplan_macro.odb $(TAPCELL_TCL),tapcell))
 
-# STEP 6: PDN generation
+# STEP 5: PDN generation
 #-------------------------------------------------------------------------------
-$(eval $(call do-step,2_6_floorplan_pdn,$(RESULTS_DIR)/2_5_floorplan_tapcell.odb $(PDN_TCL),pdn))
+$(eval $(call do-step,2_5_floorplan_pdn,$(RESULTS_DIR)/2_4_floorplan_tapcell.odb $(PDN_TCL),pdn))
 
-$(eval $(call do-copy,2_floorplan,2_6_floorplan_pdn.odb,))
+$(eval $(call do-copy,2_floorplan,2_5_floorplan_pdn.odb,))
 
 $(RESULTS_DIR)/2_floorplan.sdc: $(RESULTS_DIR)/2_1_floorplan.odb
 
 .PHONY: do-floorplan
 do-floorplan:
-	$(UNSET_AND_MAKE) do-2_1_floorplan do-2_2_floorplan_io do-2_3_floorplan_tdms do-2_4_floorplan_macro do-2_5_floorplan_tapcell do-2_6_floorplan_pdn do-2_floorplan
+	$(UNSET_AND_MAKE) do-2_1_floorplan do-2_2_floorplan_io do-2_3_floorplan_io do-2_4_floorplan_tapcell do-2_5_floorplan_pdn do-2_floorplan
 
 .PHONY: clean_floorplan
 clean_floorplan:

flow/scripts/macro_place.tcl

@@ -1,7 +1,7 @@
 source $::env(SCRIPTS_DIR)/load.tcl
 erase_non_stage_variables floorplan
-load_design 2_3_floorplan_tdms.odb 2_1_floorplan.sdc
+load_design 2_2_floorplan_io.odb 2_1_floorplan.sdc
 
 source $::env(SCRIPTS_DIR)/macro_place_util.tcl
 
-write_db $::env(RESULTS_DIR)/2_4_floorplan_macro.odb
+write_db $::env(RESULTS_DIR)/2_3_floorplan_macro.odb

flow/scripts/macro_place_util.tcl

@@ -35,7 +35,7 @@ if {[find_macros] != ""} {
     source $::env(SCRIPTS_DIR)/read_macro_placement.tcl
     puts "Using manual macro placement file $::env(MACRO_PLACEMENT)"
     read_macro_placement $::env(MACRO_PLACEMENT)
-  } elseif {[env_var_equals RTLMP_FLOW 1]} {
+  } else {
     puts "HierRTLMP Flow enabled..."
     set additional_rtlmp_args ""
     append_env_var additional_rtlmp_args RTLMP_MAX_LEVEL -max_num_level 1
@@ -70,10 +70,6 @@ if {[find_macros] != ""} {
     }
 
     log_cmd rtl_macro_placer {*}$all_args
-  } else {
-    macro_placement \
-      -halo $::env(MACRO_PLACE_HALO) \
-      -channel $::env(MACRO_PLACE_CHANNEL)
   }
 
   source $::env(SCRIPTS_DIR)/placement_blockages.tcl

flow/scripts/pdn.tcl

@@ -1,6 +1,6 @@
 source $::env(SCRIPTS_DIR)/load.tcl
 erase_non_stage_variables floorplan
-load_design 2_5_floorplan_tapcell.odb 2_1_floorplan.sdc
+load_design 2_4_floorplan_tapcell.odb 2_1_floorplan.sdc
 
 source $::env(PDN_TCL)
 pdngen
@@ -20,4 +20,4 @@ foreach net [$block getNets] {
     }
 }
 
-write_db $::env(RESULTS_DIR)/2_6_floorplan_pdn.odb
+write_db $::env(RESULTS_DIR)/2_5_floorplan_pdn.odb

flow/scripts/tapcell.tcl

@@ -1,12 +1,12 @@
 source $::env(SCRIPTS_DIR)/load.tcl
 erase_non_stage_variables floorplan
 
-load_design 2_4_floorplan_macro.odb 2_1_floorplan.sdc
+load_design 2_3_floorplan_macro.odb 2_1_floorplan.sdc
 
 if {[env_var_exists_and_non_empty TAPCELL_TCL]} {
     source $::env(TAPCELL_TCL)
 } else {
     cut_rows
 }
 
-write_db $::env(RESULTS_DIR)/2_5_floorplan_tapcell.odb
+write_db $::env(RESULTS_DIR)/2_4_floorplan_tapcell.odb

flow/scripts/tdms_place.tcl

@@ -200,11 +200,6 @@ TAPCELL_TCL:
     Path to Endcap and Welltie cells file.
   stages:
     - floorplan
-RTLMP_FLOW:
-  description: >
-    1 to enable the Hierarchical RTLMP flow, default empty.
-  stages:
-    - floorplan
 MACRO_PLACEMENT:
   description: >
     Specifies the path of a file on how to place certain macros manually using read_macro_placement.
@@ -222,7 +217,7 @@ MACRO_PLACE_HALO:
     - floorplan
 MACRO_PLACE_CHANNEL:
   description: >
-    Horizontal/vertical channel width between macros (microns). Used by automatic macro placement when RTLMP_FLOW is disabled.
+    Horizontal/vertical channel width between macros (microns). Used by automatic macro placement.
     Imagine channel=10 and halo=5. Then macros must be 10 apart but standard cells must be 5 away from a macro.
   stages:
     - floorplan

flow/scripts/variables.yaml

@@ -313,14 +313,13 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
     extractGnuTime("synth", metrics_dict, logPath + "/1_1_yosys.log")
     extractGnuTime("floorplan", metrics_dict, logPath + "/2_1_floorplan.log")
     extractGnuTime("floorplan_io", metrics_dict, logPath + "/2_2_floorplan_io.log")
-    extractGnuTime("floorplan_tdms", metrics_dict, logPath + "/2_3_floorplan_tdms.log")
     extractGnuTime(
-        "floorplan_macro", metrics_dict, logPath + "/2_4_floorplan_macro.log"
+        "floorplan_macro", metrics_dict, logPath + "/2_3_floorplan_macro.log"
     )
     extractGnuTime(
-        "floorplan_tap", metrics_dict, logPath + "/2_5_floorplan_tapcell.log"
+        "floorplan_tap", metrics_dict, logPath + "/2_4_floorplan_tapcell.log"
     )
-    extractGnuTime("floorplan_pdn", metrics_dict, logPath + "/2_6_floorplan_pdn.log")
+    extractGnuTime("floorplan_pdn", metrics_dict, logPath + "/2_5_floorplan_pdn.log")
     extractGnuTime(
         "globalplace_skip_io", metrics_dict, logPath + "/3_1_place_gp_skip_io.log"
     )