Skip to content

Commit bc50a2d

Browse files
committed
make format - solve warnings
1 parent 2bffe34 commit bc50a2d

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

libs/libvtrcapnproto/intra_cluster_serdes.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
#include "router_lookahead_map_utils.h"
1818

1919

20+
void ToIntraClusterLookahead(std::unordered_map<t_physical_tile_type_ptr, util::t_ipin_primitive_sink_delays>& inter_tile_pin_primitive_pin_delay,
21+
std::unordered_map<t_physical_tile_type_ptr, std::unordered_map<int, util::Cost_Entry>>& tile_min_cost,
22+
const std::vector<t_physical_tile_type>& physical_tile_types,
23+
const VprIntraClusterLookahead::Reader& intra_cluster_lookahead_builder);
24+
25+
void FromIntraClusterLookahead(VprIntraClusterLookahead::Builder& intra_cluster_lookahead_builder,
26+
const std::unordered_map<t_physical_tile_type_ptr, util::t_ipin_primitive_sink_delays>& inter_tile_pin_primitive_pin_delay,
27+
const std::unordered_map<t_physical_tile_type_ptr, std::unordered_map<int, util::Cost_Entry>>& tile_min_cost,
28+
const std::vector<t_physical_tile_type>& physical_tile_types);
2029
// Generic function to convert from Matrix capnproto message to vtr::NdMatrix.
2130
//
2231
// Template arguments:

vpr/src/base/stats.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void length_and_bends_stats(const Netlist<>& net_list, bool is_flat) {
146146
total_segments += segments;
147147
max_segments = std::max(segments, max_segments);
148148

149-
if(is_absorbed) {
149+
if (is_absorbed) {
150150
num_absorbed_nets++;
151151
}
152152
} else if (net_list.net_is_ignored(net_id)) {
@@ -177,8 +177,6 @@ void length_and_bends_stats(const Netlist<>& net_list, bool is_flat) {
177177
VTR_LOG("\tTotal local nets with reserved CLB opins: %d\n", num_clb_opins_reserved);
178178

179179
VTR_LOG("Total number of nets absorbed: %d\n", num_absorbed_nets);
180-
181-
182180
}
183181

184182
///@brief Determines how many tracks are used in each channel.

vpr/src/route/router_lookahead_map_utils.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,6 @@ static void run_intra_tile_dijkstra(const RRGraphView& rr_graph,
740740
auto curr_type = rr_graph.node_type(curr.node);
741741
VTR_ASSERT(curr_type != t_rr_type::CHANX && curr_type != t_rr_type::CHANY);
742742
if (curr_type != SINK) {
743-
744743
for (RREdgeId edge : rr_graph.edge_range(curr.node)) {
745744
RRNodeId next_node = rr_graph.rr_nodes().edge_sink_node(edge);
746745
auto cost_index = rr_graph.node_cost_index(next_node);

vpr/src/route/rr_graph.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2203,7 +2203,7 @@ static void add_pins_rr_graph(RRGraphBuilder& rr_graph_builder,
22032203
}
22042204

22052205
static void connect_tile_src_sink_to_pins(RRGraphBuilder& rr_graph_builder,
2206-
std::map<int, t_arch_switch_inf>& arch_sw_inf_map,
2206+
std::map<int, t_arch_switch_inf>& /*arch_sw_inf_map*/,
22072207
const std::vector<int>& class_num_vec,
22082208
const int i,
22092209
const int j,
@@ -2215,8 +2215,8 @@ static void connect_tile_src_sink_to_pins(RRGraphBuilder& rr_graph_builder,
22152215
auto class_type = get_class_type_from_class_physical_num(physical_type_ptr, class_num);
22162216
RRNodeId class_rr_node_id = get_class_rr_node_id(rr_graph_builder.node_lookup(), physical_type_ptr, i, j, class_num);
22172217
VTR_ASSERT(class_rr_node_id != RRNodeId::INVALID());
2218-
bool is_primitive = is_primitive_pin(physical_type_ptr, pin_list[0]);
2219-
t_logical_block_type_ptr logical_block = is_primitive ? get_logical_block_from_pin_physical_num(physical_type_ptr, pin_list[0]) : nullptr;
2218+
//bool is_primitive = is_primitive_pin(physical_type_ptr, pin_list[0]);
2219+
//t_logical_block_type_ptr logical_block = is_primitive ? get_logical_block_from_pin_physical_num(physical_type_ptr, pin_list[0]) : nullptr;
22202220
for (auto pin_num : pin_list) {
22212221
RRNodeId pin_rr_node_id = get_pin_rr_node_id(rr_graph_builder.node_lookup(), physical_type_ptr, i, j, pin_num);
22222222
if (pin_rr_node_id == RRNodeId::INVALID()) {
@@ -2228,17 +2228,17 @@ static void connect_tile_src_sink_to_pins(RRGraphBuilder& rr_graph_builder,
22282228
continue;
22292229
}
22302230
auto pin_type = get_pin_type_from_pin_physical_num(physical_type_ptr, pin_num);
2231-
int sw_id = -1;
2232-
if (is_primitive || pin_type == RECEIVER) {
2233-
VTR_ASSERT(logical_block != nullptr);
2234-
float primitive_comb_delay = get_pin_primitive_comb_delay(physical_type_ptr,
2235-
logical_block,
2236-
pin_num);
2237-
sw_id = find_create_intra_cluster_sw_arch_idx(arch_sw_inf_map,
2238-
primitive_comb_delay);
2239-
} else {
2240-
sw_id = delayless_switch;
2241-
}
2231+
/*int sw_id = -1;
2232+
* if (is_primitive || pin_type == RECEIVER) {
2233+
* VTR_ASSERT(logical_block != nullptr);
2234+
* float primitive_comb_delay = get_pin_primitive_comb_delay(physical_type_ptr,
2235+
* logical_block,
2236+
* pin_num);
2237+
* sw_id = find_create_intra_cluster_sw_arch_idx(arch_sw_inf_map,
2238+
* primitive_comb_delay);
2239+
* } else {
2240+
* sw_id = delayless_switch;
2241+
* }*/
22422242
if (class_type == DRIVER) {
22432243
VTR_ASSERT(pin_type == DRIVER);
22442244
rr_edges_to_create.emplace_back(class_rr_node_id, pin_rr_node_id, delayless_switch);

0 commit comments

Comments
 (0)