luke
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'YosysHQ:main' into main

This commit is contained in:
Akash Levy 2025-10-25 20:30:52 -04:00 committed by GitHub
parent ddf68e5113 8bc63ef6da
commit 303f7292a0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -176,7 +176,7 @@ ifeq ($(OS), Haiku)
CXXFLAGS += -D_DEFAULT_SOURCE
endif
YOSYS_VER := 0.58+80
YOSYS_VER := 0.58+86
YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2)
YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'.' -f3)

2
passes/cmds/bugpoint.cc
View File

@ -28,6 +28,8 @@
# define WEXITSTATUS(x) ((x) & 0xff)
# define WTERMSIG(x) SIGTERM
# define WSTOPSIG(x) 0
#else
#include <sys/wait.h>
#endif
USING_YOSYS_NAMESPACE

12
techlibs/gowin/brams.txt
View File

@ -19,8 +19,10 @@ ram block $__GOWIN_SP_ {
portoption "WRITE_MODE" 1 {
rdwr new;
}
portoption "WRITE_MODE" 2 {
rdwr old;
ifndef gw5a {
portoption "WRITE_MODE" 2 {
rdwr old;
}
}
}
}
@ -46,8 +48,10 @@ ram block $__GOWIN_DP_ {
portoption "WRITE_MODE" 1 {
rdwr new;
}
portoption "WRITE_MODE" 2 {
rdwr old;
ifndef gw5a {
portoption "WRITE_MODE" 2 {
rdwr old;
}
}
}
}

2
techlibs/gowin/synth_gowin.cc
View File

@ -263,7 +263,7 @@ struct SynthGowinPass : public ScriptPass
if (nolutram)
args += " -no-auto-distributed";
}
run("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
run(stringf("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams.txt -D %s", family) + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
run(stringf("techmap -map +/gowin/lutrams_map.v -map +/gowin/brams_map%s.v", family == "gw5a" ? "_gw5a" : ""));
}