riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove useless channel wire module generation

This commit is contained in:
tangxifan 2019-11-05 16:10:00 -07:00
parent a308a13d7c
commit 696d4a9522
4 changed files with 5 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vpr7_x2p/vpr/SRC/fpga_x2p/module_builder/build_essential_modules.cpp
View File

@ -209,33 +209,6 @@ void build_user_defined_modules(ModuleManager& module_manager,
add_circuit_model_to_module_manager(module_manager, circuit_lib, model); add_circuit_model_to_module_manager(module_manager, circuit_lib, model);
} }
/* Register the routing channel wires */
for (const auto& seg : routing_segments) {
VTR_ASSERT( CircuitModelId::INVALID() != seg.circuit_model);
VTR_ASSERT( SPICE_MODEL_CHAN_WIRE == circuit_lib.model_type(seg.circuit_model));
/* We care only user-defined circuit models */
if ( (circuit_lib.model_verilog_netlist(seg.circuit_model).empty())
&& (circuit_lib.model_verilog_netlist(seg.circuit_model).empty()) ) {
continue;
}
/* Give a unique name for subckt of wire_model of segment,
* circuit_model name is unique, and segment id is unique as well
*/
std::string segment_wire_subckt_name = generate_segment_wire_subckt_name(circuit_lib.model_name(seg.circuit_model), &seg - &routing_segments[0]);
/* Create a Verilog Module based on the circuit model, and add to module manager */
ModuleId module_id = add_circuit_model_to_module_manager(module_manager, circuit_lib, seg.circuit_model, segment_wire_subckt_name);
/* Find the output port*/
std::vector<CircuitPortId> output_ports = circuit_lib.model_ports_by_type(seg.circuit_model, SPICE_MODEL_PORT_OUTPUT, true);
/* Make sure the port size is what we want */
VTR_ASSERT (1 == circuit_lib.port_size(output_ports[0]));
/* Add a mid-output port to the module */
BasicPort module_mid_output_port(generate_segment_wire_mid_output_name(circuit_lib.port_prefix(output_ports[0])), circuit_lib.port_size(output_ports[0]));
module_manager.add_port(module_id, module_mid_output_port, ModuleManager::MODULE_OUTPUT_PORT);
}
/* End time count */ /* End time count */
clock_t t_end = clock(); clock_t t_end = clock();

63
vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_submodules.c
View File

