File tree 2 files changed +16
-17
lines changed
2 files changed +16
-17
lines changed Original file line number Diff line number Diff line change @@ -72,17 +72,17 @@ bool t_rr_switch_inf::configurable() const {
72
72
}
73
73
74
74
bool t_rr_switch_inf::operator ==(const t_rr_switch_inf& other) const {
75
- return R == other.R &&
76
- Cin == other.Cin &&
77
- Cout == other.Cout &&
78
- Cinternal == other.Cinternal &&
79
- Tdel == other.Tdel &&
80
- mux_trans_size == other.mux_trans_size &&
81
- buf_size == other.buf_size &&
82
- power_buffer_type == other.power_buffer_type &&
83
- power_buffer_size == other.power_buffer_size &&
84
- intra_tile == other.intra_tile &&
85
- type () == other.type ();
75
+ return R == other.R
76
+ && Cin == other.Cin
77
+ && Cout == other.Cout
78
+ && Cinternal == other.Cinternal
79
+ && Tdel == other.Tdel
80
+ && mux_trans_size == other.mux_trans_size
81
+ && buf_size == other.buf_size
82
+ && power_buffer_type == other.power_buffer_type
83
+ && power_buffer_size == other.power_buffer_size
84
+ && intra_tile == other.intra_tile
85
+ && type () == other.type ();
86
86
}
87
87
88
88
std::size_t t_rr_switch_inf::Hasher::operator ()(const t_rr_switch_inf& s) const {
@@ -111,7 +111,6 @@ void t_rr_switch_inf::set_type(SwitchType type_val) {
111
111
type_ = type_val;
112
112
}
113
113
114
-
115
114
static bool switch_type_is_buffered (SwitchType type) {
116
115
// Muxes and Tristates isolate their input and output into
117
116
// separate DC connected sub-circuits
Original file line number Diff line number Diff line change @@ -236,18 +236,18 @@ TEST_CASE("read_rr_edge_override", "[vpr]") {
236
236
237
237
const std::string RR_GRAPH_NAME = " test_read_rr_edge_override" ;
238
238
const std::string RR_EDGE_OVERRIDE_FILENAME = " test_read_rr_edge_override.txt" ;
239
- const std::array<std::string, 2 > file_extensions {" .xml" , " .bin" };
239
+ const std::array<std::string, 2 > file_extensions{" .xml" , " .bin" };
240
240
241
241
// We test both xml and binary file formats
242
242
for (const std::string& file_extension : file_extensions) {
243
- std::string rr_graph_filename = RR_GRAPH_NAME + file_extension ;
244
- std::string overridden_rr_graph_filename = RR_GRAPH_NAME + " _overridden" + file_extension ;
243
+ std::string rr_graph_filename = RR_GRAPH_NAME + file_extension;
244
+ std::string overridden_rr_graph_filename = RR_GRAPH_NAME + " _overridden" + file_extension;
245
245
246
246
RRNodeId src_inode = RRNodeId::INVALID ();
247
247
RRNodeId sink_inode = RRNodeId::INVALID ();
248
248
short switch_id = -1 ;
249
249
250
- { // Generate an RR graph and write it out
250
+ { // Generate an RR graph and write it out
251
251
t_vpr_setup vpr_setup;
252
252
t_arch arch;
253
253
t_options options;
@@ -299,7 +299,7 @@ TEST_CASE("read_rr_edge_override", "[vpr]") {
299
299
REQUIRE (sink_inode.is_valid ());
300
300
REQUIRE (switch_id != -1 );
301
301
302
- { // Override edge attributes
302
+ { // Override edge attributes
303
303
t_vpr_setup vpr_setup;
304
304
t_arch arch;
305
305
t_options options;
You can’t perform that action at this time.
0 commit comments