Skip to content

Commit d6128b1

Browse files
soheilshahrouzsoheilshahrouz
committed
Next ---> next
1 parent 307d184 commit d6128b1

File tree

1 file changed

+56
-56
lines changed

1 file changed

+56
-56
lines changed

‎libs/libarchfpga/src/read_xml_arch_file.cpp‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ void xml_read_arch(const char* ArchFile,
401401
t_arch* arch,
402402
std::vector<t_physical_tile_type>& PhysicalTileTypes,
403403
std::vector<t_logical_block_type>& LogicalBlockTypes) {
404-
pugi::xml_node Next;
404+
pugi::xml_node next;
405405
ReqOpt POWER_REQD, SWITCHBLOCKLIST_REQD;
406406

407407
if (!vtr::check_file_name_extension(ArchFile, ".xml")) {
@@ -437,79 +437,79 @@ void xml_read_arch(const char* ArchFile,
437437
}
438438
#endif
439439

440-
/* Process models */
441-
Next = get_single_child(architecture, "models", loc_data);
442-
process_models(Next, arch, loc_data);
440+
// Process models
441+
next = get_single_child(architecture, "models", loc_data);
442+
process_models(next, arch, loc_data);
443443

444-
/* Process layout */
444+
// Process layout
445445
int num_of_avail_layers = 0;
446-
Next = get_single_child(architecture, "layout", loc_data);
447-
process_layout(Next, arch, loc_data, num_of_avail_layers);
446+
next = get_single_child(architecture, "layout", loc_data);
447+
process_layout(next, arch, loc_data, num_of_avail_layers);
448448

449449
// Precess vib_layout
450-
Next = get_single_child(architecture, "vib_layout", loc_data, ReqOpt::OPTIONAL);
451-
if (Next) {
452-
process_vib_layout(Next, arch, loc_data);
450+
next = get_single_child(architecture, "vib_layout", loc_data, ReqOpt::OPTIONAL);
451+
if (next) {
452+
process_vib_layout(next, arch, loc_data);
453453
}
454454

455-
/* Process device */
456-
Next = get_single_child(architecture, "device", loc_data);
457-
process_device(Next, arch, arch_def_fc, loc_data);
455+
// Process device
456+
next = get_single_child(architecture, "device", loc_data);
457+
process_device(next, arch, arch_def_fc, loc_data);
458458

459-
/* Process switches */
460-
Next = get_single_child(architecture, "switchlist", loc_data);
461-
arch->switches = process_switches(Next, timing_enabled, loc_data);
459+
// Process switches
460+
next = get_single_child(architecture, "switchlist", loc_data);
461+
arch->switches = process_switches(next, timing_enabled, loc_data);
462462

463463
// Process switchblocks. This depends on switches
464464
bool switchblocklist_required = (arch->sb_type == e_switch_block_type::CUSTOM); // require this section only if custom switchblocks are used
465465
SWITCHBLOCKLIST_REQD = BoolToReqOpt(switchblocklist_required);
466466

467-
/* Process segments. This depends on switches */
468-
Next = get_single_child(architecture, "segmentlist", loc_data);
469-
arch->Segments = process_segments(Next, arch->switches, num_of_avail_layers, timing_enabled, switchblocklist_required, loc_data);
467+
// Process segments. This depends on switches
468+
next = get_single_child(architecture, "segmentlist", loc_data);
469+
arch->Segments = process_segments(next, arch->switches, num_of_avail_layers, timing_enabled, switchblocklist_required, loc_data);
470470

471-
Next = get_single_child(architecture, "switchblocklist", loc_data, SWITCHBLOCKLIST_REQD);
472-
if (Next) {
473-
process_switch_blocks(Next, arch, loc_data);
471+
next = get_single_child(architecture, "switchblocklist", loc_data, SWITCHBLOCKLIST_REQD);
472+
if (next) {
473+
process_switch_blocks(next, arch, loc_data);
474474
}
475475

476-
/* Process logical block types */
477-
Next = get_single_child(architecture, "complexblocklist", loc_data);
478-
process_complex_blocks(Next, LogicalBlockTypes, *arch, timing_enabled, loc_data);
476+
// Process logical block types
477+
next = get_single_child(architecture, "complexblocklist", loc_data);
478+
process_complex_blocks(next, LogicalBlockTypes, *arch, timing_enabled, loc_data);
479479

480-
/* Process logical block types */
481-
Next = get_single_child(architecture, "tiles", loc_data);
482-
process_tiles(Next, PhysicalTileTypes, LogicalBlockTypes, arch_def_fc, *arch, loc_data, num_of_avail_layers);
480+
// Process logical block types
481+
next = get_single_child(architecture, "tiles", loc_data);
482+
process_tiles(next, PhysicalTileTypes, LogicalBlockTypes, arch_def_fc, *arch, loc_data, num_of_avail_layers);
483483

484-
/* Link Physical Tiles with Logical Blocks */
484+
// Link Physical Tiles with Logical Blocks
485485
link_physical_logical_types(PhysicalTileTypes, LogicalBlockTypes);
486486

487-
/* Process directs */
488-
Next = get_single_child(architecture, "directlist", loc_data, ReqOpt::OPTIONAL);
489-
if (Next) {
490-
arch->directs = process_directs(Next, arch->switches, loc_data);
487+
// Process directs
488+
next = get_single_child(architecture, "directlist", loc_data, ReqOpt::OPTIONAL);
489+
if (next) {
490+
arch->directs = process_directs(next, arch->switches, loc_data);
491491
}
492492

493493
// Process vib_arch
494-
Next = get_single_child(architecture, "vib_arch", loc_data, ReqOpt::OPTIONAL);
495-
if (Next) {
496-
process_vib_arch(Next, arch, loc_data);
494+
next = get_single_child(architecture, "vib_arch", loc_data, ReqOpt::OPTIONAL);
495+
if (next) {
496+
process_vib_arch(next, arch, loc_data);
497497
}
498498

499499
// Process Clock Networks
500-
Next = get_single_child(architecture, "clocknetworks", loc_data, ReqOpt::OPTIONAL);
501-
if (Next) {
500+
next = get_single_child(architecture, "clocknetworks", loc_data, ReqOpt::OPTIONAL);
501+
if (next) {
502502
std::vector<std::string> expected_children = {"metal_layers", "clock_network", "clock_routing"};
503-
expect_only_children(Next, expected_children, loc_data);
503+
expect_only_children(next, expected_children, loc_data);
504504

505-
process_clock_metal_layers(Next, arch->clock_arch.clock_metal_layers, loc_data);
505+
process_clock_metal_layers(next, arch->clock_arch.clock_metal_layers, loc_data);
506506

507-
process_clock_networks(Next,
507+
process_clock_networks(next,
508508
arch->clock_arch.clock_networks_arch,
509509
arch->switches,
510510
loc_data);
511511

512-
process_clock_routing(Next,
512+
process_clock_routing(next,
513513
arch->clock_arch.clock_connections_arch,
514514
arch->switches,
515515
loc_data);
@@ -525,40 +525,40 @@ void xml_read_arch(const char* ArchFile,
525525
POWER_REQD = ReqOpt::OPTIONAL;
526526
}
527527

528-
Next = get_single_child(architecture, "power", loc_data, POWER_REQD);
529-
if (Next) {
528+
next = get_single_child(architecture, "power", loc_data, POWER_REQD);
529+
if (next) {
530530
if (arch->power) {
531-
process_power(Next, arch->power, loc_data);
531+
process_power(next, arch->power, loc_data);
532532
} else {
533533
// This information still needs to be read, even if it is just thrown away.
534534
t_power_arch* power_arch_fake = new t_power_arch();
535-
process_power(Next, power_arch_fake, loc_data);
535+
process_power(next, power_arch_fake, loc_data);
536536
delete power_arch_fake;
537537
}
538538
}
539539

540540
// Process Clocks
541-
Next = get_single_child(architecture, "clocks", loc_data, POWER_REQD);
542-
if (Next) {
541+
next = get_single_child(architecture, "clocks", loc_data, POWER_REQD);
542+
if (next) {
543543
if (arch->clocks) {
544-
process_clocks(Next, *arch->clocks, loc_data);
544+
process_clocks(next, *arch->clocks, loc_data);
545545
} else {
546546
// This information still needs to be read, even if it is just thrown away.
547547
std::vector<t_clock_network> clocks_fake;
548-
process_clocks(Next, clocks_fake, loc_data);
548+
process_clocks(next, clocks_fake, loc_data);
549549
}
550550
}
551551

552552
// process NoC (optional)
553-
Next = get_single_child(architecture, "noc", loc_data, pugiutil::OPTIONAL);
554-
if (Next) {
555-
process_noc_tag(Next, arch, loc_data);
553+
next = get_single_child(architecture, "noc", loc_data, pugiutil::OPTIONAL);
554+
if (next) {
555+
process_noc_tag(next, arch, loc_data);
556556
}
557557

558558
// Process scatter-gather patterns (optional)
559-
Next = get_single_child(architecture, "scatter_gather_list", loc_data, pugiutil::OPTIONAL);
560-
if (Next) {
561-
process_sg_tag(Next, arch, loc_data, arch->switches);
559+
next = get_single_child(architecture, "scatter_gather_list", loc_data, pugiutil::OPTIONAL);
560+
if (next) {
561+
process_sg_tag(next, arch, loc_data, arch->switches);
562562
}
563563

564564
SyncModelsPbTypes(arch, LogicalBlockTypes);

0 commit comments

Comments
 (0)