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

Merge pull request #680 from lnis-uofu/tileable_rr_graph_read_write_fix 

Fix tileable rr graph read/write issue.
This commit is contained in:
tangxifan 2022-06-24 08:45:19 +08:00 committed by GitHub
parent c3a76f0e44 6d461c26ae
commit 2168321958
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
vpr/src/base/read_route.cpp
View File

@ -40,6 +40,7 @@
#include "echo_files.h"
#include "route_common.h"
#include "read_route.h"
#include "openfpga_tokenizer.h"
/*************Functions local to this module*************/
static void process_route(std::ifstream& fp, const char* filename, int& lineno);
@ -47,6 +48,7 @@ static void process_nodes(std::ifstream& fp, ClusterNetId inet, const char* file
static void process_nets(std::ifstream& fp, ClusterNetId inet, std::string name, std::vector<std::string> input_tokens, const char* filename, int& lineno);
static void process_global_blocks(std::ifstream& fp, ClusterNetId inet, const char* filename, int& lineno);
static void format_coordinates(int& x, int& y, std::string coord, ClusterNetId net, const char* filename, const int lineno);
static void format_ptc_num(std::vector<int>& ptc_nums, std::string coord, ClusterNetId net, const char* filename, const int lineno);
static void format_pin_info(std::string& pb_name, std::string& port_name, int& pb_pin_num, std::string input);
static std::string format_name(std::string name);
@ -201,7 +203,7 @@ static void process_nodes(std::ifstream& fp, ClusterNetId inet, const char* file
/*remember the position of the last line in order to go back*/
std::streampos oldpos = fp.tellg();
int inode, x, y, x2, y2, ptc, switch_id, offset;
int inode, x, y, x2, y2, switch_id, offset;
int node_count = 0;
std::string input;
std::vector<std::string> tokens;
@ -281,8 +283,9 @@ static void process_nodes(std::ifstream& fp, ClusterNetId inet, const char* file
}
}
ptc = atoi(tokens[5 + offset].c_str());
if (device_ctx.rr_graph.node_ptc_num(node) != ptc) {
std::vector<int> ptc_nums;
format_ptc_num(ptc_nums, tokens[5 + offset], inet, filename, lineno);
if (device_ctx.rr_graph.node_ptc_num(node) != ptc_nums[0]) { // always the first ptc_num and track_num in rr_graph
vpr_throw(VPR_ERROR_ROUTE, filename, lineno,
"The ptc num of node %d does not match the rr graph", inode);
}
@ -411,6 +414,34 @@ static void format_coordinates(int& x, int& y, std::string coord, ClusterNetId n
}
}
// ptc (Pin-Track-Class) can be one of below patterns in route graph
// Node: 714 SOURCE (4,1) Class: 18 Switch: 0
// Node: 728 OPIN (4,1) Pin: 57 clb.O[17] Switch: 2
// Node: 16733 CHANX (6,2) to (9,2) Track: (56,58,60,62) Switch: 1
// Node: 23176 CHANY (4,1) to (4,3) Track: (69,67,65) Switch: 1
static void format_ptc_num(std::vector<int>& ptc_nums, std::string ptc_str, ClusterNetId net, const char* filename, const int lineno) {
// detect and remove the parenthesis
openfpga::StringToken tokenizer0(ptc_str);
std::vector<std::string> tokens0 = tokenizer0.split(',');
size_t ptc_count = tokens0.size() + 1;
openfpga::StringToken tokenizer1(ptc_count > 1? format_name(ptc_str) : ptc_str);
// now do the real job
std::vector<std::string> tokens1 = tokenizer1.split(',');
std::stringstream ptc_stream;
int num;
for (size_t i = 0; i < tokens1.size(); i++) {
ptc_stream << tokens1[i];
ptc_stream >> num;
if (ptc_stream.fail()) {
vpr_throw(VPR_ERROR_ROUTE, filename, lineno,
"Net %lu has bad ptc info in the form (n0,...,n3)", size_t(net));
}
ptc_nums.push_back(num);
}
return;
}
static void format_pin_info(std::string& pb_name, std::string& port_name, int& pb_pin_num, std::string input) {
/*Parse the pin info in the form of pb_name.port_name[pb_pin_num]
*into its appropriate variables*/

2
vpr/src/route/route_common.cpp
View File

@ -1510,7 +1510,7 @@ void print_route(FILE* fp, const vtr::vector<ClusterNetId, t_traceback>& traceba
fprintf(fp, "(");
for (size_t itrack = 0; itrack < device_ctx.rr_graph.node_track_ids(inode).size(); ++itrack) {
if (0 < itrack) {
fprintf(fp, ", ");
fprintf(fp, ",");
}
fprintf(fp, "%d", device_ctx.rr_graph.node_track_ids(inode)[itrack]);
}