diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2016-10-13 03:17:19 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2016-10-13 03:17:19 -0400 |
| commit | 68fdccb30bd85cd99823fb411ec7ae67112062d7 (patch) | |
| tree | e6ef3d54238c64c63b00a3b83da96a9a1cdaad8b /configs/ruby/AMD_Base_Constructor.py | |
| parent | 2e5e9085792b1a7c47c231a2adf0da6f7ff8f20d (diff) | |
| download | gem5-68fdccb30bd85cd99823fb411ec7ae67112062d7.tar.xz | |
ruby: Fix regressions and make Ruby configs Python packages
This patch moves the addition of network options into the Ruby module
to avoid the regressions all having to add it explicitly. Doing this
exposes an issue in our current config system though, namely the fact
that addtoPath is relative to the Python script being executed. Since
both example and regression scripts use the Ruby module we would end
up with two different (relative) paths being added. Instead we take a
first step at turning the config modules into Python packages, simply
by adding a __init__.py in the configs/ruby, configs/topologies and
configs/network subdirectories.
As a result, we can now add the top-level configs directory to the
Python search path, and then use the package names in the various
modules. The example scripts are also updated, and the messy
path-deducing variations in the scripts are unified.
Diffstat (limited to 'configs/ruby/AMD_Base_Constructor.py')
| -rw-r--r-- | configs/ruby/AMD_Base_Constructor.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/ruby/AMD_Base_Constructor.py b/configs/ruby/AMD_Base_Constructor.py index d13153e9a..b02b49f98 100644 --- a/configs/ruby/AMD_Base_Constructor.py +++ b/configs/ruby/AMD_Base_Constructor.py @@ -39,7 +39,7 @@ from m5.objects import * from m5.defines import buildEnv from m5.util import convert from CntrlBase import * -from Cluster import Cluster +from topologies.Cluster import Cluster # # Note: the L1 Cache latency is only used by the sequencer on fast path hits |