mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-07 09:55:20 +00:00
Code Activity

cxxrtl: expose RTLIL::{Wire,Memory}->start_offset in debug info.

Browse source
This commit is contained in:
whitequark 2020-06-11 12:42:37 +00:00
parent 8a4841d786
commit fa04b19670
3 changed files with 62 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
backends/cxxrtl/cxxrtl.h
View file

@ -734,69 +734,81 @@ struct debug_item : ::cxxrtl_object {
debug_item(const ::cxxrtl_object &object) : cxxrtl_object(object) {} debug_item(const ::cxxrtl_object &object) : cxxrtl_object(object) {}
template<size_t Bits> template<size_t Bits>
debug_item(value<Bits> &item) { debug_item(value<Bits> &item, size_t lsb_offset = 0) {
static_assert(sizeof(item) == value<Bits>::chunks * sizeof(chunk_t), static_assert(sizeof(item) == value<Bits>::chunks * sizeof(chunk_t),
"value<Bits> is not compatible with C layout"); "value<Bits> is not compatible with C layout");
type = VALUE; type = VALUE;
width = Bits; width = Bits;
lsb_at = lsb_offset;
depth = 1; depth = 1;
zero_at = 0;
curr = item.data; curr = item.data;
next = item.data; next = item.data;
} }
template<size_t Bits> template<size_t Bits>
debug_item(const value<Bits> &item) { debug_item(const value<Bits> &item, size_t lsb_offset = 0) {
static_assert(sizeof(item) == value<Bits>::chunks * sizeof(chunk_t), static_assert(sizeof(item) == value<Bits>::chunks * sizeof(chunk_t),
"value<Bits> is not compatible with C layout"); "value<Bits> is not compatible with C layout");
type = VALUE; type = VALUE;
width = Bits; width = Bits;
lsb_at = lsb_offset;
depth = 1; depth = 1;
zero_at = 0;
curr = const_cast<chunk_t*>(item.data); curr = const_cast<chunk_t*>(item.data);
next = nullptr; next = nullptr;
} }
template<size_t Bits> template<size_t Bits>
debug_item(wire<Bits> &item) { debug_item(wire<Bits> &item, size_t lsb_offset = 0) {
static_assert(sizeof(item.curr) == value<Bits>::chunks * sizeof(chunk_t) && static_assert(sizeof(item.curr) == value<Bits>::chunks * sizeof(chunk_t) &&
sizeof(item.next) == value<Bits>::chunks * sizeof(chunk_t), sizeof(item.next) == value<Bits>::chunks * sizeof(chunk_t),
"wire<Bits> is not compatible with C layout"); "wire<Bits> is not compatible with C layout");
type = WIRE; type = WIRE;
width = Bits; width = Bits;
lsb_at = lsb_offset;
depth = 1; depth = 1;
zero_at = 0;
curr = item.curr.data; curr = item.curr.data;
next = item.next.data; next = item.next.data;
} }
template<size_t Width> template<size_t Width>
debug_item(memory<Width> &item) { debug_item(memory<Width> &item, size_t zero_offset = 0) {
static_assert(sizeof(item.data[0]) == value<Width>::chunks * sizeof(chunk_t), static_assert(sizeof(item.data[0]) == value<Width>::chunks * sizeof(chunk_t),
"memory<Width> is not compatible with C layout"); "memory<Width> is not compatible with C layout");
type = MEMORY; type = MEMORY;
width = Width; width = Width;
lsb_at = 0;
depth = item.data.size(); depth = item.data.size();
zero_at = zero_offset;
curr = item.data.empty() ? nullptr : item.data[0].data; curr = item.data.empty() ? nullptr : item.data[0].data;
next = nullptr; next = nullptr;
} }
template<size_t Bits> template<size_t Bits>
debug_item(debug_alias, const value<Bits> &item) { debug_item(debug_alias, const value<Bits> &item, size_t lsb_offset = 0) {
static_assert(sizeof(item) == value<Bits>::chunks * sizeof(chunk_t), static_assert(sizeof(item) == value<Bits>::chunks * sizeof(chunk_t),
"value<Bits> is not compatible with C layout"); "value<Bits> is not compatible with C layout");
type = ALIAS; type = ALIAS;
width = Bits; width = Bits;
lsb_at = lsb_offset;
depth = 1; depth = 1;
zero_at = 0;
curr = const_cast<chunk_t*>(item.data); curr = const_cast<chunk_t*>(item.data);
next = nullptr; next = nullptr;
} }
template<size_t Bits> template<size_t Bits>
debug_item(debug_alias, const wire<Bits> &item) { debug_item(debug_alias, const wire<Bits> &item, size_t lsb_offset = 0) {
static_assert(sizeof(item.curr) == value<Bits>::chunks * sizeof(chunk_t) && static_assert(sizeof(item.curr) == value<Bits>::chunks * sizeof(chunk_t) &&
sizeof(item.next) == value<Bits>::chunks * sizeof(chunk_t), sizeof(item.next) == value<Bits>::chunks * sizeof(chunk_t),
"wire<Bits> is not compatible with C layout"); "wire<Bits> is not compatible with C layout");
type = ALIAS; type = ALIAS;
width = Bits; width = Bits;
lsb_at = lsb_offset;
depth = 1; depth = 1;
zero_at = 0;
curr = const_cast<chunk_t*>(item.curr.data); curr = const_cast<chunk_t*>(item.curr.data);
next = nullptr; next = nullptr;
} }

12
backends/cxxrtl/cxxrtl_backend.cc
View file

@ -1641,17 +1641,20 @@ struct CxxrtlWorker {
dump_const(debug_const_wires[wire]); dump_const(debug_const_wires[wire]);
f << ";\n"; f << ";\n";
f << indent << "items.emplace(path + " << escape_cxx_string(get_hdl_name(wire)); f << indent << "items.emplace(path + " << escape_cxx_string(get_hdl_name(wire));
f << ", debug_item(const_" << mangle(wire) << "));\n"; f << ", debug_item(const_" << mangle(wire) << ", ";
f << wire->start_offset << "));\n";
count_const_wires++; count_const_wires++;
} else if (debug_alias_wires.count(wire)) { } else if (debug_alias_wires.count(wire)) {
// Alias of a member wire // Alias of a member wire
f << indent << "items.emplace(path + " << escape_cxx_string(get_hdl_name(wire)); f << indent << "items.emplace(path + " << escape_cxx_string(get_hdl_name(wire));
f << ", debug_item(debug_alias(), " << mangle(debug_alias_wires[wire]) << "));\n"; f << ", debug_item(debug_alias(), " << mangle(debug_alias_wires[wire]) << ", ";
f << wire->start_offset << "));\n";
count_alias_wires++; count_alias_wires++;
} else if (!localized_wires.count(wire)) { } else if (!localized_wires.count(wire)) {
// Member wire // Member wire
f << indent << "items.emplace(path + " << escape_cxx_string(get_hdl_name(wire)); f << indent << "items.emplace(path + " << escape_cxx_string(get_hdl_name(wire));
f << ", debug_item(" << mangle(wire) << "));\n"; f << ", debug_item(" << mangle(wire) << ", ";
f << wire->start_offset << "));\n";
count_member_wires++; count_member_wires++;
} else { } else {
count_skipped_wires++; count_skipped_wires++;
@ -1661,7 +1664,8 @@ struct CxxrtlWorker {
if (memory_it.first[0] != '\\') if (memory_it.first[0] != '\\')
continue; continue;
f << indent << "items.emplace(path + " << escape_cxx_string(get_hdl_name(memory_it.second)); f << indent << "items.emplace(path + " << escape_cxx_string(get_hdl_name(memory_it.second));
f << ", debug_item(" << mangle(memory_it.second) << "));\n"; f << ", debug_item(" << mangle(memory_it.second) << ", ";
f << memory_it.second->start_offset << "));\n";
} }
for (auto cell : module->cells()) { for (auto cell : module->cells()) {
if (is_internal_cell(cell->type)) if (is_internal_cell(cell->type))

6
backends/cxxrtl/cxxrtl_capi.h
View file

@ -113,9 +113,15 @@ struct cxxrtl_object {
// Width of the object in bits. // Width of the object in bits.
size_t width; size_t width;
// Index of the least significant bit.
size_t lsb_at;
// Depth of the object. Only meaningful for memories; for other objects, always 1. // Depth of the object. Only meaningful for memories; for other objects, always 1.
size_t depth; size_t depth;
// Index of the first word. Only meaningful for memories; for other objects, always 0;
size_t zero_at;
// Bits stored in the object, as 32-bit chunks, least significant bits first. // Bits stored in the object, as 32-bit chunks, least significant bits first.
// //
// The width is rounded up to a multiple of 32; the padding bits are always set to 0 by // The width is rounded up to a multiple of 32; the padding bits are always set to 0 by