Merge branch 'master' into secure-yosys0.45_new

Author: eder-matheus

flow/Makefile

@@ -540,7 +540,8 @@ do-yosys:
 .PHONY: do-yosys-canonicalize
 do-yosys-canonicalize: yosys-dependencies
 	mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR) $(OBJECTS_DIR)
-	($(TIME_CMD) $(YOSYS_EXE) $(YOSYS_FLAGS) -c $(SCRIPTS_DIR)/synth_canonicalize.tcl) 2>&1 | tee $(abspath $(LOG_DIR)/1_1_yosys_canonicalize.log)
+	# NOTE! YOSYS_FLAGS is omitted here because "-v 3" silences helpful error messages
+	($(TIME_CMD) $(YOSYS_EXE) -c $(SCRIPTS_DIR)/synth_canonicalize.tcl) 2>&1 | tee $(abspath $(LOG_DIR)/1_1_yosys_canonicalize.log)
 
 $(RESULTS_DIR)/1_synth.rtlil: $(YOSYS_DEPENDENCIES)
 	$(UNSET_AND_MAKE) do-yosys-canonicalize
@@ -697,17 +698,7 @@ endif
 
 # STEP 3: Timing Driven Mixed Sized Placement
 #-------------------------------------------------------------------------------
-ifneq ($(MACRO_PLACEMENT)$(MACRO_PLACEMENT_TCL),)
-SKIP_TDMS:=1
-endif
-ifeq ($(RTLMP_FLOW), 1)
-SKIP_TDMS:=1
-endif
-ifneq ($(SKIP_TDMS), 1)
 $(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)))
-endif
 
 # STEP 4: Macro Placement
 #-------------------------------------------------------------------------------

flow/scripts/floorplan.tcl

@@ -40,13 +40,7 @@ set num_instances [llength [get_cells -hier *]]
 puts "number instances in verilog is $num_instances"
 
 set additional_args ""
-if { [info exists ::env(ADDITIONAL_SITES)]} {
-  append additional_args " -additional_sites $::env(ADDITIONAL_SITES)"
-}
-
-proc env_var_exists_and_non_empty {env_var} {
-    return [expr {[info exists ::env($env_var)] && ![string equal $::env($env_var) ""]}]
-}
+append_env_var additional_args ADDITIONAL_SITES -additional_sites 1
 
 set use_floorplan_def [env_var_exists_and_non_empty FLOORPLAN_DEF]
 set use_footprint [env_var_exists_and_non_empty FOOTPRINT]
@@ -97,27 +91,27 @@ if {$use_floorplan_def} {
     exit 1
 }
 
-if { [info exists ::env(MAKE_TRACKS)] } {
+if { [env_var_exists_and_non_empty MAKE_TRACKS] } {
   source $::env(MAKE_TRACKS)
 } elseif {[file exists $::env(PLATFORM_DIR)/make_tracks.tcl]} {
   source $::env(PLATFORM_DIR)/make_tracks.tcl
 } else {
   make_tracks
 }
 
-if {[info exists ::env(FOOTPRINT_TCL)]} {
+if {[env_var_exists_and_non_empty FOOTPRINT_TCL]} {
   source $::env(FOOTPRINT_TCL)
 }
 
-if { [info exists ::env(REMOVE_ABC_BUFFERS)] && $::env(REMOVE_ABC_BUFFERS) == 1 } {
+if { [env_var_equals REMOVE_ABC_BUFFERS 1] } {
   # remove buffers inserted by yosys/abc
   remove_buffers
 } else {
   repair_timing_helper 0
 }
 
 ##### Restructure for timing #########
-if { [info exist ::env(RESYNTH_TIMING_RECOVER)] && $::env(RESYNTH_TIMING_RECOVER) == 1 } {
+if { [env_var_equals RESYNTH_TIMING_RECOVER 1] } {
   repair_design
   repair_timing
   # pre restructure area/timing report (ideal clocks)
@@ -156,7 +150,7 @@ report_units
 report_units_metric
 report_metrics 2 "floorplan final" false false
 
-if { [info exist ::env(RESYNTH_AREA_RECOVER)] && $::env(RESYNTH_AREA_RECOVER) == 1 } {
+if { [env_var_equals RESYNTH_AREA_RECOVER 1] } {
 
   utl::push_metrics_stage "floorplan__{}__pre_restruct"
   set num_instances [llength [get_cells -hier *]]
@@ -194,7 +188,7 @@ if { [info exist ::env(RESYNTH_AREA_RECOVER)] && $::env(RESYNTH_AREA_RECOVER) ==
   utl::pop_metrics_stage
 }
 
-if { [info exists ::env(POST_FLOORPLAN_TCL)] } {
+if { [env_var_exists_and_non_empty POST_FLOORPLAN_TCL] } {
   source $::env(POST_FLOORPLAN_TCL)
 }
 

flow/scripts/load.tcl

@@ -126,13 +126,3 @@ proc run_equivalence_test {} {
       puts "Repair timing output passed equivalence test"
     }
 }
-
-proc append_env_var {list_name var_name prefix has_arg} {
-  upvar $list_name list
-  if {[info exist ::env($var_name)]} {
-    lappend list $prefix
-    if {$has_arg} {
-      lappend list $::env($var_name)
-    }
-  }
-}

flow/scripts/tdms_place.tcl

@@ -1,5 +1,4 @@
 source $::env(SCRIPTS_DIR)/load.tcl
-load_design 2_2_floorplan_io.odb 1_synth.sdc
 
 proc find_macros {} {
   set macros ""
@@ -17,14 +16,21 @@ proc find_macros {} {
   return $macros
 }
 
-set_dont_use $::env(DONT_USE_CELLS)
+if {!([env_var_exists_and_non_empty MACRO_PLACEMENT] ||
+      [env_var_exists_and_non_empty MACRO_PLACEMENT_TCL]) &&
+    ![env_var_equals RTLMP_FLOW 1]} {
+  load_design 2_2_floorplan_io.odb 1_synth.sdc
 
-if {[find_macros] != ""} {
-  global_placement -density $::env(PLACE_DENSITY) \
-                 -pad_left $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT) \
-                 -pad_right $::env(CELL_PAD_IN_SITES_GLOBAL_PLACEMENT)
+  set_dont_use $::env(DONT_USE_CELLS)
+
+  if {[find_macros] != ""} {
+    log_cmd 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"
+  }
+  write_db $::env(RESULTS_DIR)/2_3_floorplan_tdms.odb
 } else {
-  puts "No macros found: Skipping global_placement"
+  log_cmd exec cp $::env(RESULTS_DIR)/2_2_floorplan_io.odb $::env(RESULTS_DIR)/2_3_floorplan_tdms.odb
 }
-
-write_db $::env(RESULTS_DIR)/2_3_floorplan_tdms.odb

flow/scripts/util.tcl

@@ -64,3 +64,21 @@ proc find_sdc_file {input_file} {
     }
     return [list $design_stage $sdc_file]
 }
+
+proc env_var_equals {env_var value} {
+    return [expr {[info exists ::env($env_var)] && $::env($env_var) == $value}]
+}
+
+proc env_var_exists_and_non_empty {env_var} {
+    return [expr {[info exists ::env($env_var)] && ![string equal $::env($env_var) ""]}]
+}
+
+proc append_env_var {list_name var_name prefix has_arg} {
+  upvar $list_name list
+  if {[info exist ::env($var_name)]} {
+    lappend list $prefix
+    if {$has_arg} {
+      lappend list $::env($var_name)
+    }
+  }
+}