enforce use of module::delete_net

Author: joern274

include/hal_core/netlist/module.h

@@ -748,7 +748,7 @@ namespace hal
 
         NetConnectivity check_net_endpoints(const Net* net) const;
         bool check_net(Net* net, bool recursive = false);
-        bool delete_net(Net* net, bool recursive = false);
+        bool delete_net(Net* net);
         bool assign_pin_net(const u32 pin_id, Net* net, PinDirection direction);
         bool remove_pin_net(Net* net);
         Result<ModulePin*> create_pin_internal(const u32 id, const std::string& name, Net* net, PinDirection direction, PinType type, bool force_name);

src/netlist/module.cpp

@@ -627,7 +627,7 @@ namespace hal
         return res;
     }
 
-    bool Module::delete_net(Net* net, bool recursive)
+    bool Module::delete_net(Net* net)
     {
         if (!m_internal_manager->m_net_checks_enabled)
         {
@@ -639,16 +639,16 @@ namespace hal
         m_input_nets.erase(net);
         m_output_nets.erase(net);
 
-        if (m_internal_manager->m_net_checks_enabled && recursive && m_parent != nullptr)
+        if (auto pin = get_pin_by_net(net); pin != nullptr)
         {
-            if (!m_parent->delete_net(net, recursive))
+            if (!remove_pin_net(net))
             {
+                log_warning("module", "Cannot delete pin ID {} from net ID {}", pin->get_id(), net->get_id());
                 return false;
             }
         }
 
         return true;
-
     }
 
     bool Module::check_net(Net* net, bool recursive)

src/netlist/netlist.cpp

@@ -7,7 +7,7 @@
 #include "hal_core/netlist/net.h"
 #include "hal_core/netlist/netlist_internal_manager.h"
 #include "hal_core/utilities/log.h"
-#include <valgrind/callgrind.h>
+//#include <valgrind/callgrind.h>
 
 namespace hal
 {
@@ -343,11 +343,11 @@ namespace hal
 
     bool Netlist::delete_net(Net* n)
     {
-        CALLGRIND_START_INSTRUMENTATION;
-        CALLGRIND_TOGGLE_COLLECT;
+    //    CALLGRIND_START_INSTRUMENTATION;
+    //    CALLGRIND_TOGGLE_COLLECT;
         return m_manager->delete_net(n);
-        CALLGRIND_TOGGLE_COLLECT;
-        CALLGRIND_STOP_INSTRUMENTATION;
+    //    CALLGRIND_TOGGLE_COLLECT;
+    //    CALLGRIND_STOP_INSTRUMENTATION;
     }
 
     bool Netlist::is_net_in_netlist(const Net* n) const

src/netlist/netlist_internal_manager.cpp

@@ -442,9 +442,12 @@ namespace hal
             return false;
         }
 
+        std::unordered_set<Gate*> gates_to_check;
+
         auto dsts = net->m_destinations_raw;
         for (auto dst : dsts)
         {
+            gates_to_check.insert(dst->get_gate());
             if (!this->net_remove_destination_internal(net, dst))
             {
                 return false;
@@ -454,12 +457,23 @@ namespace hal
         auto srcs = net->m_sources_raw;
         for (auto src : srcs)
         {
+            gates_to_check.insert(src->get_gate());
             if (!this->net_remove_source_internal(net, src))
             {
                 return false;
             }
         }
 
+        for (const Gate* g : gates_to_check)
+        {
+            Module* m = g->get_module();
+            while (m)
+            {
+                m->delete_net(net);
+                m = m->get_parent_module();
+            }
+        }
+
         // remove from grouping
         if (Grouping* g = net->get_grouping(); g != nullptr)
         {