Skip to content

timing_builder: allow dangling combinational nodes #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions vpr/src/base/read_options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -949,6 +949,16 @@ static argparse::ArgumentParser create_arg_parser(std::string prog_name, t_optio
"This option should be only used for development purposes.")
.default_value("");

gen_grp.add_argument<bool, ParseOnOff>(args.allow_dangling_combinational_nodes, "--allow_dangling_combinational_nodes")
.help(
"Option to allow dangling combinational nodes in the timing graph.\n"
"This option should normally be off, as dangling combinational nodes are unusual\n"
"in the timing graph and may indicate a problem in the circuit or architecture.\n"
"Unless you understand why your architecture/circuit can have valid dangling combinational nodes, this option should be off.\n"
"In general this is a dev-only option and should not be turned on by the end-user.")
.default_value("off")
.show_in(argparse::ShowIn::HELP_ONLY);

auto& file_grp = parser.add_argument_group("file options");

file_grp.add_argument(args.BlifFile, "--circuit_file")
Expand Down
1 change: 1 addition & 0 deletions vpr/src/base/read_options.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ struct t_options {
argparse::ArgValue<bool> strict_checks;
argparse::ArgValue<std::string> disable_errors;
argparse::ArgValue<std::string> suppress_warnings;
argparse::ArgValue<bool> allow_dangling_combinational_nodes;

/* Atom netlist options */
argparse::ArgValue<bool> absorb_buffer_luts;
Expand Down
2 changes: 1 addition & 1 deletion vpr/src/base/vpr_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ void vpr_init(const int argc, const char** argv, t_options* options, t_vpr_setup
auto& timing_ctx = g_vpr_ctx.mutable_timing();
{
vtr::ScopedStartFinishTimer t("Build Timing Graph");
timing_ctx.graph = TimingGraphBuilder(atom_ctx.nlist, atom_ctx.lookup).timing_graph();
timing_ctx.graph = TimingGraphBuilder(atom_ctx.nlist, atom_ctx.lookup).timing_graph(options->allow_dangling_combinational_nodes);
VTR_LOG(" Timing Graph Nodes: %zu\n", timing_ctx.graph->nodes().size());
VTR_LOG(" Timing Graph Edges: %zu\n", timing_ctx.graph->edges().size());
VTR_LOG(" Timing Graph Levels: %zu\n", timing_ctx.graph->levels().size());
Expand Down
10 changes: 7 additions & 3 deletions vpr/src/timing/timing_graph_builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ TimingGraphBuilder::TimingGraphBuilder(const AtomNetlist& netlist,
//pass
}

std::unique_ptr<TimingGraph> TimingGraphBuilder::timing_graph() {
build();
std::unique_ptr<TimingGraph> TimingGraphBuilder::timing_graph(bool allow_dangling_combinational_nodes) {
build(allow_dangling_combinational_nodes);
opt_memory_layout();

VTR_ASSERT(tg_);
Expand All @@ -50,9 +50,13 @@ std::unique_ptr<TimingGraph> TimingGraphBuilder::timing_graph() {
return std::move(tg_);
}

void TimingGraphBuilder::build() {
void TimingGraphBuilder::build(bool allow_dangling_combinational_nodes) {
tg_ = std::make_unique<tatum::TimingGraph>();

// Optionally allow dangling combinational nodes.
// Set by `--allow_dangling_combinational_nodes on`. Default value is false
tg_->set_allow_dangling_combinational_nodes(allow_dangling_combinational_nodes);

for (AtomBlockId blk : netlist_.blocks()) {
AtomBlockType blk_type = netlist_.block_type(blk);

Expand Down
4 changes: 2 additions & 2 deletions vpr/src/timing/timing_graph_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ class TimingGraphBuilder {
TimingGraphBuilder(const AtomNetlist& netlist,
AtomLookup& netlist_lookup);

std::unique_ptr<tatum::TimingGraph> timing_graph();
std::unique_ptr<tatum::TimingGraph> timing_graph(bool allow_dangling_combinational_nodes);

private:
void build();
void build(bool allow_dangling_combinational_nodes);
void opt_memory_layout();

void add_io_to_timing_graph(const AtomBlockId blk);
Expand Down