add noexcept to criteria

Author: soheilshahrouz

libs/libarchfpga/src/arch_util.cpp

@@ -140,14 +140,14 @@ InstPort::name_index InstPort::parse_name_index(const std::string& str) {
 
 int InstPort::num_instances() const {
     if (instance_high_index() == UNSPECIFIED || instance_low_index() == UNSPECIFIED) {
-        throw ArchFpgaError("Unspecified instance indicies");
+        throw ArchFpgaError("Unspecified instance indices");
     }
     return instance_high_index() - instance_low_index() + 1;
 }
 
 int InstPort::num_pins() const {
     if (port_high_index() == UNSPECIFIED || port_low_index() == UNSPECIFIED) {
-        throw ArchFpgaError("Unspecified port indicies");
+        throw ArchFpgaError("Unspecified port indices");
     }
     return port_high_index() - port_low_index() + 1;
 }
@@ -1011,7 +1011,7 @@ void link_physical_logical_types(std::vector<t_physical_tile_type>& PhysicalTile
         auto eq_sites_set = get_equivalent_sites_set(&physical_tile);
         auto equivalent_sites = std::vector<t_logical_block_type_ptr>(eq_sites_set.begin(), eq_sites_set.end());
 
-        auto criteria = [&physical_tile](const t_logical_block_type* lhs, const t_logical_block_type* rhs) {
+        auto criteria = [&physical_tile](const t_logical_block_type* lhs, const t_logical_block_type* rhs) noexcept {
             int num_pins = physical_tile.num_inst_pins;
 
             int lhs_num_logical_pins = lhs->pb_type->num_pins;
@@ -1048,7 +1048,7 @@ void link_physical_logical_types(std::vector<t_physical_tile_type>& PhysicalTile
         std::unordered_map<int, bool> ignored_pins_check_map;
         std::unordered_map<int, bool> global_pins_check_map;
 
-        auto criteria = [&logical_block](const t_physical_tile_type* lhs, const t_physical_tile_type* rhs) {
+        auto criteria = [&logical_block](const t_physical_tile_type* lhs, const t_physical_tile_type* rhs) noexcept {
             int num_logical_pins = logical_block.pb_type->num_pins;
 
             int lhs_num_pins = lhs->num_inst_pins;
@@ -1063,7 +1063,7 @@ void link_physical_logical_types(std::vector<t_physical_tile_type>& PhysicalTile
         std::ranges::stable_sort(equivalent_tiles, criteria);
 
         for (int pin = 0; pin < logical_block.pb_type->num_pins; pin++) {
-            for (auto& tile : equivalent_tiles) {
+            for (t_physical_tile_type_ptr tile : equivalent_tiles) {
                 auto direct_maps = tile->tile_block_pin_directs_map.at(logical_block.index);
 
                 for (auto& sub_tile : tile->sub_tiles) {

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -2632,12 +2632,12 @@ static void process_block_type_locs(t_grid_def& grid_def,
                                     const pugiutil::loc_data& loc_data) {
     //Process all the block location specifications
     for (pugi::xml_node loc_spec_tag : layout_block_type_tag.children()) {
-        const char* loc_type = loc_spec_tag.name();
+        std::string_view loc_type = loc_spec_tag.name();
 
         // There are multiple attributes that are shared by every other tag that interposer
         // tags do not have. For this reason we check if loc_spec_tag is an interposer tag
         // and switch code paths if it is.
-        if (loc_type == std::string("interposer_cut")) {
+        if (loc_type == "interposer_cut") {
             if (grid_def.grid_type == e_grid_def_type::AUTO) {
                 archfpga_throw(loc_data.filename_c_str(), loc_data.line(loc_spec_tag), "Interposers are not currently supported for auto sized devices.");
             }
@@ -2658,7 +2658,7 @@ static void process_block_type_locs(t_grid_def& grid_def,
         int priority = get_attribute(loc_spec_tag, "priority", loc_data).as_int();
         t_metadata_dict meta = process_meta_data(strings, loc_spec_tag, loc_data);
 
-        if (loc_type == std::string("perimeter")) {
+        if (loc_type == "perimeter") {
             expect_only_attributes(loc_spec_tag, {"type", "priority"}, loc_data);
 
             //The edges
@@ -2697,7 +2697,7 @@ static void process_block_type_locs(t_grid_def& grid_def,
             grid_def.layers.at(die_number).loc_defs.emplace_back(std::move(top_edge));
             grid_def.layers.at(die_number).loc_defs.emplace_back(std::move(bottom_edge));
 
-        } else if (loc_type == std::string("corners")) {
+        } else if (loc_type == "corners") {
             expect_only_attributes(loc_spec_tag, {"type", "priority"}, loc_data);
 
             //The corners
@@ -2736,7 +2736,7 @@ static void process_block_type_locs(t_grid_def& grid_def,
             grid_def.layers.at(die_number).loc_defs.emplace_back(std::move(bottom_right));
             grid_def.layers.at(die_number).loc_defs.emplace_back(std::move(top_right));
 
-        } else if (loc_type == std::string("fill")) {
+        } else if (loc_type == "fill") {
             expect_only_attributes(loc_spec_tag, {"type", "priority"}, loc_data);
 
             t_grid_loc_def fill(type_name, priority);
@@ -2750,7 +2750,7 @@ static void process_block_type_locs(t_grid_def& grid_def,
 
             grid_def.layers.at(die_number).loc_defs.emplace_back(std::move(fill));
 
-        } else if (loc_type == std::string("single")) {
+        } else if (loc_type == "single") {
             expect_only_attributes(loc_spec_tag, {"type", "priority", "x", "y"}, loc_data);
 
             t_grid_loc_def single(type_name, priority);
@@ -2764,7 +2764,7 @@ static void process_block_type_locs(t_grid_def& grid_def,
 
             grid_def.layers.at(die_number).loc_defs.emplace_back(std::move(single));
 
-        } else if (loc_type == std::string("col")) {
+        } else if (loc_type == "col") {
             expect_only_attributes(loc_spec_tag, {"type", "priority", "startx", "repeatx", "starty", "incry"}, loc_data);
 
             t_grid_loc_def col(type_name, priority);
@@ -2794,7 +2794,7 @@ static void process_block_type_locs(t_grid_def& grid_def,
 
             grid_def.layers.at(die_number).loc_defs.emplace_back(std::move(col));
 
-        } else if (loc_type == std::string("row")) {
+        } else if (loc_type == "row") {
             expect_only_attributes(loc_spec_tag, {"type", "priority", "starty", "repeaty", "startx", "incrx"}, loc_data);
 
             t_grid_loc_def row(type_name, priority);
@@ -2823,7 +2823,7 @@ static void process_block_type_locs(t_grid_def& grid_def,
             row.meta = row.owned_meta.get();
 
             grid_def.layers.at(die_number).loc_defs.emplace_back(std::move(row));
-        } else if (loc_type == std::string("region")) {
+        } else if (loc_type == "region") {
             expect_only_attributes(loc_spec_tag,
                                    {"type", "priority",
                                     "startx", "endx", "repeatx", "incrx",
@@ -4094,12 +4094,12 @@ static void process_bend(pugi::xml_node node, t_segment_inf& segment, const int
     std::vector<int>& part_len = segment.part_len;
     bool& is_bend = segment.is_bend;
 
-    std::string tmp = std::string(get_attribute(node, "type", loc_data).value());
+    std::string tmp = get_attribute(node, "type", loc_data).value();
     if (tmp == "pattern") {
         int i = 0;
 
-        /* Get the content string */
-        std::string content = std::string(node.child_value());
+        // Get the content string
+        std::string content = node.child_value();
         for (char c : content) {
             switch (c) {
                 case ' ':

vpr/src/base/load_flat_place.cpp

@@ -187,7 +187,7 @@ FlatPlacementInfo read_flat_placement(const std::string& read_flat_place_file_pa
 }
 
 /* ingests and legalizes a flat placement file  */
-bool load_flat_placement(t_vpr_setup& vpr_setup, const t_arch& arch) {
+bool load_flat_placement(const t_vpr_setup& vpr_setup, const t_arch& arch) {
     VTR_LOG("load_flat_placement(); when implemented, this function:");
     VTR_LOG("\n\tLoads flat placement file: %s, ", vpr_setup.FileNameOpts.FlatPlaceFile.c_str());
     VTR_LOG("\n\tArch id: %s, ", arch.architecture_id.c_str());

vpr/src/base/load_flat_place.h

@@ -59,7 +59,7 @@ FlatPlacementInfo read_flat_placement(const std::string& read_flat_place_file_pa
 /**
  * @brief A function that loads and legalizes a flat placement file
  */
-bool load_flat_placement(t_vpr_setup& vpr_setup, const t_arch& arch);
+bool load_flat_placement(const t_vpr_setup& vpr_setup, const t_arch& arch);
 
 /**
  * @brief Logs information on the quality of the clustering and placement