From 0a81c8e161cd6abb36e3ba4eb5edfc745836a9d5 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 11 Jun 2024 08:26:16 +0200
Subject: [PATCH] Import all modules from all libraries when when needed

---
 frontends/verific/verific.cc | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 39e968837..e7bc24219 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -2731,13 +2731,17 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin
 		netlists = new Array(1);
 		MapIter mi ;
 		Verific::Cell *c ;
-		Library *l = Libset::Global()->GetLibrary("work");
-		FOREACH_CELL_OF_LIBRARY(l,mi,c) {
-			MapIter ni ;
-			Netlist *nl;
-			FOREACH_NETLIST_OF_CELL(c, ni, nl) {
-				if (nl)
-					netlists->InsertLast(nl);
+		MapIter it ;
+		Library *l ;
+		FOREACH_LIBRARY_OF_LIBSET(Libset::Global(),it,l) {
+			if (l == Library::Primitives() || l == Library::Operators()) continue;
+			FOREACH_CELL_OF_LIBRARY(l,mi,c) {
+				MapIter ni ;
+				Netlist *nl;
+				FOREACH_NETLIST_OF_CELL(c, ni, nl) {
+					if (nl)
+						netlists->InsertLast(nl);
+				}
 			}
 		}
 #endif
@@ -3994,13 +3998,17 @@ struct VerificPass : public Pass {
 #endif
 				MapIter mi ;
 				Verific::Cell *c ;
-				Library *l = Libset::Global()->GetLibrary(work.c_str());
-				FOREACH_CELL_OF_LIBRARY(l,mi,c) {
-					MapIter ni ;
-					Netlist *nl;
-					FOREACH_NETLIST_OF_CELL(c, ni, nl) {
-						if (nl)
-							nl_todo.emplace(nl->CellBaseName(), nl);
+				MapIter it ;
+				Library *l ;
+				FOREACH_LIBRARY_OF_LIBSET(Libset::Global(),it,l) {
+					if (l == Library::Primitives() || l == Library::Operators()) continue;
+					FOREACH_CELL_OF_LIBRARY(l,mi,c) {
+						MapIter ni ;
+						Netlist *nl;
+						FOREACH_NETLIST_OF_CELL(c, ni, nl) {
+							if (nl)
+								nl_todo.emplace(nl->CellBaseName(), nl);
+						}
 					}
 				}
 #endif