From 840cdb415b4d83ea21211c2e900a8f515cf3cf3a Mon Sep 17 00:00:00 2001 From: akash Date: Mon, 8 Apr 2024 12:36:08 -0700 Subject: [PATCH] Update Verific, add to gitmodules, remove unused/GPL features from Makefile --- .gitmodules | 3 +++ Makefile | 14 +++++++------- frontends/verific/verific.cc | 2 +- verific | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 .gitmodules create mode 160000 verific diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..f309a4fd0 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "verific"] + path = verific + url = git@github.com:silimate/verific.git diff --git a/Makefile b/Makefile index f86a0c341..45df1f163 100644 --- a/Makefile +++ b/Makefile @@ -9,20 +9,20 @@ CONFIG := none # CONFIG := msys2-64 # features (the more the better) -ENABLE_TCL := 1 +ENABLE_TCL := 0 ENABLE_ABC := 1 ENABLE_GLOB := 1 ENABLE_PLUGINS := 1 -ENABLE_READLINE := 1 +ENABLE_READLINE := 0 ENABLE_EDITLINE := 0 ENABLE_GHDL := 0 ENABLE_VERIFIC := 1 -ENABLE_VERIFIC_EDIF := 1 +ENABLE_VERIFIC_EDIF := 0 ENABLE_VERIFIC_LIBERTY := 1 DISABLE_VERIFIC_EXTENSIONS := 1 DISABLE_VERIFIC_VHDL := 1 -ENABLE_COVER := 1 -ENABLE_LIBYOSYS := 1 +ENABLE_COVER := 0 +ENABLE_LIBYOSYS := 0 ENABLE_ZLIB := 1 # python wrappers @@ -518,8 +518,8 @@ endif LIBS_VERIFIC = ifeq ($(ENABLE_VERIFIC),1) -VERIFIC_DIR ?= /usr/local/src/verific_lib -VERIFIC_COMPONENTS ?= verilog database util containers hier_tree sdf +VERIFIC_DIR ?= ./verific +VERIFIC_COMPONENTS ?= verilog database util containers hier_tree ifneq ($(DISABLE_VERIFIC_VHDL),1) VERIFIC_COMPONENTS += vhdl CXXFLAGS += -DVERIFIC_VHDL_SUPPORT diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc index 6ae6ac4b0..96c2c3645 100644 --- a/frontends/verific/verific.cc +++ b/frontends/verific/verific.cc @@ -101,7 +101,7 @@ vector verific_incdirs, verific_libdirs, verific_libexts; void msg_func(msg_type_t msg_type, const char *message_id, linefile_type linefile, const char *msg, va_list args) { - string message_prefix = stringf("VERIFIC-%s [%s] ", + string message_prefix = stringf("ELAB-%s [%s] ", msg_type == VERIFIC_NONE ? "NONE" : msg_type == VERIFIC_ERROR ? "ERROR" : msg_type == VERIFIC_WARNING ? "WARNING" : diff --git a/verific b/verific new file mode 160000 index 000000000..62f92c82c --- /dev/null +++ b/verific @@ -0,0 +1 @@ +Subproject commit 62f92c82cc8338482e5739a458ae4b1aac28b6ce