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

Merge branch 'refactoring' into dev

This commit is contained in:
tangxifan 2020-03-07 17:54:13 -07:00
parent 3eeac94a6e ca92c2717f
commit 8b40ca2990
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openfpga/src/base/openfpga_naming.cpp
View File

@ -496,7 +496,7 @@ std::string generate_grid_duplicated_port_name(const size_t& width,
port_name += std::to_string(width);
port_name += std::string("_height_");
port_name += std::to_string(height);
port_name += std::string("_pin_");
port_name += std::string("__pin_");
port_name += std::to_string(pin_id);
port_name += std::string("_");

14
openfpga/src/tile_direct/build_tile_direct.cpp
View File

@ -203,9 +203,9 @@ vtr::Point<size_t> find_inter_direct_destination_coordinate(const DeviceGrid& gr
* +------+
* | Grid | ny
* +------+
* ^ .
* | .
* | .
* v .
* +------+
* | Grid | 1
* +------+
@ -219,14 +219,14 @@ vtr::Point<size_t> find_inter_direct_destination_coordinate(const DeviceGrid& gr
* +------+
* | Grid | ny
* +------+
* ^ .
* | .
* | .
* v .
* +------+
* | Grid | 1
* +------+
*/
if (NEGATIVE_DIR == arch_direct.y_dir(arch_direct_id)) {
if (POSITIVE_DIR == arch_direct.y_dir(arch_direct_id)) {
std::reverse(second_search_space.begin(), second_search_space.end());
}
}
@ -279,7 +279,7 @@ vtr::Point<size_t> find_inter_direct_destination_coordinate(const DeviceGrid& gr
*
* 1 ... nx
* +------+ +------+
* | Grid |------>| Grid |
* | Grid |<------| Grid |
* +------+ +------+
*/
for (size_t ix = 1 ; ix < grids.width() - 1; ++ix) {
@ -291,10 +291,10 @@ vtr::Point<size_t> find_inter_direct_destination_coordinate(const DeviceGrid& gr
*
* 1 ... nx
* +------+ +------+
* | Grid |<------| Grid |
* | Grid |------>| Grid |
* +------+ +------+
*/
if (NEGATIVE_DIR == arch_direct.x_dir(arch_direct_id)) {
if (POSITIVE_DIR == arch_direct.x_dir(arch_direct_id)) {
std::reverse(second_search_space.begin(), second_search_space.end());
}
}
@ -515,7 +515,7 @@ void build_inter_column_row_tile_direct(TileDirect& tile_direct,
next_col_src_grid_coords.push_back(vtr::Point<size_t>(ix, iy));
}
/* For positive y- direction, we should start from y = 1 */
if (POSITIVE_DIR == arch_direct.y_dir(arch_direct_id)) {
if (NEGATIVE_DIR == arch_direct.y_dir(arch_direct_id)) {
std::reverse(next_col_src_grid_coords.begin(), next_col_src_grid_coords.end());
}

2
vpr7_x2p/vpr/SRC/fpga_x2p/base/fpga_x2p_naming.cpp
View File

@ -484,7 +484,7 @@ std::string generate_grid_duplicated_port_name(const size_t& height,
std::string port_name = std::string(side_manager.to_string());
port_name += std::string("_height_");
port_name += std::to_string(height);
port_name += std::string("_pin_");
port_name += std::string("__pin_");
port_name += std::to_string(pin_id);
port_name += std::string("_");