Merge pull request #5869 from povik/yosys-slang-updates

yosys-slang updates
chipsalliance · Aug 7, 2024 · 05aedf3 · 05aedf3
2 parents 0e5adee + a599302
commit 05aedf3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/sv-tests-ci.yml b/.github/workflows/sv-tests-ci.yml
@@ -52,7 +52,7 @@ jobs:
             deps: haskell-stack
           - name: yosys-slang
             deps: bison clang tcl-dev flex libfl-dev pkg-config libreadline-dev cmake pkg-config
-            submodules: slang
+            submodules: third_party/slang
     env:
       RUNNERS_FILTER: ${{ matrix.tool.runners_filter }}
       CCACHE_DIR: "/root/sv-tests/sv-tests/.cache/"

diff --git a/README.md b/README.md
@@ -106,3 +106,4 @@ Finally the file containing the test case and metadata should be placed in `test
 * [sv-parser](https://github.com/dalance/sv-parser)
 * [moore](http://llhd.io)
 * [verible](https://github.com/google/verible)
+* [yosys-slang](https://github.com/povik/yosys-slang)
diff --git a/third_party/tools/yosys b/third_party/tools/yosys
diff --git a/third_party/tools/yosys-slang b/third_party/tools/yosys-slang
diff --git a/tools/runners.mk b/tools/runners.mk
@@ -129,8 +129,7 @@ $(INSTALL_DIR)/bin/verilog_syntax: verible
 yosys-slang: $(INSTALL_DIR)/bin/yosys-slang
 
 $(INSTALL_DIR)/bin/slang-yosys $(INSTALL_DIR)/bin/slang-yosys-config:
-	# TODO: set to CXXSTD=c++20 to match slang once yosys upstream issues are resolved
-	$(MAKE) -C $(RDIR)/yosys CONFIG=gcc CXXSTD=c++11 ENABLE_ABC=0 \
+	$(MAKE) -C $(RDIR)/yosys CONFIG=gcc CXXSTD=c++20 ENABLE_ABC=0 \
 				PROGRAM_PREFIX=slang- PREFIX=$(INSTALL_DIR) install
 
 $(INSTALL_DIR)/bin/yosys-slang: $(INSTALL_DIR)/bin/slang-yosys-config
+8 −0		.github/dependabot.yaml
+183 −0		.github/workflows/build-and-test.yaml
+8 −2		.gitmodules
+9 −17		README.md
+276 −0		addressing.h
+3 −3		build.sh
+238 −0		builder.cc
+162 −0		cases.h
+81 −0		diag.h
+17 −5		initial_eval.cc
+1 −0		initial_eval.h
+149 −0		memory.h
+0 −142		proc_usage.cc
+0 −1		slang
+2,010 −1,053		slang_frontend.cc
+125 −0		slang_frontend.h
+20 −0		tests/croc_boot/debugger.tcl_
+13 −0		tests/croc_boot/helloworld.ihex
+126 −0		tests/croc_boot/main.cc
+9 −0		tests/croc_boot/prepare.ys_
+14 −0		tests/croc_boot/run.sh
+22 −0		tests/run.sh
+24 −0		tests/selects/all.tcl
+76 −0		tests/selects/bitsel.v
+130 −0		tests/selects/indexed_down.v
+125 −0		tests/selects/indexed_up.v
+1 −0		tests/third_party/croc
+80 −0		tests/third_party/cxxrtl-work-around-issue-3459.patch
+1 −0		tests/third_party/yosys
+9 −0		tests/various/unknown_cells.sv
+5 −0		tests/various/unknown_cells.ys
+1 −0		third_party/slang