mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-03 21:09:12 +00:00
Code Activity

Fixed type of sign extension in opt_const $eq/$ne handling

Browse source
This commit is contained in:
Clifford Wolf 2013-11-07 16:53:28 +01:00
parent ed4bcd52e5
commit 0e1661f84e
3 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
kernel/rtlil.cc
View file

@ -940,6 +940,22 @@ void RTLIL::SigSpec::extend(int width, bool is_signed)
optimize(); optimize();
} }
void RTLIL::SigSpec::extend_un0(int width, bool is_signed)
{
if (this->width > width)
remove(width, this->width - width);
if (this->width < width) {
RTLIL::SigSpec padding = this->width > 0 ? extract(this->width - 1, 1) : RTLIL::SigSpec(RTLIL::State::S0);
if (!is_signed)
padding = RTLIL::SigSpec(RTLIL::State::S0);
while (this->width < width)
append(padding);
}
optimize();
}
void RTLIL::SigSpec::check() const void RTLIL::SigSpec::check() const
{ {
int w = 0; int w = 0;

1
kernel/rtlil.h
View file

@ -342,6 +342,7 @@ struct RTLIL::SigSpec {
void append(const RTLIL::SigSpec &signal); void append(const RTLIL::SigSpec &signal);
bool combine(RTLIL::SigSpec signal, RTLIL::State freeState = RTLIL::State::Sz, bool override = false); bool combine(RTLIL::SigSpec signal, RTLIL::State freeState = RTLIL::State::Sz, bool override = false);
void extend(int width, bool is_signed = false); void extend(int width, bool is_signed = false);
void extend_un0(int width, bool is_signed = false);
void check() const; void check() const;
bool operator <(const RTLIL::SigSpec &other) const; bool operator <(const RTLIL::SigSpec &other) const;
bool operator ==(const RTLIL::SigSpec &other) const; bool operator ==(const RTLIL::SigSpec &other) const;

18
passes/opt/opt_const.cc
View file

@ -151,8 +151,8 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons
if (cell->parameters["\\A_WIDTH"].as_int() != cell->parameters["\\B_WIDTH"].as_int()) { if (cell->parameters["\\A_WIDTH"].as_int() != cell->parameters["\\B_WIDTH"].as_int()) {
int width = std::max(cell->parameters["\\A_WIDTH"].as_int(), cell->parameters["\\B_WIDTH"].as_int()); int width = std::max(cell->parameters["\\A_WIDTH"].as_int(), cell->parameters["\\B_WIDTH"].as_int());
a.extend(width, cell->parameters["\\A_SIGNED"].as_bool() && cell->parameters["\\B_SIGNED"].as_bool()); a.extend_un0(width, cell->parameters["\\A_SIGNED"].as_bool() && cell->parameters["\\B_SIGNED"].as_bool());
b.extend(width, cell->parameters["\\A_SIGNED"].as_bool() && cell->parameters["\\B_SIGNED"].as_bool()); b.extend_un0(width, cell->parameters["\\A_SIGNED"].as_bool() && cell->parameters["\\B_SIGNED"].as_bool());
} }
RTLIL::SigSpec new_a, new_b; RTLIL::SigSpec new_a, new_b;
@ -168,6 +168,13 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons
new_b.append(b.chunks[i]); new_b.append(b.chunks[i]);
} }
if (new_a.width == 0) {
RTLIL::SigSpec new_y = RTLIL::SigSpec(cell->type == "$eq" ? RTLIL::State::S1 : RTLIL::State::S0);
new_y.extend(cell->parameters["\\Y_WIDTH"].as_int(), false);
replace_cell(module, cell, "empty", "\\Y", new_y);
goto next_cell;
}
if (new_a.width != a.width) { if (new_a.width != a.width) {
new_a.optimize(); new_a.optimize();
new_b.optimize(); new_b.optimize();
@ -176,13 +183,6 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons
cell->parameters["\\A_WIDTH"] = new_a.width; cell->parameters["\\A_WIDTH"] = new_a.width;
cell->parameters["\\B_WIDTH"] = new_b.width; cell->parameters["\\B_WIDTH"] = new_b.width;
} }
if (new_a.width == 0) {
RTLIL::SigSpec new_y = RTLIL::SigSpec(cell->type == "$eq" ? RTLIL::State::S1 : RTLIL::State::S0);
new_y.extend(cell->parameters["\\Y_WIDTH"].as_int(), false);
replace_cell(module, cell, "empty", "\\Y", new_y);
goto next_cell;
}
} }
if ((cell->type == "$eq" || cell->type == "$ne") && cell->parameters["\\Y_WIDTH"].as_int() == 1 && if ((cell->type == "$eq" || cell->type == "$ne") && cell->parameters["\\Y_WIDTH"].as_int() == 1 &&