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

remove simulation settings from openfpga arch data structure

This commit is contained in:
tangxifan 2020-06-11 11:58:18 -06:00
parent 068d9943e7
commit 58807bfcb3
5 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libopenfpga/libarchopenfpga/src/openfpga_arch.h
View File

@ -29,9 +29,6 @@ struct Arch {
/* Technology devices */
TechnologyLibrary tech_lib;
/* Simulation settings */
SimulationSetting sim_setting;
/* Configuration protocol settings */
ConfigProtocol config_protocol;

6
libopenfpga/libarchopenfpga/src/read_xml_openfpga_arch.cpp
View File

@ -100,12 +100,6 @@ openfpga::Arch read_xml_openfpga_arch(const char* arch_file_name) {
/* Parse the pb_type annotation */
openfpga_arch.pb_type_annotations = read_xml_pb_type_annotations(xml_openfpga_arch, loc_data);
/* Second node should be <openfpga_simulation_setting> */
auto xml_simulation_settings = get_single_child(doc, "openfpga_simulation_setting", loc_data);
/* Parse simulation settings to data structure */
openfpga_arch.sim_setting = read_xml_simulation_setting(xml_simulation_settings, loc_data);
} catch (pugiutil::XmlError& e) {
archfpga_throw(arch_file_name, e.line(),
"%s", e.what());

3
libopenfpga/libarchopenfpga/src/write_xml_openfpga_arch.cpp
View File

@ -63,9 +63,6 @@ void write_xml_openfpga_arch(const char* fname,
fp << "</openfpga_architecture>" << "\n";
/* Write the simulation */
write_xml_simulation_setting(fp, fname, openfpga_arch.sim_setting);
/* Close the file stream */
fp.close();
}

2
openfpga/src/base/openfpga_link_arch.cpp
View File

@ -150,7 +150,7 @@ int link_arch(OpenfpgaContext& openfpga_ctx,
/* OVERWRITE the simulation setting in openfpga context from the arch
* TODO: This will be removed when openfpga flow is updated
*/
openfpga_ctx.mutable_simulation_setting() = openfpga_ctx.mutable_arch().sim_setting;
//openfpga_ctx.mutable_simulation_setting() = openfpga_ctx.mutable_arch().sim_setting;
annotate_simulation_setting(g_vpr_ctx.atom(),
openfpga_ctx.net_activity(),
openfpga_ctx.mutable_simulation_setting());

2
openfpga/src/base/openfpga_setup_command.cpp
View File

@ -366,8 +366,8 @@ void add_openfpga_setup_commands(openfpga::Shell<OpenfpgaContext>& shell) {
std::vector<ShellCommandId> link_arch_dependent_cmds;
link_arch_dependent_cmds.push_back(read_arch_cmd_id);
/* TODO: This will be uncommented when openfpga flow script is updated
* link_arch_dependent_cmds.push_back(read_sim_setting_cmd_id);
*/
link_arch_dependent_cmds.push_back(read_sim_setting_cmd_id);
link_arch_dependent_cmds.push_back(vpr_cmd_id);
ShellCommandId link_arch_cmd_id = add_openfpga_link_arch_command(shell,
openfpga_setup_cmd_class,