Skip to content

Commit 70836c5

Browse files
committed
make format
1 parent 4c60c9d commit 70836c5

File tree

7 files changed

+77
-75
lines changed

7 files changed

+77
-75
lines changed

libs/libarchfpga/src/read_xml_arch_file_vib.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ static void process_first_stage(pugi::xml_node Stage_node, std::vector<t_physica
1616
static void process_second_stage(pugi::xml_node Stage_node, std::vector<t_physical_tile_type>& PhysicalTileTypes, std::vector<t_second_stage_mux_inf>& second_stages, const pugiutil::loc_data& loc_data);
1717

1818
static void process_vib_block_type_locs(t_vib_grid_def& grid_def,
19-
int die_number,
20-
vtr::string_internment& strings,
21-
pugi::xml_node layout_block_type_tag,
22-
const pugiutil::loc_data& loc_data);
19+
int die_number,
20+
vtr::string_internment& strings,
21+
pugi::xml_node layout_block_type_tag,
22+
const pugiutil::loc_data& loc_data);
2323

2424
void process_vib_arch(pugi::xml_node Parent, std::vector<t_physical_tile_type>& PhysicalTileTypes, t_arch* arch, const pugiutil::loc_data& loc_data) {
2525
int num_vibs = count_children(Parent, "vib", loc_data);
@@ -471,4 +471,4 @@ static void process_vib_block_type_locs(t_vib_grid_def& grid_def,
471471
"Unrecognized grid location specification type '%s'\n", loc_type);
472472
}
473473
}
474-
}
474+
}

