Created operator int() for vtr::StrongId

Author: Nathan Shreve

libs/librrgraph/src/base/rr_spatial_lookup.cpp

@@ -272,11 +272,11 @@ void RRSpatialLookup::add_node(RRNodeId node,
 
     if (size_t(ptc) >= rr_node_indices_[type][layer][x][y][side].size()) {
         /* Deposit invalid ids to newly allocated elements while original elements are untouched */
-        rr_node_indices_[type][layer][x][y][side].resize(ptc + 1, int(size_t(RRNodeId::INVALID())));
+        rr_node_indices_[type][layer][x][y][side].resize(ptc + 1, int(RRNodeId::INVALID()));
     }
 
     /* Resize on demand finished; Register the node */
-    rr_node_indices_[type][layer][x][y][side][ptc] = int(size_t(node));
+    rr_node_indices_[type][layer][x][y][side][ptc] = int(node);
 }
 
 bool RRSpatialLookup::remove_node(RRNodeId node,
@@ -302,7 +302,7 @@ bool RRSpatialLookup::remove_node(RRNodeId node,
     if ((size_t)y >= rr_node_indices_[type].dim_size(2)) return false;
     if (side >= rr_node_indices_[type].dim_size(3)) return false;
     if ((size_t)ptc >= rr_node_indices_[type][layer][x][y][side].size()) return false;
-    if (rr_node_indices_[type][layer][x][y][side][ptc] != int(size_t(node))) return false;
+    if (rr_node_indices_[type][layer][x][y][side][ptc] != int(node)) return false;
 
     // The node was in the spatial lookup; remove it. -1 corresponds to an invalid node id,
     // and so is treated as absent in the spatial lookup

libs/libvtrutil/src/vtr_strong_id.h

@@ -200,6 +200,9 @@ class StrongId {
     /// @brief Allow explicit conversion to size_t (e.g. my_vector[size_t(strong_id)])
     explicit constexpr operator std::size_t() const { return static_cast<std::size_t>(id_); }
 
+    /// @brief Allow explicit conversion to int (int(RRNodeId::INVALID()) == -1)
+    explicit constexpr operator int() const { return static_cast<int>(id_); }
+
     /// @brief To enable hashing Ids
     friend std::hash<StrongId<tag, T, sentinel>>;
 

vpr/src/place/place.cpp

@@ -212,7 +212,7 @@ std::unique_ptr<FILE, decltype(&vtr::fclose)> f_move_stats_file(nullptr,
                         "%s,%s,"                                                               \
                         "%d,",                                                                 \
                         t,                                                                     \
-                        int(size_t(b_from)), int(size_t(b_to)),                                \
+                        int(b_from), int(b_to),                                                \
                         from_type->name, (to_type ? to_type->name : "EMPTY"),                  \
                         affected_blocks.num_moved_blocks);                                     \
             }                                                                                  \

vpr/src/route/route_common.cpp

@@ -532,7 +532,7 @@ load_net_terminal_groups(const RRGraphView& rr_graph,
                 /* TODO: net_terminal_groups cannot be fully RRNodeId - ified, because this code calls libarchfpga which 
                  * I think should not be aware of RRNodeIds. Fixing this requires some refactoring to lift the offending functions 
                  * into VPR. */
-                std::vector<int> new_group = {int(size_t(rr_node_num))};
+                std::vector<int> new_group = {int(rr_node_num)};
                 int new_group_num = net_terminal_groups[net_id].size();
                 net_terminal_groups[net_id].push_back(new_group);
                 net_terminal_group_num[net_id][pin_count] = new_group_num;

vpr/src/route/route_debug.cpp

@@ -13,7 +13,7 @@ void enable_router_debug(
     bool active_iteration_debug = (router_opts.router_debug_iteration >= 0);
 
     bool match_net = (ParentNetId(router_opts.router_debug_net) == net || router_opts.router_debug_net == -1);
-    bool match_sink = (router_opts.router_debug_sink_rr == int(size_t((sink_rr))) || router_opts.router_debug_sink_rr < 0);
+    bool match_sink = (router_opts.router_debug_sink_rr == int(sink_rr) || router_opts.router_debug_sink_rr < 0);
     bool match_iteration = (router_opts.router_debug_iteration == router_iteration || router_opts.router_debug_iteration < 0);
 
     f_router_debug = active_net_debug || active_sink_debug || active_iteration_debug;