@ -3085,8 +3085,7 @@ void dump_verilog_submodule_memories(t_sram_orgz_info* cur_sram_orgz_info,
********************************************************************/ ********************************************************************/
static static
void add_user_defined_verilog_modules(ModuleManager& module_manager, void add_user_defined_verilog_modules(ModuleManager& module_manager,
const CircuitLibrary& circuit_lib, const CircuitLibrary& circuit_lib) {
const std::vector<t_segment_inf>& routing_segments) {
/* Iterate over Verilog modules */ /* Iterate over Verilog modules */
for (const auto& model : circuit_lib.models()) { for (const auto& model : circuit_lib.models()) {
/* We only care about user-defined models */ /* We only care about user-defined models */
@ -3106,37 +3105,6 @@ void add_user_defined_verilog_modules(ModuleManager& module_manager,
add_circuit_model_to_module_manager(module_manager, circuit_lib, model); add_circuit_model_to_module_manager(module_manager, circuit_lib, model);
} }
} }
/* Register the routing channel wires */
for (const auto& seg : routing_segments) {
VTR_ASSERT( CircuitModelId::INVALID() != seg.circuit_model);
VTR_ASSERT( SPICE_MODEL_CHAN_WIRE == circuit_lib.model_type(seg.circuit_model));
/* We care only user-defined circuit models */
if (circuit_lib.model_verilog_netlist(seg.circuit_model).empty()) {
continue;
}
/* Give a unique name for subckt of wire_model of segment,
* circuit_model name is unique, and segment id is unique as well
*/
std::string segment_wire_subckt_name = generate_segment_wire_subckt_name(circuit_lib.model_name(seg.circuit_model), &seg - &routing_segments[0]);
/* Try to find the module in the module manager,
* If not found, create a Verilog Module based on the circuit model,
* and add to module manager */
if (ModuleId::INVALID() != module_manager.find_module(segment_wire_subckt_name)) {
continue;
}
ModuleId module_id = add_circuit_model_to_module_manager(module_manager, circuit_lib, seg.circuit_model, segment_wire_subckt_name);
/* Find the output port*/
std::vector<CircuitPortId> output_ports = circuit_lib.model_ports_by_type(seg.circuit_model, SPICE_MODEL_PORT_OUTPUT, true);
/* Make sure the port size is what we want */
VTR_ASSERT (1 == circuit_lib.port_size(output_ports[0]));
/* Add a mid-output port to the module */
BasicPort module_mid_output_port(generate_segment_wire_mid_output_name(circuit_lib.port_prefix(output_ports[0])), circuit_lib.port_size(output_ports[0]));
module_manager.add_port(module_id, module_mid_output_port, ModuleManager::MODULE_OUTPUT_PORT);
}
} }
/* Print a template for a user-defined circuit model /* Print a template for a user-defined circuit model
@ -3186,7 +3154,6 @@ void print_one_verilog_template_module(const ModuleManager& module_manager,
static static
void print_verilog_submodule_templates(const ModuleManager& module_manager, void print_verilog_submodule_templates(const ModuleManager& module_manager,
const CircuitLibrary& circuit_lib, const CircuitLibrary& circuit_lib,
const std::vector<t_segment_inf>& routing_segments,
const std::string& verilog_dir, const std::string& verilog_dir,
const std::string& submodule_dir) { const std::string& submodule_dir) {
std::string verilog_fname(submodule_dir + user_defined_template_verilog_file_name); std::string verilog_fname(submodule_dir + user_defined_template_verilog_file_name);
@ -3220,22 +3187,6 @@ void print_verilog_submodule_templates(const ModuleManager& module_manager,
print_one_verilog_template_module(module_manager, fp, circuit_lib.model_name(model)); print_one_verilog_template_module(module_manager, fp, circuit_lib.model_name(model));
} }
/* Register the routing channel wires */
for (const auto& seg : routing_segments) {
VTR_ASSERT( CircuitModelId::INVALID() != seg.circuit_model);
VTR_ASSERT( SPICE_MODEL_CHAN_WIRE == circuit_lib.model_type(seg.circuit_model));
/* We care only user-defined circuit models */
if (circuit_lib.model_verilog_netlist(seg.circuit_model).empty()) {
continue;
}
/* Give a unique name for subckt of wire_model of segment,
* circuit_model name is unique, and segment id is unique as well
*/
std::string segment_wire_subckt_name = generate_segment_wire_subckt_name(circuit_lib.model_name(seg.circuit_model), &seg - &routing_segments[0]);
/* Print a Verilog template for the circuit model */
print_one_verilog_template_module(module_manager, fp, segment_wire_subckt_name);
}
/* close file stream */ /* close file stream */
fp.close(); fp.close();
@ -3255,18 +3206,12 @@ void dump_verilog_submodules(ModuleManager& module_manager,
t_det_routing_arch* routing_arch, t_det_routing_arch* routing_arch,
t_syn_verilog_opts fpga_verilog_opts) { t_syn_verilog_opts fpga_verilog_opts) {
/* Create a vector of segments. TODO: should come from DeviceContext */
std::vector<t_segment_inf> L_segment_vec;
for (int i = 0; i < Arch.num_segments; ++i) {
L_segment_vec.push_back(Arch.Segments[i]);
}
/* TODO: Register all the user-defined modules in the module manager /* TODO: Register all the user-defined modules in the module manager
* This should be done prior to other steps in this function, * This should be done prior to other steps in this function,
* because they will be instanciated by other primitive modules * because they will be instanciated by other primitive modules
*/ */
vpr_printf(TIO_MESSAGE_INFO, "Registering user-defined modules...\n"); vpr_printf(TIO_MESSAGE_INFO, "Registering user-defined modules...\n");
add_user_defined_verilog_modules(module_manager, Arch.spice->circuit_lib, L_segment_vec); add_user_defined_verilog_modules(module_manager, Arch.spice->circuit_lib);
print_verilog_submodule_essentials(module_manager, print_verilog_submodule_essentials(module_manager,
std::string(verilog_dir), std::string(verilog_dir),
@ -3299,7 +3244,7 @@ void dump_verilog_submodules(ModuleManager& module_manager,
fpga_verilog_opts.dump_explicit_verilog); fpga_verilog_opts.dump_explicit_verilog);
/* 3. Hardwires */ /* 3. Hardwires */
print_verilog_submodule_wires(module_manager, Arch.spice->circuit_lib, L_segment_vec, std::string(verilog_dir), std::string(submodule_dir)); print_verilog_submodule_wires(module_manager, Arch.spice->circuit_lib, std::string(verilog_dir), std::string(submodule_dir));
/* 4. Memories */ /* 4. Memories */
vpr_printf(TIO_MESSAGE_INFO, "Generating modules of memories...\n"); vpr_printf(TIO_MESSAGE_INFO, "Generating modules of memories...\n");
@ -3311,7 +3256,7 @@ void dump_verilog_submodules(ModuleManager& module_manager,
/* 5. Dump template for all the modules */ /* 5. Dump template for all the modules */
if (TRUE == fpga_verilog_opts.print_user_defined_template) { if (TRUE == fpga_verilog_opts.print_user_defined_template) {
print_verilog_submodule_templates(module_manager, Arch.spice->circuit_lib, L_segment_vec, std::string(verilog_dir), std::string(submodule_dir)); print_verilog_submodule_templates(module_manager, Arch.spice->circuit_lib, std::string(verilog_dir), std::string(submodule_dir));
} }
/* Create a header file to include all the subckts */ /* Create a header file to include all the subckts */

104
vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_wire.cpp
View File

@ -90,92 +90,10 @@ void print_verilog_wire_module(ModuleManager& module_manager,
} }
/******************************************************************** /********************************************************************
* Print a Verilog module of a routing track wire segment * Top-level function to print wire modules
* Routing track wire, which is 1-input and dual output
* This type of wires are used in the global routing architecture.
* One of the output is wired to another Switch block multiplexer,
* while the mid-output is wired to a Connection block multiplexer.
*
* | CLB |
* +------------+
* ^
* |
* +------------------------------+
* | Connection block multiplexer |
* +------------------------------+
* ^
* | mid-output +--------------
* +--------------------+ |
* input --->| Routing track wire |--------->| Switch Block
* +--------------------+ output |
* +--------------
*
*******************************************************************/ *******************************************************************/
static
void print_verilog_routing_wire_module(ModuleManager& module_manager,
const CircuitLibrary& circuit_lib,
std::fstream& fp,
const CircuitModelId& wire_model,
const std::string& wire_subckt_name) {
/* Ensure a valid file handler*/
check_file_handler(fp);
/* Find the input port, output port*/
std::vector<CircuitPortId> input_ports = circuit_lib.model_ports_by_type(wire_model, SPICE_MODEL_PORT_INPUT, true);
std::vector<CircuitPortId> output_ports = circuit_lib.model_ports_by_type(wire_model, SPICE_MODEL_PORT_OUTPUT, true);
/* Make sure the port size is what we want */
VTR_ASSERT (1 == input_ports.size());
VTR_ASSERT (1 == output_ports.size());
VTR_ASSERT (1 == circuit_lib.port_size(input_ports[0]));
VTR_ASSERT (1 == circuit_lib.port_size(output_ports[0]));
/* Create a Verilog Module based on the circuit model, and add to module manager */
ModuleId wire_module = module_manager.find_module(wire_subckt_name);
VTR_ASSERT(true == module_manager.valid_module_id(wire_module));
/* Add a mid-output port to the module */
BasicPort module_mid_output_port(generate_segment_wire_mid_output_name(circuit_lib.port_lib_name(output_ports[0])), circuit_lib.port_size(output_ports[0]));
ModulePortId module_mid_output_port_id = module_manager.find_module_port(wire_module, module_mid_output_port.get_name());
VTR_ASSERT(ModulePortId::INVALID() != module_mid_output_port_id);
/* dump module definition + ports */
print_verilog_module_declaration(fp, module_manager, wire_module);
/* Finish dumping ports */
/* Print the internal logic of Verilog module */
/* Find the input port of the module */
ModulePortId module_input_port_id = module_manager.find_module_port(wire_module, circuit_lib.port_lib_name(input_ports[0]));
VTR_ASSERT(ModulePortId::INVALID() != module_input_port_id);
BasicPort module_input_port = module_manager.module_port(wire_module, module_input_port_id);
/* Find the output port of the module */
ModulePortId module_output_port_id = module_manager.find_module_port(wire_module, circuit_lib.port_lib_name(output_ports[0]));
VTR_ASSERT(ModulePortId::INVALID() != module_output_port_id);
BasicPort module_output_port = module_manager.module_port(wire_module, module_output_port_id);
/* Print wire declaration for the inputs and outputs */
fp << generate_verilog_port(VERILOG_PORT_WIRE, module_input_port) << ";" << std::endl;
fp << generate_verilog_port(VERILOG_PORT_WIRE, module_output_port) << ";" << std::endl;
fp << generate_verilog_port(VERILOG_PORT_WIRE, module_mid_output_port) << ";" << std::endl;
/* Direct shortcut */
print_verilog_wire_connection(fp, module_output_port, module_input_port, false);
print_verilog_wire_connection(fp, module_mid_output_port, module_input_port, false);
/* Print timing info */
print_verilog_submodule_timing(fp, circuit_lib, wire_model);
/* Put an end to the Verilog module */
print_verilog_module_end(fp, circuit_lib.model_name(wire_model));
/* Add an empty line as a splitter */
fp << std::endl;
}
void print_verilog_submodule_wires(ModuleManager& module_manager, void print_verilog_submodule_wires(ModuleManager& module_manager,
const CircuitLibrary& circuit_lib, const CircuitLibrary& circuit_lib,
std::vector<t_segment_inf> routing_segments,
const std::string& verilog_dir, const std::string& verilog_dir,
const std::string& submodule_dir) { const std::string& submodule_dir) {
std::string verilog_fname(submodule_dir + wires_verilog_file_name); std::string verilog_fname(submodule_dir + wires_verilog_file_name);
@ -205,26 +123,6 @@ void print_verilog_submodule_wires(ModuleManager& module_manager,
print_verilog_wire_module(module_manager, circuit_lib, fp, model); print_verilog_wire_module(module_manager, circuit_lib, fp, model);
} }
print_verilog_comment(fp, std::string("----- END Verilog modules for regular wires -----")); print_verilog_comment(fp, std::string("----- END Verilog modules for regular wires -----"));
/* Create wire models for routing segments*/
print_verilog_comment(fp, std::string("----- BEGIN Verilog modules for routing track wires -----"));
for (const auto& seg : routing_segments) {
VTR_ASSERT( CircuitModelId::INVALID() != seg.circuit_model);
VTR_ASSERT( SPICE_MODEL_CHAN_WIRE == circuit_lib.model_type(seg.circuit_model));
/* Bypass user-defined circuit models */
if (!circuit_lib.model_verilog_netlist(seg.circuit_model).empty()) {
continue;
}
/* Give a unique name for subckt of wire_model of segment,
* circuit_model name is unique, and segment id is unique as well
*/
std::string segment_wire_subckt_name = generate_segment_wire_subckt_name(circuit_lib.model_name(seg.circuit_model), &seg - &routing_segments[0]);
/* Print a Verilog module */
print_verilog_routing_wire_module(module_manager, circuit_lib, fp, seg.circuit_model, segment_wire_subckt_name);
}
print_verilog_comment(fp, std::string("----- END Verilog modules for routing track wires -----"));
/* Close the file stream */ /* Close the file stream */
fp.close(); fp.close();

1
vpr7_x2p/vpr/SRC/fpga_x2p/verilog/verilog_wire.h
View File

@ -16,7 +16,6 @@
void print_verilog_submodule_wires(ModuleManager& module_manager, void print_verilog_submodule_wires(ModuleManager& module_manager,
const CircuitLibrary& circuit_lib, const CircuitLibrary& circuit_lib,
std::vector<t_segment_inf> routing_segments,
const std::string& verilog_dir, const std::string& verilog_dir,
const std::string& submodule_dir); const std::string& submodule_dir);