remove blocks_per_type() from clustered_netlist

Author: soheilshahrouz

vpr/src/base/clustered_netlist.cpp

@@ -30,19 +30,6 @@ t_logical_block_type_ptr ClusteredNetlist::block_type(const ClusterBlockId id) c
     return block_types_[id];
 }
 
-const std::vector<ClusterBlockId>& ClusteredNetlist::blocks_per_type(const t_logical_block_type& blk_type) const {
-    // empty vector is declared static to avoid re-allocation every time the function is called
-    static std::vector<ClusterBlockId> empty_vector;
-    if (blocks_per_type_.count(blk_type.index) == 0) {
-        return empty_vector;
-    }
-
-    // the vector is returned as const reference to avoid unnecessary copies,
-    // especially that returned vectors may be very large as they contain
-    // all clustered blocks with a specific block type
-    return blocks_per_type_.at(blk_type.index);
-}
-
 ClusterNetId ClusteredNetlist::block_net(const ClusterBlockId blk_id, const int logical_pin_index) const {
     auto pin_id = block_pin(blk_id, logical_pin_index);
 
@@ -123,8 +110,6 @@ ClusterBlockId ClusteredNetlist::create_block(const char* name, t_pb* pb, t_logi
         block_pbs_.insert(blk_id, pb);
         block_types_.insert(blk_id, type);
 
-        blocks_per_type_[type->index].push_back(blk_id);
-
         //Allocate and initialize every potential pin of the block
         block_logical_pins_.insert(blk_id, std::vector<ClusterPinId>(get_max_num_pins(type), ClusterPinId::INVALID()));
     }
@@ -185,14 +170,11 @@ ClusterNetId ClusteredNetlist::create_net(const std::string& name) {
 }
 
 void ClusteredNetlist::remove_block_impl(const ClusterBlockId blk_id) {
-    //find the block type, so we can remove it from blocks_per_type_ data structure
-    auto blk_type = block_type(blk_id);
     //Remove & invalidate pointers
     free_pb(block_pbs_[blk_id]);
     delete block_pbs_[blk_id];
     block_pbs_.insert(blk_id, NULL);
     block_types_.insert(blk_id, NULL);
-    std::remove(blocks_per_type_[blk_type->index].begin(), blocks_per_type_[blk_type->index].end(), blk_id);
     block_logical_pins_.insert(blk_id, std::vector<ClusterPinId>());
 }
 

vpr/src/base/clustered_netlist.h

@@ -134,9 +134,6 @@ class ClusteredNetlist : public Netlist<ClusterBlockId, ClusterPortId, ClusterPi
     ///@brief Returns the type of CLB (Logic block, RAM, DSP, etc.)
     t_logical_block_type_ptr block_type(const ClusterBlockId id) const;
 
-    ///@brief Returns the blocks with the specific block types in the netlist
-    const std::vector<ClusterBlockId>& blocks_per_type(const t_logical_block_type& blk_type) const;
-
     ///@brief Returns the net of the block attached to the specific pin index
     ClusterNetId block_net(const ClusterBlockId blk_id, const int pin_index) const;
 

vpr/src/place/initial_placement.cpp

@@ -1157,7 +1157,6 @@ bool place_one_block(const ClusterBlockId& blk_id,
 static void alloc_and_load_movable_blocks() {
     auto& place_ctx = g_vpr_ctx.mutable_placement();
     auto& cluster_ctx = g_vpr_ctx.clustering();
-    auto& device_ctx = g_vpr_ctx.device();
 
     place_ctx.movable_blocks.clear();
     place_ctx.movable_blocks_per_type.clear();

vpr/src/place/place.cpp

@@ -4369,14 +4369,13 @@ static void print_placement_move_types_stats(
     }
 
     auto& device_ctx = g_vpr_ctx.device();
-    auto& cluster_ctx = g_vpr_ctx.clustering();
     int count = 0;
     int num_of_avail_moves = move_type_stat.blk_type_moves.size() / device_ctx.logical_block_types.size();
 
     //Print placement information for each block type
     for (const auto& itype : device_ctx.logical_block_types) {
         //Skip non-existing block types in the netlist
-        if (itype.index == 0 || cluster_ctx.clb_nlist.blocks_per_type(itype).empty()) {
+        if (itype.index == 0 || movable_blocks_per_type(itype).empty()) {
             continue;
         }
 

vpr/src/place/simpleRL_move_generator.cpp

@@ -302,7 +302,6 @@ t_propose_action SoftmaxAgent::propose_action() {
 }
 
 void SoftmaxAgent::set_block_ratio_() {
-    auto& cluster_ctx = g_vpr_ctx.clustering();
     const auto& place_ctx = g_vpr_ctx.placement();
     size_t num_movable_total_blocks = place_ctx.movable_blocks.size();