Progress in memory_bram

diff --git a/passes/memory/memory_bram.cc b/passes/memory/memory_bram.cc
index 356663e034b94695ceaf03f4157a8c2d348d8fc4..0fb563bd0db73b62296b986e89d81377f1ac8ea0 100644 (file)
--- a/passes/memory/memory_bram.cc
+++ b/passes/memory/memory_bram.cc
@@ -465,8 +465,6 @@ grow_read_ports:;
                Cell *c = module->addCell(module->uniquify(stringf("%s.%d.%d.%d", cell->name.c_str(), grid_d, grid_a, dupidx)), bram.name);
                log("    Creating %s cell at grid position <%d %d %d>: %s\n", log_id(bram.name), grid_d, grid_a, dupidx, log_id(c));
 
-               dict<int, SigBit> clocks;
-
                for (auto &pi : portinfos)
                {
                        if (pi.dupidx != dupidx)
@@ -475,8 +473,11 @@ grow_read_ports:;
                        string prefix = stringf("%c%d", pi.group + 'A', pi.index + 1);
                        const char *pf = prefix.c_str();
 
-                       if (pi.clocks && (!clocks.count(pi.clocks) || pi.sig_clock.wire))
-                               clocks[pi.clocks] = pi.sig_clock;
+                       if (pi.clocks && (!c->hasPort(stringf("\\CLK%d", (pi.clocks-1) % clocks_max + 1)) || pi.sig_clock.wire)) {
+                               c->setPort(stringf("\\CLK%d", (pi.clocks-1) % clocks_max + 1), pi.sig_clock);
+                               if (pi.clkpol > 1 && pi.sig_clock.wire)
+                                       c->setParam(stringf("\\CLKPOL%d", (pi.clkpol-1) % clkpol_max + 1), clock_polarities.at(pi.clkpol));
+                       }
 
                        SigSpec addr_ok;
                        if (GetSize(pi.sig_addr) > bram.abits) {
@@ -527,13 +528,6 @@ grow_read_ports:;
                        sig_addr.extend_u0(bram.abits);
                        c->setPort(stringf("\\%sADDR", pf), sig_addr);
                }
-
-               for (auto &it : clocks)
-                       c->setPort(stringf("\\CLK%d", (it.first-1) % clocks_max + 1), it.second);
-
-               for (auto &it : clock_polarities)
-                       if (it.first > 1)
-                               c->setParam(stringf("\\CLKPOL%d", (it.first-1) % clkpol_max + 1), it.second);
        }
 
        for (auto &it : dout_cache)

diff --git a/techlibs/common/simlib.v b/techlibs/common/simlib.v
index 4680e209a87c0b24ebceeb56f2667790acf84d34..f16bd6bd28cd254c45cd5a801c099cf738c69384 100644 (file)
--- a/techlibs/common/simlib.v
+++ b/techlibs/common/simlib.v
@@ -1540,6 +1540,9 @@ function port_active;
 endfunction
 
 always @(RD_CLK, RD_ADDR, RD_DATA, WR_CLK, WR_EN, WR_ADDR, WR_DATA) begin
+`ifdef SIMLIB_MEMDELAY
+       #`SIMLIB_MEMDELAY;
+`endif
        for (i = 0; i < RD_PORTS; i = i+1) begin
                if ((!RD_TRANSPARENT[i] && RD_CLK_ENABLE[i]) && port_active(RD_CLK_ENABLE[i], RD_CLK_POLARITY[i], LAST_RD_CLK[i], RD_CLK[i]))
                        RD_DATA[i*WIDTH +: WIDTH] <= memory[RD_ADDR[i*ABITS +: ABITS] - OFFSET];

diff --git a/tests/bram/generate.py b/tests/bram/generate.py
index 0e803218a39fec1cb8c4b1fc84f3faf662ae4a52..840bfbd98cac2c9c2cd065f2dcc99e628110c6b1 100644 (file)
--- a/tests/bram/generate.py
+++ b/tests/bram/generate.py
@@ -32,7 +32,6 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
         # XXX
         init = 0
         transp = [ 0 for i in range(groups) ]
-        clkpol = [ random.randrange(0, 2) for i in range(groups) ]
 
         for p1 in range(groups):
             if wrmode[p1] == 0:
@@ -134,15 +133,25 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
                     states.add(("CPW", clocks[p1], clkpol[p1]))
                 always_hdr = "always @(posedge CLK%d_CLKPOL%d) begin" % (clocks[p1], clkpol[p1])
 
+            v_stmts.append("`ifndef SYNTHESIS")
+            v_stmts.append("event UPDATE_%s;" % pf)
+            v_stmts.append("`endif")
+
             v_stmts.append(always_hdr)
             if wrmode[p1]:
