Skip to content

Commit bf0f777

Browse files
make format
1 parent 94b4c9c commit bf0f777

File tree

5 files changed

+16
-18
lines changed

5 files changed

+16
-18
lines changed

libs/libarchfpga/src/physical_types.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1543,11 +1543,11 @@ enum class e_stat {
15431543
/// @note If detailed routing is performed, only a uniform (all channels in a given direction are the same width)
15441544
/// distribution is supported.
15451545
struct t_chan {
1546-
e_stat type; ///< Distribution type
1547-
float peak; ///< Peak value. For a UNIFORM distribution, this is the value for all channels (in a given direction).
1548-
float width; ///< Standard deviation (Gaussian)
1549-
float xpeak; ///< Peak location (Gaussian)
1550-
float dc; ///< DC offset (Gaussian, pulse)
1546+
e_stat type; ///< Distribution type
1547+
float peak; ///< Peak value. For a UNIFORM distribution, this is the value for all channels (in a given direction).
1548+
float width; ///< Standard deviation (Gaussian)
1549+
float xpeak; ///< Peak location (Gaussian)
1550+
float dc; ///< DC offset (Gaussian, pulse)
15511551
};
15521552

15531553
/* chan_x_dist: Describes the x-directed channel width distribution. *

vpr/src/base/read_blif.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ struct BlifAllocCallback : public blifparse::Callback {
244244
VTR_ASSERT(ports.size() == nets.size());
245245

246246
LogicalModelId blk_model_id = models_.get_model_by_name(subckt_model);
247-
if(!blk_model_id.is_valid()) {
247+
if (!blk_model_id.is_valid()) {
248248
vpr_throw(VPR_ERROR_BLIF_F, filename_.c_str(), lineno_,
249-
"Subckt instantiates model '%s', but no such model exists in the architecture file.",
250-
subckt_model.c_str());
249+
"Subckt instantiates model '%s', but no such model exists in the architecture file.",
250+
subckt_model.c_str());
251251
}
252252
const t_model& blk_model = models_.get_model(blk_model_id);
253253

vpr/src/draw/draw_debug.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ bool valid_expression(std::string exp) {
772772
vtr::t_formula_data dummy;
773773
try {
774774
int result = fp.parse_formula(exp, dummy, true);
775-
(void)result;
775+
(void)result;
776776
} catch (const vtr::VtrError& e) {
777777
return false;
778778
}

vpr/src/route/rr_graph_generation/build_scatter_gathers.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,11 @@ std::vector<t_bottleneck_link> alloc_and_load_scatter_gather_connections(const s
210210
scatter_loc.y = gather_loc.y + sg_link.y_offset;
211211
scatter_loc.layer_num = gather_loc.layer_num + sg_link.z_offset;
212212

213-
const std::vector<t_segment_inf>& segment_inf = (sg_link.x_offset != 0) ? segment_inf_x :
214-
(sg_link.y_offset != 0) ? segment_inf_y : segment_inf_z;
215-
216-
const e_rr_type chan_type = (sg_link.x_offset != 0) ? e_rr_type::CHANX :
217-
(sg_link.y_offset != 0) ? e_rr_type::CHANY : e_rr_type::CHANZ;
213+
const std::vector<t_segment_inf>& segment_inf = (sg_link.x_offset != 0) ? segment_inf_x : (sg_link.y_offset != 0) ? segment_inf_y
214+
: segment_inf_z;
218215

216+
const e_rr_type chan_type = (sg_link.x_offset != 0) ? e_rr_type::CHANX : (sg_link.y_offset != 0) ? e_rr_type::CHANY
217+
: e_rr_type::CHANZ;
219218

220219
auto seg_it = std::ranges::find_if(segment_inf,
221220
[&](const t_segment_inf& seg) noexcept {
@@ -225,7 +224,6 @@ std::vector<t_bottleneck_link> alloc_and_load_scatter_gather_connections(const s
225224
VTR_ASSERT(seg_it != segment_inf.end());
226225
const t_segment_inf& wire_segment = *seg_it;
227226

228-
229227
index_to_correct_sg_channels(sg_pattern.gather_pattern, gather_loc, chan_details_x, chan_details_y, gather_channels);
230228
index_to_correct_sg_channels(sg_pattern.scatter_pattern, scatter_loc, chan_details_x, chan_details_y, scatter_channels);
231229

vpr/src/route/rr_graph_generation/build_scatter_gathers.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ struct t_sg_candidate {
2929
/// This data structure is used in RR graph generation to model a node that is
3030
/// driven by wires at a gather location and drives wires at a scatter location.
3131
struct t_bottleneck_link {
32-
t_physical_tile_loc gather_loc; ///< Source switchblock location.
33-
t_physical_tile_loc scatter_loc; ///< Destination switchblock location.
34-
int arch_wire_switch; ///< The switch (mux) used to drive the bottleneck wire.
32+
t_physical_tile_loc gather_loc; ///< Source switchblock location.
33+
t_physical_tile_loc scatter_loc; ///< Destination switchblock location.
34+
int arch_wire_switch; ///< The switch (mux) used to drive the bottleneck wire.
3535
int parallel_segment_index;
3636
e_rr_type chan_type;
3737
std::vector<t_sg_candidate> gather_fanin_connections; ///< Wires driving the bottleneck link at `gather_loc`

0 commit comments

Comments
 (0)