From a54f632258600b824b9c2082a2f7c97cec2843c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:20:44 +0000 Subject: [PATCH 1/4] Bump version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 91f48921e..b161a4ecb 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,7 @@ ifeq ($(OS), Haiku) CXXFLAGS += -D_DEFAULT_SOURCE endif -YOSYS_VER := 0.46+34 +YOSYS_VER := 0.46+107 # Note: We arrange for .gitcommit to contain the (short) commit hash in # tarballs generated with git-archive(1) using .gitattributes. The git repo From e4ddfed7a2ca00841a7458e53f8cdc78c07c6a86 Mon Sep 17 00:00:00 2001 From: Akash Levy Date: Wed, 16 Oct 2024 20:00:46 -0700 Subject: [PATCH 2/4] Add UPF linking --- Makefile | 11 +++++++++++ verific | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 25921987c..3bdea5c5b 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ ENABLE_VERIFIC_HIER_TREE := 1 ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 0 ENABLE_VERIFIC_EDIF := 0 ENABLE_VERIFIC_LIBERTY := 0 +ENABLE_VERIFIC_UPF := 1 ENABLE_COVER := 1 ENABLE_LIBYOSYS := 0 ENABLE_ZLIB := 1 @@ -48,6 +49,11 @@ DISABLE_SPAWN := 0 # Needed for environments that don't have proper thread support (i.e. emscripten, wasm--for now) DISABLE_ABC_THREADS := 0 +# UPF requires TCL +ifeq ($(ENABLE_VERIFIC_UPF),1) +ENABLE_TCL := 1 +endif + # clang sanitizers SANITIZER = # SANITIZER = address @@ -532,6 +538,11 @@ ifeq ($(ENABLE_VERIFIC_LIBERTY),1) VERIFIC_COMPONENTS += synlib CXXFLAGS += -DVERIFIC_LIBERTY_SUPPORT endif +ifeq ($(ENABLE_VERIFIC_UPF),1) +VERIFIC_COMPONENTS += hdl_file_sort verilog_nl +VERIFIC_COMPONENTS += commands upf +CXXFLAGS += -DVERIFIC_UPF_SUPPORT +endif ifeq ($(ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS),1) VERIFIC_COMPONENTS += extensions CXXFLAGS += -DYOSYSHQ_VERIFIC_EXTENSIONS diff --git a/verific b/verific index daddc8a19..6c4245752 160000 --- a/verific +++ b/verific @@ -1 +1 @@ -Subproject commit daddc8a191f4206ab3a03faebbc0018828b18591 +Subproject commit 6c424575286e66b434fab12663a627653e2c265e From 0ba36ea83f8542c1467206fe8e8614fd521e02bf Mon Sep 17 00:00:00 2001 From: Akash Levy Date: Wed, 16 Oct 2024 20:00:55 -0700 Subject: [PATCH 3/4] Update yosys-slang dep --- yosys-slang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yosys-slang b/yosys-slang index 9cdd8ccc7..9553038f9 160000 --- a/yosys-slang +++ b/yosys-slang @@ -1 +1 @@ -Subproject commit 9cdd8ccc73b870021c8245652148baa12777bc16 +Subproject commit 9553038f983946cf8747524f46ddfa31decfe5d3 From 01dc9295150975bcf30fef0e0138292bd78e075d Mon Sep 17 00:00:00 2001 From: Akash Levy Date: Wed, 16 Oct 2024 20:46:46 -0700 Subject: [PATCH 4/4] Bump yosys-slang dep --- yosys-slang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yosys-slang b/yosys-slang index 9553038f9..e11a98349 160000 --- a/yosys-slang +++ b/yosys-slang @@ -1 +1 @@ -Subproject commit 9553038f983946cf8747524f46ddfa31decfe5d3 +Subproject commit e11a98349bf687f945b47a5eb69bae49dd4f0b63