riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Using std::vector<RTLIL::State> instead of RTLIL::Const for RTLIL::SigChunk::data

This commit is contained in:
Clifford Wolf 2014-09-01 11:36:02 +02:00
parent e3664066d5
commit e07698818d
4 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backends/btor/btor.cc
View File

@ -294,7 +294,8 @@ struct BtorDumper
int l=-1; int l=-1;
if(chunk->wire == NULL) if(chunk->wire == NULL)
{ {
l=dump_const(&chunk->data, chunk->width, chunk->offset); RTLIL::Const data_const(chunk->data);
l=dump_const(&data_const, chunk->width, chunk->offset);
} }
else else
{ {

62
kernel/rtlil.cc
View File

@ -1819,8 +1819,8 @@ RTLIL::SigChunk::SigChunk()
RTLIL::SigChunk::SigChunk(const RTLIL::Const &value) RTLIL::SigChunk::SigChunk(const RTLIL::Const &value)
{ {
wire = NULL; wire = NULL;
data = value; data = value.bits;
width = data.bits.size(); width = SIZE(data);
offset = 0; offset = 0;
} }
@ -1843,24 +1843,24 @@ RTLIL::SigChunk::SigChunk(RTLIL::Wire *wire, int offset, int width)
RTLIL::SigChunk::SigChunk(const std::string &str) RTLIL::SigChunk::SigChunk(const std::string &str)
{ {
wire = NULL; wire = NULL;
data = RTLIL::Const(str); data = RTLIL::Const(str).bits;
width = data.bits.size(); width = SIZE(data);
offset = 0; offset = 0;
} }
RTLIL::SigChunk::SigChunk(int val, int width) RTLIL::SigChunk::SigChunk(int val, int width)
{ {
wire = NULL; wire = NULL;
data = RTLIL::Const(val, width); data = RTLIL::Const(val, width).bits;
this->width = data.bits.size(); this->width = SIZE(data);
offset = 0; offset = 0;
} }
RTLIL::SigChunk::SigChunk(RTLIL::State bit, int width) RTLIL::SigChunk::SigChunk(RTLIL::State bit, int width)
{ {
wire = NULL; wire = NULL;
data = RTLIL::Const(bit, width); data = RTLIL::Const(bit, width).bits;
this->width = data.bits.size(); this->width = SIZE(data);
offset = 0; offset = 0;
} }
@ -1869,7 +1869,7 @@ RTLIL::SigChunk::SigChunk(RTLIL::SigBit bit)
wire = bit.wire; wire = bit.wire;
offset = 0; offset = 0;
if (wire == NULL) if (wire == NULL)
data = RTLIL::Const(bit.data); data = RTLIL::Const(bit.data).bits;
else else
offset = bit.offset; offset = bit.offset;
width = 1; width = 1;
@ -1884,7 +1884,7 @@ RTLIL::SigChunk RTLIL::SigChunk::extract(int offset, int length) const
ret.width = length; ret.width = length;
} else { } else {
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
ret.data.bits.push_back(data.bits[offset+i]); ret.data.push_back(data[offset+i]);
ret.width = length; ret.width = length;
} }
return ret; return ret;
@ -1905,16 +1905,12 @@ bool RTLIL::SigChunk::operator <(const RTLIL::SigChunk &other) const
if (width != other.width) if (width != other.width)
return width < other.width; return width < other.width;
return data.bits < other.data.bits; return data < other.data;
} }
bool RTLIL::SigChunk::operator ==(const RTLIL::SigChunk &other) const bool RTLIL::SigChunk::operator ==(const RTLIL::SigChunk &other) const
{ {
if (wire != other.wire || width != other.width || offset != other.offset) return wire == other.wire && width == other.width && offset == other.offset && data == other.data;
return false;
if (data.bits != other.data.bits)
return false;
return true;
} }
bool RTLIL::SigChunk::operator !=(const RTLIL::SigChunk &other) const bool RTLIL::SigChunk::operator !=(const RTLIL::SigChunk &other) const
@ -1964,7 +1960,7 @@ const RTLIL::SigSpec &RTLIL::SigSpec::operator=(const RTLIL::SigSpec &other)
for (auto &bit : other.bits_) { for (auto &bit : other.bits_) {
if (last && bit.wire == last->wire) { if (last && bit.wire == last->wire) {
if (bit.wire == NULL) { if (bit.wire == NULL) {
last->data.bits.push_back(bit.data); last->data.push_back(bit.data);
last->width++; last->width++;
continue; continue;
} else if (last_end_offset == bit.offset) { } else if (last_end_offset == bit.offset) {
@ -2120,7 +2116,7 @@ void RTLIL::SigSpec::pack() const
for (auto &bit : old_bits) { for (auto &bit : old_bits) {
if (last && bit.wire == last->wire) { if (last && bit.wire == last->wire) {
if (bit.wire == NULL) { if (bit.wire == NULL) {
last->data.bits.push_back(bit.data); last->data.push_back(bit.data);
last->width++; last->width++;
continue; continue;
} else if (last_end_offset == bit.offset) { } else if (last_end_offset == bit.offset) {
@ -2171,7 +2167,7 @@ void RTLIL::SigSpec::hash() const
that->hash_ = 5381; that->hash_ = 5381;
for (auto &c : that->chunks_) for (auto &c : that->chunks_)
if (c.wire == NULL) { if (c.wire == NULL) {
for (auto &v : c.data.bits) for (auto &v : c.data)
DJB2(that->hash_, v); DJB2(that->hash_, v);
} else { } else {
DJB2(that->hash_, c.wire->name.index_); DJB2(that->hash_, c.wire->name.index_);
@ -2444,8 +2440,8 @@ void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
{ {
auto &my_last_c = chunks_.back(); auto &my_last_c = chunks_.back();
if (my_last_c.wire == NULL && other_c.wire == NULL) { if (my_last_c.wire == NULL && other_c.wire == NULL) {
auto &this_data = my_last_c.data.bits; auto &this_data = my_last_c.data;
auto &other_data = other_c.data.bits; auto &other_data = other_c.data;
this_data.insert(this_data.end(), other_data.begin(), other_data.end()); this_data.insert(this_data.end(), other_data.begin(), other_data.end());
my_last_c.width += other_c.width; my_last_c.width += other_c.width;
} else } else
@ -2472,7 +2468,7 @@ void RTLIL::SigSpec::append_bit(const RTLIL::SigBit &bit)
else else
if (bit.wire == NULL) if (bit.wire == NULL)
if (chunks_.back().wire == NULL) { if (chunks_.back().wire == NULL) {
chunks_.back().data.bits.push_back(bit.data); chunks_.back().data.push_back(bit.data);
chunks_.back().width++; chunks_.back().width++;
} else } else
chunks_.push_back(bit); chunks_.push_back(bit);
@ -2558,14 +2554,14 @@ void RTLIL::SigSpec::check() const
if (i > 0) if (i > 0)
log_assert(chunks_[i-1].wire != NULL); log_assert(chunks_[i-1].wire != NULL);
log_assert(chunk.offset == 0); log_assert(chunk.offset == 0);
log_assert(chunk.data.bits.size() == (size_t)chunk.width); log_assert(chunk.data.size() == (size_t)chunk.width);
} else { } else {
if (i > 0 && chunks_[i-1].wire == chunk.wire) if (i > 0 && chunks_[i-1].wire == chunk.wire)
log_assert(chunk.offset != chunks_[i-1].offset + chunks_[i-1].width); log_assert(chunk.offset != chunks_[i-1].offset + chunks_[i-1].width);
log_assert(chunk.offset >= 0); log_assert(chunk.offset >= 0);
log_assert(chunk.width >= 0); log_assert(chunk.width >= 0);
log_assert(chunk.offset + chunk.width <= chunk.wire->width); log_assert(chunk.offset + chunk.width <= chunk.wire->width);
log_assert(chunk.data.bits.size() == 0); log_assert(chunk.data.size() == 0);
} }
w += chunk.width; w += chunk.width;
} }
@ -2681,8 +2677,8 @@ bool RTLIL::SigSpec::is_fully_def() const
for (auto it = chunks_.begin(); it != chunks_.end(); it++) { for (auto it = chunks_.begin(); it != chunks_.end(); it++) {
if (it->width > 0 && it->wire != NULL) if (it->width > 0 && it->wire != NULL)
return false; return false;
for (size_t i = 0; i < it->data.bits.size(); i++) for (size_t i = 0; i < it->data.size(); i++)
if (it->data.bits[i] != RTLIL::State::S0 && it->data.bits[i] != RTLIL::State::S1) if (it->data[i] != RTLIL::State::S0 && it->data[i] != RTLIL::State::S1)
return false; return false;
} }
return true; return true;
@ -2696,8 +2692,8 @@ bool RTLIL::SigSpec::is_fully_undef() const
for (auto it = chunks_.begin(); it != chunks_.end(); it++) { for (auto it = chunks_.begin(); it != chunks_.end(); it++) {
if (it->width > 0 && it->wire != NULL) if (it->width > 0 && it->wire != NULL)
return false; return false;
for (size_t i = 0; i < it->data.bits.size(); i++) for (size_t i = 0; i < it->data.size(); i++)
if (it->data.bits[i] != RTLIL::State::Sx && it->data.bits[i] != RTLIL::State::Sz) if (it->data[i] != RTLIL::State::Sx && it->data[i] != RTLIL::State::Sz)
return false; return false;
} }
return true; return true;
@ -2710,8 +2706,8 @@ bool RTLIL::SigSpec::has_marked_bits() const
pack(); pack();
for (auto it = chunks_.begin(); it != chunks_.end(); it++) for (auto it = chunks_.begin(); it != chunks_.end(); it++)
if (it->width > 0 && it->wire == NULL) { if (it->width > 0 && it->wire == NULL) {
for (size_t i = 0; i < it->data.bits.size(); i++) for (size_t i = 0; i < it->data.size(); i++)
if (it->data.bits[i] == RTLIL::State::Sm) if (it->data[i] == RTLIL::State::Sm)
return true; return true;
} }
return false; return false;
@ -2724,7 +2720,7 @@ bool RTLIL::SigSpec::as_bool() const
pack(); pack();
log_assert(is_fully_const() && SIZE(chunks_) <= 1); log_assert(is_fully_const() && SIZE(chunks_) <= 1);
if (width_) if (width_)
return chunks_[0].data.as_bool(); return RTLIL::Const(chunks_[0].data).as_bool();
return false; return false;
} }
@ -2735,7 +2731,7 @@ int RTLIL::SigSpec::as_int(bool is_signed) const
pack(); pack();
log_assert(is_fully_const() && SIZE(chunks_) <= 1); log_assert(is_fully_const() && SIZE(chunks_) <= 1);
if (width_) if (width_)
return chunks_[0].data.as_int(is_signed); return RTLIL::Const(chunks_[0].data).as_int(is_signed);
return 0; return 0;
} }
@ -2751,7 +2747,7 @@ std::string RTLIL::SigSpec::as_string() const
for (int j = 0; j < chunk.width; j++) for (int j = 0; j < chunk.width; j++)
str += "?"; str += "?";
else else
str += chunk.data.as_string(); str += RTLIL::Const(chunk.data).as_string();
} }
return str; return str;
} }

6
kernel/rtlil.h
View File

@ -864,7 +864,7 @@ public:
struct RTLIL::SigChunk struct RTLIL::SigChunk
{ {
RTLIL::Wire *wire; RTLIL::Wire *wire;
RTLIL::Const data; // only used if wire == NULL, LSB at index 0 std::vector<RTLIL::State> data; // only used if wire == NULL, LSB at index 0
int width, offset; int width, offset;
SigChunk(); SigChunk();
@ -895,8 +895,8 @@ struct RTLIL::SigBit
SigBit(RTLIL::State bit) : wire(NULL), data(bit) { } SigBit(RTLIL::State bit) : wire(NULL), data(bit) { }
SigBit(RTLIL::Wire *wire) : wire(wire), offset(0) { log_assert(wire && wire->width == 1); } SigBit(RTLIL::Wire *wire) : wire(wire), offset(0) { log_assert(wire && wire->width == 1); }
SigBit(RTLIL::Wire *wire, int offset) : wire(wire), offset(offset) { log_assert(wire); } SigBit(RTLIL::Wire *wire, int offset) : wire(wire), offset(offset) { log_assert(wire); }
SigBit(const RTLIL::SigChunk &chunk) : wire(chunk.wire) { log_assert(chunk.width == 1); if (wire) offset = chunk.offset; else data = chunk.data.bits[0]; } SigBit(const RTLIL::SigChunk &chunk) : wire(chunk.wire) { log_assert(chunk.width == 1); if (wire) offset = chunk.offset; else data = chunk.data[0]; }
SigBit(const RTLIL::SigChunk &chunk, int index) : wire(chunk.wire) { if (wire) offset = chunk.offset + index; else data = chunk.data.bits[index]; } SigBit(const RTLIL::SigChunk &chunk, int index) : wire(chunk.wire) { if (wire) offset = chunk.offset + index; else data = chunk.data[index]; }
SigBit(const RTLIL::SigSpec &sig); SigBit(const RTLIL::SigSpec &sig);
bool operator <(const RTLIL::SigBit &other) const { bool operator <(const RTLIL::SigBit &other) const {

2
passes/opt/opt_share.cc
View File

@ -101,7 +101,7 @@ struct OptShareWorker
int_to_hash_string(chunk.offset) + " " + int_to_hash_string(chunk.offset) + " " +
int_to_hash_string(chunk.width) + "}"; int_to_hash_string(chunk.width) + "}";
else else
hash_string += chunk.data.as_string(); hash_string += RTLIL::Const(chunk.data).as_string();
} }
hash_string += "\n"; hash_string += "\n";
} }