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

adapt Fc in gsb connection builder to use VPR8 Fc builder

This commit is contained in:
tangxifan 2020-03-06 14:43:12 -07:00
parent 8d350ee22f
commit 441de12936
4 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vpr/src/tileable_rr_graph/tileable_rr_graph_edge_builder.cpp
View File

@ -92,7 +92,8 @@ void build_rr_graph_edges(RRGraph& rr_graph,
const DeviceGrid& grids, const DeviceGrid& grids,
const vtr::Point<size_t>& device_chan_width, const vtr::Point<size_t>& device_chan_width,
const std::vector<t_segment_inf>& segment_inf, const std::vector<t_segment_inf>& segment_inf,
int** Fc_in, int** Fc_out, const std::vector<vtr::Matrix<int>>& Fc_in,
const std::vector<vtr::Matrix<int>>& Fc_out,
const e_switch_block_type& sb_type, const int& Fs, const e_switch_block_type& sb_type, const int& Fs,
const e_switch_block_type& sb_subtype, const int& subFs, const e_switch_block_type& sb_subtype, const int& subFs,
const bool& wire_opposite_side) { const bool& wire_opposite_side) {

4
vpr/src/tileable_rr_graph/tileable_rr_graph_edge_builder.h
View File

@ -7,6 +7,7 @@
#include <vector> #include <vector>
/* Headers from vtrutil library */ /* Headers from vtrutil library */
#include "vtr_ndmatrix.h"
#include "vtr_geometry.h" #include "vtr_geometry.h"
#include "physical_types.h" #include "physical_types.h"
@ -26,7 +27,8 @@ void build_rr_graph_edges(RRGraph& rr_graph,
const DeviceGrid& grids, const DeviceGrid& grids,
const vtr::Point<size_t>& device_chan_width, const vtr::Point<size_t>& device_chan_width,
const std::vector<t_segment_inf>& segment_inf, const std::vector<t_segment_inf>& segment_inf,
int** Fc_in, int** Fc_out, const std::vector<vtr::Matrix<int>>& Fc_in,
const std::vector<vtr::Matrix<int>>& Fc_out,
const e_switch_block_type& sb_type, const int& Fs, const e_switch_block_type& sb_type, const int& Fs,
const e_switch_block_type& sb_subtype, const int& subFs, const e_switch_block_type& sb_subtype, const int& subFs,
const bool& wire_opposite_side); const bool& wire_opposite_side);

57
vpr/src/tileable_rr_graph/tileable_rr_graph_gsb.cpp
View File

