Change the default_clock_network_name from extern variable to a member of the t_arch struct

Author: kimiatkh

libs/libarchfpga/src/physical_types.h

@@ -2026,6 +2026,7 @@ struct t_arch {
 
     std::string gnd_net = "$__gnd_net";
     std::string vcc_net = "$__vcc_net";
+    std::string default_clock_network_name = "clock_network";
 
     // Luts
     std::vector<t_lut_cell> lut_cells;

vpr/src/base/vpr_constraints_reader.cpp

@@ -12,7 +12,7 @@
 #include "vpr_constraints_reader.h"
 
 void load_vpr_constraints_file(const char* read_vpr_constraints_name) {
-    vtr::ScopedStartFinishTimer timer("Loading VPR constraints file");
+    vtr::ScopedStartFinishTimer timer("Reading VPR constraints from " + std::string(read_vpr_constraints_name));
 
     VprConstraintsSerializer reader;
 

vpr/src/route/clock_connection_builders.cpp

@@ -95,6 +95,7 @@ RRNodeId RoutingToClockConnection::create_virtual_clock_network_sink_node(int la
     auto& rr_graph_builder = device_ctx.rr_graph_builder;
     auto& node_lookup = device_ctx.rr_graph_builder.node_lookup();
     auto& rr_rc_data = device_ctx.rr_rc_data;
+    auto& arch = device_ctx.arch;
     rr_graph_builder.emplace_back();
     RRNodeId node_index = RRNodeId(rr_graph.num_nodes() - 1);
 
@@ -108,7 +109,7 @@ RRNodeId RoutingToClockConnection::create_virtual_clock_network_sink_node(int la
     int ptc = max_ptc + 1;
 
     rr_graph_builder.set_node_type(node_index, SINK);
-    rr_graph_builder.set_node_name(node_index, default_clock_network_name);
+    rr_graph_builder.set_node_name(node_index, arch->default_clock_network_name);
     rr_graph_builder.set_node_class_num(node_index, ptc);
     rr_graph_builder.set_node_coordinates(node_index, x, y, x, y);
     rr_graph_builder.set_node_layer(node_index, layer);

vpr/src/route/clock_network_builders.cpp

@@ -6,8 +6,6 @@
 #include "vtr_log.h"
 #include "vtr_error.h"
 
-std::string default_clock_network_name = "clock_network";
-
 void static populate_segment_values(int seg_index,
                                     std::string name,
                                     int length,

vpr/src/route/clock_network_builders.h

@@ -15,8 +15,6 @@
 class t_rr_graph_storage;
 class ClockRRGraphBuilder;
 
-extern std::string default_clock_network_name;
-
 enum class ClockType {
     SPINE,
     RIB,