diff options
| author | Adam Izraelevitz | 2019-02-21 21:21:15 -0800 |
|---|---|---|
| committer | mergify[bot] | 2019-02-22 05:21:15 +0000 |
| commit | ea43e484959d4edd031a1420a775204aac41aa13 (patch) | |
| tree | 22488312214f628c5f4be2234253f78b266c4494 | |
| parent | b3833821a50eb7b08fe75f3729ef57355d5765ec (diff) | |
Bump yosys to 0.8 (#1029)
| -rw-r--r-- | .fix_yosys_abc.patch | 37 | ||||
| -rw-r--r-- | .install_yosys.sh | 4 | ||||
| -rwxr-xr-x | scripts/formal_equiv.sh | 2 |
3 files changed, 2 insertions, 41 deletions
diff --git a/.fix_yosys_abc.patch b/.fix_yosys_abc.patch deleted file mode 100644 index dac2fb18..00000000 --- a/.fix_yosys_abc.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/Makefile b/Makefile -index 0a61fe65..ef336faf 100644 ---- a/Makefile -+++ b/Makefile -@@ -82,10 +82,10 @@ OBJS = kernel/version_$(GIT_REV).o - # is just a symlink to your actual ABC working directory, as 'make mrproper' - # will remove the 'abc' directory and you do not want to accidentally - # delete your work on ABC.. --ABCREV = eb6eca6807cc -+ABCREV = a2d59be - ABCPULL = 1 --ABCURL ?= https://bitbucket.org/alanmi/abc --ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" -+ABCURL ?= https://github.com/berkeley-abc/abc -+ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 - - # set ABCEXTERNAL = <abc-command> to use an external ABC instance - # Note: The in-tree ABC (yosys-abc) will not be installed when ABCEXTERNAL is set. -@@ -386,14 +386,14 @@ yosys-config: misc/yosys-config.in - abc/abc-$(ABCREV)$(EXE): - $(P) - ifneq ($(ABCREV),default) -- $(Q) if ( cd abc 2> /dev/null && hg identify; ) | grep -q +; then \ -+ $(Q) if ( cd abc 2> /dev/null && ! git diff-index --quiet HEAD; ); then \ - echo 'REEBE: NOP pbagnvaf ybpny zbqvsvpngvbaf! Frg NOPERI=qrsnhyg va Lbflf Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; false; \ - fi -- $(Q) if test "`cd abc 2> /dev/null && hg identify | cut -f1 -d' '`" != "$(ABCREV)"; then \ -+ $(Q) if test "`cd abc 2> /dev/null && git rev-parse --short HEAD`" != "$(ABCREV)"; then \ - test $(ABCPULL) -ne 0 || { echo 'REEBE: NOP abg hc gb qngr naq NOPCHYY frg gb 0 va Znxrsvyr!' | tr 'A-Za-z' 'N-ZA-Mn-za-m'; exit 1; }; \ - echo "Pulling ABC from $(ABCURL):"; set -x; \ -- test -d abc || hg clone $(ABCURL) abc; \ -- cd abc && $(MAKE) DEP= clean && hg pull && hg update -r $(ABCREV); \ -+ test -d abc || git clone $(ABCURL) abc; \ -+ cd abc && $(MAKE) DEP= clean && git fetch origin master && git checkout $(ABCREV); \ - fi - endif - $(Q) rm -f abc/abc-[0-9a-f]* diff --git a/.install_yosys.sh b/.install_yosys.sh index a9ab9c25..d9276125 100644 --- a/.install_yosys.sh +++ b/.install_yosys.sh @@ -5,9 +5,7 @@ if [ ! -f $INSTALL_DIR/bin/yosys ]; then git clone https://github.com/cliffordwolf/yosys.git cd yosys git pull - git checkout yosys-0.7 - # Workaround moving ABC repo - git apply ../.fix_yosys_abc.patch + git checkout yosys-0.8 make make PREFIX=$INSTALL_DIR install fi diff --git a/scripts/formal_equiv.sh b/scripts/formal_equiv.sh index 407ae753..8214e56b 100755 --- a/scripts/formal_equiv.sh +++ b/scripts/formal_equiv.sh @@ -61,7 +61,7 @@ else equiv_make top1 top2 equiv hierarchy -top equiv clean -purge - equiv_simple + equiv_simple -short equiv_induct equiv_status -assert " |