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

bug fix for configure port disable_timing writer

This commit is contained in:
tangxifan 2020-05-14 17:13:05 -06:00
parent f4dd882f0f
commit 067d09f954
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openfpga/src/fpga_sdc/configure_port_sdc_writer.cpp
View File

@ -25,6 +25,8 @@
#include "openfpga_naming.h"
#include "circuit_library_utils.h"
#include "sdc_writer_naming.h"
#include "sdc_writer_utils.h"
#include "sdc_mux_utils.h"
@ -76,8 +78,9 @@ int print_sdc_disable_non_mux_circuit_configure_ports(std::fstream& fp,
* starting from the top-level module: instance id of the top-level module is 0 by default
* Disable all the outputs of child modules that matches the mux_module id
*/
for (const CircuitPortId& sram_port : circuit_lib.model_ports_by_type(model, CIRCUIT_MODEL_PORT_SRAM)) {
for (const CircuitPortId& sram_port : find_circuit_mode_select_sram_ports(circuit_lib, model)) {
const std::string& sram_port_name = circuit_lib.port_lib_name(sram_port);
VTR_ASSERT(true == module_manager.valid_module_port_id(programmable_module, module_manager.find_module_port(programmable_module, sram_port_name)));
if (CMD_EXEC_FATAL_ERROR ==
rec_print_sdc_disable_timing_for_module_ports(fp,
flatten_names,

7
openfpga/src/fpga_sdc/sdc_mux_utils.cpp
View File

@ -17,6 +17,7 @@
#include "openfpga_naming.h"
#include "mux_utils.h"
#include "circuit_library_utils.h"
#include "sdc_writer_naming.h"
#include "sdc_writer_utils.h"
@ -127,8 +128,8 @@ int print_sdc_disable_routing_multiplexer_configure_ports(std::fstream& fp,
* starting from the top-level module: instance id of the top-level module is 0 by default
* Disable all the outputs of child modules that matches the mux_module id
*/
for (const CircuitPortId& mux_sram_port : circuit_lib.model_ports_by_type(mux_model, CIRCUIT_MODEL_PORT_SRAM)) {
const std::string& mux_sram_port_name = circuit_lib.port_prefix(mux_sram_port);
for (const CircuitPortId& mux_sram_port : find_circuit_regular_sram_ports(circuit_lib, mux_model)) {
const std::string& mux_sram_port_name = circuit_lib.port_lib_name(mux_sram_port);
VTR_ASSERT(true == module_manager.valid_module_port_id(mux_module, module_manager.find_module_port(mux_module, mux_sram_port_name)));
if (CMD_EXEC_FATAL_ERROR ==
rec_print_sdc_disable_timing_for_module_ports(fp,
@ -141,7 +142,7 @@ int print_sdc_disable_routing_multiplexer_configure_ports(std::fstream& fp,
return CMD_EXEC_FATAL_ERROR;
}
const std::string& mux_sram_inv_port_name = circuit_lib.port_prefix(mux_sram_port) + "_inv";
const std::string& mux_sram_inv_port_name = circuit_lib.port_lib_name(mux_sram_port) + "_inv";
VTR_ASSERT(true == module_manager.valid_module_port_id(mux_module, module_manager.find_module_port(mux_module, mux_sram_inv_port_name)));
if (CMD_EXEC_FATAL_ERROR ==
rec_print_sdc_disable_timing_for_module_ports(fp,