From b3e4a06969a0c7a7fcb886a806686d00c14d3e07 Mon Sep 17 00:00:00 2001 From: tangxifan Date: Tue, 23 Aug 2022 14:28:05 -0700 Subject: [PATCH] [engine] adapt vpr wrapper to the latest main.cpp from vtr --- openfpga/src/fabric/build_top_module_connection.cpp | 4 ++++ openfpga/src/vpr_wrapper/vpr_main.cpp | 9 +-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/openfpga/src/fabric/build_top_module_connection.cpp b/openfpga/src/fabric/build_top_module_connection.cpp index 2f8133f57..aa7ed94f3 100644 --- a/openfpga/src/fabric/build_top_module_connection.cpp +++ b/openfpga/src/fabric/build_top_module_connection.cpp @@ -453,6 +453,10 @@ void add_top_module_nets_connect_grids_and_cb(ModuleManager& module_manager, ModulePortId sink_grid_port_id = module_manager.find_module_port(sink_grid_module, sink_grid_port_name); VTR_ASSERT(true == module_manager.valid_module_port_id(sink_grid_module, sink_grid_port_id)); BasicPort sink_grid_port = module_manager.module_port(sink_grid_module, sink_grid_port_id); + VTR_LOG("src: %s[%d:%d] -> sink: %s[%ld:%ld]\n", + src_cb_port.get_name().c_str(), src_cb_port.get_lsb(), src_cb_port.get_msb(), + sink_grid_port.get_name().c_str(), sink_grid_port.get_lsb(), sink_grid_port.get_msb() + ); /* Source and sink port should match in size */ VTR_ASSERT(src_cb_port.get_width() == sink_grid_port.get_width()); diff --git a/openfpga/src/vpr_wrapper/vpr_main.cpp b/openfpga/src/vpr_wrapper/vpr_main.cpp index 37560b288..94ef4ed74 100644 --- a/openfpga/src/vpr_wrapper/vpr_main.cpp +++ b/openfpga/src/vpr_wrapper/vpr_main.cpp @@ -62,14 +62,7 @@ int vpr(int argc, char** argv) { } auto& timing_ctx = g_vpr_ctx.timing(); - VTR_LOG("Timing analysis took %g seconds (%g STA, %g slack) (%zu full updates: %zu setup, %zu hold, %zu combined).\n", - timing_ctx.stats.timing_analysis_wallclock_time(), - timing_ctx.stats.sta_wallclock_time, - timing_ctx.stats.slack_wallclock_time, - timing_ctx.stats.num_full_updates(), - timing_ctx.stats.num_full_setup_updates, - timing_ctx.stats.num_full_hold_updates, - timing_ctx.stats.num_full_setup_hold_updates); + print_timing_stats("Flow", timing_ctx.stats); /* TODO: move this to the end of flow * free data structures