From bbbc2922093153c002b8f59234b1c2504b79a5a8 Mon Sep 17 00:00:00 2001
From: Akash Levy <akash@silimate.com>
Date: Wed, 20 Nov 2024 21:10:58 -0800
Subject: [PATCH] Smallfixes

---
 frontends/verific/verific.cc | 7 ++++---
 kernel/ff.cc                 | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 140926a51..761c80b9d 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -3010,7 +3010,8 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin
 	}
 
 #ifdef VERIFIC_UPF_SUPPORT
-	upf_file::Elaborate(top.c_str());
+	if (upf_file::GetActiveScope())
+		upf_file::Elaborate(top.c_str());
 #endif
 
 	if (!verific_error_msg.empty())
@@ -3535,9 +3536,9 @@ struct VerificPass : public Pass {
 			RuntimeFlags::SetVar("vhdl_preserve_drivers", 1);
 #endif
 #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT
-			// RuntimeFlags::SetVar("veri_preserve_assignments", 1); // SILIMATE: disable to improve optimization
+			RuntimeFlags::SetVar("veri_preserve_assignments", 1);
 			RuntimeFlags::SetVar("veri_preserve_comments", 1);
-			// RuntimeFlags::SetVar("veri_preserve_drivers", 1); // SILIMATE: disable to improve optimization
+			RuntimeFlags::SetVar("veri_preserve_drivers", 1);
 
 			// Workaround for VIPER #13851
 			RuntimeFlags::SetVar("veri_create_name_for_unnamed_gen_block", 1);
diff --git a/kernel/ff.cc b/kernel/ff.cc
index a143c50c5..5eef58909 100644
--- a/kernel/ff.cc
+++ b/kernel/ff.cc
@@ -263,7 +263,7 @@ FfData::FfData(FfInitVals *initvals, Cell *cell_) : FfData(cell_->module, initva
 }
 
 FfData FfData::slice(const std::vector<int> &bits) {
-	FfData res(module, initvals, NEW_ID2_SUFFIX("slice")); // SILIMATE: Improve the naming
+	FfData res(module, initvals, NEW_ID2); // SILIMATE: Improve the naming
 	res.sig_clk = sig_clk;
 	res.sig_ce = sig_ce;
 	res.sig_aload = sig_aload;