Fix merge errors that made symbiflow tests fail

Signed-off-by: Alessandro Comodi <[email protected]>

Author: acomodi

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -1608,7 +1608,8 @@ static void ProcessMode(pugi::xml_node Parent, t_mode* mode, const bool timing_e
     map<string, int> pb_type_names;
     pair<map<string, int>::iterator, bool> ret_pb_types;
 
-    if (0 == strcmp(Parent.name(), "pb_type")) {
+    bool implied_mode = 0 == strcmp(Parent.name(), "pb_type");
+    if (implied_mode) {
         /* implied mode */
         mode->name = vtr::strdup("default");
     } else {
@@ -1646,7 +1647,11 @@ static void ProcessMode(pugi::xml_node Parent, t_mode* mode, const bool timing_e
     /* Allocate power structure */
     mode->mode_power = (t_mode_power*)vtr::calloc(1, sizeof(t_mode_power));
 
-    mode->meta = ProcessMetadata(Parent, loc_data);
+    if (!implied_mode) {
+        // Implied mode metadata is attached to the pb_type, rather than
+        // the t_mode object.
+        mode->meta = ProcessMetadata(Parent, loc_data);
+    }
 
     /* Clear STL map used for duplicate checks */
     pb_type_names.clear();

vpr/src/route/route_tree_timing.cpp

@@ -61,7 +61,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);