From 9d4630484fa117774c307ec19b6cfcf2ccf0863b Mon Sep 17 00:00:00 2001 From: Wanda Date: Wed, 29 Jan 2025 01:39:09 +0100 Subject: [PATCH 1/5] mailmap: fix up some identities. --- .mailmap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index 78afe1b6c..2d9f424d4 100644 --- a/.mailmap +++ b/.mailmap @@ -1,6 +1,6 @@ -Marcelina Kościelnicka -Marcelina Kościelnicka -Marcelina Kościelnicka +Wanda Phinode +Wanda Phinode +Wanda Phinode Claire Xenia Wolf Claire Xenia Wolf Claire Xenia Wolf From 954250d1dfa1530cc235aaea3e475cdaac854dcb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 00:20:17 +0000 Subject: [PATCH 2/5] Bump version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b11c27597..371380cd2 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ ifeq ($(OS), Haiku) CXXFLAGS += -D_DEFAULT_SOURCE endif -YOSYS_VER := 0.49+3 +YOSYS_VER := 0.49+5 # Note: We arrange for .gitcommit to contain the (short) commit hash in # tarballs generated with git-archive(1) using .gitattributes. The git repo From c2691207df5c337f08577cd9a4fc50c68f4c7edb Mon Sep 17 00:00:00 2001 From: "Emil J. Tywoniak" Date: Thu, 30 Jan 2025 12:01:30 +0100 Subject: [PATCH 3/5] wreduce: fix warning for deprecated IdString::in(pool) --- passes/opt/wreduce.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/passes/opt/wreduce.cc b/passes/opt/wreduce.cc index 5b3b1edc8..be67d3a7f 100644 --- a/passes/opt/wreduce.cc +++ b/passes/opt/wreduce.cc @@ -280,7 +280,7 @@ struct WreduceWorker { bool did_something = false; - if (!cell->type.in(config->supported_cell_types)) + if (!config->supported_cell_types.count(cell->type)) return; if (cell->type.in(ID($mux), ID($pmux))) From 2f11dc87c987f734009d8171c5f15dc12f85061e Mon Sep 17 00:00:00 2001 From: Robin Ole Heinemann Date: Thu, 30 Jan 2025 10:15:53 +0100 Subject: [PATCH 4/5] write_verilog: emit $check cell names as labels --- backends/verilog/verilog_backend.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc index fa9100635..419f484fa 100644 --- a/backends/verilog/verilog_backend.cc +++ b/backends/verilog/verilog_backend.cc @@ -1044,16 +1044,21 @@ void dump_cell_expr_print(std::ostream &f, std::string indent, const RTLIL::Cell void dump_cell_expr_check(std::ostream &f, std::string indent, const RTLIL::Cell *cell) { std::string flavor = cell->getParam(ID(FLAVOR)).decode_string(); + std::string label = ""; + if (cell->name.isPublic()) { + label = stringf("%s: ", id(cell->name).c_str()); + } + if (flavor == "assert") - f << stringf("%s" "assert (", indent.c_str()); + f << stringf("%s" "%s" "assert (", indent.c_str(), label.c_str()); else if (flavor == "assume") - f << stringf("%s" "assume (", indent.c_str()); + f << stringf("%s" "%s" "assume (", indent.c_str(), label.c_str()); else if (flavor == "live") - f << stringf("%s" "assert (eventually ", indent.c_str()); + f << stringf("%s" "%s" "assert (eventually ", indent.c_str(), label.c_str()); else if (flavor == "fair") - f << stringf("%s" "assume (eventually ", indent.c_str()); + f << stringf("%s" "%s" "assume (eventually ", indent.c_str(), label.c_str()); else if (flavor == "cover") - f << stringf("%s" "cover (", indent.c_str()); + f << stringf("%s" "%s" "cover (", indent.c_str(), label.c_str()); dump_sigspec(f, cell->getPort(ID::A)); f << stringf(");\n"); } From 0ab13924a54fa9db49f52b51b29cee058cc543c4 Mon Sep 17 00:00:00 2001 From: Robin Ole Heinemann Date: Thu, 30 Jan 2025 14:39:09 +0100 Subject: [PATCH 5/5] write_verilog: log_abort on unhandled $check flavor --- backends/verilog/verilog_backend.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc index 419f484fa..2bc6ff3b8 100644 --- a/backends/verilog/verilog_backend.cc +++ b/backends/verilog/verilog_backend.cc @@ -1059,6 +1059,8 @@ void dump_cell_expr_check(std::ostream &f, std::string indent, const RTLIL::Cell f << stringf("%s" "%s" "assume (eventually ", indent.c_str(), label.c_str()); else if (flavor == "cover") f << stringf("%s" "%s" "cover (", indent.c_str(), label.c_str()); + else + log_abort(); dump_sigspec(f, cell->getPort(ID::A)); f << stringf(");\n"); }