diff --git a/Makefile b/Makefile index fa5da0b78..b1ff267fc 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 @@ -155,7 +161,7 @@ ifeq ($(OS), Haiku) CXXFLAGS += -D_DEFAULT_SOURCE endif -YOSYS_VER := 0.46+32 +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 @@ -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 diff --git a/yosys-slang b/yosys-slang index 9cdd8ccc7..e11a98349 160000 --- a/yosys-slang +++ b/yosys-slang @@ -1 +1 @@ -Subproject commit 9cdd8ccc73b870021c8245652148baa12777bc16 +Subproject commit e11a98349bf687f945b47a5eb69bae49dd4f0b63