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

Merge pull request #852 from lnis-uofu/pcf_hotfix 

Pcf hotfix - Avoid key collision when validating pcf data
This commit is contained in:
tangxifan 2022-10-21 15:24:02 -07:00 committed by GitHub
parent 0e48e74240 2d42826919
commit 2bed188d66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/libpcf/src/base/pcf_data.cpp
View File

@ -60,18 +60,21 @@ bool PcfData::validate() const {
net2pin[curr_net] = curr_pin; net2pin[curr_net] = curr_pin;
} }
/* We should not have duplicated pins in assignment: 1 pin -> 2 nets */ /* We should not have duplicated pins in assignment: 1 pin -> 2 nets */
std::map<BasicPort, std::string> pin2net; /* Caution: must use constant pointer here, otherwise you may see duplicated
* key on BasicPort with different content! */
std::map<const BasicPort*, std::string> pin2net;
for (const PcfIoConstraintId& io_id : io_constraints()) { for (const PcfIoConstraintId& io_id : io_constraints()) {
std::string curr_net = io_constraint_nets_[io_id]; std::string curr_net = io_constraint_nets_[io_id];
BasicPort curr_pin = io_constraint_pins_[io_id]; const BasicPort& curr_pin = io_constraint_pins_[io_id];
auto result = pin2net.find(curr_pin); auto result = pin2net.find(&curr_pin);
if (result != pin2net.end()) { if (result != pin2net.end()) {
/* Found one pin assigned to two nets, this is definitely an error */ /* Found one pin assigned to two nets, this is definitely an error */
VTR_LOG_ERROR("Pin '%s[%lu]' is assigned to two nets '%s' and '%s'!\n", VTR_LOG_ERROR("Pin '%s[%lu]' is assigned to two nets '%s' and '%s'!\n",
curr_pin.get_name().c_str(), curr_pin.get_lsb(), curr_pin.get_name().c_str(), curr_pin.get_lsb(),
result->second.c_str(), curr_net.c_str()); result->second.c_str(), curr_net.c_str());
num_err++;
} }
pin2net[curr_pin] = curr_net; pin2net[&curr_pin] = curr_net;
} }
if (num_err) { if (num_err) {
return false; return false;