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

[core] code format

This commit is contained in:
tangxifan 2023-10-06 17:28:25 -07:00
parent 1e8bf1cece
commit ae63c9d441
5 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
openfpga/src/base/openfpga_bitstream_template.h
View File

@ -4,6 +4,7 @@
/********************************************************************
* This file includes functions to build bitstream database
*******************************************************************/
#include "bitstream_writer_options.h"
#include "build_device_bitstream.h"
#include "build_fabric_bitstream.h"
#include "build_io_mapping_info.h"
@ -22,7 +23,6 @@
#include "write_xml_arch_bitstream.h"
#include "write_xml_fabric_bitstream.h"
#include "write_xml_io_mapping.h"
#include "bitstream_writer_options.h"
/* begin namespace openfpga */
namespace openfpga {
@ -120,37 +120,47 @@ int write_fabric_bitstream_template(const T& openfpga_ctx, const Command& cmd,
/* Validate options */
BitstreamWriterOption bitfile_writer_opt;
bitfile_writer_opt.set_output_file_type(file_format);
bitfile_writer_opt.set_output_file_name(cmd_context.option_value(cmd, opt_file));
bitfile_writer_opt.set_time_stamp(!cmd_context.option_enable(cmd, opt_no_time_stamp));
bitfile_writer_opt.set_verbose_output(cmd_context.option_enable(cmd, opt_verbose));
bitfile_writer_opt.set_trim_path(cmd_context.option_enable(cmd, opt_trim_path));
bitfile_writer_opt.set_path_only(cmd_context.option_enable(cmd, opt_path_only));
bitfile_writer_opt.set_value_only(cmd_context.option_enable(cmd, opt_value_only));
bitfile_writer_opt.set_fast_configuration(cmd_context.option_enable(cmd, opt_fast_config));
bitfile_writer_opt.set_keep_dont_care_bits(cmd_context.option_enable(cmd, opt_keep_dont_care_bits));
bitfile_writer_opt.set_wl_decremental_order(cmd_context.option_enable(cmd, opt_wl_decremental_order));
bitfile_writer_opt.set_output_file_name(
cmd_context.option_value(cmd, opt_file));
bitfile_writer_opt.set_time_stamp(
!cmd_context.option_enable(cmd, opt_no_time_stamp));
bitfile_writer_opt.set_verbose_output(
cmd_context.option_enable(cmd, opt_verbose));
bitfile_writer_opt.set_trim_path(
cmd_context.option_enable(cmd, opt_trim_path));
bitfile_writer_opt.set_path_only(
cmd_context.option_enable(cmd, opt_path_only));
bitfile_writer_opt.set_value_only(
cmd_context.option_enable(cmd, opt_value_only));
bitfile_writer_opt.set_fast_configuration(
cmd_context.option_enable(cmd, opt_fast_config));
bitfile_writer_opt.set_keep_dont_care_bits(
cmd_context.option_enable(cmd, opt_keep_dont_care_bits));
bitfile_writer_opt.set_wl_decremental_order(
cmd_context.option_enable(cmd, opt_wl_decremental_order));
if (cmd_context.option_enable(cmd, opt_filter_value)) {
bitfile_writer_opt.set_filter_value(cmd_context.option_value(cmd, opt_filter_value));
bitfile_writer_opt.set_filter_value(
cmd_context.option_value(cmd, opt_filter_value));
}
if (!bitfile_writer_opt.validate(true)) {
VTR_LOG_ERROR("Conflicts detected in options for bitstream writer!\n");
return CMD_EXEC_FATAL_ERROR;
return CMD_EXEC_FATAL_ERROR;
}
if (bitfile_writer_opt.output_file_type() == BitstreamWriterOption::e_bitfile_type::XML) {
if (bitfile_writer_opt.output_file_type() ==
BitstreamWriterOption::e_bitfile_type::XML) {
status = write_fabric_bitstream_to_xml_file(
openfpga_ctx.bitstream_manager(), openfpga_ctx.fabric_bitstream(),
openfpga_ctx.arch().config_protocol,
bitfile_writer_opt);
openfpga_ctx.arch().config_protocol, bitfile_writer_opt);
} else {
VTR_ASSERT_SAFE(bitfile_writer_opt.output_file_type() == BitstreamWriterOption::e_bitfile_type::TEXT);
VTR_ASSERT_SAFE(bitfile_writer_opt.output_file_type() ==
BitstreamWriterOption::e_bitfile_type::TEXT);
/* By default, output in plain text format */
status = write_fabric_bitstream_to_text_file(
openfpga_ctx.bitstream_manager(), openfpga_ctx.fabric_bitstream(),
openfpga_ctx.blwl_shift_register_banks(),
openfpga_ctx.arch().config_protocol,
openfpga_ctx.fabric_global_port_info(),
bitfile_writer_opt);
openfpga_ctx.fabric_global_port_info(), bitfile_writer_opt);
}
return status;

16
openfpga/src/fpga_bitstream/write_text_fabric_bitstream.cpp
View File

@ -581,7 +581,8 @@ int write_fabric_bitstream_to_text_file(
const ConfigProtocol& config_protocol,
const FabricGlobalPortInfo& global_ports,
const BitstreamWriterOption& options) {
VTR_ASSERT(options.output_file_type() == BitstreamWriterOption::e_bitfile_type::TEXT);
VTR_ASSERT(options.output_file_type() ==
BitstreamWriterOption::e_bitfile_type::TEXT);
std::string fname = options.output_file_name();
/* Ensure that we have a valid file name */
if (true == fname.empty()) {
@ -603,8 +604,10 @@ int write_fabric_bitstream_to_text_file(
check_file_stream(fname.c_str(), fp);
bool apply_fast_configuration =
is_fast_configuration_applicable(global_ports) && options.fast_configuration();
if (options.fast_configuration() && apply_fast_configuration != options.fast_configuration()) {
is_fast_configuration_applicable(global_ports) &&
options.fast_configuration();
if (options.fast_configuration() &&
apply_fast_configuration != options.fast_configuration()) {
VTR_LOG_WARN("Disable fast configuration even it is enabled by user\n");
}
@ -659,8 +662,8 @@ int write_fabric_bitstream_to_text_file(
VTR_ASSERT(BLWL_PROTOCOL_SHIFT_REGISTER ==
config_protocol.bl_protocol_type());
status = write_memory_bank_shift_register_fabric_bitstream_to_text_file(
fp, apply_fast_configuration, bit_value_to_skip,
fabric_bitstream, blwl_sr_banks, options.keep_dont_care_bits());
fp, apply_fast_configuration, bit_value_to_skip, fabric_bitstream,
blwl_sr_banks, options.keep_dont_care_bits());
}
break;
}
@ -684,7 +687,8 @@ int write_fabric_bitstream_to_text_file(
/* Close file handler */
fp.close();
VTR_LOGV(options.verbose_output(), "Outputted %lu configuration bits to plain text file: %s\n",
VTR_LOGV(options.verbose_output(),
"Outputted %lu configuration bits to plain text file: %s\n",
fabric_bitstream.bits().size(), fname.c_str());
return status;

2
openfpga/src/fpga_bitstream/write_text_fabric_bitstream.h
View File

@ -8,11 +8,11 @@
#include <vector>
#include "bitstream_manager.h"
#include "bitstream_writer_options.h"
#include "config_protocol.h"
#include "fabric_bitstream.h"
#include "fabric_global_port_info.h"
#include "memory_bank_shift_register_banks.h"
#include "bitstream_writer_options.h"
/********************************************************************
* Function declaration

9
openfpga/src/fpga_bitstream/write_xml_fabric_bitstream.cpp
View File

@ -261,9 +261,9 @@ static int write_fabric_regional_config_bit_to_xml_file(
int write_fabric_bitstream_to_xml_file(
const BitstreamManager& bitstream_manager,
const FabricBitstream& fabric_bitstream,
const ConfigProtocol& config_protocol,
const BitstreamWriterOption& options) {
VTR_ASSERT(options.output_file_type() == BitstreamWriterOption::e_bitfile_type::XML);
const ConfigProtocol& config_protocol, const BitstreamWriterOption& options) {
VTR_ASSERT(options.output_file_type() ==
BitstreamWriterOption::e_bitfile_type::XML);
/* Ensure that we have a valid file name */
std::string fname = options.output_file_name();
if (true == fname.empty()) {
@ -308,7 +308,8 @@ int write_fabric_bitstream_to_xml_file(
/* Close file handler */
fp.close();
VTR_LOGV(options.verbose_output(), "Outputted %lu configuration bits to XML file: %s\n",
VTR_LOGV(options.verbose_output(),
"Outputted %lu configuration bits to XML file: %s\n",
fabric_bitstream.bits().size(), fname.c_str());
return status;

5
openfpga/src/fpga_bitstream/write_xml_fabric_bitstream.h
View File

@ -8,9 +8,9 @@
#include <vector>
#include "bitstream_manager.h"
#include "bitstream_writer_options.h"
#include "config_protocol.h"
#include "fabric_bitstream.h"
#include "bitstream_writer_options.h"
/********************************************************************
* Function declaration
@ -22,8 +22,7 @@ namespace openfpga {
int write_fabric_bitstream_to_xml_file(
const BitstreamManager& bitstream_manager,
const FabricBitstream& fabric_bitstream,
const ConfigProtocol& config_protocol,
const BitstreamWriterOption& options);
const ConfigProtocol& config_protocol, const BitstreamWriterOption& options);
} /* end namespace openfpga */