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

add lb_rr_graph to device annotation

This commit is contained in:
tangxifan 2020-02-17 17:26:27 -07:00
parent 6c69b52ded
commit 62e4f14e30
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openfpga/src/annotation/vpr_device_annotation.cpp
View File

@ -241,6 +241,14 @@ ArchDirectId VprDeviceAnnotation::direct_annotation(const size_t& direct) const
return direct_annotations_.at(direct);
}
LbRRGraph VprDeviceAnnotation::physical_lb_rr_graph(t_pb_graph_node* pb_graph_head) const {
/* Ensure that the rr_switch is in the list */
if (0 == physical_lb_rr_graphs_.count(pb_graph_head)) {
return LbRRGraph();
}
return physical_lb_rr_graphs_.at(pb_graph_head);
}
/************************************************************************
* Public mutators
***********************************************************************/
@ -470,4 +478,14 @@ void VprDeviceAnnotation::add_direct_annotation(const size_t& direct, const Arch
direct_annotations_[direct] = arch_direct_id;
}
void VprDeviceAnnotation::add_physical_lb_rr_graph(t_pb_graph_node* pb_graph_head, const LbRRGraph& lb_rr_graph) {
/* Warn any override attempt */
if (0 < physical_lb_rr_graphs_.count(pb_graph_head)) {
VTR_LOG_WARN("Override the physical lb_rr_graph for pb_graph_head '%s'!\n",
pb_graph_head->pb_type->name);
}
physical_lb_rr_graphs_[pb_graph_head] = lb_rr_graph;
}
} /* End namespace openfpga*/

6
openfpga/src/annotation/vpr_device_annotation.h
View File

@ -19,6 +19,7 @@
#include "openfpga_port.h"
#include "circuit_library.h"
#include "arch_direct.h"
#include "lb_rr_graph.h"
/* Begin namespace openfpga */
namespace openfpga {
@ -73,6 +74,7 @@ class VprDeviceAnnotation {
CircuitModelId rr_switch_circuit_model(const RRSwitchId& rr_switch) const;
CircuitModelId rr_segment_circuit_model(const RRSegmentId& rr_segment) const;
ArchDirectId direct_annotation(const size_t& direct) const;
LbRRGraph physical_lb_rr_graph(t_pb_graph_node* pb_graph_head) const;
public: /* Public mutators */
void add_pb_type_physical_mode(t_pb_type* pb_type, t_mode* physical_mode);
void add_physical_pb_type(t_pb_type* operating_pb_type, t_pb_type* physical_pb_type);
@ -93,6 +95,7 @@ class VprDeviceAnnotation {
void add_rr_switch_circuit_model(const RRSwitchId& rr_switch, const CircuitModelId& circuit_model);
void add_rr_segment_circuit_model(const RRSegmentId& rr_segment, const CircuitModelId& circuit_model);
void add_direct_annotation(const size_t& direct, const ArchDirectId& arch_direct_id);
void add_physical_lb_rr_graph(t_pb_graph_node* pb_graph_head, const LbRRGraph& lb_rr_graph);
private: /* Internal data */
/* Pair a regular pb_type to its physical pb_type */
std::map<t_pb_type*, t_pb_type*> physical_pb_types_;
@ -176,6 +179,9 @@ class VprDeviceAnnotation {
/* Pair a direct connection (direct) to a annotation which contains circuit model id */
std::map<size_t, ArchDirectId> direct_annotations_;
/* Logical type routing resource graphs built from physical modes */
std::map<t_pb_graph_node*, LbRRGraph> physical_lb_rr_graphs_;
};
} /* End namespace openfpga*/

1
openfpga/src/base/openfpga_context.h
View File

@ -11,7 +11,6 @@
#include "tile_direct.h"
#include "module_manager.h"
#include "openfpga_flow_manager.h"
#include "lb_rr_graph.h"
#include "device_rr_gsb.h"
/********************************************************************