Misc fixes and comments

Signed-off-by: Maciej Dudek <[email protected]>

Author: mtdudek

libs/libarchfpga/src/fpga_interchange_arch_utils.cpp

@@ -76,3 +76,24 @@ float get_corner_value(DeviceResources::Device::CornerModel::Reader model, const
     }
     return 0.;
 }
+
+void fill_switch(t_rr_switch_inf& switch_,
+                 float R,
+                 float Cin,
+                 float Cout,
+                 float Cinternal,
+                 float Tdel,
+                 float mux_trans_size,
+                 float buf_size,
+                 char* name,
+                 SwitchType type) {
+    switch_.R = R;
+    switch_.Cin = Cin;
+    switch_.Cout = Cout;
+    switch_.Cinternal = Cinternal;
+    switch_.Tdel = Tdel;
+    switch_.mux_trans_size = mux_trans_size;
+    switch_.buf_size = buf_size;
+    switch_.name = name;
+    switch_.set_type(type);
+}

libs/libarchfpga/src/fpga_interchange_arch_utils.h

@@ -34,6 +34,17 @@ extern "C" {
 
 float get_corner_value(DeviceResources::Device::CornerModel::Reader model, const char* speed_model, const char* value);
 
+void fill_switch(t_rr_switch_inf& switch_,
+                 float R,
+                 float Cin,
+                 float Cout,
+                 float Cinternal,
+                 float Tdel,
+                 float mux_trans_size,
+                 float buf_size,
+                 char* name,
+                 SwitchType type);
+
 #ifdef __cplusplus
 }
 #endif

libs/libarchfpga/src/read_fpga_interchange_arch.cpp

@@ -183,6 +183,29 @@ static t_pin_to_pin_annotation get_pack_pattern(std::string pp_name, std::string
     return pp;
 }
 
+void add_segment_with_default_values(t_segment_inf& seg, std::string name) {
+    // Use default values as we will populate rr_graph with correct values
+    // This segments are just declaration of future use
+    seg.name = name;
+    seg.length = 1;
+    seg.frequency = 1;
+    seg.Rmetal = 1e-12;
+    seg.Cmetal = 1e-12;
+    seg.parallel_axis = BOTH_AXIS;
+
+    // TODO: Only bi-directional segments are created, but it the interchange format
+    //       has directionality information on PIPs, which may be used to infer the
+    //       segments' directonality.
+    seg.directionality = BI_DIRECTIONAL;
+    seg.arch_wire_switch = 1;
+    seg.arch_opin_switch = 1;
+    seg.cb.resize(1);
+    seg.cb[0] = true;
+    seg.sb.resize(2);
+    seg.sb[0] = true;
+    seg.sb[1] = true;
+}
+
 /****************** End Utility functions ******************/
 
 struct ArchReader {
@@ -2370,29 +2393,6 @@ struct ArchReader {
         }
     }
 
-    void add_segment_with_default_values(t_segment_inf& seg, std::string name) {
-        // Use default values as we will populate rr_graph with correct values
-        // This segments are just declaration of future use
-        seg.name = name;
-        seg.length = 1;
-        seg.frequency = 1;
-        seg.Rmetal = 1e-12;
-        seg.Cmetal = 1e-12;
-        seg.parallel_axis = BOTH_AXIS;
-
-        // TODO: Only bi-directional segments are created, but it the interchange format
-        //       has directionality information on PIPs, which may be used to infer the
-        //       segments' directonality.
-        seg.directionality = BI_DIRECTIONAL;
-        seg.arch_wire_switch = 1;
-        seg.arch_opin_switch = 1;
-        seg.cb.resize(1);
-        seg.cb[0] = true;
-        seg.sb.resize(2);
-        seg.sb[0] = true;
-        seg.sb[1] = true;
-    }
-
     void process_segments() {
         // Segment names will be taken from wires connected to pips
         // They are good representation for nodes

vpr/src/route/rr_graph.cpp

@@ -318,7 +318,7 @@ void create_rr_graph(const t_graph_type graph_type,
     auto& mutable_device_ctx = g_vpr_ctx.mutable_device();
 
     if (!det_routing_arch->read_rr_graph_filename.empty() || router_opts.FPGAInterchange) {
-        if (device_ctx.read_rr_graph_filename != det_routing_arch->read_rr_graph_filename && !router_opts.FPGAInterchange) {
+        if (device_ctx.read_rr_graph_filename != det_routing_arch->read_rr_graph_filename) {
             free_rr_graph();
 
             load_rr_file(graph_type,
@@ -343,6 +343,7 @@ void create_rr_graph(const t_graph_type graph_type,
                                             segment_inf,
                                             router_opts.base_cost_type,
                                             &det_routing_arch->wire_to_rr_ipin_switch,
+                                            det_routing_arch->read_rr_graph_filename,
                                             router_opts.do_check_rr_graph);
             if (router_opts.reorder_rr_graph_nodes_algorithm != DONT_REORDER) {
                 mutable_device_ctx.rr_graph_builder.reorder_nodes(router_opts.reorder_rr_graph_nodes_algorithm,