From 0c689091e2a0959b1a6173de1bd7bd679b6120b2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Mar 2025 00:21:58 +0000 Subject: [PATCH 1/4] Bump version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 89ffaef66..76c7cffbb 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ ifeq ($(OS), Haiku) CXXFLAGS += -D_DEFAULT_SOURCE endif -YOSYS_VER := 0.51+17 +YOSYS_VER := 0.51+41 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1) YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1) YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2) From 061cf5c6c41c6d2e4c7460453d466dd2ab15ce53 Mon Sep 17 00:00:00 2001 From: "Emil J. Tywoniak" Date: Wed, 19 Mar 2025 10:27:23 +0100 Subject: [PATCH 2/4] share: re-add SAT solver cell count to log message --- passes/opt/share.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/passes/opt/share.cc b/passes/opt/share.cc index 40d6d1d20..1a4e2b31c 100644 --- a/passes/opt/share.cc +++ b/passes/opt/share.cc @@ -1297,8 +1297,8 @@ struct ShareWorker qcsat.ez->assume(qcsat.ez->AND(sub1, sub2)); - log(" Size of SAT problem: %d variables, %d clauses\n", - qcsat.ez->numCnfVariables(), qcsat.ez->numCnfClauses()); + log(" Size of SAT problem: %zu cells, %d variables, %d clauses\n", + qcsat.imported_cells.size(), qcsat.ez->numCnfVariables(), qcsat.ez->numCnfClauses()); if (qcsat.ez->solve(sat_model, sat_model_values)) { log(" According to the SAT solver this pair of cells can not be shared.\n"); From 613a17b4a8c2f370a26a788fd0ab7ae4fbad2503 Mon Sep 17 00:00:00 2001 From: "Emil J. Tywoniak" Date: Wed, 19 Mar 2025 10:33:28 +0100 Subject: [PATCH 3/4] ezsat: fix incorrect logging references to function names --- libs/ezsat/ezsat.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/ezsat/ezsat.cc b/libs/ezsat/ezsat.cc index 3b089ccca..20a210abe 100644 --- a/libs/ezsat/ezsat.cc +++ b/libs/ezsat/ezsat.cc @@ -676,10 +676,10 @@ void ezSAT::preSolverCallback() bool ezSAT::solver(const std::vector&, std::vector&, const std::vector&) { preSolverCallback(); - fprintf(stderr, "************************************************************************\n"); - fprintf(stderr, "ERROR: You are trying to use the solve() method of the ezSAT base class!\n"); + fprintf(stderr, "*************************************************************************\n"); + fprintf(stderr, "ERROR: You are trying to use the solver() method of the ezSAT base class!\n"); fprintf(stderr, "Use a dervied class like ezMiniSAT instead.\n"); - fprintf(stderr, "************************************************************************\n"); + fprintf(stderr, "*************************************************************************\n"); abort(); } @@ -1332,7 +1332,7 @@ void ezSAT::printInternalState(FILE *f) const fprintf(f, "\n"); } if (cnfConsumed) - fprintf(f, " *** more clauses consumed via cnfConsume() ***\n"); + fprintf(f, " *** more clauses consumed via consumeCnf() ***\n"); fprintf(f, "--8<-- snap --8<--\n"); } From f92ad7d900af8d9095cf91abd5d0dfce8ea42a3d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Mar 2025 00:21:55 +0000 Subject: [PATCH 4/4] Bump version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 76c7cffbb..c58c6f0f3 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ ifeq ($(OS), Haiku) CXXFLAGS += -D_DEFAULT_SOURCE endif -YOSYS_VER := 0.51+41 +YOSYS_VER := 0.51+46 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1) YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1) YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)