Revert "Merge pull request #5301 from KrystalDelusion/krys/re_5280"

mmicko · mmicko · commit 88eb83a0c3e1 · 2025-08-28T11:58:02.000+02:00
This reverts commit c9a602e, reversing changes made to 51eaaff.
diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
@@ -1,14 +1,6 @@
 name: Test extra build flows
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre_job:
@@ -19,11 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   vs-prep:
     name: Prepare Visual Studio build
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -1,14 +1,6 @@
 name: Build and run tests
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre_job:
@@ -19,12 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
-
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
   pre_docs_job:
     runs-on: ubuntu-latest
     outputs:
@@ -33,23 +24,23 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on readme changes
           paths_ignore: '["**/README.md"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   build-yosys:
     name: Reusable build
     runs-on: ${{ matrix.os }}
-    # pre_job is a subset of pre_docs_job, so we can always build for pre_docs_job
     needs: pre_docs_job
     if: needs.pre_docs_job.outputs.should_skip != 'true'
     env:
       CC: clang
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -67,6 +58,7 @@ jobs:
           mkdir build
           cd build
           make -f ../Makefile config-$CC
+          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
           make -f ../Makefile -j$procs ENABLE_LTO=1
 
       - name: Log yosys-config output
@@ -82,7 +74,7 @@ jobs:
       - name: Store build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
           path: build.tar
           retention-days: 1
 
@@ -93,9 +85,12 @@ jobs:
     if: needs.pre_job.outputs.should_skip != 'true'
     env:
       CC: clang
+      ASAN_OPTIONS: halt_on_error=1
+      UBSAN_OPTIONS: halt_on_error=1
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -107,12 +102,11 @@ jobs:
         uses: ./.github/actions/setup-build-env
 
       - name: Get iverilog
-        id: get-iverilog
         shell: bash
         run: |
           git clone https://github.com/steveicarus/iverilog.git
           cd iverilog
-          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
 
       - name: Get vcd2fst
         shell: bash
@@ -129,7 +123,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .local/
-          key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
+          key: ${{ matrix.os }}-${IVERILOG_GIT}
 
       - name: Build iverilog
         if: steps.cache-iverilog.outputs.cache-hit != 'true'
@@ -145,7 +139,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash
@@ -177,6 +171,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        sanitizer: [undefined]
     steps:
       - name: Checkout Yosys
         uses: actions/checkout@v4
@@ -189,7 +184,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash
@@ -214,6 +209,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -227,7 +223,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
@@ -1,14 +1,6 @@
 name: Compiler testing
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre_job:
@@ -19,11 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   test-compile:
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
@@ -1,14 +1,6 @@
 name: Build and run tests with Verific (Linux)
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre-job:
@@ -19,11 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   test-verific:
     needs: pre-job
diff --git a/passes/memory/memlib.cc b/passes/memory/memlib.cc
@@ -878,7 +878,7 @@ struct Parser {
 						}
 					}
 				}
-				var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken") != nullptr;
+				var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken");
 			}
 			const PortWidthDef *wdef = find_single_cap(pdef.width, cram.options, portopts, "width");
 			if (wdef) {
diff --git a/passes/memory/memlib.h b/passes/memory/memlib.h
@@ -109,7 +109,7 @@ struct PortVariant {
 	PortKind kind;
 	int clk_shared;
 	ClkPolKind clk_pol;
-	bool clk_en = false;
+	bool clk_en;
 	bool width_tied;
 	int min_wr_wide_log2;
 	int max_wr_wide_log2;

Original file line number	Diff line number	Diff line change
`@@ -878,7 +878,7 @@ struct Parser {`
`878`	`878`	`}`
`879`	`879`	`}`
`880`	`880`	`}`
`881`		`- var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken") != nullptr;`
	`881`	`+ var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken");`
`882`	`882`	`}`
`883`	`883`	`const PortWidthDef *wdef = find_single_cap(pdef.width, cram.options, portopts, "width");`
`884`	`884`	`if (wdef) {`