Merge pull request #2373 from Pinata-Consulting/makefile-less-iffy-is-chip-code

makefile: less iffy IS_CHIP code

Author: maliberty

flow/Makefile

@@ -688,13 +688,7 @@ 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: IO Placement (random)
-#-------------------------------------------------------------------------------
-ifeq ($(IS_CHIP),1)
-$(eval $(call do-copy,2_2_floorplan_io,2_1_floorplan.odb,$(IO_CONSTRAINTS)))
-else
 $(eval $(call do-step,2_2_floorplan_io,$(RESULTS_DIR)/2_1_floorplan.odb $(IO_CONSTRAINTS),io_placement_random))
-endif
 
 # STEP 3: Timing Driven Mixed Sized Placement
 #-------------------------------------------------------------------------------
@@ -741,13 +735,7 @@ place: $(RESULTS_DIR)/3_place.odb \
 #-------------------------------------------------------------------------------
 $(eval $(call do-step,3_1_place_gp_skip_io,$(RESULTS_DIR)/2_floorplan.odb $(RESULTS_DIR)/2_floorplan.sdc $(LIB_FILES),global_place_skip_io))
 
-# STEP 2: IO placement (non-random)
-#-------------------------------------------------------------------------------
-ifeq ($(IS_CHIP),1)
-$(eval $(call do-copy,3_2_place_iop,3_1_place_gp_skip_io.odb,$(IO_CONSTRAINTS)))
-else
 $(eval $(call do-step,3_2_place_iop,$(RESULTS_DIR)/3_1_place_gp_skip_io.odb $(IO_CONSTRAINTS),io_placement))
-endif
 
 # STEP 3: Global placement with placed IOs, timing-driven, and routability-driven.
 #-------------------------------------------------------------------------------

flow/scripts/io_placement.tcl

@@ -1,6 +1,9 @@
 source $::env(SCRIPTS_DIR)/load.tcl
-load_design 3_1_place_gp_skip_io.odb 2_floorplan.sdc
 
-source $::env(SCRIPTS_DIR)/io_placement_util.tcl
-
-write_db $::env(RESULTS_DIR)/3_2_place_iop.odb
+if {![env_var_equals IS_CHIP 1]} {
+  load_design 3_1_place_gp_skip_io.odb 2_floorplan.sdc
+  source $::env(SCRIPTS_DIR)/io_placement_util.tcl
+  write_db $::env(RESULTS_DIR)/3_2_place_iop.odb
+} else {
+  log_cmd exec cp $::env(RESULTS_DIR)/3_1_place_gp_skip_io.odb $::env(RESULTS_DIR)/3_2_place_iop.odb
+}

flow/scripts/io_placement_random.tcl

@@ -1,8 +1,10 @@
 source $::env(SCRIPTS_DIR)/load.tcl
-load_design 2_1_floorplan.odb 1_synth.sdc
 
-lappend ::env(PLACE_PINS_ARGS) -random
-
-source $::env(SCRIPTS_DIR)/io_placement_util.tcl
-
-write_db $::env(RESULTS_DIR)/2_2_floorplan_io.odb
+if {![env_var_equals IS_CHIP 1]} {
+  load_design 2_1_floorplan.odb 1_synth.sdc
+  lappend ::env(PLACE_PINS_ARGS) -random
+  source $::env(SCRIPTS_DIR)/io_placement_util.tcl
+  write_db $::env(RESULTS_DIR)/2_2_floorplan_io.odb
+} else {
+  log_cmd exec cp $::env(RESULTS_DIR)/2_1_floorplan.odb $::env(RESULTS_DIR)/2_2_floorplan_io.odb
+}