mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-12 17:06:15 +00:00
Code Activity

memory_bram transp support

Browse source
This commit is contained in:
Clifford Wolf 2015-01-03 12:41:46 +01:00
parent a7e43ae3d9
commit fd2c224c04
2 changed files with 86 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

26
passes/memory/memory_bram.cc
View file

@ -226,10 +226,12 @@ bool replace_cell(Cell *cell, const rules_t::bram_t &bram, const rules_t::match_
dict<int, pair<SigBit, bool>> clock_domains; dict<int, pair<SigBit, bool>> clock_domains;
dict<int, bool> clock_polarities; dict<int, bool> clock_polarities;
dict<int, bool> read_transp;
pool<int> clocks_wr_ports; pool<int> clocks_wr_ports;
pool<int> clkpol_wr_ports; pool<int> clkpol_wr_ports;
int clocks_max = 0; int clocks_max = 0;
int clkpol_max = 0; int clkpol_max = 0;
int transp_max = 0;
clock_polarities[0] = false; clock_polarities[0] = false;
clock_polarities[1] = true; clock_polarities[1] = true;
@ -242,6 +244,7 @@ bool replace_cell(Cell *cell, const rules_t::bram_t &bram, const rules_t::match_
} }
clocks_max = std::max(clocks_max, pi.clocks); clocks_max = std::max(clocks_max, pi.clocks);
clkpol_max = std::max(clkpol_max, pi.clkpol); clkpol_max = std::max(clkpol_max, pi.clkpol);
transp_max = std::max(transp_max, pi.transp);
} }
log(" Mapping to bram type %s:\n", log_id(bram.name)); log(" Mapping to bram type %s:\n", log_id(bram.name));
@ -277,8 +280,8 @@ bool replace_cell(Cell *cell, const rules_t::bram_t &bram, const rules_t::match_
for (int cell_port_i = 0, bram_port_i = 0; cell_port_i < wr_ports; cell_port_i++) for (int cell_port_i = 0, bram_port_i = 0; cell_port_i < wr_ports; cell_port_i++)
{ {
bool clken = wr_clken[cell_port_i] == State::S1; bool clken = wr_clken[cell_port_i] == State::S1;
auto clkpol = wr_clkpol[cell_port_i] == State::S1; bool clkpol = wr_clkpol[cell_port_i] == State::S1;
auto clksig = wr_clk[cell_port_i]; SigBit clksig = wr_clk[cell_port_i];
pair<SigBit, bool> clkdom(clksig, clkpol); pair<SigBit, bool> clkdom(clksig, clkpol);
if (!clken) if (!clken)
@ -374,6 +377,8 @@ grow_read_ports:;
pi.clocks += clocks_max; pi.clocks += clocks_max;
if (pi.clkpol > 1 && !clkpol_wr_ports[pi.clkpol]) if (pi.clkpol > 1 && !clkpol_wr_ports[pi.clkpol])
pi.clkpol += clkpol_max; pi.clkpol += clkpol_max;
if (pi.transp > 1)
pi.transp += transp_max;
pi.dupidx++; pi.dupidx++;
new_portinfos.push_back(pi); new_portinfos.push_back(pi);
} }
@ -385,11 +390,16 @@ grow_read_ports:;
dup_count++; dup_count++;
} }
read_transp.clear();
read_transp[0] = false;
read_transp[1] = true;
for (int cell_port_i = 0; cell_port_i < rd_ports; cell_port_i++) for (int cell_port_i = 0; cell_port_i < rd_ports; cell_port_i++)
{ {
bool clken = rd_clken[cell_port_i] == State::S1; bool clken = rd_clken[cell_port_i] == State::S1;
auto clkpol = rd_clkpol[cell_port_i] == State::S1; bool clkpol = rd_clkpol[cell_port_i] == State::S1;
auto clksig = rd_clk[cell_port_i]; bool transp = rd_transp[cell_port_i] == State::S1;
SigBit clksig = rd_clk[cell_port_i];
pair<SigBit, bool> clkdom(clksig, clkpol); pair<SigBit, bool> clkdom(clksig, clkpol);
if (!clken) if (!clken)
@ -420,6 +430,10 @@ grow_read_ports:;
log(" Bram port %c%d.%d has incompatible clock polarity.\n", pi.group + 'A', pi.index + 1, pi.dupidx + 1); log(" Bram port %c%d.%d has incompatible clock polarity.\n", pi.group + 'A', pi.index + 1, pi.dupidx + 1);
goto skip_bram_rport; goto skip_bram_rport;
} }
if (read_transp.count(pi.transp) && read_transp.at(pi.transp) != transp) {
log(" Bram port %c%d.%d has incompatible read transparancy.\n", pi.group + 'A', pi.index + 1, pi.dupidx + 1);
goto skip_bram_rport;
}
} else { } else {
if (pi.clocks != 0) { if (pi.clocks != 0) {
log(" Bram port %c%d.%d has incompatible clock type.\n", pi.group + 'A', pi.index + 1, pi.dupidx + 1); log(" Bram port %c%d.%d has incompatible clock type.\n", pi.group + 'A', pi.index + 1, pi.dupidx + 1);
@ -433,6 +447,7 @@ grow_read_ports:;
if (clken) { if (clken) {
clock_domains[pi.clocks] = clkdom; clock_domains[pi.clocks] = clkdom;
clock_polarities[pi.clkpol] = clkdom.second; clock_polarities[pi.clkpol] = clkdom.second;
read_transp[pi.transp] = transp;
pi.sig_clock = clkdom.first; pi.sig_clock = clkdom.first;
pi.effective_clkpol = clkdom.second; pi.effective_clkpol = clkdom.second;
} }
@ -444,6 +459,7 @@ grow_read_ports:;
grow_read_ports_cursor = cell_port_i; grow_read_ports_cursor = cell_port_i;
try_growing_more_read_ports = true; try_growing_more_read_ports = true;
} }
goto mapped_rd_port; goto mapped_rd_port;
} }
@ -477,6 +493,8 @@ grow_read_ports:;
c->setPort(stringf("\\CLK%d", (pi.clocks-1) % clocks_max + 1), pi.sig_clock); c->setPort(stringf("\\CLK%d", (pi.clocks-1) % clocks_max + 1), pi.sig_clock);
if (pi.clkpol > 1 && pi.sig_clock.wire) if (pi.clkpol > 1 && pi.sig_clock.wire)
c->setParam(stringf("\\CLKPOL%d", (pi.clkpol-1) % clkpol_max + 1), clock_polarities.at(pi.clkpol)); c->setParam(stringf("\\CLKPOL%d", (pi.clkpol-1) % clkpol_max + 1), clock_polarities.at(pi.clkpol));
if (pi.transp > 1 && pi.sig_clock.wire)
c->setParam(stringf("\\TRANSP%d", (pi.transp-1) % transp_max + 1), read_transp.at(pi.transp));
} }
SigSpec addr_ok; SigSpec addr_ok;