@ -966,7 +966,7 @@ void build_gsb_one_ipin_track2pin_map(const RRGraph& rr_graph,
const RRGSB& rr_gsb, const RRGSB& rr_gsb,
const enum e_side& ipin_side, const enum e_side& ipin_side,
const size_t& ipin_node_id, const size_t& ipin_node_id,
const size_t& Fc, const std::vector<int>& Fc,
const size_t& offset, const size_t& offset,
const std::vector<t_segment_inf>& segment_inf, const std::vector<t_segment_inf>& segment_inf,
t_track2pin_map& track2ipin_map) { t_track2pin_map& track2ipin_map) {
@ -995,7 +995,7 @@ void build_gsb_one_ipin_track2pin_map(const RRGraph& rr_graph,
VTR_ASSERT(0 == actual_track_list.size() % 2); VTR_ASSERT(0 == actual_track_list.size() % 2);
/* Scale Fc */ /* Scale Fc */
int actual_Fc = std::ceil((float)Fc * (float)actual_track_list.size() / (float)chan_width); int actual_Fc = std::ceil((float)Fc[iseg] * (float)actual_track_list.size() / (float)chan_width);
/* Minimum Fc should be 2 : ensure we will connect to a pair of routing tracks */ /* Minimum Fc should be 2 : ensure we will connect to a pair of routing tracks */
actual_Fc = std::max(1, actual_Fc); actual_Fc = std::max(1, actual_Fc);
/* Compute the step between two connection from this IPIN to tracks: /* Compute the step between two connection from this IPIN to tracks:
@ -1060,7 +1060,7 @@ void build_gsb_one_opin_pin2track_map(const RRGraph& rr_graph,
const RRGSB& rr_gsb, const RRGSB& rr_gsb,
const enum e_side& opin_side, const enum e_side& opin_side,
const size_t& opin_node_id, const size_t& opin_node_id,
const size_t& Fc, const std::vector<int>& Fc,
const size_t& offset, const size_t& offset,
const std::vector<t_segment_inf>& segment_inf, const std::vector<t_segment_inf>& segment_inf,
t_pin2track_map& opin2track_map) { t_pin2track_map& opin2track_map) {
@ -1094,7 +1094,7 @@ void build_gsb_one_opin_pin2track_map(const RRGraph& rr_graph,
} }
/* Scale Fc */ /* Scale Fc */
int actual_Fc = std::ceil((float)Fc * (float)actual_track_list.size() / (float)chan_width); int actual_Fc = std::ceil((float)Fc[iseg] * (float)actual_track_list.size() / (float)chan_width);
/* Minimum Fc should be 1 : ensure we will drive 1 routing track */ /* Minimum Fc should be 1 : ensure we will drive 1 routing track */
actual_Fc = std::max(1, actual_Fc); actual_Fc = std::max(1, actual_Fc);
/* Compute the step between two connection from this IPIN to tracks: /* Compute the step between two connection from this IPIN to tracks:
@ -1144,8 +1144,6 @@ void build_gsb_one_opin_pin2track_map(const RRGraph& rr_graph,
} }
*/ */
} }
return;
} }
@ -1163,7 +1161,7 @@ t_track2pin_map build_gsb_track_to_ipin_map(const RRGraph& rr_graph,
const RRGSB& rr_gsb, const RRGSB& rr_gsb,
const DeviceGrid& grids, const DeviceGrid& grids,
const std::vector<t_segment_inf>& segment_inf, const std::vector<t_segment_inf>& segment_inf,
int** Fc_in) { const std::vector<vtr::Matrix<int>>& Fc_in) {
t_track2pin_map track2ipin_map; t_track2pin_map track2ipin_map;
/* Resize the matrix */ /* Resize the matrix */
track2ipin_map.resize(rr_gsb.get_num_sides()); track2ipin_map.resize(rr_gsb.get_num_sides());
@ -1202,16 +1200,29 @@ t_track2pin_map build_gsb_track_to_ipin_map(const RRGraph& rr_graph,
if (true == is_empty_type(grids[rr_graph.node_xlow(ipin_node)][rr_graph.node_ylow(ipin_node)].type)) { if (true == is_empty_type(grids[rr_graph.node_xlow(ipin_node)][rr_graph.node_ylow(ipin_node)].type)) {
continue; continue;
} }
int grid_type_index = grids[rr_graph.node_xlow(ipin_node)][rr_graph.node_ylow(ipin_node)].type->index; int grid_type_index = grids[rr_graph.node_xlow(ipin_node)][rr_graph.node_ylow(ipin_node)].type->index;
/* Get Fc of the ipin */ /* Get Fc of the ipin */
int ipin_Fc = Fc_in[grid_type_index][rr_graph.node_pin_num(ipin_node)]; /* skip Fc = 0 or unintialized, those pins are in the <directlist> */
/* skip Fc = 0 */ bool skip_conn2track = true;
if ( (-1 == ipin_Fc) std::vector<int> ipin_Fc_out;
|| (0 == ipin_Fc) ) { for (size_t iseg = 0; iseg < segment_inf.size(); ++iseg) {
int ipin_Fc = Fc_in[grid_type_index][rr_graph.node_pin_num(ipin_node)][iseg];
ipin_Fc_out.push_back(ipin_Fc);
if (0 != ipin_Fc) {
skip_conn2track = false;
break;
}
}
if (true == skip_conn2track) {
continue; continue;
} }
VTR_ASSERT(ipin_Fc_out.size() == segment_inf.size());
/* Build track2ipin_map for this IPIN */ /* Build track2ipin_map for this IPIN */
build_gsb_one_ipin_track2pin_map(rr_graph, rr_gsb, ipin_side, inode, ipin_Fc, build_gsb_one_ipin_track2pin_map(rr_graph, rr_gsb, ipin_side, inode, ipin_Fc_out,
/* Give an offset for the first track that this ipin will connect to */ /* Give an offset for the first track that this ipin will connect to */
offset[chan_side_manager.to_size_t()], offset[chan_side_manager.to_size_t()],
segment_inf, track2ipin_map); segment_inf, track2ipin_map);
@ -1240,7 +1251,7 @@ t_pin2track_map build_gsb_opin_to_track_map(const RRGraph& rr_graph,
const RRGSB& rr_gsb, const RRGSB& rr_gsb,
const DeviceGrid& grids, const DeviceGrid& grids,
const std::vector<t_segment_inf>& segment_inf, const std::vector<t_segment_inf>& segment_inf,
int** Fc_out) { const std::vector<vtr::Matrix<int>>& Fc_out) {
t_pin2track_map opin2track_map; t_pin2track_map opin2track_map;
/* Resize the matrix */ /* Resize the matrix */
opin2track_map.resize(rr_gsb.get_num_sides()); opin2track_map.resize(rr_gsb.get_num_sides());
@ -1269,15 +1280,27 @@ t_pin2track_map build_gsb_opin_to_track_map(const RRGraph& rr_graph,
continue; continue;
} }
int grid_type_index = grids[rr_graph.node_xlow(opin_node)][rr_graph.node_ylow(opin_node)].type->index; int grid_type_index = grids[rr_graph.node_xlow(opin_node)][rr_graph.node_ylow(opin_node)].type->index;
/* Get Fc of the ipin */ /* Get Fc of the ipin */
int opin_Fc = Fc_out[grid_type_index][rr_graph.node_pin_num(opin_node)];
/* skip Fc = 0 or unintialized, those pins are in the <directlist> */ /* skip Fc = 0 or unintialized, those pins are in the <directlist> */
if ( (-1 == opin_Fc) bool skip_conn2track = true;
|| (0 == opin_Fc) ) { std::vector<int> opin_Fc_out;
for (size_t iseg = 0; iseg < segment_inf.size(); ++iseg) {
int opin_Fc = Fc_out[grid_type_index][rr_graph.node_pin_num(opin_node)][iseg];
opin_Fc_out.push_back(opin_Fc);
if (0 != opin_Fc) {
skip_conn2track = false;
break;
}
}
if (true == skip_conn2track) {
continue; continue;
} }
VTR_ASSERT(opin_Fc_out.size() == segment_inf.size());
/* Build track2ipin_map for this IPIN */ /* Build track2ipin_map for this IPIN */
build_gsb_one_opin_pin2track_map(rr_graph, rr_gsb, opin_side, inode, opin_Fc, build_gsb_one_opin_pin2track_map(rr_graph, rr_gsb, opin_side, inode, opin_Fc_out,
/* Give an offset for the first track that this ipin will connect to */ /* Give an offset for the first track that this ipin will connect to */
offset[side_manager.to_size_t()], offset[side_manager.to_size_t()],
segment_inf, opin2track_map); segment_inf, opin2track_map);

4
vpr/src/tileable_rr_graph/tileable_rr_graph_gsb.h
View File

@ -59,13 +59,13 @@ t_track2pin_map build_gsb_track_to_ipin_map(const RRGraph& rr_graph,
const RRGSB& rr_gsb, const RRGSB& rr_gsb,
const DeviceGrid& grids, const DeviceGrid& grids,
const std::vector<t_segment_inf>& segment_inf, const std::vector<t_segment_inf>& segment_inf,
int** Fc_in); const std::vector<vtr::Matrix<int>>& Fc_in);
t_pin2track_map build_gsb_opin_to_track_map(const RRGraph& rr_graph, t_pin2track_map build_gsb_opin_to_track_map(const RRGraph& rr_graph,
const RRGSB& rr_gsb, const RRGSB& rr_gsb,
const DeviceGrid& grids, const DeviceGrid& grids,
const std::vector<t_segment_inf>& segment_inf, const std::vector<t_segment_inf>& segment_inf,
int** Fc_out); const std::vector<vtr::Matrix<int>>& Fc_out);
void build_direct_connections_for_one_gsb(RRGraph& rr_graph, void build_direct_connections_for_one_gsb(RRGraph& rr_graph,
const DeviceGrid& grids, const DeviceGrid& grids,