Skip to content

Commit f1506e8

Browse files
committed
Ran make format
1 parent f26768a commit f1506e8

File tree

4 files changed

+29
-28
lines changed

4 files changed

+29
-28
lines changed

vpr/src/base/read_options.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,16 +2021,18 @@ argparse::ArgumentParser create_arg_parser(std::string prog_name, t_options& arg
20212021
.show_in(argparse::ShowIn::HELP_ONLY);
20222022

20232023
place_grp.add_argument(args.floorplan_num_horizontal_partitions, "--floorplan_num_horizontal_partitions")
2024-
.help("An argument used for generating test constraints files. Specifies how many partitions to "
2025-
"make in the horizontal dimension. Must be used in conjunction with "
2026-
"--floorplan_num_vertical_partitions")
2024+
.help(
2025+
"An argument used for generating test constraints files. Specifies how many partitions to "
2026+
"make in the horizontal dimension. Must be used in conjunction with "
2027+
"--floorplan_num_vertical_partitions")
20272028
.default_value("0")
20282029
.show_in(argparse::ShowIn::HELP_ONLY);
20292030

20302031
place_grp.add_argument(args.floorplan_num_vertical_partitions, "--floorplan_num_vertical_partitions")
2031-
.help("An argument used for generating test constraints files. Specifies how many partitions to "
2032-
"make in the vertical dimension. Must be used in conjunction with "
2033-
"--floorplan_num_horizontal_partitions")
2032+
.help(
2033+
"An argument used for generating test constraints files. Specifies how many partitions to "
2034+
"make in the vertical dimension. Must be used in conjunction with "
2035+
"--floorplan_num_horizontal_partitions")
20342036
.default_value("0")
20352037
.show_in(argparse::ShowIn::HELP_ONLY);
20362038

vpr/src/base/vpr_api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ bool vpr_place_flow(t_vpr_setup& vpr_setup, const t_arch& arch) {
633633
//Write out a vpr floorplanning constraints file if the option is specified
634634
if (!filename_opts.write_vpr_constraints_file.empty()) {
635635
write_vpr_floorplan_constraints(filename_opts.write_vpr_constraints_file.c_str(), placer_opts.place_constraint_expand, placer_opts.place_constraint_subtile,
636-
placer_opts.floorplan_num_horizontal_partitions, placer_opts.floorplan_num_vertical_partitions);
636+
placer_opts.floorplan_num_horizontal_partitions, placer_opts.floorplan_num_vertical_partitions);
637637
}
638638

639639
return true;

vpr/src/base/vpr_constraints_writer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ void write_vpr_floorplan_constraints(const char* file_name, int expand, bool sub
2323
VprConstraints constraints;
2424

2525
if (horizontal_partitions != 0 && vertical_partitions != 0) {
26-
setup_vpr_floorplan_constraints_cutpoints(constraints, horizontal_partitions, vertical_partitions);
26+
setup_vpr_floorplan_constraints_cutpoints(constraints, horizontal_partitions, vertical_partitions);
2727
} else {
28-
setup_vpr_floorplan_constraints_one_loc(constraints, expand, subtile);
28+
setup_vpr_floorplan_constraints_one_loc(constraints, expand, subtile);
2929
}
3030

3131
VprConstraintsSerializer writer(constraints);

vpr/src/pack/cluster.cpp

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -443,11 +443,11 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
443443
*
444444
*/
445445

446-
/* This routine returns a map that details the number of used block type instances.
447-
* The bool floorplan_regions_overfull also acts as a return value - it is set to
448-
* true when one or more floorplan regions have more blocks assigned to them than
449-
* they can fit.
450-
*/
446+
/* This routine returns a map that details the number of used block type instances.
447+
* The bool floorplan_regions_overfull also acts as a return value - it is set to
448+
* true when one or more floorplan regions have more blocks assigned to them than
449+
* they can fit.
450+
*/
451451

452452
/****************************************************************
453453
* Initialization
@@ -733,7 +733,7 @@ static void print_pack_status(int num_clb,
733733
int device_width,
734734
int device_height,
735735
AttractionInfo& attraction_groups) {
736-
//Print a packing update each time another 4% of molecules have been packed.
736+
//Print a packing update each time another 4% of molecules have been packed.
737737
const float print_frequency = 0.04;
738738

739739
double percentage = (num_molecules_processed / (double)tot_num_molecules) * 100;
@@ -777,7 +777,7 @@ static void rebuild_attraction_groups(AttractionInfo& attraction_groups) {
777777
AttractionGroup new_att_group_info;
778778

779779
for (AtomBlockId atom : group.group_atoms) {
780-
//If the ClusterBlockId is anything other than invalid, the atom has been packed already
780+
//If the ClusterBlockId is anything other than invalid, the atom has been packed already
781781
if (atom_ctx.lookup.atom_clb(atom) == ClusterBlockId::INVALID()) {
782782
new_att_group_info.group_atoms.push_back(atom);
783783
}
@@ -1552,16 +1552,15 @@ static enum e_block_pack_status try_pack_molecule(t_cluster_placement_stats* clu
15521552
* attraction groups on. */
15531553
static void record_molecule_failure(t_pack_molecule* molecule, t_pb* pb) {
15541554
//Only have to record the failure for the first atom in the molecule.
1555-
//The convention when checking if a molecule has failed to pack in the cluster
1556-
//is to check whether the first atoms has been recorded as having failed
1557-
1558-
auto got = pb->pb_stats->atom_failures.find(molecule->atom_block_ids[0]);
1559-
if (got == pb->pb_stats->atom_failures.end()) {
1560-
pb->pb_stats->atom_failures.insert({molecule->atom_block_ids[0], 1});
1561-
} else {
1562-
got->second++;
1563-
}
1555+
//The convention when checking if a molecule has failed to pack in the cluster
1556+
//is to check whether the first atoms has been recorded as having failed
15641557

1558+
auto got = pb->pb_stats->atom_failures.find(molecule->atom_block_ids[0]);
1559+
if (got == pb->pb_stats->atom_failures.end()) {
1560+
pb->pb_stats->atom_failures.insert({molecule->atom_block_ids[0], 1});
1561+
} else {
1562+
got->second++;
1563+
}
15651564
}
15661565

15671566
/**
@@ -2637,8 +2636,8 @@ static t_pack_molecule* get_highest_gain_molecule(t_pb* cur_pb,
26372636
* attraction groups were created, explore the attraction groups to see if
26382637
* any suitable molecules can be found.
26392638
*/
2640-
add_cluster_molecule_candidates_by_attraction_group(cur_pb, cluster_placement_stats_ptr, atom_molecules, attraction_groups,
2641-
feasible_block_array_size, cluster_index, primitive_candidate_block_types);
2639+
add_cluster_molecule_candidates_by_attraction_group(cur_pb, cluster_placement_stats_ptr, atom_molecules, attraction_groups,
2640+
feasible_block_array_size, cluster_index, primitive_candidate_block_types);
26422641
}
26432642

26442643
if (cur_pb->pb_stats->num_feasible_blocks > 0) {
@@ -2756,7 +2755,7 @@ static void add_cluster_molecule_candidates_by_attraction_group(t_pb* cur_pb,
27562755
if (cur_pb->pb_stats->pulled_from_atom_groups < num_pulls) {
27572756
cur_pb->pb_stats->pulled_from_atom_groups++;
27582757
} else {
2759-
return;
2758+
return;
27602759
}
27612760

27622761
AttractGroupId grp_id = cur_pb->pb_stats->attraction_grp_id;

0 commit comments

Comments
 (0)