Merge pull request #1057 from alainmarcel/alainmarcel-patch-1

hier path simplification
chipsalliance · Dec 9, 2023 · 9055aae · 9055aae
2 parents 7b8baa3 + 1a4f62c
commit 9055aae
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # -*- mode:cmake -*-
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-project(UHDM VERSION 1.81)
+project(UHDM VERSION 1.82)
 
 # Detect build type, fallback to release and throw a warning if use didn't
 # specify any

diff --git a/templates/clone_tree.cpp b/templates/clone_tree.cpp
@@ -735,10 +735,28 @@ cont_assign* cont_assign::DeepClone(BaseClass* parent,
   expr* lhs = nullptr;
   if (auto obj = Lhs()) {
     lhs = obj->DeepClone(clone, context);
+    if (lhs->UhdmType() == uhdmhier_path) {
+      hier_path* path = (hier_path*) lhs;
+      any* last = path->Path_elems()->back();
+      if (ref_obj* ro = any_cast<ref_obj*>(last)) {
+        if (net* n = any_cast<net*>(ro->Actual_group())) {
+          lhs = n;
+        } 
+      }
+    }
     clone->Lhs(lhs);
   }
   if (auto obj = Rhs()) {
     expr* rhs = obj->DeepClone(clone, context);
+    if (rhs->UhdmType() == uhdmhier_path) {
+      hier_path* path = (hier_path*) rhs;
+      any* last = path->Path_elems()->back();
+      if (ref_obj* ro = any_cast<ref_obj*>(last)) {
+        if (ro->Actual_group()->UhdmType() == uhdmconstant) {
+          rhs = (expr*) ro->Actual_group();
+        } 
+      }
+    }
     clone->Rhs(rhs);
     if (ref_obj* ro = any_cast<ref_obj*>(lhs)) {
       if (struct_var* stv = ro->Actual_group<struct_var>()) {
@@ -1349,6 +1367,18 @@ hier_path* hier_path::DeepClone(BaseClass* parent,
                     }
                   }
                 }
+                if (!found && mod->Param_assigns()) {
+                  for (auto pa : *mod->Param_assigns()) {
+                    if (pa->Lhs()->VpiName() == name ||
+                        pa->Lhs()->VpiName() == nameIndexed) {
+                      if (ref_obj* cro = any_cast<ref_obj*>(current)) {
+                        cro->Actual_group(pa->Rhs());
+                      }
+                      previous = pa;
+                      found = true;
+                    }
+                  }
+                }
                 break;
               }
               case UHDM_OBJECT_TYPE::uhdmclass_var: {