From db3f8103044131c0603ec0c05c74dd6f0b06e31b Mon Sep 17 00:00:00 2001
From: Mary Guillemard <mary@mary.zone>
Date: Wed, 22 May 2024 23:40:02 +0200
Subject: [PATCH 1/5] Only build yosys-abc usage docs when ABCEXTERNAL is not
 set

Since 0.41, when building docs with ABCEXTERNAL set, the rule for
yosys-abc docs usage would attempt to build in-tree ABC.

This fix this regression by only including yosys-abc in
DOCS_USAGE_STDERR when ABCEXTERNAL is not set.

Signed-off-by: Mary Guillemard <mary@mary.zone>
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cbf834007..55866259c 100644
--- a/Makefile
+++ b/Makefile
@@ -946,7 +946,13 @@ define DOC_USAGE_STDERR
 docs/source/generated/$(1): $(PROGRAM_PREFIX)$(1) docs/source/generated
 	-$(Q) ./$$< --help 2> $$@
 endef
-DOCS_USAGE_STDERR := yosys-config yosys-filterlib yosys-abc
+DOCS_USAGE_STDERR := yosys-config yosys-filterlib
+
+# The in-tree ABC (yosys-abc) is only built when ABCEXTERNAL is not set.
+ifeq ($(ABCEXTERNAL),)
+DOCS_USAGE_STDERR += yosys-abc
+endif
+
 $(foreach usage,$(DOCS_USAGE_STDERR),$(eval $(call DOC_USAGE_STDERR,$(usage))))
 
 # others print to stdout

From 1aae0bcd40accc760e30d5c1bab09c1303bca2bf Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 24 May 2024 09:09:48 +1200
Subject: [PATCH 2/5] ci: Move nix build to extra-builds.yml

Skip duplicate actions on nix build.
---
 .github/workflows/extra-builds.yml       | 14 ++++++++++++++
 .github/workflows/nix-github-actions.yml | 15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 .github/workflows/nix-github-actions.yml

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 260394a3f..031f69653 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -81,3 +81,17 @@ jobs:
           END
 
           make -C build -f ../Makefile CXX=clang -j$(nproc)
+
+  nix-build:
+    name: "Build nix flake"
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+        submodules: true
+      - uses: cachix/install-nix-action@v26
+        with:
+        install_url: https://releases.nixos.org/nix/nix-2.18.1/install
+      - run: nix build .?submodules=1
diff --git a/.github/workflows/nix-github-actions.yml b/.github/workflows/nix-github-actions.yml
deleted file mode 100644
index 6d5c5b4b2..000000000
--- a/.github/workflows/nix-github-actions.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: "build nix flake"
-on:
-  pull_request:
-  push:
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-       submodules: true
-    - uses: cachix/install-nix-action@v26
-      with:
-       install_url: https://releases.nixos.org/nix/nix-2.18.1/install
-    - run: nix build .?submodules=1

From d135c0bf87b0054cffd77ff6dbc030b194d5ef12 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 24 May 2024 09:41:31 +1200
Subject: [PATCH 3/5] extra-builds.yml: Fix indentation

---
 .github/workflows/extra-builds.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 031f69653..d7c6e13ff 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -90,8 +90,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-        submodules: true
+          submodules: true
       - uses: cachix/install-nix-action@v26
         with:
-        install_url: https://releases.nixos.org/nix/nix-2.18.1/install
+          install_url: https://releases.nixos.org/nix/nix-2.18.1/install
       - run: nix build .?submodules=1

From c7580eb18ed2a8ba313b5120dfc1dba36cef485e Mon Sep 17 00:00:00 2001
From: Amiot Noe <noe.amiot@lip6.fr>
Date: Tue, 21 May 2024 21:47:00 +0200
Subject: [PATCH 4/5] cxxrtl: Prevent wires with input or output ports from
 being aliased

---
 backends/cxxrtl/cxxrtl_backend.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backends/cxxrtl/cxxrtl_backend.cc b/backends/cxxrtl/cxxrtl_backend.cc
index 703494682..9ddbd33b0 100644
--- a/backends/cxxrtl/cxxrtl_backend.cc
+++ b/backends/cxxrtl/cxxrtl_backend.cc
@@ -3263,6 +3263,7 @@ struct CxxrtlWorker {
 						debug_wire_type = wire_type; // wire is a member
 
 					if (!debug_alias) continue;
+					if (wire->port_input || wire->port_output) continue; // preserve input/output metadata in flags
 					const RTLIL::Wire *it = wire;
 					while (flow.is_inlinable(it)) {
 						log_assert(flow.wire_comb_defs[it].size() == 1);

From 557968567360026ae8dc75341564209868171296 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 25 May 2024 00:16:20 +0000
Subject: [PATCH 5/5] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 55866259c..15ab4766c 100644
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,7 @@ LIBS += -lrt
 endif
 endif
 
-YOSYS_VER := 0.41+101
+YOSYS_VER := 0.41+108
 
 # Note: We arrange for .gitcommit to contain the (short) commit hash in
 # tarballs generated with git-archive(1) using .gitattributes. The git repo