riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reformat code

This commit is contained in:
Lin 2024-08-27 17:05:13 +08:00
parent 3c28f84727
commit 1b0fcaee0f
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openfpga/src/annotation/device_rr_gsb.cpp
View File

@ -2,6 +2,7 @@
* Member functions for class DeviceRRGSB * Member functions for class DeviceRRGSB
***********************************************************************/ ***********************************************************************/
#include "device_rr_gsb.h" #include "device_rr_gsb.h"
#include "rr_gsb_utils.h" #include "rr_gsb_utils.h"
#include "vtr_assert.h" #include "vtr_assert.h"
#include "vtr_log.h" #include "vtr_log.h"
@ -647,7 +648,7 @@ void DeviceRRGSB::preload_unique_sb_module(
/*The following four functions will allow us to get /*The following four functions will allow us to get
The map between (id,mirror instance coord), (id, unique block coord) The map between (id,mirror instance coord), (id, unique block coord)
As the unique block and its mirror instances share the same id, we can get the As the unique block and its mirror instances share the same id, we can get the
map between (unique block coord, mirror instance coord) map between (unique block coord, mirror instance coord)
*/ */
void DeviceRRGSB::get_id_unique_sb_block_map( void DeviceRRGSB::get_id_unique_sb_block_map(
std::map<int, vtr::Point<size_t>>& id_unique_block_map) const { std::map<int, vtr::Point<size_t>>& id_unique_block_map) const {

5
openfpga/src/base/openfpga_setup_command_template.h
View File

@ -392,8 +392,9 @@ ShellCommandId add_build_fabric_command_template(
"identifying the unique GSBs"); "identifying the unique GSBs");
/* Add an option '--preload_unique_blocks' */ /* Add an option '--preload_unique_blocks' */
shell_cmd.add_option("preload_unique_blocks", false, shell_cmd.add_option(
"preload unique routing modules from user input xml file"); "preload_unique_blocks", false,
"preload unique routing modules from user input xml file");
/* Add an option '--duplicate_grid_pin' */ /* Add an option '--duplicate_grid_pin' */
shell_cmd.add_option("duplicate_grid_pin", false, shell_cmd.add_option("duplicate_grid_pin", false,

27
openfpga/src/fabric/read_write_xml_unique_blocks.h
View File

@ -47,10 +47,8 @@ vtr::Point<size_t> read_xml_unique_instance_info(
template <class T> template <class T>
void report_unique_module_status_read(T& openfpga_ctx, bool verbose_output) { void report_unique_module_status_read(T& openfpga_ctx, bool verbose_output) {
/* Report the stats */ /* Report the stats */
VTR_LOGV( VTR_LOGV(verbose_output, "Read %lu unique X-direction connection blocks ",
verbose_output, openfpga_ctx.device_rr_gsb().get_num_cb_unique_module(CHANX));
"Read %lu unique X-direction connection blocks ",
openfpga_ctx.device_rr_gsb().get_num_cb_unique_module(CHANX));
VTR_LOGV( VTR_LOGV(
verbose_output, verbose_output,
@ -89,7 +87,6 @@ void report_unique_module_status_read(T& openfpga_ctx, bool verbose_output) {
1.)); 1.));
} }
template <class T> template <class T>
void report_unique_module_status_write(T& openfpga_ctx, bool verbose_output) { void report_unique_module_status_write(T& openfpga_ctx, bool verbose_output) {
/* Report the stats */ /* Report the stats */
@ -161,8 +158,8 @@ int read_xml_unique_blocks(T& openfpga_ctx, const char* file_name,
openfpga::DeviceRRGSB& device_rr_gsb = openfpga_ctx.mutable_device_rr_gsb(); openfpga::DeviceRRGSB& device_rr_gsb = openfpga_ctx.mutable_device_rr_gsb();
/* clear unique modules & reserve memory to relavant vectors */ /* clear unique modules & reserve memory to relavant vectors */
device_rr_gsb.clear_unique_modules(); device_rr_gsb.clear_unique_modules();
vtr::Point<size_t> grid_coord(g_vpr_ctx.device().grid.width() - 1, vtr::Point<size_t> grid_coord(g_vpr_ctx.device().grid.width() - 1,
g_vpr_ctx.device().grid.height() - 1); g_vpr_ctx.device().grid.height() - 1);
device_rr_gsb.reserve_unique_modules(grid_coord); device_rr_gsb.reserve_unique_modules(grid_coord);
/* load unique blocks xml file and set up device_rr_gdb */ /* load unique blocks xml file and set up device_rr_gdb */
for (pugi::xml_node xml_block_info : xml_root.children()) { for (pugi::xml_node xml_block_info : xml_root.children()) {
@ -181,16 +178,17 @@ int read_xml_unique_blocks(T& openfpga_ctx, const char* file_name,
instance_coords.push_back(instance_coordinate); instance_coords.push_back(instance_coordinate);
} }
} }
/* get block coordinate and instance coordinate, try to setup device_rr_gsb */ /* get block coordinate and instance coordinate, try to setup
* device_rr_gsb */
if (type == "sb") { if (type == "sb") {
device_rr_gsb.preload_unique_sb_module(block_coordinate, device_rr_gsb.preload_unique_sb_module(block_coordinate,
instance_coords); instance_coords);
} else if (type == "cby") { } else if (type == "cby") {
device_rr_gsb.preload_unique_cby_module(block_coordinate, device_rr_gsb.preload_unique_cby_module(block_coordinate,
instance_coords); instance_coords);
} else if (type == "cbx") { } else if (type == "cbx") {
device_rr_gsb.preload_unique_cbx_module(block_coordinate, device_rr_gsb.preload_unique_cbx_module(block_coordinate,
instance_coords); instance_coords);
} else { } else {
VTR_LOG_ERROR("Unexpected type!"); VTR_LOG_ERROR("Unexpected type!");
} }
@ -199,7 +197,8 @@ int read_xml_unique_blocks(T& openfpga_ctx, const char* file_name,
return 1; return 1;
} }
} }
/* As preloading gsb hasn't been developed, we should build gsb using the preloaded cbs and sbs*/ /* As preloading gsb hasn't been developed, we should build gsb using the
* preloaded cbs and sbs*/
device_rr_gsb.build_gsb_unique_module(); device_rr_gsb.build_gsb_unique_module();
if (verbose_output) { if (verbose_output) {
report_unique_module_status_read(openfpga_ctx, true); report_unique_module_status_read(openfpga_ctx, true);
@ -207,7 +206,7 @@ int read_xml_unique_blocks(T& openfpga_ctx, const char* file_name,
} catch (pugiutil::XmlError& e) { } catch (pugiutil::XmlError& e) {
archfpga_throw(file_name, e.line(), "%s", e.what()); archfpga_throw(file_name, e.line(), "%s", e.what());
} }
return 0; return 0;
} }
@ -232,8 +231,8 @@ int write_xml_block(
for (const auto& instance_info : id_instance_map[pair.first]) { for (const auto& instance_info : id_instance_map[pair.first]) {
if (instance_info.x() == pair.second.x() && if (instance_info.x() == pair.second.x() &&
instance_info.y() == pair.second.y()) { instance_info.y() == pair.second.y()) {
; ;
}else{ } else {
openfpga::write_tab_to_file(fp, 2); openfpga::write_tab_to_file(fp, 2);
fp << "<instance"; fp << "<instance";
write_xml_attribute(fp, "x", instance_info.x()); write_xml_attribute(fp, "x", instance_info.x());