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

[core] add new syntax to support from_pin and to_pin for internal driver in clock network

This commit is contained in:
tangxifan 2024-07-10 14:28:28 -07:00
parent 215de8eb93
commit 079e6f2fca
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/libclkarchopenfpga/src/base/clock_network.cpp
View File

@ -360,10 +360,16 @@ ClockNetwork::spine_switch_point_internal_drivers(
return spine_switch_internal_drivers_[spine_id][size_t(switch_point_id)]; return spine_switch_internal_drivers_[spine_id][size_t(switch_point_id)];
} }
std::string ClockNetwork::internal_driver_port( std::string ClockNetwork::internal_driver_from_pin(
const ClockInternalDriverId& int_driver_id) const { const ClockInternalDriverId& int_driver_id) const {
VTR_ASSERT(valid_internal_driver_id(int_driver_id)); VTR_ASSERT(valid_internal_driver_id(int_driver_id));
return internal_driver_ports_[int_driver_id]; return internal_driver_from_pins_[int_driver_id];
}
std::string ClockNetwork::internal_driver_to_pin(
const ClockInternalDriverId& int_driver_id) const {
VTR_ASSERT(valid_internal_driver_id(int_driver_id));
return internal_driver_to_pins_[int_driver_id];
} }
std::vector<ClockTapId> ClockNetwork::tree_taps( std::vector<ClockTapId> ClockNetwork::tree_taps(
@ -523,7 +529,7 @@ std::vector<std::string> ClockNetwork::tree_flatten_tap_to_ports(
return flatten_taps; return flatten_taps;
} }
std::vector<std::string> ClockNetwork::flatten_internal_driver_port( std::vector<std::string> ClockNetwork::flatten_internal_driver_from_pin(
const ClockInternalDriverId& int_driver_id) const { const ClockInternalDriverId& int_driver_id) const {
std::vector<std::string> flatten_taps; std::vector<std::string> flatten_taps;
std::string tap_name = internal_driver_port(int_driver_id); std::string tap_name = internal_driver_port(int_driver_id);
@ -765,12 +771,14 @@ ClockSwitchPointId ClockNetwork::add_spine_switch_point(
ClockInternalDriverId ClockNetwork::add_spine_switch_point_internal_driver( ClockInternalDriverId ClockNetwork::add_spine_switch_point_internal_driver(
const ClockSpineId& spine_id, const ClockSwitchPointId& switch_point_id, const ClockSpineId& spine_id, const ClockSwitchPointId& switch_point_id,
const std::string& int_driver_port) { const std::string& int_driver_from_port,
const std::string& int_driver_to_port) {
VTR_ASSERT(valid_spine_id(spine_id)); VTR_ASSERT(valid_spine_id(spine_id));
VTR_ASSERT(valid_spine_switch_point_id(spine_id, switch_point_id)); VTR_ASSERT(valid_spine_switch_point_id(spine_id, switch_point_id));
/* Find any existing id for the driver port */ /* Find any existing id for the driver port */
for (ClockInternalDriverId int_driver_id : internal_driver_ids_) { for (ClockInternalDriverId int_driver_id : internal_driver_ids_) {
if (internal_driver_ports_[int_driver_id] == int_driver_port) { if (internal_driver_from_pins_[int_driver_id] == int_driver_from_port
&& internal_driver_to_pins_[int_driver_id] == int_driver_to_port) {
spine_switch_internal_drivers_[spine_id][size_t(switch_point_id)] spine_switch_internal_drivers_[spine_id][size_t(switch_point_id)]
.push_back(int_driver_id); .push_back(int_driver_id);
return int_driver_id; return int_driver_id;
@ -780,7 +788,8 @@ ClockInternalDriverId ClockNetwork::add_spine_switch_point_internal_driver(
ClockInternalDriverId int_driver_id = ClockInternalDriverId int_driver_id =
ClockInternalDriverId(internal_driver_ids_.size()); ClockInternalDriverId(internal_driver_ids_.size());
internal_driver_ids_.push_back(int_driver_id); internal_driver_ids_.push_back(int_driver_id);
internal_driver_ports_.push_back(int_driver_port); internal_driver_from_pins_.push_back(int_driver_port_from_port);
internal_driver_to_pins_.push_back(int_driver_port_to_port);
spine_switch_internal_drivers_[spine_id][size_t(switch_point_id)].push_back( spine_switch_internal_drivers_[spine_id][size_t(switch_point_id)].push_back(
int_driver_id); int_driver_id);
return int_driver_id; return int_driver_id;

11
libs/libclkarchopenfpga/src/base/clock_network.h
View File

@ -135,9 +135,11 @@ class ClockNetwork {
std::vector<ClockInternalDriverId> spine_switch_point_internal_drivers( std::vector<ClockInternalDriverId> spine_switch_point_internal_drivers(
const ClockSpineId& spine_id, const ClockSpineId& spine_id,
const ClockSwitchPointId& switch_point_id) const; const ClockSwitchPointId& switch_point_id) const;
std::string internal_driver_port( std::string internal_driver_from_pin(
const ClockInternalDriverId& int_driver_id) const; const ClockInternalDriverId& int_driver_id) const;
std::vector<std::string> flatten_internal_driver_port( std::vector<std::string> flatten_internal_driver_from_pin(
const ClockInternalDriverId& int_driver_id) const;
std::string internal_driver_to_pin(
const ClockInternalDriverId& int_driver_id) const; const ClockInternalDriverId& int_driver_id) const;
/* Return the original list of tap pins that is in storage; useful for parsers /* Return the original list of tap pins that is in storage; useful for parsers
@ -222,7 +224,7 @@ class ClockNetwork {
const vtr::Point<int>& coord); const vtr::Point<int>& coord);
ClockInternalDriverId add_spine_switch_point_internal_driver( ClockInternalDriverId add_spine_switch_point_internal_driver(
const ClockSpineId& spine_id, const ClockSwitchPointId& switch_point_id, const ClockSpineId& spine_id, const ClockSwitchPointId& switch_point_id,
const std::string& internal_driver_port); const std::string& internal_driver_from_port, const std::string& internal_driver_to_port);
ClockTapId add_tree_tap(const ClockTreeId& tree_id, ClockTapId add_tree_tap(const ClockTreeId& tree_id,
const BasicPort& from_port, const BasicPort& from_port,
const std::string& to_port); const std::string& to_port);
@ -317,7 +319,8 @@ class ClockNetwork {
/* Basic Information about internal drivers */ /* Basic Information about internal drivers */
vtr::vector<ClockInternalDriverId, ClockInternalDriverId> vtr::vector<ClockInternalDriverId, ClockInternalDriverId>
internal_driver_ids_; internal_driver_ids_;
vtr::vector<ClockInternalDriverId, std::string> internal_driver_ports_; vtr::vector<ClockInternalDriverId, std::string> internal_driver_from_pins_;
vtr::vector<ClockInternalDriverId, std::string> internal_driver_to_pins_;
/* Basic information about tap */ /* Basic information about tap */
vtr::vector<ClockTapId, ClockTapId> tap_ids_; vtr::vector<ClockTapId, ClockTapId> tap_ids_;
vtr::vector<ClockTapId, BasicPort> tap_from_ports_; vtr::vector<ClockTapId, BasicPort> tap_from_ports_;