Properly skip tdms_place when MACRO_PLACEMENT_TCL is set

Also skip for RTLMP_FLOW rather than skipping inside the step

Signed-off-by: Matt Liberty <[email protected]>

Author: maliberty

flow/Makefile

@@ -511,7 +511,7 @@ endif
 
 # STEP 3: Timing Driven Mixed Sized Placement
 #-------------------------------------------------------------------------------
-ifeq ($(MACRO_PLACEMENT),)
+ifeq ($(MACRO_PLACEMENT)$(MACRO_PLACEMENT_TCL)$(RTLMP_FLOW),)
 $(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))
 else
 $(eval $(call do-copy,2_3_floorplan_tdms,2_2_floorplan_io.odb,$(RESULTS_DIR)/1_synth.v $(RESULTS_DIR)/1_synth.sdc $(LIB_FILES)))

flow/scripts/tdms_place.tcl

@@ -20,13 +20,9 @@ proc find_macros {} {
 set_dont_use $::env(DONT_USE_CELLS)
 
 if {[find_macros] != ""} {
-  if {[info exists ::env(RTLMP_FLOW)]} {
-    puts "RTLMP flow enabled. Skipping tdms place."
-  } else {
-    global_placement -density $::env(PLACE_DENSITY) \
-                   -pad_left $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT) \
-                   -pad_right $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT)
-  }
+  global_placement -density $::env(PLACE_DENSITY) \
+                 -pad_left $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT) \
+                 -pad_right $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT)
 } else {
   puts "No macros found: Skipping global_placement"
 }