-                v_stmts.append("  `delay(%d)" % portindex);
+                v_stmts.append("  `ifndef SYNTHESIS");
+                v_stmts.append("    #%d;" % portindex);
+                v_stmts.append("    -> UPDATE_%s;" % pf)
+                v_stmts.append("  `endif")
                 for i in range(enable[p1]):
                     enrange = "[%d:%d]" % ((i+1)*dbits/enable[p1]-1, i*dbits/enable[p1])
                     v_stmts.append("  if (%sEN[%d]) memory[%sADDR]%s = %sDATA%s;" % (pf, i, pf, enrange, pf, enrange))
             else:
+                v_stmts.append("  `ifndef SYNTHESIS");
                 if transp[p1]:
-                    v_stmts.append("  `delay(%d)" % (sum(ports)+1))
+                    v_stmts.append("    #%d;" % sum(ports));
+                v_stmts.append("    -> UPDATE_%s;" % pf)
+                v_stmts.append("  `endif")
                 v_stmts.append("  %sDATA %s memory[%sADDR];" % (pf, assign_op, pf))
             v_stmts.append("end")
 
@@ -177,13 +186,14 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
     if debug_mode:
         print("    $dumpfile(`vcd_file);", file=tb_f)
         print("    $dumpvars(0, bram_%02d_%02d_tb);" % (k1, k2), file=tb_f)
+    print("    #%d;" % (1000 + k2), file=tb_f)
 
     for p in (tb_clocks + tb_addr + tb_din):
         if p[-2:] == "EN":
             print("    %s <= ~0;" % p, file=tb_f)
         else:
             print("    %s <= 0;" % p, file=tb_f)
-    print("    #%d;" % (1000 + k2), file=tb_f)
+    print("    #1000;", file=tb_f)
 
     for v in [1, 0, 1, 0]:
         for p in tb_clocks:
@@ -218,13 +228,6 @@ for k1 in range(5):
     for f in [sim_f, ref_f, tb_f]:
         print("`timescale 1 ns / 1 ns", file=f)
 
-    for f in [sim_f, ref_f]:
-        print("`ifdef SYNTHESIS", file=f)
-        print("  `define delay(n)", file=f)
-        print("`else", file=f)
-        print("  `define delay(n) #n;", file=f)
-        print("`endif", file=f)
-
     for k2 in range(1 if debug_mode else 10):
         create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2)
 

diff --git a/tests/bram/run-single.sh b/tests/bram/run-single.sh
index 8a022e59749bf9146e13b3532f3d2493dab5e945..cb8295d1bcd23cb633825801ece273d0c699b5f3 100644 (file)
--- a/tests/bram/run-single.sh
+++ b/tests/bram/run-single.sh
@@ -2,8 +2,8 @@
 set -e
 ../../yosys -qq -p "proc; opt; memory -nomap; memory_bram -rules temp/brams_${2}.txt; opt -fast -full" \
                -l temp/synth_${1}_${2}.log -o temp/synth_${1}_${2}.v temp/brams_${1}.v
-iverilog -Dvcd_file=\"temp/tb_${1}_${2}.vcd\" -o temp/tb_${1}_${2}.tb temp/brams_${1}_tb.v temp/brams_${1}_ref.v \
-               temp/synth_${1}_${2}.v temp/brams_${2}.v ../../techlibs/common/simlib.v
+iverilog -Dvcd_file=\"temp/tb_${1}_${2}.vcd\" -DSIMLIB_MEMDELAY=1ns -o temp/tb_${1}_${2}.tb temp/brams_${1}_tb.v \
+               temp/brams_${1}_ref.v temp/synth_${1}_${2}.v temp/brams_${2}.v ../../techlibs/common/simlib.v
 temp/tb_${1}_${2}.tb > temp/tb_${1}_${2}.txt
 if grep -q ERROR temp/tb_${1}_${2}.txt; then
        grep -HC2 ERROR temp/tb_${1}_${2}.txt | head

diff --git a/tests/bram/run-test.sh b/tests/bram/run-test.sh
index cdf7d61b622b58ea44c7f8a00a8151aa042db41d..d617187ecaacd24d8f0a039c740819ca4fc0554f 100755 (executable)
--- a/tests/bram/run-test.sh
+++ b/tests/bram/run-test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # run this test many times:
-# time bash -c 'for ((i=0; i<100; i++)); do echo "-- $i --"; bash run-test.sh || exit 1; done'
+# MAKE="make -j8" time bash -c 'for ((i=0; i<100; i++)); do echo "-- $i --"; bash run-test.sh || exit 1; done'
 
 set -e
 rm -rf temp