Looking up port nets for internal instances (#1547)

os-fpga · Apr 20, 2024 · 04c14d1 · 04c14d1
1 parent 23a88c9
commit 04c14d1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/src/DeviceModeling/device_instance.h b/src/DeviceModeling/device_instance.h
@@ -59,11 +59,13 @@ class device_block_instance {
       this->ports_map_[pr.first] = std::make_shared<device_port>(*pr.second);
       ports_map_[pr.first]->set_enclosing_instance(this);
     }
-    // for (const auto &pr : instaciated_block_ptr_->nets()) {
-    //   this->nets_map_[pr.first] = std::make_shared<device_net>(*pr.second);
-    //   ports_map_[pr.first]->set_enclosing_instance(this);
-    //   std::cout << "Port Net :: " << pr.first << std::endl;
-    // }
+    for (const auto &pr : instaciated_block_ptr_->nets()) {
+      // create nets without their driver and sinks until full
+      // elaboration
+      this->nets_map_[pr.first] = std::make_shared<device_net>(pr.first);
+      ports_map_[pr.first]->set_enclosing_instance(this);
+      std::cout << "Port Net :: " << pr.first << std::endl;
+    }
   }
   /**
    * @brief Copy constructor.
@@ -215,6 +217,10 @@ class device_block_instance {
       return instance_map_[name];
     return nullptr;
   }
+  std::shared_ptr<device_net> get_net(const std::string &n) {
+    if (nets_map_.find(n) != end(nets_map_)) return nets_map_[n];
+    return nullptr;
+  }
 
  private:
   int instance_id_ = -1;

diff --git a/src/DeviceModeling/device_modeler.h b/src/DeviceModeling/device_modeler.h
@@ -1200,7 +1200,15 @@ class device_modeler {
     block->add_net(std::make_shared<device_net>(net_name));
     auto net_ptr = block->get_net(net_name);
     if (!driver_name.empty()) {
-      auto drv = block->get_net(driver_name);
+      std::vector<std::string> xmr_refs =
+          FOEDAG::StringUtils::tokenize(driver_name, ".", false);
+      std::shared_ptr<device_net> drv = nullptr;
+      if (xmr_refs.size() == 2) {
+        auto ins = block->get_instance(xmr_refs[0]);
+        if (ins) drv = ins->get_net(xmr_refs[1]);
+      } else {
+        drv = block->get_net(driver_name);
+      }
       if (drv)
         net_ptr->set_source(drv);
       else
@@ -1209,7 +1217,15 @@ class device_modeler {
                   << std::endl;
     }
     for (auto &ld_n : v) {
-      auto load = block->get_net(ld_n);
+      std::vector<std::string> xmr_refs =
+          FOEDAG::StringUtils::tokenize(ld_n, ".", false);
+      std::shared_ptr<device_net> load = nullptr;
+      if (xmr_refs.size() == 2) {
+        auto ins = block->get_instance(xmr_refs[0]);
+        if (ins) load = ins->get_net(xmr_refs[1]);
+      } else {
+        load = block->get_net(ld_n);
+      }
       if (load)
         net_ptr->add_sink(load);
       else