Added dump -m and -n options

This commit is contained in:
Clifford Wolf 2013-11-29 10:33:36 +01:00
parent f89ecbc100
commit ed441346ca
2 changed files with 89 additions and 54 deletions

View File

@ -258,74 +258,93 @@ void ILANG_BACKEND::dump_conn(FILE *f, std::string indent, const RTLIL::SigSpec
fprintf(f, "\n"); fprintf(f, "\n");
} }
void ILANG_BACKEND::dump_module(FILE *f, std::string indent, const RTLIL::Module *module, const RTLIL::Design *design, bool only_selected) void ILANG_BACKEND::dump_module(FILE *f, std::string indent, const RTLIL::Module *module, const RTLIL::Design *design, bool only_selected, bool flag_m, bool flag_n)
{ {
for (auto it = module->attributes.begin(); it != module->attributes.end(); it++) { bool print_header = flag_m || design->selected_whole_module(module->name);
fprintf(f, "%s" "attribute %s ", indent.c_str(), it->first.c_str()); bool print_body = !flag_n || !design->selected_whole_module(module->name);
dump_const(f, it->second);
fprintf(f, "\n"); if (print_header)
{
for (auto it = module->attributes.begin(); it != module->attributes.end(); it++) {
fprintf(f, "%s" "attribute %s ", indent.c_str(), it->first.c_str());
dump_const(f, it->second);
fprintf(f, "\n");
}
fprintf(f, "%s" "module %s\n", indent.c_str(), module->name.c_str());
} }
fprintf(f, "%s" "module %s\n", indent.c_str(), module->name.c_str()); if (print_body)
{
for (auto it = module->wires.begin(); it != module->wires.end(); it++)
if (!only_selected || design->selected(module, it->second)) {
if (only_selected)
fprintf(f, "\n");
dump_wire(f, indent + " ", it->second);
}
for (auto it = module->wires.begin(); it != module->wires.end(); it++) for (auto it = module->memories.begin(); it != module->memories.end(); it++)
if (!only_selected || design->selected(module, it->second)) { if (!only_selected || design->selected(module, it->second)) {
if (only_selected) if (only_selected)
fprintf(f, "\n"); fprintf(f, "\n");
dump_wire(f, indent + " ", it->second); dump_memory(f, indent + " ", it->second);
} }
for (auto it = module->memories.begin(); it != module->memories.end(); it++) for (auto it = module->cells.begin(); it != module->cells.end(); it++)
if (!only_selected || design->selected(module, it->second)) { if (!only_selected || design->selected(module, it->second)) {
if (only_selected) if (only_selected)
fprintf(f, "\n"); fprintf(f, "\n");
dump_memory(f, indent + " ", it->second); dump_cell(f, indent + " ", it->second);
} }
for (auto it = module->cells.begin(); it != module->cells.end(); it++) for (auto it = module->processes.begin(); it != module->processes.end(); it++)
if (!only_selected || design->selected(module, it->second)) { if (!only_selected || design->selected(module, it->second)) {
if (only_selected) if (only_selected)
fprintf(f, "\n"); fprintf(f, "\n");
dump_cell(f, indent + " ", it->second); dump_proc(f, indent + " ", it->second);
} }
for (auto it = module->processes.begin(); it != module->processes.end(); it++) bool first_conn_line = true;
if (!only_selected || design->selected(module, it->second)) { for (auto it = module->connections.begin(); it != module->connections.end(); it++) {
if (only_selected) bool show_conn = !only_selected;
fprintf(f, "\n"); if (only_selected) {
dump_proc(f, indent + " ", it->second); RTLIL::SigSpec sigs = it->first;
} sigs.append(it->second);
for (auto &c : sigs.chunks) {
bool first_conn_line = true; if (c.wire == NULL || !design->selected(module, c.wire))
for (auto it = module->connections.begin(); it != module->connections.end(); it++) { continue;
bool show_conn = !only_selected; show_conn = true;
if (only_selected) { }
RTLIL::SigSpec sigs = it->first; }
sigs.append(it->second); if (show_conn) {
for (auto &c : sigs.chunks) { if (only_selected && first_conn_line)
if (c.wire == NULL || !design->selected(module, c.wire)) fprintf(f, "\n");
continue; dump_conn(f, indent + " ", it->first, it->second);
show_conn = true; first_conn_line = false;
} }
} }
if (show_conn) {
if (only_selected && first_conn_line)
fprintf(f, "\n");
dump_conn(f, indent + " ", it->first, it->second);
first_conn_line = false;
}
} }
fprintf(f, "%s" "end\n", indent.c_str()); if (print_header)
fprintf(f, "%s" "end\n", indent.c_str());
} }
void ILANG_BACKEND::dump_design(FILE *f, const RTLIL::Design *design, bool only_selected) void ILANG_BACKEND::dump_design(FILE *f, const RTLIL::Design *design, bool only_selected, bool flag_m, bool flag_n)
{ {
if (!flag_m) {
int count_selected_mods = 0;
for (auto it = design->modules.begin(); it != design->modules.end(); it++)
if (design->selected(it->second))
count_selected_mods++;
if (count_selected_mods > 1)
flag_m = true;
}
for (auto it = design->modules.begin(); it != design->modules.end(); it++) { for (auto it = design->modules.begin(); it != design->modules.end(); it++) {
if (!only_selected || design->selected(it->second)) { if (!only_selected || design->selected(it->second)) {
if (only_selected) if (only_selected)
fprintf(f, "\n"); fprintf(f, "\n");
dump_module(f, "", it->second, design, only_selected); dump_module(f, "", it->second, design, only_selected, flag_m, flag_n);
} }
} }
} }
@ -364,7 +383,7 @@ struct IlangBackend : public Backend {
log("Output filename: %s\n", filename.c_str()); log("Output filename: %s\n", filename.c_str());
fprintf(f, "# Generated by %s\n", yosys_version_str); fprintf(f, "# Generated by %s\n", yosys_version_str);
ILANG_BACKEND::dump_design(f, design, selected); ILANG_BACKEND::dump_design(f, design, selected, true, false);
} }
} IlangBackend; } IlangBackend;
@ -379,6 +398,13 @@ struct DumpPass : public Pass {
log("Write the selected parts of the design to the console or specified file in\n"); log("Write the selected parts of the design to the console or specified file in\n");
log("ilang format.\n"); log("ilang format.\n");
log("\n"); log("\n");
log(" -m\n");
log(" also dump the module headers, even if only parts of a single");
log(" module is selected\n");
log("\n");
log(" -n\n");
log(" only dump the module headers if the entire module is selected\n");
log("\n");
log(" -outfile <filename>\n"); log(" -outfile <filename>\n");
log(" Write to the specified file.\n"); log(" Write to the specified file.\n");
log("\n"); log("\n");
@ -386,6 +412,7 @@ struct DumpPass : public Pass {
virtual void execute(std::vector<std::string> args, RTLIL::Design *design) virtual void execute(std::vector<std::string> args, RTLIL::Design *design)
{ {
std::string filename; std::string filename;
bool flag_m = false, flag_n = false;
size_t argidx; size_t argidx;
for (argidx = 1; argidx < args.size(); argidx++) for (argidx = 1; argidx < args.size(); argidx++)
@ -395,6 +422,14 @@ struct DumpPass : public Pass {
filename = args[++argidx]; filename = args[++argidx];
continue; continue;
} }
if (arg == "-m") {
flag_m = true;
continue;
}
if (arg == "-n") {
flag_n = true;
continue;
}
break; break;
} }
extra_args(args, argidx, design); extra_args(args, argidx, design);
@ -411,7 +446,7 @@ struct DumpPass : public Pass {
f = open_memstream(&buf_ptr, &buf_size); f = open_memstream(&buf_ptr, &buf_size);
} }
ILANG_BACKEND::dump_design(f, design, true); ILANG_BACKEND::dump_design(f, design, true, flag_m, flag_n);
fclose(f); fclose(f);

View File

@ -40,8 +40,8 @@ namespace ILANG_BACKEND {
void dump_proc_sync(FILE *f, std::string indent, const RTLIL::SyncRule *sy); void dump_proc_sync(FILE *f, std::string indent, const RTLIL::SyncRule *sy);
void dump_proc(FILE *f, std::string indent, const RTLIL::Process *proc); void dump_proc(FILE *f, std::string indent, const RTLIL::Process *proc);
void dump_conn(FILE *f, std::string indent, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right); void dump_conn(FILE *f, std::string indent, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right);
void dump_module(FILE *f, std::string indent, const RTLIL::Module *module, const RTLIL::Design *design, bool only_selected); void dump_module(FILE *f, std::string indent, const RTLIL::Module *module, const RTLIL::Design *design, bool only_selected, bool flag_m = true, bool flag_n = false);
void dump_design(FILE *f, const RTLIL::Design *design, bool only_selected); void dump_design(FILE *f, const RTLIL::Design *design, bool only_selected, bool flag_m = true, bool flag_n = false);
} }
#endif #endif