@@ -155,7 +155,7 @@ static std::tuple<int, int, int, int, int> get_pin_index_for_inst(t_physical_til
155155 logical_block_idx = -1 ;
156156 pb_type_idx = 0 ;
157157 } else {
158- auto logical_block = get_logical_block_from_pin_physical_num (type, pin_physical_num);
158+ t_logical_block_type_ptr logical_block = get_logical_block_from_pin_physical_num (type, pin_physical_num);
159159 auto pb_type = get_pb_pin_from_pin_physical_num (type, pin_physical_num)->parent_node ->pb_type ;
160160 VTR_ASSERT (logical_block != nullptr );
161161 logical_block_idx = logical_block->index ;
@@ -682,7 +682,7 @@ std::vector<std::string> block_type_class_index_to_pin_names(t_physical_tile_typ
682682 pin_info.push_back (block_type_pin_index_to_pin_inst (type, pin_physical_num, is_flat));
683683 }
684684
685- auto cmp = [](const t_pin_inst_port& lhs, const t_pin_inst_port& rhs) {
685+ auto cmp = [](const t_pin_inst_port& lhs, const t_pin_inst_port& rhs) noexcept {
686686 return lhs.pin_physical_num < rhs.pin_physical_num ;
687687 };
688688
@@ -691,7 +691,7 @@ std::vector<std::string> block_type_class_index_to_pin_names(t_physical_tile_typ
691691
692692 // Determine ranges for each capacity instance and port pair
693693 std::map<std::tuple<int , int , int , int , int >, std::array<int , 4 >> pin_ranges;
694- for (const auto & pin_inf : pin_info) {
694+ for (const t_pin_inst_port & pin_inf : pin_info) {
695695 auto key = std::make_tuple (pin_inf.sub_tile_index , pin_inf.capacity_instance , pin_inf.logical_block_index , pin_inf.pb_type_idx , pin_inf.port_index );
696696 if (!pin_ranges.contains (key)) {
697697 pin_ranges[key][0 ] = pin_inf.pin_index_in_port ;
@@ -778,7 +778,7 @@ std::tuple<const t_sub_tile*, int> get_sub_tile_from_class_physical_num(t_physic
778778 int num_seen_class = (is_on_tile) ? 0 : (int )physical_tile->class_inf .size ();
779779 int class_num_offset = num_seen_class;
780780
781- for (auto & sub_tile : physical_tile->sub_tiles ) {
781+ for (const t_sub_tile & sub_tile : physical_tile->sub_tiles ) {
782782 int sub_tile_num_class = is_on_tile ? sub_tile.class_range .total_num () : get_sub_tile_num_internal_classes (&sub_tile);
783783 num_seen_class += sub_tile_num_class;
784784
@@ -796,8 +796,8 @@ std::tuple<const t_sub_tile*, int> get_sub_tile_from_class_physical_num(t_physic
796796
797797t_logical_block_type_ptr get_logical_block_from_class_physical_num (t_physical_tile_type_ptr physical_tile,
798798 int class_physical_num) {
799- auto pin_list = get_pin_list_from_class_physical_num (physical_tile, class_physical_num);
800- VTR_ASSERT (( int ) pin_list.size () != 0 );
799+ std::vector< int > pin_list = get_pin_list_from_class_physical_num (physical_tile, class_physical_num);
800+ VTR_ASSERT (! pin_list.empty () );
801801 return get_logical_block_from_pin_physical_num (physical_tile, pin_list[0 ]);
802802}
803803
@@ -890,7 +890,7 @@ std::tuple<const t_sub_tile*, int> get_sub_tile_from_pin_physical_num(t_physical
890890 int total_pin_counts = pin_on_tile ? 0 : physical_tile->num_pins ;
891891 int pin_offset = total_pin_counts;
892892
893- for (auto & sub_tile : physical_tile->sub_tiles ) {
893+ for (const t_sub_tile & sub_tile : physical_tile->sub_tiles ) {
894894 int sub_tile_num_pins = pin_on_tile ? sub_tile.num_phy_pins : sub_tile.total_num_internal_pins ();
895895 total_pin_counts += sub_tile_num_pins;
896896
@@ -1264,9 +1264,7 @@ bool intra_tile_nodes_connected(t_physical_tile_type_ptr physical_type,
12641264 } else {
12651265 const t_pb_graph_pin* from_pb_graph_pin = get_pb_pin_from_pin_physical_num (physical_type, pin_physical_num);
12661266
1267- auto res = from_pb_graph_pin->connected_sinks_ptc .find (sink_physical_num);
1268-
1269- if (res == from_pb_graph_pin->connected_sinks_ptc .end ()) {
1267+ if (!from_pb_graph_pin->connected_sinks_ptc .contains (sink_physical_num)) {
12701268 return false ;
12711269 } else {
12721270 return true ;
@@ -1300,7 +1298,6 @@ float get_pin_primitive_comb_delay(t_physical_tile_type_ptr physical_type,
13001298 VTR_ASSERT (pb_pin->is_primitive_pin ());
13011299
13021300 auto it = std::ranges::max_element (pb_pin->pin_timing_del_max );
1303-
13041301 if (it == pb_pin->pin_timing_del_max .end ()) {
13051302 return 0 .;
13061303 } else {
0 commit comments