[lib][rr_graph] fix switch blocks

Author: amin1377

libs/librrgraph/src/base/rr_node_types.h

@@ -57,26 +57,26 @@ constexpr vtr::array<e_rr_type, const char*, (size_t)e_rr_type::NUM_RR_TYPES> rr
                                                                                                "MUX"};
 
 inline e_rr_type get_rr_type(const std::string& type_name) {
-    switch (type_name) {
-        case "SOURCE":
-            return e_rr_type::SOURCE;
-        case "SINK":
-            return e_rr_type::SINK;
-        case "IPIN":
-            return e_rr_type::IPIN;
-        case "OPIN":
-            return e_rr_type::OPIN;
-        case "CHANX":
-            return e_rr_type::CHANX;
-        case "CHANY":
-            return e_rr_type::CHANY;
-        case "CHANZ":
-            return e_rr_type::CHANZ;
-        case "MUX":
-            return e_rr_type::MUX;
-        default:
-            VTR_ASSERT_MSG(false, "Invalid RR type name");
-            return e_rr_type::NUM_RR_TYPES;
+    if (type_name == "SOURCE") {
+        return e_rr_type::SOURCE;
+    } else if (type_name == "SINK") {
+        return e_rr_type::SINK;
+    } else if (type_name == "IPIN") {
+        return e_rr_type::IPIN;
+    } else if (type_name == "OPIN") {
+        return e_rr_type::OPIN;
+    } else if (type_name == "CHANX") {
+        return e_rr_type::CHANX;
+    } else if (type_name == "CHANY") {
+        return e_rr_type::CHANY;
+    } else if (type_name == "CHANZ") {
+        return e_rr_type::CHANZ;
+    } else if (type_name == "MUX") {
+        return e_rr_type::MUX;
+    } else {
+        std::string error_message = "Invalid RR type name: " + type_name;
+        VTR_ASSERT_MSG(false, error_message.c_str());
+        return e_rr_type::NUM_RR_TYPES;
     }
 }
 

vpr/src/base/stats.cpp

@@ -249,10 +249,10 @@ void write_sb_count_stats(const Netlist<>& net_list,
                 if (sw_template_id.empty()) {
                     continue;
                 }
-                if (sb_count.find(*sb_id) == sb_count.end()) {
-                    sb_count[*sb_id] = 0;
+                if (sb_count.find(sw_template_id) == sb_count.end()) {
+                    sb_count[sw_template_id] = 0;
                 }
-                sb_count[*sb_id]++;
+                sb_count[sw_template_id]++;
             }
         }
     }

vpr/src/route/rr_graph_generation/tileable_rr_graph/crr_generator/crr_common.h

@@ -27,22 +27,22 @@ enum class e_sw_template_dir { LEFT = 0,
                                NUM_SIDES };
 
 inline e_sw_template_dir get_sw_template_dir(const std::string& name) {
-    switch (name) {
-        case "LEFT":
-            return e_sw_template_dir::LEFT;
-        case "RIGHT":
-            return e_sw_template_dir::RIGHT;
-        case "TOP":
-            return e_sw_template_dir::TOP;
-        case "BOTTOM":
-            return e_sw_template_dir::BOTTOM;
-        case "IPIN":
-            return e_sw_template_dir::IPIN;
-        case "OPIN":
-            return e_sw_template_dir::OPIN;
-        default:
-            VTR_ASSERT_MSG(false, "Invalid switch template direction name");
-            return e_sw_template_dir::NUM_SIDES;
+    if (name == "LEFT") {
+        return e_sw_template_dir::LEFT;
+    } else if (name == "RIGHT") {
+        return e_sw_template_dir::RIGHT;
+    } else if (name == "TOP") {
+        return e_sw_template_dir::TOP;
+    } else if (name == "BOTTOM") {
+        return e_sw_template_dir::BOTTOM;
+    } else if (name == "IPIN") {
+        return e_sw_template_dir::IPIN;
+    } else if (name == "OPIN") {
+        return e_sw_template_dir::OPIN;
+    } else {
+        std::string error_message = "Invalid switch template direction name: " + name;
+        VTR_ASSERT_MSG(false, error_message.c_str());
+        return e_sw_template_dir::NUM_SIDES;
     }
 }
 constexpr vtr::array<e_sw_template_dir, const char*, (size_t)e_sw_template_dir::NUM_SIDES> template_side_name = {"LEFT", "RIGHT",