Skip to content

Commit c3e33e0

Browse files
acomodiacomodi
committed
run make format
Signed-off-by: Alessandro Comodi <[email protected]>
1 parent 99f0cd6 commit c3e33e0

File tree

7 files changed

+21
-19
lines changed

7 files changed

+21
-19
lines changed

‎libs/libarchfpga/src/read_xml_arch_file.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -812,9 +812,9 @@ static void LoadPinLoc(pugi::xml_node Locations,
812812
for (e_side side : {TOP, RIGHT, BOTTOM, LEFT}) {
813813
for (int pin = 0; pin < type->num_pin_loc_assignments[width][height][side]; ++pin) {
814814
auto pin_range = ProcessPinString<t_physical_tile_type_ptr>(Locations,
815-
type,
816-
type->pin_loc_assignments[width][height][side][pin],
817-
loc_data);
815+
type,
816+
type->pin_loc_assignments[width][height][side][pin],
817+
loc_data);
818818

819819
for (int pin_num = pin_range.first; pin_num < pin_range.second; ++pin_num) {
820820
VTR_ASSERT(pin_num < type->num_pins / type->capacity);
@@ -4747,7 +4747,6 @@ e_side string_to_side(std::string side_str) {
47474747

47484748
static void link_physical_logical_types(std::vector<t_physical_tile_type>& PhysicalTileTypes,
47494749
std::vector<t_logical_block_type>& LogicalBlockTypes) {
4750-
47514750
for (auto& physical_tile : PhysicalTileTypes) {
47524751
if (physical_tile.index == EMPTY_TYPE_INDEX) continue;
47534752

‎vpr/src/base/clustered_netlist.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,9 @@ class ClusteredNetlist : public Netlist<ClusterBlockId, ClusterPortId, ClusterPi
254254

255255
//Pins
256256
vtr::vector_map<ClusterPinId, int> pin_physical_index_; //The physical pin index (i.e. pin index
257-
//in t_physical_tile_type) corresponding
258-
//to the logical pin
259-
vtr::vector_map<ClusterPinId, int> pin_logical_index_; //The logical pin index of this block
257+
//in t_physical_tile_type) corresponding
258+
//to the logical pin
259+
vtr::vector_map<ClusterPinId, int> pin_logical_index_; //The logical pin index of this block
260260

261261
//Nets
262262
vtr::vector_map<ClusterNetId, bool> net_is_ignored_; //Boolean mapping indicating if the net is ignored

‎vpr/src/base/read_place.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void read_user_pad_loc(const char* pad_loc_file) {
160160

161161
hash_table = alloc_hash_table();
162162
for (auto blk_id : cluster_ctx.clb_nlist.blocks()) {
163-
auto logical_block = cluster_ctx.clb_nlist.block_type(blk_id);
163+
auto logical_block = cluster_ctx.clb_nlist.block_type(blk_id);
164164
if (is_io_type(physical_tile_type(logical_block))) {
165165
insert_in_hash_table(hash_table, cluster_ctx.clb_nlist.block_name(blk_id).c_str(), size_t(blk_id));
166166
place_ctx.block_locs[blk_id].loc.x = OPEN; /* Mark as not seen yet. */
@@ -267,7 +267,7 @@ void read_user_pad_loc(const char* pad_loc_file) {
267267
}
268268

269269
for (auto blk_id : cluster_ctx.clb_nlist.blocks()) {
270-
auto logical_block = cluster_ctx.clb_nlist.block_type(blk_id);
270+
auto logical_block = cluster_ctx.clb_nlist.block_type(blk_id);
271271
auto type = physical_tile_type(logical_block);
272272
if (is_io_type(type) && place_ctx.block_locs[blk_id].loc.x == OPEN) {
273273
vpr_throw(VPR_ERROR_PLACE_F, pad_loc_file, 0,

‎vpr/src/base/vpr_api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ void vpr_create_device_grid(const t_vpr_setup& vpr_setup, const t_arch& Arch) {
424424
num_type_instances[&type], type.name);
425425

426426
VTR_LOG("\tArchitecture\n");
427-
for(const auto equivalent_tile : type.equivalent_tiles) {
427+
for (const auto equivalent_tile : type.equivalent_tiles) {
428428
VTR_LOG("\t\t%d\tblocks of type: %s\n",
429429
device_ctx.grid.num_instances(equivalent_tile), equivalent_tile->name);
430430
}

‎vpr/src/pack/cluster.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,8 +1966,10 @@ static void start_new_cluster(t_cluster_placement_stats* cluster_placement_stats
19661966
int lhs_num_instances = 0;
19671967
int rhs_num_instances = 0;
19681968
// Count number of instances for each type
1969-
for (auto type : lhs->equivalent_tiles) lhs_num_instances += device_ctx.grid.num_instances(type);
1970-
for (auto type : rhs->equivalent_tiles) rhs_num_instances += device_ctx.grid.num_instances(type);
1969+
for (auto type : lhs->equivalent_tiles)
1970+
lhs_num_instances += device_ctx.grid.num_instances(type);
1971+
for (auto type : rhs->equivalent_tiles)
1972+
rhs_num_instances += device_ctx.grid.num_instances(type);
19711973

19721974
float lhs_util = vtr::safe_ratio<float>(num_used_type_instances[lhs], lhs_num_instances);
19731975
float rhs_util = vtr::safe_ratio<float>(num_used_type_instances[rhs], rhs_num_instances);

‎vpr/src/pack/pack.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ bool try_pack(t_packer_opts* packer_opts,
171171
resource_reqs += std::string(iter->first->name) + ": " + std::to_string(iter->second);
172172

173173
int num_instances = 0;
174-
for (auto type : iter->first->equivalent_tiles) num_instances += grid.num_instances(type);
174+
for (auto type : iter->first->equivalent_tiles)
175+
num_instances += grid.num_instances(type);
175176

176177
resource_avail += std::string(iter->first->name) + ": " + std::to_string(num_instances);
177178
}
@@ -278,7 +279,7 @@ static bool try_size_device_grid(const t_arch& arch, const std::map<t_logical_bl
278279
VTR_LOG("Device Utilization: %.2f (target %.2f)\n", device_utilization, target_device_utilization);
279280
std::map<t_logical_block_type_ptr, float> type_util;
280281
for (const auto& type : device_ctx.logical_block_types) {
281-
if(is_empty_type(&type)) continue;
282+
if (is_empty_type(&type)) continue;
282283

283284
auto itr = num_type_instances.find(&type);
284285
if (itr == num_type_instances.end()) continue;

‎vpr/src/util/vpr_utils.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ std::string block_type_pin_index_to_name(t_physical_tile_type_ptr type, int pin_
220220

221221
int curr_index = 0;
222222
for (auto const port : type->ports) {
223-
224223
if (curr_index + port.num_pins > pin_index) {
225224
//This port contains the desired pin index
226225
int index_in_port = pin_index - curr_index;
@@ -766,8 +765,10 @@ t_logical_block_type_ptr infer_logic_block_type(const DeviceGrid& grid) {
766765
int lhs_num_instances = 0;
767766
int rhs_num_instances = 0;
768767
// Count number of instances for each type
769-
for (auto type : lhs->equivalent_tiles) lhs_num_instances += grid.num_instances(type);
770-
for (auto type : rhs->equivalent_tiles) rhs_num_instances += grid.num_instances(type);
768+
for (auto type : lhs->equivalent_tiles)
769+
lhs_num_instances += grid.num_instances(type);
770+
for (auto type : rhs->equivalent_tiles)
771+
rhs_num_instances += grid.num_instances(type);
771772
return lhs_num_instances > rhs_num_instances;
772773
};
773774
std::stable_sort(logic_block_candidates.begin(), logic_block_candidates.end(), by_desc_grid_count);
@@ -841,7 +842,7 @@ InstPort parse_inst_port(std::string str) {
841842
int num_pins = OPEN;
842843
for (auto physical_port : blk_type->ports) {
843844
if (0 == strcmp(inst_port.port_name().c_str(), physical_port.name)) {
844-
num_pins = physical_port.num_pins;
845+
num_pins = physical_port.num_pins;
845846
break;
846847
}
847848
}
@@ -890,7 +891,6 @@ int find_pin(t_physical_tile_type_ptr type, std::string port_name, int pin_index
890891
int num_pins = OPEN;
891892

892893
for (auto port : type->ports) {
893-
894894
if (port.name == port_name) {
895895
num_pins = port.num_pins;
896896
break;

0 commit comments

Comments
 (0)