libs/libarchfpga/src/read_xml_arch_file_vib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ void process_vib_arch(pugi::xml_node Parent, std::vector<t_physical_tile_type>&
88

99
void process_vib_layout(pugi::xml_node vib_layout_tag, t_arch* arch, const pugiutil::loc_data& loc_data);
1010

11-
t_vib_grid_def process_vib_grid_layout(vtr::string_internment& strings, pugi::xml_node layout_type_tag, const pugiutil::loc_data& loc_data, t_arch* arch, int& num_of_avail_layer);
11+
t_vib_grid_def process_vib_grid_layout(vtr::string_internment& strings, pugi::xml_node layout_type_tag, const pugiutil::loc_data& loc_data, t_arch* arch, int& num_of_avail_layer);

libs/libarchfpga/src/read_xml_util.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ int get_number_of_layers(pugi::xml_node layout_type_tag, const pugiutil::loc_dat
161161
}
162162

163163
t_metadata_dict process_meta_data(vtr::string_internment& strings,
164-
pugi::xml_node Parent,
165-
const pugiutil::loc_data& loc_data) {
164+
pugi::xml_node Parent,
165+
const pugiutil::loc_data& loc_data) {
166166
// <metadata>
167167
// <meta>CLBLL_L_</meta>
168168
// </metadata>

libs/libvtrutil/src/vtr_util.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ int get_pid() {
381381
/************************************************************************
382382
* Constructors
383383
***********************************************************************/
384-
StringToken::StringToken(const std::string& data) {
384+
StringToken::StringToken(const std::string& data) {
385385
set_data(data);
386386
}
387387

@@ -397,7 +397,7 @@ StringToken::StringToken(const char* data) {
397397
* Public Accessors
398398
***********************************************************************/
399399
/* Get the data string */
400-
std::string StringToken::data() const {
400+
std::string StringToken::data() const {
401401
return data_;
402402
}
403403

@@ -480,7 +480,8 @@ std::vector<size_t> StringToken::find_positions(const char& delim) const {
480480
}
481481

482482
std::vector<std::string> StringToken::split_by_chunks(
483-
const char& chunk_delim, const bool& split_odd_chunk) const {
483+
const char& chunk_delim,
484+
const bool& split_odd_chunk) const {
484485
size_t chunk_idx_mod = 0;
485486
if (split_odd_chunk) {
486487
chunk_idx_mod = 1;

libs/libvtrutil/src/vtr_util.h

Lines changed: 60 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -146,65 +146,66 @@ int get_pid();
146146
* It can accept different delimiters in splitting strings
147147
*/
148148
class StringToken {
149-
public: /* Constructors*/
150-
StringToken(const std::string& data);
151-
152-
StringToken(std::string_view data);
153-
154-
StringToken(const char* data);
155-
156-
public: /* Public Accessors */
157-
std::string data() const;
158-
/**
159-
* @brief Splits the string 'text' along the specified delimiter characters in 'delims'
160-
*
161-
* The split strings (excluding the delimiters) are returned
162-
*/
163-
std::vector<std::string> split(const std::string& delims) const;
164-
std::vector<std::string> split(const char& delim) const;
165-
std::vector<std::string> split(const char* delim) const;
166-
std::vector<std::string> split(const std::vector<char>& delim) const;
167-
std::vector<std::string> split();
168-
/**
169-
* @brief Find the position (i-th charactor) in a string for a given
170-
* delimiter, it will return a list of positions For example, to find the
171-
* position of all quotes (") in a string: "we" are good The following code is
172-
* suggested: StringToken tokenizer("\"we\" are good"); std::vector<size_t>
173-
* anchors = tokenizer.find_positions('\"') The following vector will be
174-
* returned: [0, 3]
175-
*/
176-
std::vector<size_t> find_positions(const char& delim) const;
177-
178-
/**
179-
* @brief split the string for each chunk. This is useful where there are
180-
* chunks of substring should not be splitted by the given delimiter For
181-
* example, to split the string with quotes (") in a string: source "cmdA
182-
* --opt1 val1;cmdB --opt2 val2" --verbose where the string between the two
183-
* quotes should not be splitted The following code is suggested: StringToken
184-
* tokenizer("source \"cmdA --opt1 val1;cmdB --opt2 val2\" --verbose");
185-
* std::vector<std::string> tokenizer.split_by_chunks('\"', true);
186-
* The following vector will be returned:
187-
* ["source" "cmdA --opt1 val1;cmdB --opt2 val2" "--verbose"]
188-
*
189-
* .. note:: The option ``split_odd_chunk`` is useful when the chunk delimiter
190-
* appears at the beginning of the string.
191-
*/
192-
std::vector<std::string> split_by_chunks(
193-
const char& chunk_delim, const bool& split_odd_chunk = false) const;
194-
195-
public: /* Public Mutators */
196-
void set_data(const std::string& data);
197-
void add_delim(const char& delim);
198-
void ltrim(const std::string& sensitive_word);
199-
void rtrim(const std::string& sensitive_word);
200-
void trim();
201-
202-
private: /* Private Mutators */
203-
void add_default_delim();
204-
205-
private: /* Internal data */
206-
std::string data_; /* Lines to be splited */
207-
std::vector<char> delims_;
149+
public: /* Constructors*/
150+
StringToken(const std::string& data);
151+
152+
StringToken(std::string_view data);
153+
154+
StringToken(const char* data);
155+
156+
public: /* Public Accessors */
157+
std::string data() const;
158+
/**
159+
* @brief Splits the string 'text' along the specified delimiter characters in 'delims'
160+
*
161+
* The split strings (excluding the delimiters) are returned
162+
*/
163+
std::vector<std::string> split(const std::string& delims) const;
164+
std::vector<std::string> split(const char& delim) const;
165+
std::vector<std::string> split(const char* delim) const;
166+
std::vector<std::string> split(const std::vector<char>& delim) const;
167+
std::vector<std::string> split();
168+
/**
169+
* @brief Find the position (i-th charactor) in a string for a given
170+
* delimiter, it will return a list of positions For example, to find the
171+
* position of all quotes (") in a string: "we" are good The following code is
172+
* suggested: StringToken tokenizer("\"we\" are good"); std::vector<size_t>
173+
* anchors = tokenizer.find_positions('\"') The following vector will be
174+
* returned: [0, 3]
175+
*/
176+
std::vector<size_t> find_positions(const char& delim) const;
177+
178+
/**
179+
* @brief split the string for each chunk. This is useful where there are
180+
* chunks of substring should not be splitted by the given delimiter For
181+
* example, to split the string with quotes (") in a string: source "cmdA
182+
* --opt1 val1;cmdB --opt2 val2" --verbose where the string between the two
183+
* quotes should not be splitted The following code is suggested: StringToken
184+
* tokenizer("source \"cmdA --opt1 val1;cmdB --opt2 val2\" --verbose");
185+
* std::vector<std::string> tokenizer.split_by_chunks('\"', true);
186+
* The following vector will be returned:
187+
* ["source" "cmdA --opt1 val1;cmdB --opt2 val2" "--verbose"]
188+
*
189+
* .. note:: The option ``split_odd_chunk`` is useful when the chunk delimiter
190+
* appears at the beginning of the string.
191+
*/
192+
std::vector<std::string> split_by_chunks(
193+
const char& chunk_delim,
194+
const bool& split_odd_chunk = false) const;
195+
196+
public: /* Public Mutators */
197+
void set_data(const std::string& data);
198+
void add_delim(const char& delim);
199+
void ltrim(const std::string& sensitive_word);
200+
void rtrim(const std::string& sensitive_word);
201+
void trim();
202+
203+
private: /* Private Mutators */
204+
void add_default_delim();
205+
206+
private: /* Internal data */
207+
std::string data_; /* Lines to be splited */
208+
std::vector<char> delims_;
208209
};
209210

210211
} // namespace vtr

vpr/src/base/setup_vpr.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,8 +1033,8 @@ static void do_reachability_analysis(t_physical_tile_type* physical_tile,
10331033
if (insert_res.second) {
10341034
curr_pb_graph_pin->connected_sinks_ptc.insert(physical_class_num);
10351035
std::vector<int> driving_pins = get_physical_pin_src_pins(physical_tile,
1036-
logical_block,
1037-
curr_pin_physical_num);
1036+
logical_block,
1037+
curr_pin_physical_num);
10381038
for (int driving_pin_physical_num : driving_pins) {
10391039
// Since we define reachable class as a class which is connected to a pin through a series of IPINs, only IPINs are added to the list
10401040
if (get_pin_type_from_pin_physical_num(physical_tile, driving_pin_physical_num) == e_pin_type::RECEIVER) {

vpr/src/base/vpr_types.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,15 +1427,15 @@ struct t_det_routing_arch {
14271427
/// Allow routing channels to pass through multi-width and multi-height programmable blocks.
14281428
bool through_channel;
14291429

1430-
/// Allow each output pin of a programmable block to drive the routing tracks on all the
1430+
/// Allow each output pin of a programmable block to drive the routing tracks on all the
14311431
/// sides of its adjacent switch block
14321432
bool opin2all_sides;
14331433

1434-
///In each switch block, allow each routing track which ends to drive another
1434+
///In each switch block, allow each routing track which ends to drive another
14351435
/// routing track on the opposite side
14361436
bool concat_wire;
14371437

1438-
/// In each switch block, allow each routing track which passes to drive
1438+
/// In each switch block, allow each routing track which passes to drive
14391439
/// another routing track on the opposite side
14401440
bool concat_pass_wire;
14411441

0 commit comments

Comments
 (0)