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

enum const constant pushing
chipsalliance · Nov 14, 2023 · a5149e8 · a5149e8
2 parents 36ec06b + 0d636f0
commit a5149e8
Show file tree

Hide file tree

Showing 20 changed files with 1,439 additions and 3,377 deletions.
diff --git a/.github/workflows/non_vendored.yml b/.github/workflows/non_vendored.yml
@@ -58,7 +58,7 @@ jobs:
         cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DJSON_BuildTests=OFF . && cmake --build build && sudo cmake --install build
         popd
 
-        git clone --depth 1 --branch v1.79 https://github.com/chipsalliance/UHDM.git
+        git clone --depth 1 --branch v1.80 https://github.com/chipsalliance/UHDM.git
         pushd UHDM
         cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DUHDM_USE_HOST_GTEST=ON -DUHDM_USE_HOST_CAPNP=ON . && cmake --build build && sudo cmake --install build
         popd

diff --git a/.gitmodules b/.gitmodules
@@ -7,7 +7,7 @@
 [submodule "third_party/UHDM"]
 	path = third_party/UHDM
 	url = https://github.com/chipsalliance/UHDM.git
-	branch = v1.79
+	branch = v1.80
 [submodule "third_party/antlr4"]
 	path = third_party/antlr4
 	url = https://github.com/antlr/antlr4.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 # Version changes whenever some new features accumulated, or the
 # grammar or the cache format changes to make sure caches
 # are invalidated.
-project(SURELOG VERSION 1.79)
+project(SURELOG VERSION 1.80)
 
 # Detect build type, fallback to release and throw a warning if use didn't
 # specify any

diff --git a/src/DesignCompile/UhdmWriter.cpp b/src/DesignCompile/UhdmWriter.cpp
@@ -3273,6 +3273,27 @@ void UhdmWriter::lateBinding(Serializer& s, DesignComponent* mod, scope* m) {
                 }
               }
             }
+            if (m->Typespecs()) {
+              for (auto n : *m->Typespecs()) {
+                if (n->UhdmType() == uhdmenum_typespec) {
+                  enum_typespec* tps = any_cast<enum_typespec*>(n);
+                  if (tps && tps->Enum_consts()) {
+                    for (auto c : *tps->Enum_consts()) {
+                      if (c->VpiName() == name) {
+                        ref->Actual_group(c);
+                        break;
+                      }
+                      if (std::string(std::string(m->VpiName()) +
+                                      std::string("::") + std::string(name)) ==
+                          c->VpiName()) {
+                        ref->Actual_group(c);
+                        break;
+                      }
+                    }
+                  }
+                }
+              }
+            }
           }
         }
         if (ref->Actual_group()) break;
@@ -3611,6 +3632,11 @@ void UhdmWriter::lateBinding(Serializer& s, DesignComponent* mod, scope* m) {
                 ref->Actual_group(c);
                 break;
               }
+              if (std::string(std::string(m->VpiName()) + std::string("::") +
+                              std::string(name)) == c->VpiName()) {
+                ref->Actual_group(c);
+                break;
+              }
             }
           }
         }