rename device_ctx.read_rr_graph_filename to loaded_rr_graph_filename and pass the correct argument to load_rr_file

Author: soheilshahrouz

libs/librrgraph/src/io/rr_graph_reader.cpp

@@ -54,7 +54,7 @@ void load_rr_file(RRGraphBuilder* rr_graph_builder,
                   int* wire_to_rr_ipin_switch,
                   int* wire_to_rr_ipin_switch_between_dice,
                   const char* read_rr_graph_name,
-                  std::string* read_rr_graph_filename,
+                  std::string* loaded_rr_graph_filename,
                   bool read_edge_metadata,
                   bool do_check_rr_graph,
                   bool echo_enabled,
@@ -75,7 +75,7 @@ void load_rr_file(RRGraphBuilder* rr_graph_builder,
         wire_to_rr_ipin_switch_between_dice,
         do_check_rr_graph,
         read_rr_graph_name,
-        read_rr_graph_filename,
+        loaded_rr_graph_filename,
         read_edge_metadata,
         echo_enabled,
         echo_file_name,

libs/librrgraph/src/io/rr_graph_reader.h

@@ -28,7 +28,7 @@ void load_rr_file(RRGraphBuilder* rr_graph_builder,
                   int* wire_to_rr_ipin_switch,
                   int* wire_to_rr_ipin_switch_between_dice,
                   const char* read_rr_graph_name,
-                  std::string* read_rr_graph_filename,
+                  std::string* loaded_rr_graph_filename,
                   bool read_edge_metadata,
                   bool do_check_rr_graph,
                   bool echo_enabled,

libs/librrgraph/src/io/rr_graph_uxsdcxx_serializer.h

@@ -276,7 +276,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         int* wire_to_rr_ipin_switch_between_dice,
         bool do_check_rr_graph,
         const char* read_rr_graph_name,
-        std::string* read_rr_graph_filename,
+        std::string* loaded_rr_graph_filename,
         bool read_edge_metadata,
         bool echo_enabled,
         const char* echo_file_name,
@@ -303,7 +303,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         , rr_graph_(rr_graph)
         , rr_switch_inf_(rr_switch_inf)
         , rr_indexed_data_(rr_indexed_data)
-        , read_rr_graph_filename_(read_rr_graph_filename)
+        , loaded_rr_graph_filename_(loaded_rr_graph_filename)
         , rr_rc_data_(rr_rc_data)
         , graph_type_(graph_type)
         , base_cost_type_(base_cost_type)
@@ -1825,9 +1825,9 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
             (*rr_indexed_data_)[RRIndexedDataId(i)].seg_index = seg_index_[RRIndexedDataId(i)];
         }
 
-        VTR_ASSERT(read_rr_graph_filename_ != nullptr);
+        VTR_ASSERT(loaded_rr_graph_filename_ != nullptr);
         VTR_ASSERT(read_rr_graph_name_ != nullptr);
-        read_rr_graph_filename_->assign(read_rr_graph_name_);
+        loaded_rr_graph_filename_->assign(read_rr_graph_name_);
 
         if (do_check_rr_graph_) {
             check_rr_graph(*rr_graph_,
@@ -2162,7 +2162,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
     vtr::vector<RRSwitchId, t_rr_switch_inf>* rr_switch_inf_;
     vtr::vector<RRIndexedDataId, t_rr_indexed_data>* rr_indexed_data_;
     t_rr_node_indices* rr_node_indices_;
-    std::string* read_rr_graph_filename_;
+    std::string* loaded_rr_graph_filename_;
     std::vector<t_rr_rc_data>* rr_rc_data_;
 
     // Constant data for loads and writes.

vpr/src/base/vpr_context.h

@@ -271,13 +271,13 @@ struct DeviceContext : public Context {
      ********************************************************************/
     t_clock_arch* clock_arch;
 
-    /**
-     * @brief Name of rrgraph file read (if any).
-     *
-     * Used to determine when reading rrgraph if file is already loaded.
-     */
-    std::string read_rr_graph_filename;
-    std::string read_rr_edge_override_filename;
+    /// @brief Name of rrgraph file read (if any).
+    /// Used to determine if the file is already loaded when reading rrgraph.
+    std::string loaded_rr_graph_filename;
+
+    /// @brief Name of rrgraph edge override file read (if any).
+    /// Used to determine if the file is already loaded when reading rrgraph edge overrides.
+    std::string loaded_rr_edge_override_filename;
 
     /*******************************************************************
      * Place Related

vpr/src/route/rr_graph.cpp

@@ -775,7 +775,7 @@ void create_rr_graph(const t_graph_type graph_type,
         }
     } else {
         if (load_rr_graph) {
-            if (device_ctx.read_rr_graph_filename != det_routing_arch->read_rr_graph_filename) {
+            if (device_ctx.loaded_rr_graph_filename != det_routing_arch->read_rr_graph_filename) {
                 free_rr_graph();
 
                 load_rr_file(&mutable_device_ctx.rr_graph_builder,
@@ -793,7 +793,7 @@ void create_rr_graph(const t_graph_type graph_type,
                              &det_routing_arch->wire_to_rr_ipin_switch,
                              &det_routing_arch->wire_to_arch_ipin_switch_between_dice,
                              det_routing_arch->read_rr_graph_filename.c_str(),
-                             &det_routing_arch->read_rr_graph_filename,
+                             &mutable_device_ctx.loaded_rr_graph_filename,
                              router_opts.read_rr_edge_metadata,
                              router_opts.do_check_rr_graph,
                              echo_enabled,
@@ -831,11 +831,16 @@ void create_rr_graph(const t_graph_type graph_type,
                            router_opts.route_verbosity);
         }
 
-        if (!det_routing_arch->read_rr_graph_filename.empty() &&
-            det_routing_arch->read_rr_graph_filename != device_ctx.read_rr_graph_filename) {
+        // Check if there is an edge override file to read and that it is not already loaded.
+        if (!det_routing_arch->read_rr_edge_override_filename.empty() &&
+            det_routing_arch->read_rr_edge_override_filename != device_ctx.loaded_rr_edge_override_filename) {
+
             load_rr_edge_overrides(det_routing_arch->read_rr_edge_override_filename,
                                    mutable_device_ctx.rr_graph_builder,
                                    device_ctx.rr_graph);
+
+            // Remember the loaded filename to avoid reloading it before the RR graph is cleared.
+            mutable_device_ctx.loaded_rr_edge_override_filename =  det_routing_arch->read_rr_edge_override_filename;
         }
     }
 
@@ -2787,7 +2792,8 @@ void free_rr_graph() {
      * allocated, as ALL the chunk allocated data is already free!           */
     auto& device_ctx = g_vpr_ctx.mutable_device();
 
-    device_ctx.read_rr_graph_filename.clear();
+    device_ctx.loaded_rr_graph_filename.clear();
+    device_ctx.loaded_rr_edge_override_filename.clear();
 
     device_ctx.rr_graph_builder.clear();