Merge branch 'master+wip' into equivalent-tiles

Author: acomodi

utils/fasm/src/fasm.cpp

@@ -22,6 +22,7 @@
 #include "atom_netlist_utils.h"
 #include "netlist_writer.h"
 #include "vpr_utils.h"
+#include "route_tree_timing.h"
 
 #include "fasm_utils.h"
 
@@ -560,28 +561,30 @@ void FasmWriterVisitor::visit_atom_impl(const t_pb* atom) {
   check_for_param(atom);
 }
 
-void FasmWriterVisitor::walk_routing() {
-    auto& route_ctx = g_vpr_ctx.routing();
-
-    for(const auto &trace : route_ctx.trace) {
-      const t_trace *head = trace.head;
-      while(head != nullptr) {
-        const t_trace *next = head->next;
-
-        if(next != nullptr) {
-          const auto next_inode = next->index;
-          auto *meta = vpr::rr_edge_metadata(head->index, next_inode, head->iswitch, "fasm_features");
-          if(meta != nullptr) {
+void FasmWriterVisitor::walk_route_tree(const t_rt_node *root) {
+    for (t_linked_rt_edge* edge = root->u.child_list; edge != nullptr; edge = edge->next) {
+        auto *meta = vpr::rr_edge_metadata(root->inode, edge->child->inode, edge->iswitch, "fasm_features");
+        if(meta != nullptr) {
             current_blk_has_prefix_ = false;
             output_fasm_features(meta->as_string());
-          }
         }
 
-        head = next;
-      }
+        walk_route_tree(edge->child);
+    }
+}
+
+void FasmWriterVisitor::walk_routing() {
+    auto& route_ctx = g_vpr_ctx.mutable_routing();
+
+    for(const auto &trace : route_ctx.trace) {
+      t_trace *head = trace.head;
+      t_rt_node* root = traceback_to_route_tree(head);
+      walk_route_tree(root);
+      free_route_tree(root);
     }
 }
 
+
 void FasmWriterVisitor::finish_impl() {
     auto& device_ctx = g_vpr_ctx.device();
     for(int itype = 0; itype < device_ctx.num_block_types; itype++) {

utils/fasm/src/fasm.h

@@ -22,6 +22,7 @@
 #include "netlist_writer.h"
 #include "lut.h"
 #include "parameters.h"
+#include "route_tree_type.h"
 
 namespace fasm {
 
@@ -71,6 +72,7 @@ class FasmWriterVisitor : public NetlistVisitor {
       void check_for_lut(const t_pb* atom);
       void output_fasm_mux(std::string fasm_mux, t_interconnect *interconnect, t_pb_graph_pin *mux_input_pin);
       void walk_routing();
+      void walk_route_tree(const t_rt_node *root);
       std::string build_clb_prefix(const t_pb *pb, const t_pb_graph_node* pb_graph_node) const;
       const LutOutputDefinition* find_lut(const t_pb_graph_node* pb_graph_node);
       void check_for_param(const t_pb *atom);

vpr/src/route/route_tree_timing.cpp

@@ -62,7 +62,6 @@ bool verify_route_tree_recurr(t_rt_node* node, std::set<int>& seen_nodes);
 
 t_rt_node* prune_route_tree_recurr(t_rt_node* node, CBRR& connections_inf, bool congested);
 
-t_rt_node* traceback_to_route_tree(t_trace* head);
 static t_trace* traceback_to_route_tree_branch(t_trace* trace, std::map<int,t_rt_node*>& rr_node_to_rt);
 
 static std::pair<t_trace*,t_trace*> traceback_from_route_tree_recurr(t_trace* head, t_trace* tail, const t_rt_node* node);
@@ -631,7 +630,9 @@ void free_route_tree(t_rt_node * rt_node) {
 		rt_edge = next_edge;
 	}
 
-    rr_node_to_rt_node[rt_node->inode] = nullptr;
+    if(!rr_node_to_rt_node.empty()) {
+        rr_node_to_rt_node.at(rt_node->inode) = nullptr;
+    }
 	free_rt_node(rt_node);
 }
 

vpr/src/route/route_tree_timing.h

@@ -43,6 +43,7 @@ void print_route_tree(const t_rt_node* rt_root);
 void print_route_tree_inf(const t_rt_node* rt_root);
 void print_route_tree_congestion(const t_rt_node* rt_root);
 
+t_rt_node* traceback_to_route_tree(t_trace* head);
 t_rt_node* traceback_to_route_tree(ClusterNetId inet);
 t_trace* traceback_from_route_tree(ClusterNetId inet, const t_rt_node* root, int num_remaining_sinks);