remove global traceback (won't compile)

Author: duck2

vpr/src/base/place_and_route.cpp

@@ -497,9 +497,9 @@ t_chan_width init_chan(int cfactor, t_chan_width_dist chan_width_dist, t_graph_t
 }
 
 /**
- * @brief Computes the channel width and adjusts it to be an an even number if unidirectional 
+ * @brief Computes the channel width and adjusts it to be an an even number if unidirectional
  *        since unidirectional graphs need to have paired wires.
- * 
+ *
  *   @param cfactor                 Channel width factor: multiplier on the channel width distribution (usually the number of tracks in the widest channel).
  *   @param chan_dist               Channel width distribution.
  *   @param x                       The distance (between 0 and 1) we are across the chip.

vpr/src/base/read_route.cpp

@@ -46,6 +46,9 @@
 #include "read_route.h"
 #include "binary_heap.h"
 
+#include "route_tree_timing.h"
+#include "t_trace.h"
+
 /*************Functions local to this module*************/
 static void process_route(std::ifstream& fp, const char* filename, int& lineno);
 static void process_nodes(std::ifstream& fp, ClusterNetId inet, const char* filename, int& lineno);
@@ -214,7 +217,7 @@ static void process_nets(std::ifstream& fp, ClusterNetId inet, std::string name,
     return;
 }
 
-static void process_nodes(std::ifstream& fp, ClusterNetId inet, const char* filename, int& lineno) {
+static void process_nodes(std::ifstream& fp, ClusterNetId inet, const char* filename, int& lineno) { // T_TRACE_USER
     /* Not a global net. Goes through every node and add it into trace.head*/
 
     auto& cluster_ctx = g_vpr_ctx.mutable_clustering();
@@ -223,7 +226,8 @@ static void process_nodes(std::ifstream& fp, ClusterNetId inet, const char* file
     auto& route_ctx = g_vpr_ctx.mutable_routing();
     auto& place_ctx = g_vpr_ctx.placement();
 
-    t_trace* tptr = route_ctx.trace[(const ParentNetId&)inet].head;
+    t_trace* head_ptr = alloc_trace_data();
+    t_trace* tptr = alloc_trace_data();
 
     /*remember the position of the last line in order to go back*/
     std::streampos oldpos = fp.tellg();
@@ -376,12 +380,12 @@ static void process_nodes(std::ifstream& fp, ClusterNetId inet, const char* file
 
             /* Allocate and load correct values to trace.head*/
             if (node_count == 0) {
-                route_ctx.trace[(const ParentNetId&)inet].head = alloc_trace_data();
-                route_ctx.trace[(const ParentNetId&)inet].head->index = inode;
-                route_ctx.trace[(const ParentNetId&)inet].head->net_pin_index = net_pin_index;
-                route_ctx.trace[(const ParentNetId&)inet].head->iswitch = switch_id;
-                route_ctx.trace[(const ParentNetId&)inet].head->next = nullptr;
-                tptr = route_ctx.trace[(const ParentNetId&)inet].head;
+                head_ptr = alloc_trace_data();
+                head_ptr->index = inode;
+                head_ptr->net_pin_index = net_pin_index;
+                head_ptr->iswitch = switch_id;
+                head_ptr->next = nullptr;
+                tptr = head_ptr;
                 node_count++;
             } else {
                 tptr->next = alloc_trace_data();
@@ -396,6 +400,9 @@ static void process_nodes(std::ifstream& fp, ClusterNetId inet, const char* file
         /*stores last line so can easily go back to read*/
         oldpos = fp.tellg();
     }
+
+    /* Convert to route_tree after reading */
+    route_ctx.current_rt[inet] = traceback_to_route_tree(head_ptr);
 }
 
 /**

vpr/src/base/stats.cpp

@@ -27,6 +27,9 @@
 #include "timing_util.h"
 #include "tatum/TimingReporter.hpp"
 
+#include "route_tree_timing.h"
+#include "t_trace.h"
+
 /********************** Subroutines local to this module *********************/
 
 static void load_channel_occupancies(const Netlist<>& net_list,
@@ -261,7 +264,7 @@ static void load_channel_occupancies(const Netlist<>& net_list,
         if (net_list.net_is_ignored(net_id) && net_list.net_sinks(net_id).size() != 0)
             continue;
 
-        tptr = route_ctx.trace[net_id].head;
+        tptr = traceback_from_route_tree_recurr(NULL, NULL, route_ctx.current_rt[net_id]).first;
         while (tptr != nullptr) {
             inode = tptr->index;
             rr_type = rr_graph.node_type(RRNodeId(inode));
@@ -309,7 +312,7 @@ void get_num_bends_and_length(ParentNetId inet, int* bends_ptr, int* len_ptr, in
     length = 0;
     segments = 0;
 
-    prevptr = route_ctx.trace[inet].head; /* Should always be SOURCE. */
+    prevptr = traceback_from_route_tree_recurr(NULL, NULL, route_ctx.current_rt[inet]).first; /* Should always be SOURCE. */
     if (prevptr == nullptr) {
         VPR_FATAL_ERROR(VPR_ERROR_OTHER,
                         "in get_num_bends_and_length: net #%lu has no traceback.\n", size_t(inet));

vpr/src/base/t_trace.h

@@ -0,0 +1,29 @@
+#pragma once
+
+/**
+ * @brief Basic element used to store the traceback (routing) of each net.
+ *
+ *   @param index    Array index (ID) of this routing resource node.
+ *   @param net_pin_index:    Net pin index associated with the node. This value
+ *                            ranges from 1 to fanout [1..num_pins-1]. For cases when
+ *                            different speed paths are taken to the same SINK for
+ *                            different pins, node index cannot uniquely identify
+ *                            each SINK, so the net pin index guarantees an unique
+ *                            identification for each SINK node. For non-SINK nodes
+ *                            and for SINK nodes with no associated net pin index
+ *                            (i.e. special SINKs like the source of a clock tree
+ *                            which do not correspond to an actual netlist connection),
+ *                            the value for this member should be set to OPEN (-1).
+ *   @param iswitch  Index of the switch type used to go from this rr_node to
+ *                   the next one in the routing.  OPEN if there is no next node
+ *                   (i.e. this node is the last one (a SINK) in a branch of the
+ *                   net's routing).
+ *   @param next     Pointer to the next traceback element in this route.
+ */
+struct t_trace {
+    t_trace* next;
+    int index;
+    int net_pin_index = -1;
+    //int net_pin_index = OPEN;
+    short iswitch;
+};

vpr/src/base/vpr_api.cpp

@@ -96,6 +96,7 @@
 #include "iostream"
 
 #ifdef VPR_USE_TBB
+#define TBB_PREVIEW_GLOBAL_CONTROL 1
 #    include <tbb/task_arena.h>
 #    include <tbb/global_control.h>
 #endif
@@ -1182,7 +1183,7 @@ static void free_placement() {
 
 static void free_routing() {
     auto& routing_ctx = g_vpr_ctx.mutable_routing();
-    routing_ctx.trace.clear();
+    routing_ctx.current_rt.clear();
     routing_ctx.trace_nodes.clear();
     routing_ctx.net_rr_terminals.clear();
     routing_ctx.rr_blk_source.clear();
@@ -1219,7 +1220,6 @@ void vpr_free_all(const Netlist<>& net_list,
     if (vpr_setup.RouterOpts.doRouting) {
         free_route_structs();
     }
-    free_trace_structs(net_list);
     vpr_free_vpr_data_structures(Arch, vpr_setup);
 }
 
@@ -1375,7 +1375,7 @@ void vpr_analysis(const Netlist<>& net_list,
 
     //Check the first index to see if a pointer exists
     //TODO: Implement a better error check
-    if (route_ctx.trace.empty()) {
+    if (route_ctx.current_rt.empty()) {
         VPR_FATAL_ERROR(VPR_ERROR_ANALYSIS, "No routing loaded -- can not perform post-routing analysis");
     }
 

vpr/src/base/vpr_context.h

@@ -22,7 +22,7 @@
 #include "device_grid.h"
 #include "clock_network_builders.h"
 #include "clock_connection_builders.h"
-#include "route_traceback.h"
+#include "route_tree_type.h"
 #include "router_lookahead.h"
 #include "place_macro.h"
 #include "compressed_grid.h"
@@ -61,7 +61,7 @@ struct AtomContext : public Context {
      ********************************************************************/
     /**
      * @brief constructor
-     * 
+     *
      * In the constructor initialize the list of pack molecules to nullptr and defines a custom deletor for it
      */
     AtomContext()
@@ -75,15 +75,15 @@ struct AtomContext : public Context {
 
     /**
      * @brief The molecules associated with each atom block.
-     * 
+     *
      * This map is loaded in the pre-packing stage and freed at the very end of vpr flow run.
      * The pointers in this multimap is shared with list_of_pack_molecules.
      */
     std::multimap<AtomBlockId, t_pack_molecule*> atom_molecules;
 
     /**
      * @brief A linked list of all the packing molecules that are loaded in pre-packing stage.
-     * 
+     *
      * Is is useful in freeing the pack molecules at the destructor of the Atom context using free_pack_molecules.
      */
     std::unique_ptr<t_pack_molecule, decltype(&free_pack_molecules)> list_of_pack_molecules;
@@ -188,12 +188,12 @@ struct DeviceContext : public Context {
     ///@brief Reverse look-up from RR node to non-configurably connected node set (index into rr_nonconf_node_sets)
     std::unordered_map<int, int> rr_node_to_non_config_node_set;
 
-    /* A writeable view of routing resource graph to be the ONLY database 
+    /* A writeable view of routing resource graph to be the ONLY database
      * for routing resource graph builder functions.
      */
     RRGraphBuilder rr_graph_builder{};
 
-    /* A read-only view of routing resource graph to be the ONLY database 
+    /* A read-only view of routing resource graph to be the ONLY database
      * for client functions: GUI, placer, router, timing analyzer etc.
      */
     RRGraphView rr_graph{rr_graph_builder.rr_nodes(), rr_graph_builder.node_lookup(), rr_graph_builder.rr_node_metadata(), rr_graph_builder.rr_edge_metadata(), rr_indexed_data, rr_rc_data, rr_graph_builder.rr_segments(), rr_graph_builder.rr_switch()};
@@ -302,7 +302,7 @@ struct ClusteringContext : public Context {
 
 /**
  * @brief State relating to helper data structure using in the clustering stage
- * 
+ *
  * This should contain helper data structures that are useful in the clustering/packing stage.
  * They are encapsulated here as they are useful in clustering and reclustering algorithms that may be used
  * in packing or placement stages.
@@ -393,7 +393,7 @@ struct PlacementContext : public Context {
  */
 struct RoutingContext : public Context {
     /* [0..num_nets-1] of linked list start pointers.  Defines the routing.  */
-    vtr::vector<ParentNetId, t_traceback> trace;
+    vtr::vector<ParentNetId, t_rt_node*> current_rt;
 
     vtr::vector<ParentNetId, std::unordered_set<int>> trace_nodes;
 
@@ -487,33 +487,33 @@ struct FloorplanningContext : public Context {
  */
 struct NocContext : public Context {
     /**
-     * @brief A model of the NoC  
+     * @brief A model of the NoC
      *
      * Contains all the routers and links that make up the NoC. The routers contain
      * information regarding the physical tile positions they represent. The links
      * define the connections between every router (topology) and also metrics that describe its
-     * "usage". 
-     * 
+     * "usage".
      *
-     * The NoC model is created once from the architecture file description. 
+     *
+     * The NoC model is created once from the architecture file description.
      */
     NocStorage noc_model;
 
     /**
-     * @brief Stores all the communication happening between routers in the NoC 
+     * @brief Stores all the communication happening between routers in the NoC
+     *
+     * Contains all of the traffic flows that ddescribe which pairs of logical routers are communicating and also some metrics and constraints on the data transfer between the two routers.
      *
-     * Contains all of the traffic flows that ddescribe which pairs of logical routers are communicating and also some metrics and constraints on the data transfer between the two routers. 
-     * 
      *
      * This is created from a user supplied .flows file.
      */
     NocTrafficFlows noc_traffic_flows_storage;
 
     /**
      * @brief Contains the packet routing algorithm used by the NoC.
-     * 
+     *
      * This should be used to route traffic flows within the NoC.
-     * 
+     *
      * This is created from a user supplied command line option "--noc_routing_algorithm"
      */
     NocRouting* noc_flows_router;

vpr/src/base/vpr_types.h

@@ -1425,17 +1425,17 @@ struct t_det_routing_arch {
  *                     Note that this index will store the index of the segment
  *                     relative to its **parallel** segment types, not all segments
  *                     as stored in device_ctx. Look in rr_graph.cpp: build_rr_graph
- *                     for details but here is an example: say our segment_inf_vec in 
+ *                     for details but here is an example: say our segment_inf_vec in
  *                     device_ctx is as follows: [seg_a_x, seg_b_x, seg_a_y, seg_b_y]
- *                     when building the rr_graph, static segment_inf_vectors will be 
- *                     created for each direction, thus you will have the following 
- *                     2 vectors: X_vec =[seg_a_x,seg_b_x] and Y_vec = [seg_a_y,seg_b_y]. 
- *                     As a result, e.g. seg_b_y::index == 1 (index in Y_vec) 
+ *                     when building the rr_graph, static segment_inf_vectors will be
+ *                     created for each direction, thus you will have the following
+ *                     2 vectors: X_vec =[seg_a_x,seg_b_x] and Y_vec = [seg_a_y,seg_b_y].
+ *                     As a result, e.g. seg_b_y::index == 1 (index in Y_vec)
  *                     and != 3 (index in device_ctx segment_inf_vec).
- *   @param abs_index  index is relative to the segment_inf vec as stored in device_ctx. 
- *                     Note that the above vector is **unifies** both x-parallel and 
- *                     y-parallel segments and is loaded up originally in read_xml_arch_file.cpp 
- * 
+ *   @param abs_index  index is relative to the segment_inf vec as stored in device_ctx.
+ *                     Note that the above vector is **unifies** both x-parallel and
+ *                     y-parallel segments and is loaded up originally in read_xml_arch_file.cpp
+ *
  *   @param type_name_ptr  pointer to name of the segment type this track belongs
  *                     to. points to the appropriate name in s_segment_inf
  */
@@ -1519,7 +1519,7 @@ class t_chan_seg_details {
     const t_seg_details* seg_detail_ = nullptr;
 };
 
-/* Defines a 3-D array of t_chan_seg_details data structures (one per-each horizontal and vertical channel)   
+/* Defines a 3-D array of t_chan_seg_details data structures (one per-each horizontal and vertical channel)
  * once allocated in rr_graph2.cpp, is can be accessed like: [0..grid.width()][0..grid.height()][0..num_tracks-1]
  */
 typedef vtr::NdMatrix<t_chan_seg_details, 3> t_chan_details;
@@ -1538,33 +1538,6 @@ constexpr bool is_pin(e_rr_type type) { return (type == IPIN || type == OPIN); }
 constexpr bool is_chan(e_rr_type type) { return (type == CHANX || type == CHANY); }
 constexpr bool is_src_sink(e_rr_type type) { return (type == SOURCE || type == SINK); }
 
-/**
- * @brief Basic element used to store the traceback (routing) of each net.
- *
- *   @param index    Array index (ID) of this routing resource node.
- *   @param net_pin_index:    Net pin index associated with the node. This value       
- *                            ranges from 1 to fanout [1..num_pins-1]. For cases when  
- *                            different speed paths are taken to the same SINK for     
- *                            different pins, node index cannot uniquely identify      
- *                            each SINK, so the net pin index guarantees an unique     
- *                            identification for each SINK node. For non-SINK nodes    
- *                            and for SINK nodes with no associated net pin index      
- *                            (i.e. special SINKs like the source of a clock tree      
- *                            which do not correspond to an actual netlist connection),
- *                            the value for this member should be set to OPEN (-1).
- *   @param iswitch  Index of the switch type used to go from this rr_node to
- *                   the next one in the routing.  OPEN if there is no next node
- *                   (i.e. this node is the last one (a SINK) in a branch of the
- *                   net's routing).
- *   @param next     Pointer to the next traceback element in this route.
- */
-struct t_trace {
-    t_trace* next;
-    int index;
-    int net_pin_index = OPEN;
-    short iswitch;
-};
-
 /**
  * @brief Extra information about each rr_node needed only during routing
  *        (i.e. during the maze expansion).
@@ -1708,12 +1681,12 @@ struct t_power_opts {
 };
 
 /** @brief Channel width data
- * @param max= Maximum channel width between x_max and y_max. 
- * @param x_min= Minimum channel width of horizontal channels. Initialized when init_chan() is invoked in rr_graph2.cpp 
- * @param y_min= Same as above but for vertical channels. 
- * @param x_max= Maximum channel width of horiozntal channels. Initialized when init_chan() is invoked in rr_graph2.cpp 
- * @param y_max= Same as above but for vertical channels. 
- * @param x_list= Stores the channel width of all horizontal channels and thus goes from [0..grid.height()] 
+ * @param max= Maximum channel width between x_max and y_max.
+ * @param x_min= Minimum channel width of horizontal channels. Initialized when init_chan() is invoked in rr_graph2.cpp
+ * @param y_min= Same as above but for vertical channels.
+ * @param x_max= Maximum channel width of horiozntal channels. Initialized when init_chan() is invoked in rr_graph2.cpp
+ * @param y_max= Same as above but for vertical channels.
+ * @param x_list= Stores the channel width of all horizontal channels and thus goes from [0..grid.height()]
  * (imagine a 2D Cartesian grid with horizontal lines starting at every grid point on a line parallel to the y-axis)
  * @param y_list= Stores the channel width of all verical channels and thus goes from [0..grid.width()]
  * (imagine a 2D Cartesian grid with vertical lines starting at every grid point on a line parallel to the x-axis)