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

[core] syntax

This commit is contained in:
tangxifan 2024-08-06 17:20:34 -07:00
parent ac2337d24b
commit 0dba4082d1
6 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openfpga/src/base/openfpga_verilog_template.h
View File

@ -64,8 +64,8 @@ int write_fabric_verilog_template(T& openfpga_ctx, const Command& cmd,
options.set_constant_undriven_inputs(cmd_context.option_value(cmd, opt_constant_undriven_inputs)); options.set_constant_undriven_inputs(cmd_context.option_value(cmd, opt_constant_undriven_inputs));
} }
if (g_vpr_ctx.device().arch->perimeter_cb) { if (g_vpr_ctx.device().arch->perimeter_cb) {
if (FabricVerilogOptions::e_undriven_input_type::NONE == options.constant_undriven_inputs()) { if (FabricVerilogOption::e_undriven_input_type::NONE == options.constant_undriven_inputs()) {
options.set_constant_undriven_inputs(FabricVerilogOptions::e_undriven_input_type::BUS0); options.set_constant_undriven_inputs(FabricVerilogOption::e_undriven_input_type::BUS0);
VTR_LOG( VTR_LOG(
"Automatically enable the constant_undriven_input option as perimeter " "Automatically enable the constant_undriven_input option as perimeter "
"connection blocks are seen in FPGA fabric\n"); "connection blocks are seen in FPGA fabric\n");

6
openfpga/src/fpga_verilog/fabric_verilog_options.cpp
View File

@ -72,9 +72,9 @@ size_t FabricVerilogOption::constant_undriven_inputs_value() const {
return 0; return 0;
} }
std::string FabricVerilogOption::full_constant_undriven_input_type_str() const; std::string FabricVerilogOption::full_constant_undriven_input_type_str() const {
std::string full_type_str("["); std::string full_type_str("[");
for (size_t itype = 0; itype < FabricVerilogOption::e_undriven_input_type::NUM_TYPES; ++itype) { for (size_t itype = 0; itype < size_t(FabricVerilogOption::e_undriven_input_type::NUM_TYPES); ++itype) {
full_type_str += std::string(CONSTANT_UNDRIVEN_INPUT_TYPE_STRING_[itype]) + std::string("|"); full_type_str += std::string(CONSTANT_UNDRIVEN_INPUT_TYPE_STRING_[itype]) + std::string("|");
} }
full_type_str.pop_back(); full_type_str.pop_back();
@ -137,7 +137,7 @@ void FabricVerilogOption::set_default_net_type(
bool FabricVerilogOption::set_constant_undriven_inputs(const std::string& type_str) { bool FabricVerilogOption::set_constant_undriven_inputs(const std::string& type_str) {
bool valid_type = false; bool valid_type = false;
for (size_t itype = 0; itype < FabricVerilogOption::e_undriven_input_type::NUM_TYPES; ++itype) { for (size_t itype = 0; itype < size_t(FabricVerilogOption::e_undriven_input_type::NUM_TYPES); ++itype) {
if (std::string(CONSTANT_UNDRIVEN_INPUT_TYPE_STRING_[itype]) == type_str) { if (std::string(CONSTANT_UNDRIVEN_INPUT_TYPE_STRING_[itype]) == type_str) {
constant_undriven_inputs_ = static_cast<FabricVerilogOption::e_undriven_input_type>(itype); constant_undriven_inputs_ = static_cast<FabricVerilogOption::e_undriven_input_type>(itype);
valid_type = true; valid_type = true;

2
openfpga/src/fpga_verilog/fabric_verilog_options.h
View File

@ -73,7 +73,7 @@ class FabricVerilogOption {
bool time_stamp_; bool time_stamp_;
bool use_relative_path_; bool use_relative_path_;
e_undriven_input_type constant_undriven_inputs_; e_undriven_input_type constant_undriven_inputs_;
std::array<const char*, FabricVerilogOption::e_undriven_input_type::NUM_TYPES> CONSTANT_UNDRIVEN_INPUT_TYPE_STRING_; //String versions of constant undriven input types std::array<const char*, size_t(FabricVerilogOption::e_undriven_input_type::NUM_TYPES)> CONSTANT_UNDRIVEN_INPUT_TYPE_STRING_; //String versions of constant undriven input types
bool verbose_output_; bool verbose_output_;
}; };

10
openfpga/src/fpga_verilog/verilog_module_writer.cpp
View File

@ -604,7 +604,7 @@ void write_verilog_module_to_file(
} }
/* Use constant to drive undriven local wires */ /* Use constant to drive undriven local wires */
if (options.constant_local_undriven_inputs() != FabricVerilogOption::e_undriven_input_type::NONE) { if (options.constant_undriven_inputs() != FabricVerilogOption::e_undriven_input_type::NONE) {
std::vector<ModuleManager::e_module_port_type> blacklist = { std::vector<ModuleManager::e_module_port_type> blacklist = {
ModuleManager::e_module_port_type::MODULE_GLOBAL_PORT, ModuleManager::e_module_port_type::MODULE_GLOBAL_PORT,
ModuleManager::e_module_port_type::MODULE_GPIN_PORT, ModuleManager::e_module_port_type::MODULE_GPIN_PORT,
@ -619,14 +619,14 @@ void write_verilog_module_to_file(
for (std::pair<std::string, std::vector<BasicPort>> port_group : for (std::pair<std::string, std::vector<BasicPort>> port_group :
local_undriven_wires) { local_undriven_wires) {
for (const BasicPort& local_undriven_wire : port_group.second) { for (const BasicPort& local_undriven_wire : port_group.second) {
if (options.constant_local_undriven_inputs_use_bus()) { if (options.constant_undriven_inputs_use_bus()) {
print_verilog_wire_constant_values( print_verilog_wire_constant_values(
fp, local_undriven_wire, fp, local_undriven_wire,
std::vector<size_t>(local_undriven_wire.get_width(), options.constant_local_undriven_inputs_value())); std::vector<size_t>(local_undriven_wire.get_width(), options.constant_undriven_inputs_value()));
} else { } else {
print_verilog_wire_constant_values_bit_blast( print_verilog_wire_constant_values_bit_blast(
fp, local_undriven_wire, fp, local_undriven_wire,
std::vector<size_t>(local_undriven_wire.get_width(), options.constant_local_undriven_inputs_value())); std::vector<size_t>(local_undriven_wire.get_width(), options.constant_undriven_inputs_value()));
} }
} }
} }
@ -658,7 +658,7 @@ void write_verilog_module_to_file(
/* Print an instance */ /* Print an instance */
write_verilog_instance_to_file(fp, module_manager, module_id, write_verilog_instance_to_file(fp, module_manager, module_id,
child_module, instance, child_module, instance,
options.use_explicit_port_map()); options.explicit_port_mapping());
/* Print an empty line as splitter */ /* Print an empty line as splitter */
fp << std::endl; fp << std::endl;
} }

21
openfpga/src/fpga_verilog/verilog_mux.cpp
View File

@ -676,7 +676,7 @@ static void generate_verilog_mux_branch_module(
VTR_ASSERT(true == module_manager.valid_module_id(mux_module)); VTR_ASSERT(true == module_manager.valid_module_id(mux_module));
FabricVerilogOption curr_options = options; FabricVerilogOption curr_options = options;
curr_options.set_explicit_port_mapping( curr_options.set_explicit_port_mapping(
use_explicit_port_map || curr_options.explicit_port_mapping() ||
circuit_lib.dump_explicit_port_map(mux_model)); circuit_lib.dump_explicit_port_map(mux_model));
curr_options.set_constant_undriven_inputs(FabricVerilogOption::e_undriven_input_type::NONE); curr_options.set_constant_undriven_inputs(FabricVerilogOption::e_undriven_input_type::NONE);
write_verilog_module_to_file( write_verilog_module_to_file(
@ -688,13 +688,13 @@ static void generate_verilog_mux_branch_module(
/* Behavioral verilog requires customized generation */ /* Behavioral verilog requires customized generation */
print_verilog_cmos_mux_branch_module_behavioral( print_verilog_cmos_mux_branch_module_behavioral(
module_manager, circuit_lib, fp, mux_model, module_name, mux_graph, module_manager, circuit_lib, fp, mux_model, module_name, mux_graph,
default_net_type); options.default_net_type());
} }
break; break;
case CIRCUIT_MODEL_DESIGN_RRAM: case CIRCUIT_MODEL_DESIGN_RRAM:
generate_verilog_rram_mux_branch_module( generate_verilog_rram_mux_branch_module(
module_manager, circuit_lib, fp, mux_model, module_name, mux_graph, module_manager, circuit_lib, fp, mux_model, module_name, mux_graph,
default_net_type, circuit_lib.dump_structural_verilog(mux_model)); options.default_net_type(), circuit_lib.dump_structural_verilog(mux_model));
break; break;
default: default:
VTR_LOGF_ERROR(__FILE__, __LINE__, VTR_LOGF_ERROR(__FILE__, __LINE__,
@ -1403,8 +1403,8 @@ static void generate_verilog_rram_mux_module(
static void generate_verilog_mux_module( static void generate_verilog_mux_module(
ModuleManager& module_manager, const CircuitLibrary& circuit_lib, ModuleManager& module_manager, const CircuitLibrary& circuit_lib,
std::fstream& fp, const CircuitModelId& mux_model, const MuxGraph& mux_graph, std::fstream& fp, const CircuitModelId& mux_model, const MuxGraph& mux_graph,
const ModuleNameMap& module_name_map, const bool& use_explicit_port_map, const ModuleNameMap& module_name_map,
const e_verilog_default_net_type& default_net_type) { const FabricVerilogOption& options) {
std::string module_name = std::string module_name =
generate_mux_subckt_name(circuit_lib, mux_model, generate_mux_subckt_name(circuit_lib, mux_model,
find_mux_num_datapath_inputs( find_mux_num_datapath_inputs(
@ -1420,13 +1420,13 @@ static void generate_verilog_mux_module(
ModuleId mux_module = module_manager.find_module(module_name); ModuleId mux_module = module_manager.find_module(module_name);
VTR_ASSERT(true == module_manager.valid_module_id(mux_module)); VTR_ASSERT(true == module_manager.valid_module_id(mux_module));
FabricVerilogOption curr_options = options; FabricVerilogOption curr_options = options;
curr_option.set_explict_port_mapping( curr_options.set_explicit_port_mapping(
(use_explicit_port_map || (curr_options.explicit_port_mapping() ||
circuit_lib.dump_explicit_port_map(mux_model) || circuit_lib.dump_explicit_port_map(mux_model) ||
circuit_lib.dump_explicit_port_map( circuit_lib.dump_explicit_port_map(
circuit_lib.pass_gate_logic_model(mux_model))) circuit_lib.pass_gate_logic_model(mux_model)))
); );
curr_option.set_constant_undriven_inputs(FabricVerilogOption::e_undriven_input_type::NONE); curr_options.set_constant_undriven_inputs(FabricVerilogOption::e_undriven_input_type::NONE);
write_verilog_module_to_file( write_verilog_module_to_file(
fp, module_manager, mux_module, fp, module_manager, mux_module,
curr_options); curr_options);
@ -1438,7 +1438,7 @@ static void generate_verilog_mux_module(
/* TODO: RRAM-based Multiplexer Verilog module generation */ /* TODO: RRAM-based Multiplexer Verilog module generation */
generate_verilog_rram_mux_module(module_manager, circuit_lib, fp, generate_verilog_rram_mux_module(module_manager, circuit_lib, fp,
mux_model, module_name, mux_graph, mux_model, module_name, mux_graph,
default_net_type); options.default_net_type());
break; break;
default: default:
VTR_LOGF_ERROR(__FILE__, __LINE__, VTR_LOGF_ERROR(__FILE__, __LINE__,
@ -1545,8 +1545,7 @@ static void print_verilog_submodule_mux_top_modules(
/* Create MUX circuits */ /* Create MUX circuits */
generate_verilog_mux_module(module_manager, circuit_lib, fp, generate_verilog_mux_module(module_manager, circuit_lib, fp,
mux_circuit_model, mux_graph, module_name_map, mux_circuit_model, mux_graph, module_name_map,
options.explicit_port_mapping(), options);
options.default_net_type());
} }
/* Close the file stream */ /* Close the file stream */

2
openfpga/src/fpga_verilog/verilog_writer_utils.cpp
View File

@ -843,7 +843,7 @@ void print_verilog_wire_constant_values_bit_blast(
for (size_t ipin : output_port.pins()) { for (size_t ipin : output_port.pins()) {
BasicPort curr_pin(output_port.get_name(), ipin, ipin); BasicPort curr_pin(output_port.get_name(), ipin, ipin);
print_verilog_wire_constant_values_bit_blast(fp, curr_pin, const_values[ipin]); print_verilog_wire_constant_values(fp, curr_pin, std::vector<size_t>(curr_pin.get_width(), const_values[ipin]));
} }
} }