Fix a couple of bugs introduced (or tickled) by the .ini sorting change.

sim/pyconfig/m5config.py:
    Don't sort child nodes, as this can change timing in memory system.
    (Really ought to be fixed in memory system, but we'll just take the
    sort back out for now to avoid intoducing gratuitous changes.)

--HG--
extra : convert_revision : 07e950c25911443cbc7a84435969ca596fb04348

diff --git a/sim/pyconfig/m5config.py b/sim/pyconfig/m5config.py
index 17a0d8f4229c35a5fc76eeebe5524f5a930148df..330d7e878108615481f5d219d5b2707028ac7c37 100644 (file)
--- a/sim/pyconfig/m5config.py
+++ b/sim/pyconfig/m5config.py
@@ -697,8 +697,12 @@ class Node(object):
         if self.children:
             # instantiate children in same order they were added for
             # backward compatibility (else we can end up with cpu1
-            # before cpu0).
-            self.children.sort(lambda x,y: cmp(x.name, y.name))
+            # before cpu0).  Changing ordering can also influence timing
+            # in the current memory system, as caches get added to a bus
+            # in different orders which affects their priority in the
+            # case of simulataneous requests.  We should uncomment the
+            # following line once we take care of that issue.
+            # self.children.sort(lambda x,y: cmp(x.name, y.name))
             children = [ c.name for c in self.children if not c.paramcontext]
             print 'children =', ' '.join(children)