diff --git a/openfpga/src/annotation/openfpga_annotate_routing.cpp b/openfpga/src/annotation/openfpga_annotate_routing.cpp index 75da0fe8f..489c80986 100644 --- a/openfpga/src/annotation/openfpga_annotate_routing.cpp +++ b/openfpga/src/annotation/openfpga_annotate_routing.cpp @@ -73,14 +73,17 @@ vtr::vector annotate_rr_node_global_net( } VTR_ASSERT(node_pin_num < phy_tile->num_pins); t_rr_type rr_pin_type = IPIN; - if (phy_tile->class_inf[phy_tile->pin_class[node_pin_num]].type == RECEIVER) { + if (phy_tile->class_inf[phy_tile->pin_class[node_pin_num]].type == + RECEIVER) { rr_pin_type = IPIN; - } else if (phy_tile->class_inf[phy_tile->pin_class[node_pin_num]].type == DRIVER) { + } else if (phy_tile->class_inf[phy_tile->pin_class[node_pin_num]].type == + DRIVER) { rr_pin_type = OPIN; } else { - VTR_LOG_ERROR("When annotating global net '%s', invalid rr node pin type for '%s' pin '%d'\n", - cluster_nlist.net_name(net_id).c_str(), phy_tile->name, - node_pin_num); + VTR_LOG_ERROR( + "When annotating global net '%s', invalid rr node pin type for '%s' " + "pin '%d'\n", + cluster_nlist.net_name(net_id).c_str(), phy_tile->name, node_pin_num); exit(1); } std::vector curr_rr_nodes = diff --git a/openfpga/src/fpga_verilog/verilog_preconfig_top_module.cpp b/openfpga/src/fpga_verilog/verilog_preconfig_top_module.cpp index 8e4a14170..3e47c6a16 100644 --- a/openfpga/src/fpga_verilog/verilog_preconfig_top_module.cpp +++ b/openfpga/src/fpga_verilog/verilog_preconfig_top_module.cpp @@ -65,8 +65,10 @@ static void print_verilog_preconfig_top_module_ports( /* The block may be renamed as it contains special characters which violate * Verilog syntax */ if (true == netlist_annotation.is_block_renamed(atom_blk)) { - VTR_LOG("Replace pin name '%s' with '%s' as it is renamed to comply verilog syntax\n", block_name.c_str(), - netlist_annotation.block_name(atom_blk).c_str()); + VTR_LOG( + "Replace pin name '%s' with '%s' as it is renamed to comply verilog " + "syntax\n", + block_name.c_str(), netlist_annotation.block_name(atom_blk).c_str()); block_name = netlist_annotation.block_name(atom_blk); } /* For output block, remove the prefix which is added by VPR */ @@ -447,8 +449,8 @@ int print_verilog_preconfig_top_module( /* Connect FPGA top module global ports to constant or benchmark global * signals! */ status = print_verilog_preconfig_top_module_connect_global_ports( - fp, module_manager, core_module, pin_constraints, atom_ctx, netlist_annotation, global_ports, - benchmark_clock_port_names, + fp, module_manager, core_module, pin_constraints, atom_ctx, + netlist_annotation, global_ports, benchmark_clock_port_names, std::string(FORMAL_VERIFICATION_TOP_MODULE_PORT_POSTFIX)); if (CMD_EXEC_FATAL_ERROR == status) { return status; diff --git a/openfpga/src/fpga_verilog/verilog_preconfig_top_module_utils.cpp b/openfpga/src/fpga_verilog/verilog_preconfig_top_module_utils.cpp index 2649c2c64..bca7b6709 100644 --- a/openfpga/src/fpga_verilog/verilog_preconfig_top_module_utils.cpp +++ b/openfpga/src/fpga_verilog/verilog_preconfig_top_module_utils.cpp @@ -57,8 +57,7 @@ void print_verilog_preconfig_top_module_internal_wires( int print_verilog_preconfig_top_module_connect_global_ports( std::fstream &fp, const ModuleManager &module_manager, const ModuleId &top_module, const PinConstraints &pin_constraints, - const AtomContext& atom_ctx, - const VprNetlistAnnotation &netlist_annotation, + const AtomContext &atom_ctx, const VprNetlistAnnotation &netlist_annotation, const FabricGlobalPortInfo &fabric_global_ports, const std::vector &benchmark_clock_port_names, const std::string &port_postfix) { @@ -123,17 +122,25 @@ int print_verilog_preconfig_top_module_connect_global_ports( } clock_name_to_connect = benchmark_clock_port_names[pin_id]; } - /* The clock name must be a valid primary input. Otherwise, it could be a signal generated by internal logics, e.g., clb */ + /* The clock name must be a valid primary input. Otherwise, it could be + * a signal generated by internal logics, e.g., clb */ AtomBlockId atom_blk = atom_ctx.nlist.find_block(clock_name_to_connect); if ((AtomBlockType::INPAD != atom_ctx.nlist.block_type(atom_blk))) { - VTR_LOG("Global net '%s' is not a primary input of the netlist (which could a signal generated by internal logic). Will not wire it to any FPGA primary input pin\n", clock_name_to_connect.c_str()); + VTR_LOG( + "Global net '%s' is not a primary input of the netlist (which " + "could a signal generated by internal logic). Will not wire it to " + "any FPGA primary input pin\n", + clock_name_to_connect.c_str()); continue; } - /* The block may be renamed as it contains special characters which violate - * Verilog syntax */ + /* The block may be renamed as it contains special characters which + * violate Verilog syntax */ if (true == netlist_annotation.is_block_renamed(atom_blk)) { - VTR_LOG("Replace pin name '%s' with '%s' as it is renamed to comply verilog syntax\n", clock_name_to_connect.c_str(), - netlist_annotation.block_name(atom_blk).c_str()); + VTR_LOG( + "Replace pin name '%s' with '%s' as it is renamed to comply " + "verilog syntax\n", + clock_name_to_connect.c_str(), + netlist_annotation.block_name(atom_blk).c_str()); clock_name_to_connect = netlist_annotation.block_name(atom_blk); } BasicPort benchmark_clock_pin(clock_name_to_connect, 1); diff --git a/openfpga/src/fpga_verilog/verilog_preconfig_top_module_utils.h b/openfpga/src/fpga_verilog/verilog_preconfig_top_module_utils.h index a0eb1616f..20ae797e2 100644 --- a/openfpga/src/fpga_verilog/verilog_preconfig_top_module_utils.h +++ b/openfpga/src/fpga_verilog/verilog_preconfig_top_module_utils.h @@ -35,8 +35,7 @@ void print_verilog_preconfig_top_module_internal_wires( int print_verilog_preconfig_top_module_connect_global_ports( std::fstream &fp, const ModuleManager &module_manager, const ModuleId &top_module, const PinConstraints &pin_constraints, - const AtomContext& atom_ctx, - const VprNetlistAnnotation &netlist_annotation, + const AtomContext &atom_ctx, const VprNetlistAnnotation &netlist_annotation, const FabricGlobalPortInfo &fabric_global_ports, const std::vector &benchmark_clock_port_names, const std::string &port_postfix); diff --git a/openfpga/src/fpga_verilog/verilog_testbench_io_connection.cpp b/openfpga/src/fpga_verilog/verilog_testbench_io_connection.cpp index 41ce502c8..0f4978c60 100644 --- a/openfpga/src/fpga_verilog/verilog_testbench_io_connection.cpp +++ b/openfpga/src/fpga_verilog/verilog_testbench_io_connection.cpp @@ -90,8 +90,9 @@ int print_verilog_testbench_io_connection( /* Connect FPGA top module global ports to constant or benchmark global * signals! */ status = print_verilog_preconfig_top_module_connect_global_ports( - fp, module_manager, core_module, pin_constraints, atom_ctx, netlist_annotation, global_ports, - benchmark_clock_port_names, std::string()); + fp, module_manager, core_module, pin_constraints, atom_ctx, + netlist_annotation, global_ports, benchmark_clock_port_names, + std::string()); if (CMD_EXEC_FATAL_ERROR == status) { return status; }