-- Robert Jordens.
From 3ca3a678141f9cf2933252ecba0ccb8e250af10f Mon Sep 17 00:00:00 2001 From: Robert Jordens <jord...@gmail.com> Date: Fri, 6 Dec 2013 15:04:57 -0700 Subject: [PATCH 1/2] migen/fhdl/tools: speed up group_by_targets (halves the mixxeo runtime)
--- migen/fhdl/tools.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/migen/fhdl/tools.py b/migen/fhdl/tools.py index 00c9932..47ef253 100644 --- a/migen/fhdl/tools.py +++ b/migen/fhdl/tools.py @@ -45,23 +45,23 @@ def _resort_statements(ol): def group_by_targets(sl): groups = [] - for statement_order, statement in enumerate(flat_iteration(sl)): - targets = list_targets(statement) - - chk_groups = [(targets.isdisjoint(g[0]), g) for g in groups] - merge_groups = [g for dj, g in chk_groups if not dj] - groups = [g for dj, g in chk_groups if dj] - - new_group = (set(targets), [(statement_order, statement)]) - - for g in merge_groups: - new_group[0].update(g[0]) - new_group[1].extend(g[1]) - - groups.append(new_group) - - return [(target, _resort_statements(stmts)) - for target, stmts in groups] + seen = set() + for order, stmt in enumerate(flat_iteration(sl)): + targets = set(list_targets(stmt)) + group = [(order, stmt)] + disjoint = targets.isdisjoint(seen) + seen |= targets + if not disjoint: + groups, old_groups = [], groups + for old_targets, old_group in old_groups: + if targets.isdisjoint(old_targets): + groups.append((old_targets, old_group)) + else: + targets |= old_targets + group += old_group + groups.append((targets, group)) + return [(targets, _resort_statements(stmts)) + for targets, stmts in groups] def list_special_ios(f, ins, outs, inouts): r = set() -- 1.8.3.2
_______________________________________________ Devel mailing list Devel@lists.milkymist.org https://ssl.serverraum.org/lists/listinfo/devel
