From e5c7a3df9f62c053e427a53ba3b159090ddeeb78 Mon Sep 17 00:00:00 2001 From: tangxifan Date: Wed, 7 Sep 2022 15:51:54 -0700 Subject: [PATCH] [engine] syntax --- openfpga/src/utils/rr_gsb_utils.cpp | 14 +++++++------- openfpga/src/utils/rr_gsb_utils.h | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/openfpga/src/utils/rr_gsb_utils.cpp b/openfpga/src/utils/rr_gsb_utils.cpp index 526448a48..641688fc9 100644 --- a/openfpga/src/utils/rr_gsb_utils.cpp +++ b/openfpga/src/utils/rr_gsb_utils.cpp @@ -58,7 +58,7 @@ std::vector get_rr_gsb_chan_node_configurable_driver_nodes(const RRGra /** @brief Evaluate if two routing channels are mirror to each other */ static -bool is_chan_mirror(const RRGraph& rr_graph, +bool is_chan_mirror(const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation, const RRChan& base, const RRChan& cand) { @@ -97,7 +97,7 @@ bool is_chan_mirror(const RRGraph& rr_graph, * 3. each drive_rr_switch should be the same */ static -bool is_sb_node_mirror(const RRGraph& rr_graph, +bool is_sb_node_mirror(const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation, const RRGSB& base, const RRGSB& cand, @@ -159,7 +159,7 @@ bool is_sb_node_mirror(const RRGraph& rr_graph, /** @brief Check if all the routing segments of a side of candidate SB is a mirror of the current one */ static -bool is_sb_side_segment_mirror(const RRGraph& rr_graph, +bool is_sb_side_segment_mirror(const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation, const RRGSB& base, const RRGSB& cand, @@ -219,7 +219,7 @@ bool is_sb_side_segment_mirror(const RRGraph& rr_graph, * If all above are satisfied, the side of the two switch blocks are mirrors! */ static -bool is_sb_side_mirror(const RRGraph& rr_graph, +bool is_sb_side_mirror(const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation, const RRGSB& base, const RRGSB& cand, @@ -249,7 +249,7 @@ bool is_sb_side_mirror(const RRGraph& rr_graph, * 5. check if pin class id and pin id are same * If all above are satisfied, the two switch blocks are mirrors! */ -bool is_sb_mirror(const RRGraph& rr_graph, +bool is_sb_mirror(const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation, const RRGSB& base, const RRGSB& cand) { @@ -274,7 +274,7 @@ bool is_sb_mirror(const RRGraph& rr_graph, * 2. each drive_rr_switch should be the same */ static -bool is_cb_node_mirror(const RRGraph& rr_graph, +bool is_cb_node_mirror(const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation, const RRGSB& base, const RRGSB& cand, @@ -344,7 +344,7 @@ bool is_cb_node_mirror(const RRGraph& rr_graph, } /** @brief Check if the candidate CB is a mirror of the current baselien */ -bool is_cb_mirror(const RRGraph& rr_graph, +bool is_cb_mirror(const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation, const RRGSB& base, const RRGSB& cand, diff --git a/openfpga/src/utils/rr_gsb_utils.h b/openfpga/src/utils/rr_gsb_utils.h index b302560c7..3324b4206 100644 --- a/openfpga/src/utils/rr_gsb_utils.h +++ b/openfpga/src/utils/rr_gsb_utils.h @@ -7,6 +7,7 @@ #include #include #include "rr_gsb.h" +#include "rr_graph_view.h" #include "vpr_device_annotation.h" /******************************************************************** @@ -24,12 +25,12 @@ std::vector get_rr_gsb_chan_node_configurable_driver_nodes(const RRGra const e_side& chan_side, const size_t& track_id); -bool is_sb_mirror(const RRGraph& rr_graph, +bool is_sb_mirror(const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation, const RRGSB& base, const RRGSB& cand); -bool is_cb_mirror(const RRGraph& rr_graph, +bool is_cb_mirror(const RRGraphView& rr_graph, const VprDeviceAnnotation& device_annotation, const RRGSB& base, const RRGSB& cand,