Merge pull request #2219 from CAS-Atlantic/yosys_25

Yosys version upgrade to 0.25

Author: vaughnbetz

libs/EXTERNAL/libyosys/.gitcommit

@@ -1 +1 @@
-$Format:%h$
+e02b7f64bc7

libs/EXTERNAL/libyosys/.github/workflows/emcc.yml

@@ -8,12 +8,6 @@ jobs:
     steps:
       - uses: mymindstorm/setup-emsdk@v11
       - uses: actions/checkout@v3
-      - name: Cache sources
-        id: cache-sources
-        uses: actions/cache@v3
-        with:
-          path: .
-          key: cache-yosys
       - name: Build
         run: |
           make config-emcc

libs/EXTERNAL/libyosys/.github/workflows/vs.yml

@@ -7,12 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Cache sources
-        id: cache-sources
-        uses: actions/cache@v3
-        with:
-          path: .
-          key: cache-yosys
       - name: Build
         run: make vcxsrc YOSYS_VER=latest
       - uses: actions/upload-artifact@v3

libs/EXTERNAL/libyosys/CHANGELOG

@@ -2,8 +2,32 @@
 List of major changes and improvements between releases
 =======================================================
 
-Yosys 0.23 .. Yosys 0.23-dev
+Yosys 0.24 .. Yosys 0.25
 --------------------------
+ * Verific support
+    - Respect "noblackbox" attribute for modules.
+
+ * Various
+    - Documentation is hosted at https://yosyshq.readthedocs.io/projects/yosys/en/latest/
+
+Yosys 0.23 .. Yosys 0.24
+--------------------------
+ * New commands and options
+    - Added option "-set-def-formal" to "sat" pass.
+    - Added option "-s" to "tee" command.
+
+ * Verilog
+    - Support for module-scoped identifiers referring to tasks and functions.
+    - Support for arrays with swapped ranges within structs.
+
+ * Verific support
+    - Support for importing verilog configurations per name.
+    - "verific -set-XXXXX" commands are now able to set severity to all messages
+      of certain type (errors, warnings, infos and comments)
+
+ * Various
+    - TCL shell support (use "yosys -C")
+    - Added FABulous eFPGA frontend
 
 Yosys 0.22 .. Yosys 0.23
 --------------------------

libs/EXTERNAL/libyosys/Makefile

@@ -142,7 +142,7 @@ LDLIBS += -lrt
 endif
 endif
 
-YOSYS_VER := 0.23+8
+YOSYS_VER := 0.25
 
 # Note: We arrange for .gitcommit to contain the (short) commit hash in
 # tarballs generated with git-archive(1) using .gitattributes. The git repo
@@ -158,7 +158,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 7ce5011.. | wc -l`/;" Makefile
+#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 313b799.. | wc -l`/;" Makefile
 
 # set 'ABCREV = default' to use abc/ as it is
 #
@@ -963,26 +963,22 @@ docs/source/cmd/abc.rst: $(TARGETS) $(EXTRA_TARGETS)
 	mkdir -p docs/source/cmd
 	./$(PROGRAM_PREFIX)yosys -p 'help -write-rst-command-reference-manual'
 
-PHONY: docs/gen_images
+PHONY: docs/gen_images docs/guidelines
 docs/gen_images:
 	$(Q) $(MAKE) -C docs/images all
 
+DOCS_GUIDELINE_FILES := GettingStarted CodingStyle
+docs/guidelines:
+	$(Q) mkdir -p docs/source/temp
+	$(Q) cp -f $(addprefix guidelines/,$(DOCS_GUIDELINE_FILES)) docs/source/temp
+
 DOC_TARGET ?= html
-docs: docs/source/cmd/abc.rst docs/gen_images
+docs: docs/source/cmd/abc.rst docs/gen_images docs/guidelines
 	$(Q) $(MAKE) -C docs $(DOC_TARGET)
 
-update-manual: $(TARGETS) $(EXTRA_TARGETS)
-	cd manual && ../$(PROGRAM_PREFIX)yosys -p 'help -write-tex-command-reference-manual'
-
-manual: $(TARGETS) $(EXTRA_TARGETS)
-	cd manual && bash appnotes.sh
-	cd manual && bash presentation.sh
-	cd manual && bash manual.sh
-
 clean:
 	rm -rf share
 	rm -rf kernel/*.pyh
-	if test -d manual; then cd manual && sh clean.sh; fi
 	rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) $(EXTRA_OBJS) $(PY_WRAP_INCLUDES) $(PY_WRAPPER_FILE).cc
 	rm -f kernel/version_*.o kernel/version_*.cc
 	rm -f libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d techlibs/*/*.d
@@ -1122,5 +1118,5 @@ echo-abc-rev:
 -include kernel/*.d
 -include techlibs/*/*.d
 
-.PHONY: all top-all abc test install install-abc docs manual clean mrproper qtcreator coverage vcxsrc mxebin
+.PHONY: all top-all abc test install install-abc docs clean mrproper qtcreator coverage vcxsrc mxebin
 .PHONY: config-clean config-clang config-gcc config-gcc-static config-gcc-4.8 config-afl-gcc config-gprof config-sudo

libs/EXTERNAL/libyosys/README.md

@@ -1,5 +1,6 @@
 /build/
 /source/cmd
+/source/temp
 /images/*.log
 /images/*.aux
 /images/*.pdf

libs/EXTERNAL/libyosys/docs/.gitignore

@@ -1,7 +1,7 @@
 all: dots tex svg tidy
 
 TEX_SOURCE:= $(wildcard *.tex)
-DOT_LOC:= ../../manual/APPNOTE_011_Design_Investigation
+DOT_LOC:= ../source/APPNOTE_011_Design_Investigation
 DOT_SOURCE:= $(wildcard $(DOT_LOC)/*.dot)
 
 TEX_SOURCE+= 011/example_out.tex

libs/EXTERNAL/libyosys/docs/images/Makefile

@@ -203,7 +203,7 @@ namespace AST
 
 		// if this is a multirange memory then this vector contains offset and length of each dimension
 		std::vector<int> multirange_dimensions;
-		std::vector<bool> multirange_swapped; // true if range is swapped, not used for structs
+		std::vector<bool> multirange_swapped; // true if range is swapped
 
 		// this is set by simplify and used during RTLIL generation
 		AstNode *id2ast;