diff options
author | Clifford Wolf <clifford@clifford.at> | 2019-06-25 17:34:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-25 17:34:44 +0200 |
commit | add2d415fcab64eae8819021ad1b8dd1b56e6bf2 (patch) | |
tree | 4eac0980c022262f37133350ccbe1b630d00b3e1 /tests/memories | |
parent | 58629dc2ce5ebd24bf37ab429c2723db75a772de (diff) | |
parent | 42720ef6fefdf7645db47b97cd914008d68b00a9 (diff) | |
download | yosys-add2d415fcab64eae8819021ad1b8dd1b56e6bf2.tar.gz yosys-add2d415fcab64eae8819021ad1b8dd1b56e6bf2.tar.bz2 yosys-add2d415fcab64eae8819021ad1b8dd1b56e6bf2.zip |
Merge pull request #1130 from YosysHQ/eddie/fix710
memory_dff: walk through more than one mux for computing read enable
Diffstat (limited to 'tests/memories')
-rw-r--r-- | tests/memories/issue00710.v | 17 | ||||
-rwxr-xr-x | tests/memories/run-test.sh | 6 |
2 files changed, 22 insertions, 1 deletions
diff --git a/tests/memories/issue00710.v b/tests/memories/issue00710.v new file mode 100644 index 000000000..7a5fad1c2 --- /dev/null +++ b/tests/memories/issue00710.v @@ -0,0 +1,17 @@ +// expect-wr-ports 1 +// expect-rd-ports 1 +// expect-rd-clk \clk + +module top(input clk, input we, re, reset, input [7:0] addr, wdata, output reg [7:0] rdata); + +reg [7:0] bram[0:255]; +(* keep *) reg dummy; + +always @(posedge clk) + if (reset) + dummy <= 1'b0; + else if (re) + rdata <= bram[addr]; + else if (we) + bram[addr] <= wdata; +endmodule diff --git a/tests/memories/run-test.sh b/tests/memories/run-test.sh index 734a96682..d0537bb98 100755 --- a/tests/memories/run-test.sh +++ b/tests/memories/run-test.sh @@ -14,7 +14,7 @@ shift "$((OPTIND-1))" bash ../tools/autotest.sh $seed -G *.v -for f in `egrep -l 'expect-(wr|rd)-ports' *.v`; do +for f in `egrep -l 'expect-(wr-ports|rd-ports|rd-clk)' *.v`; do echo -n "Testing expectations for $f .." ../../yosys -qp "proc; opt; memory -nomap;; dump -outfile ${f%.v}.dmp t:\$mem" $f if grep -q expect-wr-ports $f; then @@ -25,6 +25,10 @@ for f in `egrep -l 'expect-(wr|rd)-ports' *.v`; do grep -q "parameter \\\\RD_PORTS $(gawk '/expect-rd-ports/ { print $3; }' $f)\$" ${f%.v}.dmp || { echo " ERROR: Unexpected number of read ports."; false; } fi + if grep -q expect-rd-clk $f; then + grep -q "connect \\\\RD_CLK \\$(gawk '/expect-rd-clk/ { print $3; }' $f)\$" ${f%.v}.dmp || + { echo " ERROR: Unexpected read clock."; false; } + fi echo " ok." done |