104
tests/bram/generate.py
View file

@ -12,7 +12,7 @@ seed = (int(os.times()[4]*100) + os.getpid()) % 900000 + 100000
def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2): def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
while True: while True:
init = random.randrange(2) init = 0 # random.randrange(2)
abits = random.randrange(1, 8) abits = random.randrange(1, 8)
dbits = random.randrange(1, 8) dbits = random.randrange(1, 8)
groups = random.randrange(2, 5) groups = random.randrange(2, 5)
@ -22,29 +22,38 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
if random.randrange(2): if random.randrange(2):
dbits = 2 ** random.randrange(1, 4) dbits = 2 ** random.randrange(1, 4)
ports = [ random.randrange(1, 3) for i in range(groups) ] while True:
wrmode = [ random.randrange(0, 2) for i in range(groups) ] wrmode = [ random.randrange(0, 2) for i in range(groups) ]
enable = [ random.randrange(0, 4) for i in range(groups) ] if wrmode.count(1) == 0: continue
transp = [ random.randrange(0, 4) for i in range(groups) ] if wrmode.count(0) == 0: continue
clocks = [ random.randrange(1, 4) for i in range(groups) ] break
clkpol = [ random.randrange(0, 4) for i in range(groups) ]
# XXX if random.randrange(2) or True:
init = 0 maxpol = 4
transp = [ 0 for i in range(groups) ] maxtransp = 1
else:
maxpol = 2
maxtransp = 2
for p1 in range(groups): def generate_enable(i):
if wrmode[p1] == 0: if wrmode[i]:
enable[p1] = 0 v = 2 ** random.randrange(0, 4)
else: while dbits < v or dbits % v != 0:
enable[p1] = 2**enable[p1] v //= 2
while dbits < enable[p1] or dbits % enable[p1] != 0: return v
enable[p1] //= 2 return 0
config_ok = True def generate_transp(i):
if wrmode.count(1) == 0: config_ok = False if wrmode[i] == 0:
if wrmode.count(0) == 0: config_ok = False return random.randrange(maxtransp)
if config_ok: break return 0
ports = [ random.randrange(1, 3) for i in range(groups) ]
enable = [ generate_enable(i) for i in range(groups) ]
transp = [ generate_transp(i) for i in range(groups) ]
clocks = [ random.randrange(1, 4) for i in range(groups) ]
clkpol = [ random.randrange(maxpol) for i in range(groups) ]
break
print("bram bram_%02d_%02d" % (k1, k2), file=dsc_f) print("bram bram_%02d_%02d" % (k1, k2), file=dsc_f)
print(" init %d" % init, file=dsc_f) print(" init %d" % init, file=dsc_f)
@ -64,6 +73,7 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
states = set() states = set()
v_ports = set() v_ports = set()
v_stmts = list() v_stmts = list()
v_always = dict()
tb_decls = list() tb_decls = list()
tb_clocks = list() tb_clocks = list()
@ -82,12 +92,17 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
v_stmts.append("(* nomem2reg *) reg [%d:0] memory [0:%d];" % (dbits-1, 2**abits-1)) v_stmts.append("(* nomem2reg *) reg [%d:0] memory [0:%d];" % (dbits-1, 2**abits-1))
portindex = 0 portindex = 0
last_always_hdr = (-1, "")
for p1 in range(groups): for p1 in range(groups):
for p2 in range(ports[p1]): for p2 in range(ports[p1]):
pf = "%c%d" % (chr(ord("A") + p1), p2 + 1) pf = "%c%d" % (chr(ord("A") + p1), p2 + 1)
portindex += 1 portindex += 1
v_stmts.append("`ifndef SYNTHESIS")
v_stmts.append(" event UPDATE_%s;" % pf)
v_stmts.append("`endif")
if clocks[p1] and not ("CLK%d" % clocks[p1]) in v_ports: if clocks[p1] and not ("CLK%d" % clocks[p1]) in v_ports:
v_ports.add("CLK%d" % clocks[p1]) v_ports.add("CLK%d" % clocks[p1])
v_stmts.append("input CLK%d;" % clocks[p1]) v_stmts.append("input CLK%d;" % clocks[p1])
@ -133,27 +148,36 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
states.add(("CPW", clocks[p1], clkpol[p1])) states.add(("CPW", clocks[p1], clkpol[p1]))
always_hdr = "always @(posedge CLK%d_CLKPOL%d) begin" % (clocks[p1], clkpol[p1]) always_hdr = "always @(posedge CLK%d_CLKPOL%d) begin" % (clocks[p1], clkpol[p1])
v_stmts.append("`ifndef SYNTHESIS") if last_always_hdr[1] != always_hdr:
v_stmts.append("event UPDATE_%s;" % pf) last_always_hdr = (portindex, always_hdr)
v_stmts.append("`endif") v_always[last_always_hdr] = list()
v_stmts.append(always_hdr)
if wrmode[p1]: if wrmode[p1]:
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]): for i in range(enable[p1]):
enrange = "[%d:%d]" % ((i+1)*dbits/enable[p1]-1, i*dbits/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)) v_always[last_always_hdr].append((portindex, pf, "if (%sEN[%d]) memory[%sADDR]%s = %sDATA%s;" % (pf, i, pf, enrange, pf, enrange)))
else: else:
v_stmts.append(" `ifndef SYNTHESIS"); v_always[last_always_hdr].append((sum(ports)+1 if transp[p1] else 0, pf, "%sDATA %s memory[%sADDR];" % (pf, assign_op, pf)))
if transp[p1]:
v_stmts.append(" #%d;" % sum(ports)); for always_hdr in sorted(v_always):
v_stmts.append(" -> UPDATE_%s;" % pf) v_stmts.append(always_hdr[1])
triggered_events = set()
time_cursor = 0
v_always[always_hdr].sort()
for t, p, s in v_always[always_hdr]:
if time_cursor != t or not p in triggered_events:
v_stmts.append(" `ifndef SYNTHESIS")
stmt = ""
if time_cursor != t:
stmt += " #%d;" % (t-time_cursor)
time_cursor = t
if not p in triggered_events:
stmt += (" -> UPDATE_%s;" % p)
triggered_events.add(p)
v_stmts.append(" %s" % stmt)
v_stmts.append(" `endif") v_stmts.append(" `endif")
v_stmts.append(" %sDATA %s memory[%sADDR];" % (pf, assign_op, pf)) v_stmts.append(" %s" % s)
v_stmts.append("end") v_stmts.append("end")
print("module bram_%02d_%02d(%s);" % (k1, k2, ", ".join(v_ports)), file=sim_f) print("module bram_%02d_%02d(%s);" % (k1, k2, ", ".join(v_ports)), file=sim_f)
for stmt in v_stmts: for stmt in v_stmts:
@ -220,10 +244,10 @@ print("Rng seed: %d" % seed)
random.seed(seed) random.seed(seed)
for k1 in range(5): for k1 in range(5):
dsc_f = file("temp/brams_%02d.txt" % k1, "w"); dsc_f = file("temp/brams_%02d.txt" % k1, "w")
sim_f = file("temp/brams_%02d.v" % k1, "w"); sim_f = file("temp/brams_%02d.v" % k1, "w")
ref_f = file("temp/brams_%02d_ref.v" % k1, "w"); ref_f = file("temp/brams_%02d_ref.v" % k1, "w")
tb_f = file("temp/brams_%02d_tb.v" % k1, "w"); tb_f = file("temp/brams_%02d_tb.v" % k1, "w")
for f in [sim_f, ref_f, tb_f]: for f in [sim_f, ref_f, tb_f]:
print("`timescale 1 ns / 1 ns", file=f) print("`timescale 1 ns / 1 ns", file=f)