Clock Modeling: Refactored load_rr_switch_inf for code reuse

Author: mustafabbas

vpr/src/route/rr_graph.cpp

@@ -851,32 +851,44 @@ static void load_rr_switch_inf(const int num_arch_switches, const float R_minW_n
             // setup device_ctx.switch_fanin_remap, for future swich usage analysis
             device_ctx.switch_fanin_remap[i_arch_switch][fanin] = i_rr_switch;
 
-            /* figure out, by looking at the arch switch's Tdel map, what the delay of the new
-               rr switch should be */
-            double rr_switch_Tdel = device_ctx.arch_switch_inf[i_arch_switch].Tdel(fanin);
-
-            /* copy over the arch switch to rr_switch_inf[i_rr_switch], but with the changed Tdel value */
-            device_ctx.rr_switch_inf[i_rr_switch].set_type(device_ctx.arch_switch_inf[i_arch_switch].type());
-            device_ctx.rr_switch_inf[i_rr_switch].R = device_ctx.arch_switch_inf[i_arch_switch].R;
-            device_ctx.rr_switch_inf[i_rr_switch].Cin = device_ctx.arch_switch_inf[i_arch_switch].Cin;
-            device_ctx.rr_switch_inf[i_rr_switch].Cout = device_ctx.arch_switch_inf[i_arch_switch].Cout;
-            device_ctx.rr_switch_inf[i_rr_switch].Tdel = rr_switch_Tdel;
-            device_ctx.rr_switch_inf[i_rr_switch].mux_trans_size = device_ctx.arch_switch_inf[i_arch_switch].mux_trans_size;
-            if (device_ctx.arch_switch_inf[i_arch_switch].buf_size_type == BufferSize::AUTO) {
-                //Size based on resistance
-                device_ctx.rr_switch_inf[i_rr_switch].buf_size = trans_per_buf(device_ctx.arch_switch_inf[i_arch_switch].R, R_minW_nmos, R_minW_pmos);
-            } else {
-                VTR_ASSERT(device_ctx.arch_switch_inf[i_arch_switch].buf_size_type == BufferSize::ABSOLUTE);
-                //Use the specified size
-                device_ctx.rr_switch_inf[i_rr_switch].buf_size = device_ctx.arch_switch_inf[i_arch_switch].buf_size;
-            }
-            device_ctx.rr_switch_inf[i_rr_switch].name = device_ctx.arch_switch_inf[i_arch_switch].name;
-            device_ctx.rr_switch_inf[i_rr_switch].power_buffer_type = device_ctx.arch_switch_inf[i_arch_switch].power_buffer_type;
-            device_ctx.rr_switch_inf[i_rr_switch].power_buffer_size = device_ctx.arch_switch_inf[i_arch_switch].power_buffer_size;
+            add_rr_switch(i_arch_switch, i_rr_switch, fanin, R_minW_nmos, R_minW_pmos);
         }
     }
 }
 
+void add_rr_switch(
+        int arch_switch_idx,
+        int rr_switch_idx,
+        int fanin,
+        const float R_minW_nmos,
+        const float R_minW_pmos)
+{
+    auto& device_ctx = g_vpr_ctx.mutable_device();
+
+    /* figure out, by looking at the arch switch's Tdel map, what the delay of the new
+       rr switch should be */
+    double rr_switch_Tdel = device_ctx.arch_switch_inf[arch_switch_idx].Tdel(fanin);
+
+    /* copy over the arch switch to rr_switch_inf[rr_switch_idx], but with the changed Tdel value */
+    device_ctx.rr_switch_inf[rr_switch_idx].set_type(device_ctx.arch_switch_inf[arch_switch_idx].type());
+    device_ctx.rr_switch_inf[rr_switch_idx].R = device_ctx.arch_switch_inf[arch_switch_idx].R;
+    device_ctx.rr_switch_inf[rr_switch_idx].Cin = device_ctx.arch_switch_inf[arch_switch_idx].Cin;
+    device_ctx.rr_switch_inf[rr_switch_idx].Cout = device_ctx.arch_switch_inf[arch_switch_idx].Cout;
+    device_ctx.rr_switch_inf[rr_switch_idx].Tdel = rr_switch_Tdel;
+    device_ctx.rr_switch_inf[rr_switch_idx].mux_trans_size = device_ctx.arch_switch_inf[arch_switch_idx].mux_trans_size;
+    if (device_ctx.arch_switch_inf[arch_switch_idx].buf_size_type == BufferSize::AUTO) {
+        //Size based on resistance
+        device_ctx.rr_switch_inf[rr_switch_idx].buf_size = trans_per_buf(device_ctx.arch_switch_inf[arch_switch_idx].R, R_minW_nmos, R_minW_pmos);
+    } else {
+        VTR_ASSERT(device_ctx.arch_switch_inf[arch_switch_idx].buf_size_type == BufferSize::ABSOLUTE);
+        //Use the specified size
+        device_ctx.rr_switch_inf[rr_switch_idx].buf_size = device_ctx.arch_switch_inf[arch_switch_idx].buf_size;
+    }
+    device_ctx.rr_switch_inf[rr_switch_idx].name = device_ctx.arch_switch_inf[arch_switch_idx].name;
+    device_ctx.rr_switch_inf[rr_switch_idx].power_buffer_type = device_ctx.arch_switch_inf[arch_switch_idx].power_buffer_type;
+    device_ctx.rr_switch_inf[rr_switch_idx].power_buffer_size = device_ctx.arch_switch_inf[arch_switch_idx].power_buffer_size;
+}
+
 /* switch indices of each rr_node original point into the global device_ctx.arch_switch_inf array.
    now we want to remap these indices to point into the global device_ctx.rr_switch_inf array
    which contains switch info at different fan-in values */

