From 4b986c9c65a9ceb297f0843eb0a9f34d97baadb0 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Wed, 31 May 2023 17:38:46 +0200
Subject: [PATCH] fix wire color after BUF
---
passes/cmds/show.cc | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index 46aa16c90..09fd3d4b6 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -106,7 +106,7 @@ struct ShowWorker
{
std::string color = findColor(conn);
if (!color.empty()) return color;
- return nextColor(conn.first, nextColor(conn.second, defaultColor));
+ return defaultColor;
}
std::string nextColor(const RTLIL::SigSpec &sig)
@@ -490,16 +490,14 @@ struct ShowWorker
conn.second, ct.cell_output(cell->type, conn.first));
}
- std::string color = findColor(cell->name);
- if (!color.empty()) color = ", " + color;
#ifdef CLUSTER_CELLS_AND_PORTBOXES
if (!code.empty())
fprintf(f, "subgraph cluster_c%d {\nc%d [ shape=record, label=\"%s\"%s ];\n%s}\n",
id2num(cell->name), id2num(cell->name), label_string.c_str(), color.c_str(), code.c_str());
else
#endif
- fprintf(f, "c%d [ shape=record, label=\"%s\"%s ];\n%s",
- id2num(cell->name), label_string.c_str(), color.c_str(), code.c_str());
+ fprintf(f, "c%d [ shape=record, label=\"%s\", %s ];\n%s",
+ id2num(cell->name), label_string.c_str(), findColor(cell->name).c_str(), code.c_str());
}
for (auto &it : module->processes)
@@ -569,9 +567,9 @@ struct ShowWorker
} else if (right_node[0] == 'x') {
net_conn_map[left_node].out.insert({right_node, GetSize(conn.first)});
} else {
- net_conn_map[right_node].in.insert({stringf("x%d:e", single_idx_count), GetSize(conn.first)});
- net_conn_map[left_node].out.insert({stringf("x%d:w", single_idx_count), GetSize(conn.first)});
- fprintf(f, "x%d [shape=box, style=rounded, label=\"BUF\"];\n", single_idx_count++);
+ net_conn_map[right_node].in.insert({stringf("x%d", single_idx_count), GetSize(conn.first)});
+ net_conn_map[left_node].out.insert({stringf("x%d", single_idx_count), GetSize(conn.first)});
+ fprintf(f, "x%d [shape=box, style=rounded, label=\"BUF\", %s];\n", single_idx_count++, findColor(conn).c_str());
}
}
}