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

pass metadata: removed superfluous `stringf` calls

This commit is contained in:
Aki Van Ness 2021-12-03 13:43:11 -05:00 committed by N. Engelhardt
parent ca03fbdc6d
commit 1876ed21e7
1 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
backends/metadata/metadata.cc
View File

@ -77,25 +77,25 @@ struct MetadataWriter
design->sort(); design->sort();
f << stringf("{\n"); f << "{\n";
f << stringf(" \"generator\": %s,\n", get_string(yosys_version_str).c_str()); f << stringf(" \"generator\": %s,\n", get_string(yosys_version_str).c_str());
// XXX(aki): Replace this with a proper version info eventually:tm: // XXX(aki): Replace this with a proper version info eventually:tm:
f << stringf(" \"version\": \"0.0.0\",\n"); f << " \"version\": \"0.0.0\",\n";
f << stringf(" \"modules\": [\n"); f << " \"modules\": [\n";
bool first{true}; bool first{true};
for (auto mod : _use_selection ? design->selected_modules() : design->modules()) { for (auto mod : _use_selection ? design->selected_modules() : design->modules()) {
if (!first) if (!first)
f << stringf(",\n"); f << ",\n";
write_module(mod); write_module(mod);
f << stringf("\n"); f << "\n";
first = false; first = false;
} }
f << stringf(" ]\n"); f << " ]\n";
f << stringf("}\n"); f << "}\n";
} }
void write_module(Module* mod) void write_module(Module* mod)
@ -104,26 +104,26 @@ struct MetadataWriter
coalesce_cells(mod); coalesce_cells(mod);
f << stringf(" {\n"); f << " {\n";
f << stringf(" \"name\": %s,\n", get_string(RTLIL::unescape_id(mod->name)).c_str()); f << stringf(" \"name\": %s,\n", get_string(RTLIL::unescape_id(mod->name)).c_str());
f << stringf(" \"cell_sorts\": [\n"); f << " \"cell_sorts\": [\n";
bool first_sort{true}; bool first_sort{true};
for (auto& sort : _cells) { for (auto& sort : _cells) {
if (!first_sort) if (!first_sort)
f << stringf(",\n"); f << ",\n";
write_cell_sort(sort); write_cell_sort(sort);
first_sort = false; first_sort = false;
} }
f << stringf("\n"); f << "\n";
f << stringf(" ],\n"); f << " ],\n";
f << stringf(" \"connections\": [\n"); f << " \"connections\": [\n";
f << stringf(" ]\n"); f << " ]\n";
f << stringf(" }"); f << " }";
} }
@ -131,55 +131,56 @@ struct MetadataWriter
{ {
const auto port_cell = sort.second.front(); const auto port_cell = sort.second.front();
f << stringf(" {\n"); f << " {\n";
f << stringf(" \"type\": %s,\n", sort.first.c_str()); f << stringf(" \"type\": %s,\n", sort.first.c_str());
f << stringf(" \"ports\": [\n"); f << " \"ports\": [\n";
bool first_port{true}; bool first_port{true};
for (auto con : port_cell->connections()) { for (auto con : port_cell->connections()) {
if (!first_port) if (!first_port)
f << stringf(",\n"); f << ",\n";
f << stringf(" {\n"); f << " {\n";
f << stringf(" \"name\": %s,\n", get_string(RTLIL::unescape_id(con.first)).c_str()); f << stringf(" \"name\": %s,\n", get_string(RTLIL::unescape_id(con.first)).c_str());
f << stringf(" \"direction\": \""); f << " \"direction\": \"";
if (port_cell->input(con.first)) if (port_cell->input(con.first))
f << stringf("i"); f << "i";
if (port_cell->input(con.first)) if (port_cell->input(con.first))
f << stringf("o"); f << "o";
f << stringf("\",\n"); f << "\",\n";
if (con.second.size() == 1) if (con.second.size() == 1)
f << stringf(" \"range\": [0, 0]\n"); f << " \"range\": [0, 0]\n";
else else
f << stringf(" \"range\": [%d, %d]\n", con.second.size(), 0); f << stringf(" \"range\": [%d, %d]\n", con.second.size(), 0);
f << stringf(" }"); f << " }";
first_port = false; first_port = false;
} }
f << stringf("\n"); f << "\n";
f << stringf(" ],\n \"cells\": [\n"); f << " ],\n \"cells\": [\n";
bool first_cell{true}; bool first_cell{true};
for (auto& cell : sort.second) { for (auto& cell : sort.second) {
if (!first_cell) if (!first_cell)
f << stringf(",\n"); f << ",\n";
write_cell(cell); write_cell(cell);
first_cell = false; first_cell = false;
} }
f << stringf("\n"); f << "\n";
f << stringf(" ]\n"); f << " ]\n";
f << stringf(" }"); f << " }";
}
} }
void write_cell(Cell* cell) void write_cell(Cell* cell)
{ {
log_assert(cell != nullptr); log_assert(cell != nullptr);
f << stringf(" {\n"); f << " {\n";
f << stringf(" \"name\": %s,\n", get_string(RTLIL::unescape_id(cell->name)).c_str()); f << stringf(" \"name\": %s,\n", get_string(RTLIL::unescape_id(cell->name)).c_str());
f << stringf(" \"attributes\": {\n"); f << " \"attributes\": {\n";
bool first_attr{true}; bool first_attr{true};
for (auto& attr : cell->attributes) { for (auto& attr : cell->attributes) {
@ -193,9 +194,10 @@ struct MetadataWriter
first_attr = false; first_attr = false;
} }
f << "\n";
f << stringf(" },\n"); f << " },\n";
f << stringf(" \"parameters\": {\n"); f << " \"parameters\": {\n";
bool first_param{true}; bool first_param{true};
for (auto& param : cell->parameters) { for (auto& param : cell->parameters) {
@ -209,9 +211,10 @@ struct MetadataWriter
first_param = false; first_param = false;
} }
f << "\n";
f << stringf(" },\n"); f << " },\n";
f << stringf(" }"); f << " }";
} }
}; };