vpr/src/route/rr_graph.h

@@ -55,5 +55,13 @@ void print_rr_node(FILE *fp, const std::vector<t_rr_node> &L_rr_node, int inode)
 
 void init_fan_in(std::vector<t_rr_node>& L_rr_node, const int num_rr_nodes);
 
+// Sets the spec for the rr_switch based on the arch switch
+void add_rr_switch(
+        int arch_switch_idx,
+        int rr_switch_idx,
+        int fanin,
+        const float R_minW_nmos,
+        const float R_minW_pmos);
+
 #endif
 

vpr/src/route/rr_graph_clock.cpp

@@ -123,32 +123,11 @@ int ClockRRGraphBuilder::add_rr_switch_from_arch_switch_inf(
     int rr_switch_idx = rr_switch_inf.size() - 1;
 
     // TODO: Add support for non fixed Tdel based on fanin information
+    //       and move assigning Tdel into add_rr_switch
     VTR_ASSERT(arch_switch_inf[arch_switch_idx].fixed_Tdel());
     int fanin = UNDEFINED;
 
-    rr_switch_inf[rr_switch_idx].set_type(arch_switch_inf[arch_switch_idx].type());
-    rr_switch_inf[rr_switch_idx].R = arch_switch_inf[arch_switch_idx].R;
-    rr_switch_inf[rr_switch_idx].Cin = arch_switch_inf[arch_switch_idx].Cin;
-    rr_switch_inf[rr_switch_idx].Cout = arch_switch_inf[arch_switch_idx].Cout;
-    rr_switch_inf[rr_switch_idx].Tdel = arch_switch_inf[arch_switch_idx].Tdel(fanin);
-    rr_switch_inf[rr_switch_idx].mux_trans_size = arch_switch_inf[arch_switch_idx].mux_trans_size;
-
-    if (device_ctx.arch_switch_inf[arch_switch_idx].buf_size_type == BufferSize::AUTO) {
-        //Size based on resistance
-        device_ctx.rr_switch_inf[rr_switch_idx].buf_size =
-            trans_per_buf(device_ctx.arch_switch_inf[arch_switch_idx].R, R_minW_nmos, R_minW_pmos);
-    } else {
-        VTR_ASSERT(device_ctx.arch_switch_inf[arch_switch_idx].buf_size_type==BufferSize::ABSOLUTE);
-        //Use the specified size
-        device_ctx.rr_switch_inf[rr_switch_idx].buf_size =
-            device_ctx.arch_switch_inf[arch_switch_idx].buf_size;
-    }
-
-    rr_switch_inf[rr_switch_idx].name = arch_switch_inf[arch_switch_idx].name;
-    rr_switch_inf[rr_switch_idx].power_buffer_type =
-        arch_switch_inf[arch_switch_idx].power_buffer_type;
-    rr_switch_inf[rr_switch_idx].power_buffer_size =
-        arch_switch_inf[arch_switch_idx].power_buffer_size;
+    add_rr_switch(arch_switch_idx, rr_switch_idx, fanin, R_minW_nmos, R_minW_pmos);
 
     return rr_switch_idx;
 }