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

cxxrtl: make logging a little bit nicer.

This commit is contained in:
whitequark 2020-05-26 21:37:32 +00:00
parent e9c07e2bda
commit 0bf6b164be
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backends/cxxrtl/cxxrtl.cc
View File

@ -2008,6 +2008,7 @@ struct CxxrtlWorker {
log("Module `%s' contains feedback arcs through wires:\n", log_id(module)); log("Module `%s' contains feedback arcs through wires:\n", log_id(module));
for (auto wire : feedback_wires) for (auto wire : feedback_wires)
log(" %s\n", log_id(wire)); log(" %s\n", log_id(wire));
log("\n");
} }
for (auto wire : module->wires()) { for (auto wire : module->wires()) {
@ -2039,6 +2040,7 @@ struct CxxrtlWorker {
log("Module `%s' contains buffered combinatorial wires:\n", log_id(module)); log("Module `%s' contains buffered combinatorial wires:\n", log_id(module));
for (auto wire : buffered_wires) for (auto wire : buffered_wires)
log(" %s\n", log_id(wire)); log(" %s\n", log_id(wire));
log("\n");
} }
eval_converges[module] = feedback_wires.empty() && buffered_wires.empty(); eval_converges[module] = feedback_wires.empty() && buffered_wires.empty();
@ -2052,7 +2054,6 @@ struct CxxrtlWorker {
why_pessimistic = "feedback wires"; why_pessimistic = "feedback wires";
else if (has_buffered_wires) else if (has_buffered_wires)
why_pessimistic = "buffered combinatorial wires"; why_pessimistic = "buffered combinatorial wires";
log("\n");
log_warning("Design contains %s, which require delta cycles during evaluation.\n", why_pessimistic); log_warning("Design contains %s, which require delta cycles during evaluation.\n", why_pessimistic);
if (!max_opt_level) if (!max_opt_level)
log("Increasing the optimization level may eliminate %s from the design.\n", why_pessimistic); log("Increasing the optimization level may eliminate %s from the design.\n", why_pessimistic);
@ -2086,26 +2087,33 @@ struct CxxrtlWorker {
void prepare_design(RTLIL::Design *design) void prepare_design(RTLIL::Design *design)
{ {
bool did_anything = false;
bool has_sync_init, has_packed_mem; bool has_sync_init, has_packed_mem;
log_push(); log_push();
check_design(design, has_sync_init, has_packed_mem); check_design(design, has_sync_init, has_packed_mem);
if (run_proc_flatten) { if (run_proc_flatten) {
Pass::call(design, "proc"); Pass::call(design, "proc");
Pass::call(design, "flatten"); Pass::call(design, "flatten");
did_anything = true;
} else if (has_sync_init) { } else if (has_sync_init) {
// We're only interested in proc_init, but it depends on proc_prune and proc_clean, so call those // We're only interested in proc_init, but it depends on proc_prune and proc_clean, so call those
// in case they weren't already. (This allows `yosys foo.v -o foo.cc` to work.) // in case they weren't already. (This allows `yosys foo.v -o foo.cc` to work.)
Pass::call(design, "proc_prune"); Pass::call(design, "proc_prune");
Pass::call(design, "proc_clean"); Pass::call(design, "proc_clean");
Pass::call(design, "proc_init"); Pass::call(design, "proc_init");
did_anything = true;
} }
if (has_packed_mem) if (has_packed_mem) {
Pass::call(design, "memory_unpack"); Pass::call(design, "memory_unpack");
did_anything = true;
}
// Recheck the design if it was modified. // Recheck the design if it was modified.
if (has_sync_init || has_packed_mem) if (has_sync_init || has_packed_mem)
check_design(design, has_sync_init, has_packed_mem); check_design(design, has_sync_init, has_packed_mem);
log_assert(!(has_sync_init || has_packed_mem)); log_assert(!(has_sync_init || has_packed_mem));
log_pop(); log_pop();
if (did_anything)
log_spacer();
analyze_design(design); analyze_design(design);
} }
}; };