changeset babb40bd2fc6 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=babb40bd2fc6
description:
scons: Ensure dictionary iteration is sorted by key
This patch adds sorting based on the SimObject name or parameter name
for all situations where we iterate over dictionaries. This should
ensure a deterministic and consistent order across the host systems
and hopefully avoid regression results differing across python
versions.
diffstat:
SConstruct | 2 +-
src/SConscript | 8 ++++----
src/python/m5/SimObject.py | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diffs (78 lines):
diff -r d1e1e8588881 -r babb40bd2fc6 SConstruct
--- a/SConstruct Tue Dec 02 06:08:19 2014 -0500
+++ b/SConstruct Tue Dec 02 06:08:22 2014 -0500
@@ -216,7 +216,7 @@
]
use_env = {}
-for key,val in os.environ.iteritems():
+for key,val in sorted(os.environ.iteritems()):
if key in use_vars or \
any([key.startswith(prefix) for prefix in use_prefixes]):
use_env[key] = val
diff -r d1e1e8588881 -r babb40bd2fc6 src/SConscript
--- a/src/SConscript Tue Dec 02 06:08:19 2014 -0500
+++ b/src/SConscript Tue Dec 02 06:08:22 2014 -0500
@@ -528,6 +528,7 @@
#
module_depends = ["m5", "m5.SimObject", "m5.params"]
depends = [ PySource.modules[dep].snode for dep in module_depends ]
+depends.sort(key = lambda x: x.name)
########################################################################
#
@@ -717,7 +718,7 @@
env.Command(cxx_config_init_cc_file, Value(name),
MakeAction(createCxxConfigInitCC, Transform("CXXCINIT")))
cxx_param_hh_files = ["cxx_config/%s.hh" % simobj
- for simobj in sorted(sim_objects.itervalues())
+ for name,simobj in sorted(sim_objects.iteritems())
if not hasattr(simobj, 'abstract') or not simobj.abstract]
Depends(cxx_config_init_cc_file, cxx_param_hh_files +
[File('sim/cxx_config.hh')])
@@ -725,7 +726,7 @@
# Generate any needed param SWIG wrapper files
params_i_files = []
-for name,param in params_to_swig.iteritems():
+for name,param in sorted(params_to_swig.iteritems()):
i_file = File('python/m5/internal/%s.i' % (param.swig_module_name()))
params_i_files.append(i_file)
env.Command(i_file, Value(name),
@@ -760,10 +761,9 @@
SwigSource('m5.internal', i_file)
# Generate SimObject SWIG wrapper files
-for name,simobj in sim_objects.iteritems():
+for name,simobj in sorted(sim_objects.iteritems()):
py_source = PySource.modules[simobj.__module__]
extra_deps = [ py_source.tnode ]
-
i_file = File('python/m5/internal/param_%s.i' % name)
env.Command(i_file, Value(name),
MakeAction(createSimObjectSwigWrapper, Transform("SO SWIG")))
diff -r d1e1e8588881 -r babb40bd2fc6 src/python/m5/SimObject.py
--- a/src/python/m5/SimObject.py Tue Dec 02 06:08:19 2014 -0500
+++ b/src/python/m5/SimObject.py Tue Dec 02 06:08:22 2014 -0500
@@ -691,8 +691,8 @@
# The 'local' attribute restricts us to the params declared in
# the object itself, not including inherited params (which
# will also be inherited from the base class's param struct
- # here).
- params = cls._params.local.values()
+ # here). Sort the params based on their key
+ params = map(lambda (k, v): v, sorted(cls._params.local.items()))
ports = cls._ports.local
code('%module(package="m5.internal") param_$cls')
@@ -772,8 +772,8 @@
# The 'local' attribute restricts us to the params declared in
# the object itself, not including inherited params (which
# will also be inherited from the base class's param struct
- # here).
- params = cls._params.local.values()
+ # here). Sort the params based on their key
+ params = map(lambda (k, v): v, sorted(cls._params.local.items()))
ports = cls._ports.local
try:
ptypes = [p.ptype for p in params]
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
