From 2f5262eb67f0539ab6c07d56eeae1b72f6b6b509 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Fri, 14 Oct 2016 10:37:38 -0400 Subject: config: Make configs/common a Python package Continue along the same line as the recent patch that made the Ruby-related config scripts Python packages and make also the configs/common directory a package. All affected config scripts are updated (hopefully). Note that this change makes it apparent that the current organisation and naming of the config directory and its subdirectories is rather chaotic. We mix scripts that are directly invoked with scripts that merely contain convenience functions. While it is not addressed in this patch we should follow up with a re-organisation of the config structure, and renaming of some of the packages. --- configs/dram/lat_mem_rd.py | 6 +++--- configs/dram/sweep.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'configs/dram') diff --git a/configs/dram/lat_mem_rd.py b/configs/dram/lat_mem_rd.py index 374f1d4be..d4015a522 100644 --- a/configs/dram/lat_mem_rd.py +++ b/configs/dram/lat_mem_rd.py @@ -44,8 +44,8 @@ from m5.objects import * from m5.util import addToPath from m5.internal.stats import periodicStatDump -addToPath('../common') -import MemConfig +addToPath('../') +from common import MemConfig addToPath('../../util') import protolib @@ -258,7 +258,7 @@ system.tgen.port = system.monitor.slave # create the actual cache hierarchy, for now just go with something # basic to explore some of the options -from Caches import * +from common.Caches import * # a starting point for an L3 cache class L3Cache(Cache): diff --git a/configs/dram/sweep.py b/configs/dram/sweep.py index 368e39488..2797abef0 100644 --- a/configs/dram/sweep.py +++ b/configs/dram/sweep.py @@ -42,9 +42,9 @@ from m5.objects import * from m5.util import addToPath from m5.internal.stats import periodicStatDump -addToPath('../common') +addToPath('../') -import MemConfig +from common import MemConfig # this script is helpful to sweep the efficiency of a specific memory # controller configuration, by varying the number of banks accessed, -- cgit v1.2.3