fix segfault when logic block type can't be inferred

Author: soheilshahrouz

vpr/src/base/vpr_types.cpp

@@ -123,7 +123,7 @@ t_ext_pin_util_targets& t_ext_pin_util_targets::operator=(t_ext_pin_util_targets
     return *this;
 }
 
-t_ext_pin_util t_ext_pin_util_targets::get_pin_util(const std::string& block_type_name) const {
+t_ext_pin_util t_ext_pin_util_targets::get_pin_util(std::string_view block_type_name) const {
     auto itr = overrides_.find(block_type_name);
     if (itr != overrides_.end()) {
         return itr->second;
@@ -248,7 +248,7 @@ void t_pack_high_fanout_thresholds::set(const std::string& block_type_name, int
     overrides_[block_type_name] = threshold;
 }
 
-int t_pack_high_fanout_thresholds::get_threshold(const std::string& block_type_name) const {
+int t_pack_high_fanout_thresholds::get_threshold(std::string_view block_type_name) const {
     auto itr = overrides_.find(block_type_name);
     if (itr != overrides_.end()) {
         return itr->second;

vpr/src/base/vpr_types.h

@@ -28,6 +28,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <set>
+#include <string_view>
 #include "arch_types.h"
 #include "atom_netlist_fwd.h"
 #include "clustered_netlist_fwd.h"
@@ -196,7 +197,7 @@ class t_ext_pin_util_targets {
     t_ext_pin_util_targets& operator=(t_ext_pin_util_targets&& other) noexcept;
 
     ///@brief Returns the input pin util of the specified block (or default if unspecified)
-    t_ext_pin_util get_pin_util(const std::string& block_type_name) const;
+    t_ext_pin_util get_pin_util(std::string_view block_type_name) const;
 
     ///@brief Returns a string describing input/output pin utilization targets
     std::string to_string() const;
@@ -216,7 +217,7 @@ class t_ext_pin_util_targets {
 
   private:
     t_ext_pin_util defaults_;
-    std::map<std::string, t_ext_pin_util> overrides_;
+    std::map<std::string, t_ext_pin_util, std::less<>> overrides_;
 };
 
 class t_pack_high_fanout_thresholds {
@@ -227,7 +228,7 @@ class t_pack_high_fanout_thresholds {
     t_pack_high_fanout_thresholds& operator=(t_pack_high_fanout_thresholds&& other) noexcept;
 
     ///@brief Returns the high fanout threshold of the specifi  ed block
-    int get_threshold(const std::string& block_type_name) const;
+    int get_threshold(std::string_view block_type_name) const;
 
     ///@brief Returns a string describing high fanout thresholds for different block types
     std::string to_string() const;
@@ -247,7 +248,7 @@ class t_pack_high_fanout_thresholds {
 
   private:
     int default_;
-    std::map<std::string, int> overrides_;
+    std::map<std::string, int, std::less<>> overrides_;
 };
 
 /* these are defined later, but need to declare here because it is used */

vpr/src/pack/cluster_util.cpp

@@ -1382,7 +1382,6 @@ bool atom_cluster_noc_group_check(AtomBlockId blk_id,
                                   NocGroupId& temp_cluster_noc_grp_id) {
     const NocGroupId atom_noc_grp_id = g_vpr_ctx.cl_helper().atom_noc_grp_id[blk_id];
 
-
     if (temp_cluster_noc_grp_id == NocGroupId::INVALID()) {
         // the cluster does not have a NoC group
         // assign the atom's NoC group to cluster

vpr/src/pack/noc_aware_cluster_util.cpp

@@ -31,7 +31,8 @@ void update_noc_reachability_partitions(const std::vector<AtomBlockId>& noc_atom
     const auto& grid = g_vpr_ctx.device().grid;
 
     t_logical_block_type_ptr logic_block_type = infer_logic_block_type(grid);
-    const size_t high_fanout_threshold = high_fanout_thresholds.get_threshold(logic_block_type->name);
+    const char* logical_block_name = logic_block_type != nullptr ? logic_block_type->name : "";
+    const size_t high_fanout_threshold = high_fanout_thresholds.get_threshold(logical_block_name);
 
     // get the total number of atoms
     const size_t n_atoms = atom_ctx.nlist.blocks().size();

vpr/src/pack/pack.cpp

@@ -126,7 +126,6 @@ bool try_pack(t_packer_opts* packer_opts,
     int pack_iteration = 1;
     bool floorplan_regions_overfull = false;
 
-    auto constraints_backup = g_vpr_ctx.floorplanning().constraints;
     // find all NoC router atoms
     auto noc_atoms = find_noc_router_atoms();
     update_noc_reachability_partitions(noc_atoms);