mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-31 03:32:29 +00:00
Code Activity

Added RTLIL::Cell::has(portname)

Browse source
This commit is contained in:
Clifford Wolf 2014-07-26 16:11:28 +02:00
parent a84cb04935
commit 97a59851a6
12 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/spice/spice.cc
View file

@ -80,7 +80,7 @@ static void print_spice_module(FILE *f, RTLIL::Module *module, RTLIL::Design *de
for (RTLIL::Wire *wire : ports) { for (RTLIL::Wire *wire : ports) {
log_assert(wire != NULL); log_assert(wire != NULL);
RTLIL::SigSpec sig(RTLIL::State::Sz, wire->width); RTLIL::SigSpec sig(RTLIL::State::Sz, wire->width);
if (cell->connections().count(wire->name) > 0) { if (cell->has(wire->name)) {
sig = sigmap(cell->connections().at(wire->name)); sig = sigmap(cell->connections().at(wire->name));
sig.extend(wire->width, false); sig.extend(wire->width, false);
} }

4
backends/verilog/verilog_backend.cc
View file

@ -301,7 +301,7 @@ void dump_cell_expr_port(FILE *f, RTLIL::Cell *cell, std::string port, bool gen_
std::string cellname(RTLIL::Cell *cell) std::string cellname(RTLIL::Cell *cell)
{ {
if (!norename && cell->name[0] == '$' && reg_ct.cell_known(cell->type) && cell->connections().count("\\Q") > 0) if (!norename && cell->name[0] == '$' && reg_ct.cell_known(cell->type) && cell->has("\\Q"))
{ {
RTLIL::SigSpec sig = cell->get("\\Q"); RTLIL::SigSpec sig = cell->get("\\Q");
if (SIZE(sig) != 1 || sig.is_fully_const()) if (SIZE(sig) != 1 || sig.is_fully_const())
@ -908,7 +908,7 @@ void dump_module(FILE *f, std::string indent, RTLIL::Module *module)
for (auto &it : module->cells) for (auto &it : module->cells)
{ {
RTLIL::Cell *cell = it.second; RTLIL::Cell *cell = it.second;
if (!reg_ct.cell_known(cell->type) || cell->connections().count("\\Q") == 0) if (!reg_ct.cell_known(cell->type) || !cell->has("\\Q"))
continue; continue;
RTLIL::SigSpec sig = cell->get("\\Q"); RTLIL::SigSpec sig = cell->get("\\Q");

2
frontends/ilang/parser.y
View file

@ -202,7 +202,7 @@ cell_body:
delete $5; delete $5;
} | } |
cell_body TOK_CONNECT TOK_ID sigspec EOL { cell_body TOK_CONNECT TOK_ID sigspec EOL {
if (current_cell->connections().count($3) != 0) if (current_cell->has($3))
rtlil_frontend_ilang_yyerror(stringf("ilang error: redefinition of cell port %s.", $3).c_str()); rtlil_frontend_ilang_yyerror(stringf("ilang error: redefinition of cell port %s.", $3).c_str());
current_cell->set($3, *$4); current_cell->set($3, *$4);
delete $4; delete $4;

8
kernel/consteval.h
View file

@ -87,21 +87,21 @@ struct ConstEval
{ {
RTLIL::SigSpec sig_a, sig_b, sig_s, sig_y; RTLIL::SigSpec sig_a, sig_b, sig_s, sig_y;
assert(cell->connections().count("\\Y") > 0); assert(cell->has("\\Y"));
sig_y = values_map(assign_map(cell->get("\\Y"))); sig_y = values_map(assign_map(cell->get("\\Y")));
if (sig_y.is_fully_const()) if (sig_y.is_fully_const())
return true; return true;
if (cell->connections().count("\\S") > 0) { if (cell->has("\\S")) {
sig_s = cell->get("\\S"); sig_s = cell->get("\\S");
if (!eval(sig_s, undef, cell)) if (!eval(sig_s, undef, cell))
return false; return false;
} }
if (cell->connections().count("\\A") > 0) if (cell->has("\\A"))
sig_a = cell->get("\\A"); sig_a = cell->get("\\A");
if (cell->connections().count("\\B") > 0) if (cell->has("\\B"))
sig_b = cell->get("\\B"); sig_b = cell->get("\\B");
if (cell->type == "$mux" || cell->type == "$pmux" || cell->type == "$safe_pmux" || cell->type == "$_MUX_") if (cell->type == "$mux" || cell->type == "$pmux" || cell->type == "$safe_pmux" || cell->type == "$_MUX_")

13
kernel/rtlil.cc
View file

@ -348,9 +348,9 @@ namespace {
void port(const char *name, int width) void port(const char *name, int width)
{ {
if (cell->connections().count(name) == 0) if (!cell->has(name))
error(__LINE__); error(__LINE__);
if (cell->connections().at(name).size() != width) if (cell->get(name).size() != width)
error(__LINE__); error(__LINE__);
expected_ports.insert(name); expected_ports.insert(name);
} }
@ -379,9 +379,9 @@ namespace {
for (const char *p = ports; *p; p++) { for (const char *p = ports; *p; p++) {
char portname[3] = { '\\', *p, 0 }; char portname[3] = { '\\', *p, 0 };
if (cell->connections().count(portname) == 0) if (!cell->has(portname))
error(__LINE__); error(__LINE__);
if (cell->connections().at(portname).size() != 1) if (cell->get(portname).size() != 1)
error(__LINE__); error(__LINE__);
} }
@ -1340,6 +1340,11 @@ RTLIL::Memory::Memory()
size = 0; size = 0;
} }
bool RTLIL::Cell::has(RTLIL::IdString portname)
{
return connections_.count(portname) != 0;
}
void RTLIL::Cell::unset(RTLIL::IdString portname) void RTLIL::Cell::unset(RTLIL::IdString portname)
{ {
connections_.erase(portname); connections_.erase(portname);

1
kernel/rtlil.h
View file

@ -488,6 +488,7 @@ public:
RTLIL_ATTRIBUTE_MEMBERS RTLIL_ATTRIBUTE_MEMBERS
// access cell ports // access cell ports
bool has(RTLIL::IdString portname);
void unset(RTLIL::IdString portname); void unset(RTLIL::IdString portname);
void set(RTLIL::IdString portname, RTLIL::SigSpec signal); void set(RTLIL::IdString portname, RTLIL::SigSpec signal);
const RTLIL::SigSpec &get(RTLIL::IdString portname) const; const RTLIL::SigSpec &get(RTLIL::IdString portname) const;

2
passes/cmds/add.cc
View file

@ -75,7 +75,7 @@ static void add_wire(RTLIL::Design *design, RTLIL::Module *module, std::string n
continue; continue;
if (mod->get_bool_attribute("\\blackbox")) if (mod->get_bool_attribute("\\blackbox"))
continue; continue;
if (it.second->connections().count(name) > 0) if (it.second->has(name))
continue; continue;
it.second->set(name, wire); it.second->set(name, wire);

2
passes/fsm/fsm_detect.cc
View file

@ -80,7 +80,7 @@ static bool check_state_users(RTLIL::SigSpec sig)
continue; continue;
if (cellport.second != "\\A" && cellport.second != "\\B") if (cellport.second != "\\A" && cellport.second != "\\B")
return false; return false;
if (cell->connections().count("\\A") == 0 || cell->connections().count("\\B") == 0 || cell->connections().count("\\Y") == 0) if (!cell->has("\\A") || !cell->has("\\B") || !cell->has("\\Y"))
return false; return false;
for (auto &port_it : cell->connections()) for (auto &port_it : cell->connections())
if (port_it.first != "\\A" && port_it.first != "\\B" && port_it.first != "\\Y") if (port_it.first != "\\A" && port_it.first != "\\B" && port_it.first != "\\Y")

16
passes/fsm/fsm_expand.cc
View file

@ -47,13 +47,13 @@ struct FsmExpand
return true; return true;
RTLIL::SigSpec new_signals; RTLIL::SigSpec new_signals;
if (cell->connections().count("\\A") > 0) if (cell->has("\\A"))
new_signals.append(assign_map(cell->get("\\A"))); new_signals.append(assign_map(cell->get("\\A")));
if (cell->connections().count("\\B") > 0) if (cell->has("\\B"))
new_signals.append(assign_map(cell->get("\\B"))); new_signals.append(assign_map(cell->get("\\B")));
if (cell->connections().count("\\S") > 0) if (cell->has("\\S"))
new_signals.append(assign_map(cell->get("\\S"))); new_signals.append(assign_map(cell->get("\\S")));
if (cell->connections().count("\\Y") > 0) if (cell->has("\\Y"))
new_signals.append(assign_map(cell->get("\\Y"))); new_signals.append(assign_map(cell->get("\\Y")));
new_signals.sort_and_unify(); new_signals.sort_and_unify();
@ -65,7 +65,7 @@ struct FsmExpand
if (new_signals.size() > 3) if (new_signals.size() > 3)
return false; return false;
if (cell->connections().count("\\Y") > 0) { if (cell->has("\\Y")) {
new_signals.append(assign_map(cell->get("\\Y"))); new_signals.append(assign_map(cell->get("\\Y")));
new_signals.sort_and_unify(); new_signals.sort_and_unify();
new_signals.remove_const(); new_signals.remove_const();
@ -148,11 +148,11 @@ struct FsmExpand
for (int i = 0; i < (1 << input_sig.size()); i++) { for (int i = 0; i < (1 << input_sig.size()); i++) {
RTLIL::Const in_val(i, input_sig.size()); RTLIL::Const in_val(i, input_sig.size());
RTLIL::SigSpec A, B, S; RTLIL::SigSpec A, B, S;
if (cell->connections().count("\\A") > 0) if (cell->has("\\A"))
A = assign_map(cell->get("\\A")); A = assign_map(cell->get("\\A"));
if (cell->connections().count("\\B") > 0) if (cell->has("\\B"))
B = assign_map(cell->get("\\B")); B = assign_map(cell->get("\\B"));
if (cell->connections().count("\\S") > 0) if (cell->has("\\S"))
S = assign_map(cell->get("\\S")); S = assign_map(cell->get("\\S"));
A.replace(input_sig, RTLIL::SigSpec(in_val)); A.replace(input_sig, RTLIL::SigSpec(in_val));
B.replace(input_sig, RTLIL::SigSpec(in_val)); B.replace(input_sig, RTLIL::SigSpec(in_val));

2
passes/fsm/fsm_extract.cc
View file

@ -350,7 +350,7 @@ struct FsmExtractPass : public Pass {
assign_map.apply(sig); assign_map.apply(sig);
sig2driver.insert(sig, sig2driver_entry_t(cell_it.first, conn_it.first)); sig2driver.insert(sig, sig2driver_entry_t(cell_it.first, conn_it.first));
} }
if (ct.cell_input(cell_it.second->type, conn_it.first) && cell_it.second->connections().count("\\Y") > 0 && if (ct.cell_input(cell_it.second->type, conn_it.first) && cell_it.second->has("\\Y") &&
cell_it.second->get("\\Y").size() == 1 && (conn_it.first == "\\A" || conn_it.first == "\\B")) { cell_it.second->get("\\Y").size() == 1 && (conn_it.first == "\\A" || conn_it.first == "\\B")) {
RTLIL::SigSpec sig = conn_it.second; RTLIL::SigSpec sig = conn_it.second;
assign_map.apply(sig); assign_map.apply(sig);

4
passes/opt/opt_const.cc
View file

@ -88,7 +88,7 @@ static void replace_cell(RTLIL::Module *module, RTLIL::Cell *cell, std::string i
static bool group_cell_inputs(RTLIL::Module *module, RTLIL::Cell *cell, bool commutative, bool extend_u0, SigMap &sigmap) static bool group_cell_inputs(RTLIL::Module *module, RTLIL::Cell *cell, bool commutative, bool extend_u0, SigMap &sigmap)
{ {
std::string b_name = cell->connections().count("\\B") ? "\\B" : "\\A"; std::string b_name = cell->has("\\B") ? "\\B" : "\\A";
bool a_signed = cell->parameters.at("\\A_SIGNED").as_bool(); bool a_signed = cell->parameters.at("\\A_SIGNED").as_bool();
bool b_signed = cell->parameters.at(b_name + "_SIGNED").as_bool(); bool b_signed = cell->parameters.at(b_name + "_SIGNED").as_bool();
@ -321,7 +321,7 @@ static void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bo
cell->type == "$mul" || cell->type == "$div" || cell->type == "$mod" || cell->type == "$pow") cell->type == "$mul" || cell->type == "$div" || cell->type == "$mod" || cell->type == "$pow")
{ {
RTLIL::SigSpec sig_a = assign_map(cell->get("\\A")); RTLIL::SigSpec sig_a = assign_map(cell->get("\\A"));
RTLIL::SigSpec sig_b = cell->connections().count("\\B") ? assign_map(cell->get("\\B")) : RTLIL::SigSpec(); RTLIL::SigSpec sig_b = cell->has("\\B") ? assign_map(cell->get("\\B")) : RTLIL::SigSpec();
if (cell->type == "$shl" || cell->type == "$shr" || cell->type == "$sshl" || cell->type == "$sshr") if (cell->type == "$shl" || cell->type == "$shr" || cell->type == "$sshl" || cell->type == "$sshr")
sig_a = RTLIL::SigSpec(); sig_a = RTLIL::SigSpec();

4
passes/sat/expose.cc
View file

@ -83,7 +83,7 @@ static void find_dff_wires(std::set<std::string> &dff_wires, RTLIL::Module *modu
SigPool dffsignals; SigPool dffsignals;
for (auto &it : module->cells) { for (auto &it : module->cells) {
if (ct.cell_known(it.second->type) && it.second->connections().count("\\Q")) if (ct.cell_known(it.second->type) && it.second->has("\\Q"))
dffsignals.add(sigmap(it.second->get("\\Q"))); dffsignals.add(sigmap(it.second->get("\\Q")));
} }
@ -628,7 +628,7 @@ struct ExposePass : public Pass {
log("New module port: %s/%s (%s)\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(w->name), RTLIL::id2cstr(cell->type)); log("New module port: %s/%s (%s)\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(w->name), RTLIL::id2cstr(cell->type));
RTLIL::SigSpec sig; RTLIL::SigSpec sig;
if (cell->connections().count(p->name) != 0) if (cell->has(p->name))
sig = cell->connections().at(p->name); sig = cell->connections().at(p->name);
sig.extend(w->width); sig.extend(w->width);
if (w->port_input) if (w->port_input)