Added missing information in clock rr nodes

 - fixes previous valgrid errors in clock code and segfaults

Author: mustafabbas

vpr/src/route/clock_network_types.cpp

@@ -55,7 +55,7 @@ ClockType ClockRib::get_network_type() const {
  * ClockRib (setters)
  */
 
-void ClockRib::set_metal_layer(int r_metal, int c_metal) {
+void ClockRib::set_metal_layer(float r_metal, float c_metal) {
     x_chan_wire.layer.r_metal = r_metal;
     x_chan_wire.layer.c_metal = c_metal;
 }
@@ -149,6 +149,10 @@ int ClockRib::create_chanx_wire(
     rr_nodes[node_index].set_type(CHANX);
     rr_nodes[node_index].set_capacity(1);
     rr_nodes[node_index].set_ptc_num(ptc_num);
+    rr_nodes[node_index].set_cost_index(CHANX_COST_INDEX_START);
+    auto rc_index = find_create_rr_rc_data(x_chan_wire.layer.r_metal, x_chan_wire.layer.c_metal);
+    rr_nodes[node_index].set_rc_index(rc_index);
+//    rr_nodes[node_index].set_direction(); // TODO: set direction, can look into how alloc_alloc_and_load_seg_details() does it in rr_graph2.cpp
 
     return node_index;
 }
@@ -185,7 +189,7 @@ ClockType ClockSpine::get_network_type() const {
  * ClockSpine (setters)
  */
 
-void ClockSpine::set_metal_layer(int r_metal, int c_metal) {
+void ClockSpine::set_metal_layer(float r_metal, float c_metal) {
     y_chan_wire.layer.r_metal = r_metal;
     y_chan_wire.layer.c_metal = c_metal;
 }
@@ -279,6 +283,10 @@ int ClockSpine::create_chany_wire(
     rr_nodes[node_index].set_type(CHANY);
     rr_nodes[node_index].set_capacity(1);
     rr_nodes[node_index].set_ptc_num(ptc_num);
+    auto rc_index = find_create_rr_rc_data(y_chan_wire.layer.r_metal, y_chan_wire.layer.c_metal);
+    rr_nodes[node_index].set_rc_index(rc_index);
+    rr_nodes[node_index].set_cost_index(CHANX_COST_INDEX_START); //TODO: Why not chany
+//    rr_nodes[node_index].set_direction(); // TODO: set direction, can look into how alloc_alloc_and_load_seg_details() does it in rr_graph2.cpp
 
     return node_index;
 }

vpr/src/route/clock_network_types.h

@@ -128,7 +128,7 @@ class ClockRib : public ClockNetwork {
         /*
          * Setters
          */
-        void set_metal_layer(int r_metal, int c_metal);
+        void set_metal_layer(float r_metal, float c_metal);
         void set_initial_wire_location(int start_x, int end_x, int y);
         void set_wire_repeat(int repeat_x, int repeat_y);
         void set_drive_location(int offset_x);
@@ -178,7 +178,7 @@ class ClockSpine : public ClockNetwork {
         /*
          * Setters
          */
-        void set_metal_layer(int r_metal, int c_metal);
+        void set_metal_layer(float r_metal, float c_metal);
         void set_initial_wire_location(int start_y, int end_y, int x);
         void set_wire_repeat(int repeat_x, int repeat_y);
         void set_drive_location(int offset_y);

vpr/src/route/rr_graph_clock.cpp

@@ -22,7 +22,7 @@ void ClockRRGraph::create_and_append_clock_rr_graph() {
 
     rib->set_num_instance(3);
     rib->set_clock_name("rib1");
-    rib->set_metal_layer(0, 0);
+    rib->set_metal_layer(405, 0.00000116);
     rib->set_initial_wire_location(0, 19, 0);
     rib->set_wire_repeat(17, 1);
     rib->set_drive_location(10);
@@ -37,7 +37,7 @@ void ClockRRGraph::create_and_append_clock_rr_graph() {
 
     spine->set_num_instance(3);
     spine->set_clock_name("spine1");
-    spine->set_metal_layer(0,0);
+    spine->set_metal_layer(405,0.00000116);
     spine->set_initial_wire_location(0, 19, 10);
     spine->set_wire_repeat(19,19);
     spine->set_drive_location(10);
@@ -227,6 +227,8 @@ std::set<std::pair<int, int>> SwitchPoint::get_switch_locations() const {
 
     return locations;
 }
+
+
 //void ClockRRGraph::create_star_model_network() {
 //
 //    vtr::printf_info("Creating a clock network in the form of a star model\n");