From d5d2e64dc3c3c612bbfd4d33b884d0544d3cf0df Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 17 Jul 2013 16:49:26 +0200 Subject: [PATCH] Revert "fhdl/tools/group_by_target: remove resort_statements" This reverts commit 939f01cee2ebec6df738652412b1048b958bf09f. --- migen/fhdl/tools.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/migen/fhdl/tools.py b/migen/fhdl/tools.py index d87bfa17..f2f57222 100644 --- a/migen/fhdl/tools.py +++ b/migen/fhdl/tools.py @@ -48,24 +48,29 @@ def list_targets(node): lister.visit(node) return lister.output_list +def resort_statements(ol): + return [statement for i, statement in + sorted(ol, key=lambda x: x[0])] + def group_by_targets(sl): groups = [] - for statement in flat_iteration(sl): + 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), []) + new_group = (set(targets), [(statement_order, statement)]) + for g in merge_groups: new_group[0].update(g[0]) new_group[1].extend(g[1]) - new_group[1].append(statement) groups.append(new_group) - return groups + return [(target, resort_statements(stmts)) + for target, stmts in groups] def list_special_ios(f, ins, outs, inouts): r = set() -- 2.30.2