Allow fasm_prefix on modes.

Signed-off-by: Keith Rothman <[email protected]>

Author: litghost

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -1603,8 +1603,8 @@ static void ProcessMode(pugi::xml_node Parent, t_mode * mode,
 	map<string, int> pb_type_names;
 	pair<map<string, int>::iterator, bool> ret_pb_types;
 
-	if (0 == strcmp(Parent.name(), "pb_type")) {
-		/* implied mode */
+	bool implied_mode = 0 == strcmp(Parent.name(), "pb_type");
+	if (implied_mode) {
 		mode->name = vtr::strdup("default");
 	} else {
 		Prop = get_attribute(Parent, "name", loc_data).value();
@@ -1641,7 +1641,11 @@ static void ProcessMode(pugi::xml_node Parent, t_mode * mode,
 	/* 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();

utils/fasm/src/fasm.cpp

@@ -103,41 +103,75 @@ void FasmWriterVisitor::check_interconnect(const t_pb_routes &pb_route, int inod
   }
 }
 
-std::string FasmWriterVisitor::build_clb_prefix(const t_pb_graph_node* pb_graph_node) const {
-  std::string clb_prefix = "";
-
-  if(root_clb_ != pb_graph_node && pb_graph_node->parent_pb_graph_node != root_clb_) {
-    VTR_ASSERT(pb_graph_node->parent_pb_graph_node != nullptr);
-    clb_prefix = build_clb_prefix(pb_graph_node->parent_pb_graph_node);
-  }
-
-  const auto *pb_type = pb_graph_node->pb_type;
-  bool has_prefix = pb_type->meta != nullptr
-      && pb_type->meta->has("fasm_prefix");
-
+static std::string handle_fasm_prefix(const t_metadata_dict *meta,
+        const t_pb_graph_node *pb_graph_node, const t_pb_type *pb_type) {
+  bool has_prefix = meta != nullptr && meta->has("fasm_prefix");
   if(!has_prefix) {
-    return clb_prefix;
+      return "";
   }
 
-  auto fasm_prefix_unsplit = pb_type->meta->get("fasm_prefix")->front().as_string();
+  auto fasm_prefix_unsplit = meta->get("fasm_prefix")->front().as_string();
   auto fasm_prefix = vtr::split(fasm_prefix_unsplit, " ");
   VTR_ASSERT(pb_type->num_pb >= 0);
   if(fasm_prefix.size() != static_cast<size_t>(pb_type->num_pb)) {
     vpr_throw(VPR_ERROR_OTHER,
-              __FILE__, __LINE__,
-              "number of fasm_prefix (%s) options (%d) for block (%s) must match capacity(%d)",
-              fasm_prefix_unsplit, fasm_prefix.size(), pb_type->name, pb_type->num_pb);
+               __FILE__, __LINE__,
+                "number of fasm_prefix (%s) options (%d) for block (%s) must match capacity(%d)",
+                fasm_prefix_unsplit, fasm_prefix.size(), pb_type->name, pb_type->num_pb);
   }
 
   if(pb_graph_node->placement_index >= pb_type->num_pb) {
-    vpr_throw(VPR_ERROR_OTHER,
+      vpr_throw(VPR_ERROR_OTHER,
               __FILE__, __LINE__,
               "pb_graph_node->placement_index = %d >= pb_type->num_pb = %d",
               fasm_prefix_unsplit.c_str(), pb_type->num_pb);
   }
 
-  return clb_prefix + fasm_prefix.at(pb_graph_node->placement_index) + ".";
+  return fasm_prefix.at(pb_graph_node->placement_index) + ".";
+}
+
+std::string FasmWriterVisitor::build_clb_prefix(const t_pb *pb, const t_pb_graph_node* pb_graph_node) const {
+  std::string clb_prefix = "";
+
+  const t_pb *pb_for_graph_node = nullptr;
+
+  // If not t_pb, mode_index is always 0.
+  int mode_index = 0;
+  if(root_clb_ != pb_graph_node && pb_graph_node->parent_pb_graph_node != root_clb_) {
+    VTR_ASSERT(pb_graph_node->parent_pb_graph_node != nullptr);
+    if(pb != nullptr) {
+        while(pb_for_graph_node == nullptr) {
+            pb_for_graph_node = pb->find_pb(pb_graph_node);
+            if(pb_for_graph_node == nullptr) {
+                if(pb->parent_pb == nullptr) {
+                    break;
+                }
+                pb = pb->parent_pb;
+            }
+        }
+
+        if(pb_for_graph_node != nullptr) {
+            mode_index = pb_for_graph_node->mode;
+        }
+    }
+
+    clb_prefix = build_clb_prefix(pb, pb_graph_node->parent_pb_graph_node);
+  }
+
+  const auto *pb_type = pb_graph_node->pb_type;
+
+  clb_prefix += handle_fasm_prefix(pb_type->meta, pb_graph_node, pb_type);
+
+  if(pb_type->modes != nullptr) {
+    VTR_ASSERT(mode_index < pb_type->num_modes);
+
+    clb_prefix += handle_fasm_prefix(pb_type->modes[mode_index].meta,
+            pb_graph_node, pb_type);
+  } else {
+      VTR_ASSERT(mode_index == 0);
+  }
 
+  return clb_prefix;
 }
 
 static const t_pb_graph_pin* is_node_used(const t_pb_routes &top_pb_route, const t_pb_graph_node* pb_graph_node) {
@@ -176,7 +210,8 @@ void FasmWriterVisitor::check_features(t_metadata_dict *meta) const {
 
 void FasmWriterVisitor::visit_all_impl(const t_pb_routes &pb_route, const t_pb* pb,
         const t_pb_graph_node* pb_graph_node) {
-  clb_prefix_ = build_clb_prefix(pb_graph_node);
+  clb_prefix_ = build_clb_prefix(pb, pb_graph_node);
+  std::cerr << "CLB prefix: " << clb_prefix_ << std::endl;
 
   if(pb_graph_node && pb) {
     t_pb_type *pb_type = pb_graph_node->pb_type;

utils/fasm/src/fasm.h

@@ -41,7 +41,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();
-      std::string build_clb_prefix(const t_pb_graph_node* pb_graph_node) const;
+      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);