python: Rename 'components_library' to 'gem5.components'

The 'components_library' name was always a placeholder. A more accurate
name would be the 'gem5 library'. This is analogous to standard
libraries shipped as part of programming languages. Over time this will
begin to incorporate more commonly used code at the Python configuration
script level. Most of the former 'components_library' is now in
'gem5.components'.

Change-Id: I5927db7004c43b29c39e7767da3f779627081618
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49691
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>

src/python/SConscript

@@ -28,167 +28,149 @@
 
 Import('*')
 
-PySource('components_library', 'components_library/__init__.py')
-PySource('components_library', 'components_library/coherence_protocol.py')
-PySource('components_library', 'components_library/isas.py')
-PySource('components_library', 'components_library/runtime.py')
-PySource('components_library.boards', 'components_library/boards/__init__.py')
-PySource('components_library.boards',
-    'components_library/boards/abstract_board.py')
-PySource('components_library.boards',
-    'components_library/boards/mem_mode.py')
-PySource('components_library.boards',
-    'components_library/boards/riscv_board.py')
-PySource('components_library.boards',
-    'components_library/boards/simple_board.py')
-PySource('components_library.boards',
-    'components_library/boards/test_board.py')
-PySource('components_library.boards', 'components_library/boards/x86_board.py')
-PySource('components_library.cachehierarchies',
-    'components_library/cachehierarchies/__init__.py')
-PySource('components_library.cachehierarchies',
-    'components_library/cachehierarchies/abstract_cache_hierarchy.py')
-PySource('components_library.cachehierarchies',
-    'components_library/cachehierarchies/'
-    'abstract_two_level_cache_hierarchy.py')
-PySource('components_library.cachehierarchies.classic',
-    'components_library/cachehierarchies/classic/__init__.py')
-PySource('components_library.cachehierarchies.classic',
-    'components_library/cachehierarchies/classic/'
+PySource('gem5', 'gem5/__init__.py')
+PySource('gem5', 'gem5/coherence_protocol.py')
+PySource('gem5', 'gem5/isas.py')
+PySource('gem5', 'gem5/runtime.py')
+PySource('gem5.components', 'gem5/components/__init__.py')
+PySource('gem5.components.boards', 'gem5/components/boards/__init__.py')
+PySource('gem5.components.boards', 'gem5/components/boards/abstract_board.py')
+PySource('gem5.components.boards', 'gem5/components/boards/mem_mode.py')
+PySource('gem5.components.boards', 'gem5/components/boards/riscv_board.py')
+PySource('gem5.components.boards', 'gem5/components/boards/simple_board.py')
+PySource('gem5.components.boards', 'gem5/components/boards/test_board.py')
+PySource('gem5.components.boards', 'gem5/components/boards/x86_board.py')
+PySource('gem5.components.cachehierarchies',
+    'gem5/components/cachehierarchies/__init__.py')
+PySource('gem5.components.cachehierarchies',
+    'gem5/components/cachehierarchies/abstract_cache_hierarchy.py')
+PySource('gem5.components.cachehierarchies',
+    'gem5/components/cachehierarchies/abstract_two_level_cache_hierarchy.py')
+PySource('gem5.components.cachehierarchies.classic',
+    'gem5/components/cachehierarchies/classic/__init__.py')
+PySource('gem5.components.cachehierarchies.classic',
+    'gem5/components/cachehierarchies/classic/'
     'abstract_classic_cache_hierarchy.py')
-PySource('components_library.cachehierarchies.classic',
-    'components_library/cachehierarchies/classic/no_cache.py')
-PySource('components_library.cachehierarchies.classic',
-    'components_library/cachehierarchies/classic/'
-    'private_l1_cache_hierarchy.py')
-PySource('components_library.cachehierarchies.classic',
-    'components_library/cachehierarchies/classic/'
+PySource('gem5.components.cachehierarchies.classic',
+    'gem5/components/cachehierarchies/classic/no_cache.py')
+PySource('gem5.components.cachehierarchies.classic',
+    'gem5/components/cachehierarchies/classic/private_l1_cache_hierarchy.py')
+PySource('gem5.components.cachehierarchies.classic',
+    'gem5/components/cachehierarchies/classic/'
     'private_l1_private_l2_cache_hierarchy.py')
-PySource('components_library.cachehierarchies.classic.caches',
-    'components_library/cachehierarchies/classic/caches/__init__.py')
-PySource('components_library.cachehierarchies.classic.caches',
-    'components_library/cachehierarchies/classic/caches/l1dcache.py')
-PySource('components_library.cachehierarchies.classic.caches',
-    'components_library/cachehierarchies/classic/caches/l1icache.py')
-PySource('components_library.cachehierarchies.classic.caches',
-    'components_library/cachehierarchies/classic/caches/l2cache.py')
-PySource('components_library.cachehierarchies.classic.caches',
-    'components_library/cachehierarchies/classic/caches/mmu_cache.py')
-PySource('components_library.cachehierarchies.ruby',
-    'components_library/cachehierarchies/ruby/__init__.py')
-PySource('components_library.cachehierarchies.ruby',
-    'components_library/cachehierarchies/ruby/'
-    'abstract_ruby_cache_hierarchy.py')
-PySource('components_library.cachehierarchies.ruby',
-    'components_library/cachehierarchies/ruby/'
-    'mesi_two_level_cache_hierarchy.py')
-PySource('components_library.cachehierarchies.ruby',
-    'components_library/cachehierarchies/ruby/mi_example_cache_hierarchy.py')
-PySource('components_library.cachehierarchies.ruby.caches',
-    'components_library/cachehierarchies/ruby/caches/__init__.py')
-PySource('components_library.cachehierarchies.ruby.caches',
-    'components_library/cachehierarchies/ruby/caches/abstract_directory.py')
-PySource('components_library.cachehierarchies.ruby.caches',
-    'components_library/cachehierarchies/ruby/caches/'
-    'abstract_dma_controller.py')
-PySource('components_library.cachehierarchies.ruby.caches',
-    'components_library/cachehierarchies/ruby/caches/abstract_l1_cache.py')
-PySource('components_library.cachehierarchies.ruby.caches',
-    'components_library/cachehierarchies/ruby/caches/abstract_l2_cache.py')
-PySource('components_library.cachehierarchies.ruby.caches.mesi_two_level',
-    'components_library/cachehierarchies/ruby/caches/mesi_two_level/'
-    '__init__.py')
-PySource('components_library.cachehierarchies.ruby.caches.mesi_two_level',
-    'components_library/cachehierarchies/ruby/caches/mesi_two_level/'
-    'directory.py')
-PySource('components_library.cachehierarchies.ruby.caches.mesi_two_level',
-    'components_library/cachehierarchies/ruby/caches/mesi_two_level/'
+PySource('gem5.components.cachehierarchies.classic.caches',
+    'gem5/components/cachehierarchies/classic/caches/__init__.py')
+PySource('gem5.components.cachehierarchies.classic.caches',
+    'gem5/components/cachehierarchies/classic/caches/l1dcache.py')
+PySource('gem5.components.cachehierarchies.classic.caches',
+    'gem5/components/cachehierarchies/classic/caches/l1icache.py')
+PySource('gem5.components.cachehierarchies.classic.caches',
+    'gem5/components/cachehierarchies/classic/caches/l2cache.py')
+PySource('gem5.components.cachehierarchies.classic.caches',
+    'gem5/components/cachehierarchies/classic/caches/mmu_cache.py')
+PySource('gem5.components.cachehierarchies.ruby',
+    'gem5/components/cachehierarchies/ruby/__init__.py')
+PySource('gem5.components.cachehierarchies.ruby',
+    'gem5/components/cachehierarchies/ruby/abstract_ruby_cache_hierarchy.py')
+PySource('gem5.components.cachehierarchies.ruby',
+    'gem5/components/cachehierarchies/ruby/mesi_two_level_cache_hierarchy.py')
+PySource('gem5.components.cachehierarchies.ruby',
+    'gem5/components/cachehierarchies/ruby/mi_example_cache_hierarchy.py')
+PySource('gem5.components.cachehierarchies.ruby.caches',
+    'gem5/components/cachehierarchies/ruby/caches/__init__.py')
+PySource('gem5.components.cachehierarchies.ruby.caches',
+    'gem5/components/cachehierarchies/ruby/caches/abstract_directory.py')
+PySource('gem5.components.cachehierarchies.ruby.caches',
+    'gem5/components/cachehierarchies/ruby/caches/abstract_dma_controller.py')
+PySource('gem5.components.cachehierarchies.ruby.caches',
+    'gem5/components/cachehierarchies/ruby/caches/abstract_l1_cache.py')
+PySource('gem5.components.cachehierarchies.ruby.caches',
+    'gem5/components/cachehierarchies/ruby/caches/abstract_l2_cache.py')
+PySource('gem5.components.cachehierarchies.ruby.caches.mesi_two_level',
+    'gem5/components/cachehierarchies/ruby/caches/mesi_two_level/__init__.py')
+PySource('gem5.components.cachehierarchies.ruby.caches.mesi_two_level',
+    'gem5/components/cachehierarchies/ruby/caches/mesi_two_level/directory.py')
+PySource('gem5.components.cachehierarchies.ruby.caches.mesi_two_level',
+    'gem5/components/cachehierarchies/ruby/caches/mesi_two_level/'
     'dma_controller.py')
-PySource('components_library.cachehierarchies.ruby.caches.mesi_two_level',
-    'components_library/cachehierarchies/ruby/caches/mesi_two_level/'
-    'l1_cache.py')
-PySource('components_library.cachehierarchies.ruby.caches.mesi_two_level',
-    'components_library/cachehierarchies/ruby/caches/mesi_two_level/'
-    'l2_cache.py')
-PySource('components_library.cachehierarchies.ruby.caches.mi_example',
-    'components_library/cachehierarchies/ruby/caches/mi_example/__init__.py')
-PySource('components_library.cachehierarchies.ruby.caches.mi_example',
-    'components_library/cachehierarchies/ruby/caches/mi_example/directory.py')
-PySource('components_library.cachehierarchies.ruby.caches.mi_example',
-    'components_library/cachehierarchies/ruby/caches/mi_example/'
+PySource('gem5.components.cachehierarchies.ruby.caches.mesi_two_level',
+    'gem5/components/cachehierarchies/ruby/caches/mesi_two_level/l1_cache.py')
+PySource('gem5.components.cachehierarchies.ruby.caches.mesi_two_level',
+    'gem5/components/cachehierarchies/ruby/caches/mesi_two_level/l2_cache.py')
+PySource('gem5.components.cachehierarchies.ruby.caches.mi_example',
+    'gem5/components/cachehierarchies/ruby/caches/mi_example/__init__.py')
+PySource('gem5.components.cachehierarchies.ruby.caches.mi_example',
+    'gem5/components/cachehierarchies/ruby/caches/mi_example/directory.py')
+PySource('gem5.components.cachehierarchies.ruby.caches.mi_example',
+    'gem5/components/cachehierarchies/ruby/caches/mi_example/'
     'dma_controller.py')
-PySource('components_library.cachehierarchies.ruby.caches.mi_example',
-    'components_library/cachehierarchies/ruby/caches/mi_example/l1_cache.py')
-PySource('components_library.cachehierarchies.ruby.topologies',
-    'components_library/cachehierarchies/ruby/topologies/__init__.py')
-PySource('components_library.cachehierarchies.ruby.topologies',
-    'components_library/cachehierarchies/ruby/topologies/simple_pt2pt.py')
-PySource('components_library.memory', 'components_library/memory/__init__.py')
-PySource('components_library.memory',
-    'components_library/memory/abstract_memory_system.py')
-PySource('components_library.memory', 'components_library/memory/dramsim_3.py')
-PySource('components_library.memory',
-    'components_library/memory/single_channel.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/__init__.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/ddr3.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/ddr4.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/gddr.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/hbm.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/hmc.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/lpddr2.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/lpddr3.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/lpddr5.py')
-PySource('components_library.memory.dram_interfaces',
-    'components_library/memory/dram_interfaces/wideio.py')
-PySource('components_library.processors',
-    'components_library/processors/__init__.py')
-PySource('components_library.processors',
-    'components_library/processors/abstract_core.py')
-PySource('components_library.processors',
-    'components_library/processors/abstract_generator_core.py')
-PySource('components_library.processors',
-    'components_library/processors/abstract_processor.py')
-PySource('components_library.processors',
-    'components_library/processors/complex_generator_core.py')
-PySource('components_library.processors',
-    'components_library/processors/complex_generator.py')
-PySource('components_library.processors',
-    'components_library/processors/cpu_types.py')
-PySource('components_library.processors',
-    'components_library/processors/linear_generator_core.py')
-PySource('components_library.processors',
-    'components_library/processors/linear_generator.py')
-PySource('components_library.processors',
-    'components_library/processors/random_generator_core.py')
-PySource('components_library.processors',
-    'components_library/processors/random_generator.py')
-PySource('components_library.processors',
-    'components_library/processors/simple_core.py')
-PySource('components_library.processors',
-    'components_library/processors/simple_processor.py')
-PySource('components_library.processors',
-    'components_library/processors/simple_switchable_processor.py')
-PySource('components_library.processors',
-    'components_library/processors/switchable_processor.py')
-PySource('components_library.resources',
-    'components_library/resources/__init__.py')
-PySource('components_library.resources',
-    'components_library/resources/downloader.py')
-PySource('components_library.resources',
-    'components_library/resources/resource.py')
-PySource('components_library.utils', 'components_library/utils/__init__.py')
-PySource('components_library.utils', 'components_library/utils/filelock.py')
-PySource('components_library.utils', 'components_library/utils/override.py')
-PySource('components_library.utils', 'components_library/utils/requires.py')
+PySource('gem5.components.cachehierarchies.ruby.caches.mi_example',
+    'gem5/components/cachehierarchies/ruby/caches/mi_example/l1_cache.py')
+PySource('gem5.components.cachehierarchies.ruby.topologies',
+    'gem5/components/cachehierarchies/ruby/topologies/__init__.py')
+PySource('gem5.components.cachehierarchies.ruby.topologies',
+    'gem5/components/cachehierarchies/ruby/topologies/simple_pt2pt.py')
+PySource('gem5.components.memory', 'gem5/components/memory/__init__.py')
+PySource('gem5.components.memory', 'gem5/components/memory/abstract_memory_system.py')
+PySource('gem5.components.memory', 'gem5/components/memory/dramsim_3.py')
+PySource('gem5.components.memory', 'gem5/components/memory/single_channel.py')
+PySource('gem5.components.memory.dram_interfaces',
+    'gem5/components/memory/dram_interfaces/__init__.py')
+PySource('gem5.components.memory.dram_interfaces',
+    'gem5/components/memory/dram_interfaces/ddr3.py')
+PySource('gem5.components.memory.dram_interfaces',
+    'gem5/components/memory/dram_interfaces/ddr4.py')
+PySource('gem5.components.memory.dram_interfaces',
+    'gem5/components/memory/dram_interfaces/gddr.py')
+PySource('gem5.components.memory.dram_interfaces',
+    'gem5/components/memory/dram_interfaces/hbm.py')
+PySource('gem5.components.memory.dram_interfaces',
+    'gem5/components/memory/dram_interfaces/hmc.py')
+PySource('gem5.components.memory.dram_interfaces',
+    'gem5/components/memory/dram_interfaces/lpddr2.py')
+PySource('gem5.components.memory.dram_interfaces',
+    'gem5/components/memory/dram_interfaces/lpddr3.py')
+PySource('gem5.components.memory.dram_interfaces',
+'gem5/components/memory/dram_interfaces/lpddr5.py')
+PySource('gem5.components.memory.dram_interfaces',
+    'gem5/components/memory/dram_interfaces/wideio.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/__init__.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/abstract_core.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/abstract_generator_core.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/abstract_processor.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/complex_generator_core.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/complex_generator.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/cpu_types.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/linear_generator_core.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/linear_generator.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/random_generator_core.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/random_generator.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/simple_core.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/simple_processor.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/simple_switchable_processor.py')
+PySource('gem5.components.processors',
+    'gem5/components/processors/switchable_processor.py')
+PySource('gem5.resources', 'gem5/resources/__init__.py')
+PySource('gem5.resources', 'gem5/resources/downloader.py')
+PySource('gem5.resources', 'gem5/resources/resource.py')
+PySource('gem5.utils', 'gem5/utils/__init__.py')
+PySource('gem5.utils', 'gem5/utils/filelock.py')
+PySource('gem5.utils', 'gem5/utils/override.py')
+PySource('gem5.utils', 'gem5/utils/requires.py')
 
 PySource('', 'importer.py')
 PySource('m5', 'm5/__init__.py')

src/python/gem5/components/boards/riscv_board.py

@@ -27,14 +27,14 @@
 import os
 from typing import Optional
 
-from ..utils.override import overrides
+from ...utils.override import overrides
 from .simple_board import SimpleBoard
 from .abstract_board import AbstractBoard
 from ..processors.abstract_processor import AbstractProcessor
 from ..memory.abstract_memory_system import AbstractMemorySystem
 from ..cachehierarchies.abstract_cache_hierarchy import AbstractCacheHierarchy
-from ..isas import ISA
-from ..runtime import get_runtime_isa
+from ...isas import ISA
+from ...runtime import get_runtime_isa
 
 import m5
 

src/python/gem5/components/boards/simple_board.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ..resources.resource import AbstractResource
+from ...resources.resource import AbstractResource
 from m5.objects import (
     AddrRange,
     SrcClockDomain,
@@ -41,7 +41,7 @@ from .mem_mode import MemMode, mem_mode_to_string
 from ..processors.abstract_processor import AbstractProcessor
 from ..memory.abstract_memory_system import AbstractMemorySystem
 from ..cachehierarchies.abstract_cache_hierarchy import AbstractCacheHierarchy
-from ..utils.override import overrides
+from ...utils.override import overrides
 
 from typing import List
 

src/python/gem5/components/boards/test_board.py

@@ -34,7 +34,7 @@ from m5.objects import (
 )
 
 from .mem_mode import MemMode, mem_mode_to_string
-from ..utils.override import overrides
+from ...utils.override import overrides
 from .abstract_board import AbstractBoard
 from ..processors.abstract_processor import AbstractProcessor
 from ..memory.abstract_memory_system import AbstractMemorySystem

src/python/gem5/components/boards/x86_board.py

@@ -25,10 +25,10 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-from ..resources.resource import AbstractResource
-from ..utils.override import overrides
+from ...resources.resource import AbstractResource
+from ...utils.override import overrides
 from .abstract_board import AbstractBoard
-from ..isas import ISA
+from ...isas import ISA
 
 import m5
 from m5.objects import (
@@ -60,7 +60,7 @@ from .simple_board import SimpleBoard
 from ..processors.abstract_processor import AbstractProcessor
 from ..memory.abstract_memory_system import AbstractMemorySystem
 from ..cachehierarchies.abstract_cache_hierarchy import AbstractCacheHierarchy
-from ..utils.requires import requires
+from ...utils.requires import requires
 
 import os
 from typing import List, Optional, Sequence

src/python/gem5/components/cachehierarchies/classic/abstract_classic_cache_hierarchy.py

@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from abc import abstractmethod
-from ...utils.override import overrides
+from ....utils.override import overrides
 from ..abstract_cache_hierarchy import AbstractCacheHierarchy
 
 from m5.objects import Port

src/python/gem5/components/cachehierarchies/classic/caches/l1dcache.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ....utils.override import *
+from .....utils.override import *
 
 from m5.objects import Cache, BasePrefetcher, StridePrefetcher
 

src/python/gem5/components/cachehierarchies/classic/caches/l1icache.py

@@ -28,7 +28,7 @@ from typing import Optional, Type
 
 from m5.objects import Cache, BasePrefetcher, StridePrefetcher
 
-from ....utils.override import *
+from .....utils.override import *
 
 
 class L1ICache(Cache):

src/python/gem5/components/cachehierarchies/classic/caches/l2cache.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ....utils.override import *
+from .....utils.override import *
 
 from m5.objects import Cache, BasePrefetcher, StridePrefetcher
 

src/python/gem5/components/cachehierarchies/classic/caches/mmu_cache.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ....utils.override import *
+from .....utils.override import *
 
 from m5.objects import Cache, BasePrefetcher, StridePrefetcher
 

src/python/gem5/components/cachehierarchies/classic/no_cache.py

@@ -27,14 +27,14 @@
 from .abstract_classic_cache_hierarchy import AbstractClassicCacheHierarchy
 from ..abstract_cache_hierarchy import AbstractCacheHierarchy
 from ...boards.abstract_board import AbstractBoard
-from ...isas import ISA
-from ...runtime import get_runtime_isa
+from ....isas import ISA
+from ....runtime import get_runtime_isa
 
 from m5.objects import Bridge, BaseXBar, SystemXBar, BadAddr, Port
 
 from typing import Optional
 
-from ...utils.override import *
+from ....utils.override import *
 
 
 class NoCache(AbstractClassicCacheHierarchy):

src/python/gem5/components/cachehierarchies/classic/private_l1_cache_hierarchy.py

@@ -30,12 +30,12 @@ from .caches.l1dcache import L1DCache
 from .caches.l1icache import L1ICache
 from .caches.mmu_cache import MMUCache
 from ...boards.abstract_board import AbstractBoard
-from ...isas import ISA
-from ...runtime import get_runtime_isa
+from ....isas import ISA
+from ....runtime import get_runtime_isa
 
 from m5.objects import Cache, BaseXBar, SystemXBar, BadAddr, Port
 
-from ...utils.override import *
+from ....utils.override import *
 
 from typing import Optional
 

src/python/gem5/components/cachehierarchies/classic/private_l1_private_l2_cache_hierarchy.py

@@ -32,12 +32,12 @@ from .caches.l1icache import L1ICache
 from .caches.l2cache import L2Cache
 from .caches.mmu_cache import MMUCache
 from ...boards.abstract_board import AbstractBoard
-from ...isas import ISA
-from ...runtime import get_runtime_isa
+from ....isas import ISA
+from ....runtime import get_runtime_isa
 
 from m5.objects import Cache, L2XBar, BaseXBar, SystemXBar, BadAddr, Port
 
-from ...utils.override import *
+from ....utils.override import *
 
 from typing import Optional
 

src/python/gem5/components/cachehierarchies/ruby/abstract_ruby_cache_hierarchy.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ...utils.override import overrides
+from ....utils.override import overrides
 from ..abstract_cache_hierarchy import AbstractCacheHierarchy
 
 

src/python/gem5/components/cachehierarchies/ruby/caches/abstract_l1_cache.py

@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from abc import abstractmethod
-from ....isas import ISA
+from .....isas import ISA
 from ....processors.cpu_types import CPUTypes
 from ....processors.abstract_core import AbstractCore
 

src/python/gem5/components/cachehierarchies/ruby/caches/mesi_two_level/directory.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from .....utils.override import overrides
+from ......utils.override import overrides
 from ..abstract_directory import AbstractDirectory
 
 from m5.objects import (

src/python/gem5/components/cachehierarchies/ruby/caches/mesi_two_level/dma_controller.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from .....utils.override import overrides
+from ......utils.override import overrides
 from ..abstract_dma_controller import AbstractDMAController
 
 from m5.objects import MessageBuffer

src/python/gem5/components/cachehierarchies/ruby/caches/mesi_two_level/l1_cache.py

@@ -25,9 +25,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from .....processors.abstract_core import AbstractCore
-from .....isas import ISA
+from ......isas import ISA
 from ..abstract_l1_cache import AbstractL1Cache
-from .....utils.override import *
+from ......utils.override import *
 
 from m5.objects import (
     MessageBuffer,

src/python/gem5/components/cachehierarchies/ruby/caches/mesi_two_level/l2_cache.py

@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from ..abstract_l2_cache import AbstractL2Cache
-from .....utils.override import *
+from ......utils.override import *
 
 from m5.objects import MessageBuffer, RubyCache
 

src/python/gem5/components/cachehierarchies/ruby/caches/mi_example/directory.py

@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from ..abstract_directory import AbstractDirectory
-from .....utils.override import overrides
+from ......utils.override import overrides
 
 
 from m5.objects import (

src/python/gem5/components/cachehierarchies/ruby/caches/mi_example/dma_controller.py

@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from ..abstract_dma_controller import AbstractDMAController
-from .....utils.override import overrides
+from ......utils.override import overrides
 
 from m5.objects import MessageBuffer
 

src/python/gem5/components/cachehierarchies/ruby/caches/mi_example/l1_cache.py

@@ -24,9 +24,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from .....utils.override import overrides
+from ......utils.override import overrides
 from .....processors.abstract_core import AbstractCore
-from .....isas import ISA
+from ......isas import ISA
 from ..abstract_l1_cache import AbstractL1Cache
 
 from m5.objects import (

src/python/gem5/components/cachehierarchies/ruby/mesi_two_level_cache_hierarchy.py

@@ -27,11 +27,11 @@
 
 from .abstract_ruby_cache_hierarchy import AbstractRubyCacheHierarchy
 from ..abstract_two_level_cache_hierarchy import AbstractTwoLevelCacheHierarchy
-from ...coherence_protocol import CoherenceProtocol
-from ...isas import ISA
+from ....coherence_protocol import CoherenceProtocol
+from ....isas import ISA
 from ...boards.abstract_board import AbstractBoard
-from ...runtime import get_runtime_isa
-from ...utils.requires import requires
+from ....runtime import get_runtime_isa
+from ....utils.requires import requires
 
 from .topologies.simple_pt2pt import SimplePt2Pt
 from .caches.mesi_two_level.l1_cache import L1Cache

src/python/gem5/components/cachehierarchies/ruby/mi_example_cache_hierarchy.py

@@ -31,11 +31,11 @@ from .topologies.simple_pt2pt import SimplePt2Pt
 from .abstract_ruby_cache_hierarchy import AbstractRubyCacheHierarchy
 from ..abstract_cache_hierarchy import AbstractCacheHierarchy
 from ...boards.abstract_board import AbstractBoard
-from ...coherence_protocol import CoherenceProtocol
-from ...isas import ISA
-from ...utils.override import overrides
-from ...runtime import get_runtime_isa
-from ...utils.requires import requires
+from ....coherence_protocol import CoherenceProtocol
+from ....isas import ISA
+from ....utils.override import overrides
+from ....runtime import get_runtime_isa
+from ....utils.requires import requires
 
 
 from m5.objects import (

src/python/gem5/components/memory/dramsim_3.py

@@ -5,7 +5,7 @@ import configparser
 from m5.objects import DRAMsim3, AddrRange, Port, MemCtrl
 from m5.util.convert import toMemorySize
 
-from ..utils.override import overrides
+from ...utils.override import overrides
 from ..boards.abstract_board import AbstractBoard
 from .abstract_memory_system import AbstractMemorySystem
 

src/python/gem5/components/memory/single_channel.py

@@ -29,7 +29,7 @@
 
 from ..boards.abstract_board import AbstractBoard
 from .abstract_memory_system import AbstractMemorySystem
-from ..utils.override import overrides
+from ...utils.override import overrides
 
 from m5.objects import AddrRange, DRAMInterface, MemCtrl, Port
 from m5.util.convert import toMemorySize

src/python/gem5/components/processors/abstract_core.py

@@ -27,7 +27,7 @@
 from abc import ABCMeta, abstractmethod
 from typing import Optional
 from .cpu_types import CPUTypes
-from ..utils.requires import requires
+from ...utils.requires import requires
 
 from m5.objects import BaseMMU, Port, SubSystem
 

src/python/gem5/components/processors/abstract_generator_core.py

@@ -26,7 +26,7 @@
 
 
 from m5.objects import Port, PyTrafficGen
-from ..utils.override import overrides
+from ...utils.override import overrides
 
 from .cpu_types import CPUTypes
 from .abstract_core import AbstractCore

src/python/gem5/components/processors/complex_generator.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ..utils.override import overrides
+from ...utils.override import overrides
 from ..boards.mem_mode import MemMode
 from .complex_generator_core import ComplexGeneratorCore
 

src/python/gem5/components/processors/complex_generator_core.py

@@ -31,7 +31,7 @@ from m5.objects import PyTrafficGen, Port
 from .abstract_core import AbstractCore
 from .abstract_generator_core import AbstractGeneratorCore
 
-from ..utils.override import overrides
+from ...utils.override import overrides
 
 from enum import Enum
 

src/python/gem5/components/processors/linear_generator.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ..utils.override import overrides
+from ...utils.override import overrides
 from ..boards.mem_mode import MemMode
 from .linear_generator_core import LinearGeneratorCore
 

src/python/gem5/components/processors/linear_generator_core.py

@@ -31,7 +31,7 @@ from m5.objects import PyTrafficGen, Port, BaseTrafficGen
 from .abstract_core import AbstractCore
 from .abstract_generator_core import AbstractGeneratorCore
 
-from ..utils.override import overrides
+from ...utils.override import overrides
 
 from typing import Iterator
 

src/python/gem5/components/processors/random_generator.py

@@ -24,7 +24,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from ..utils.override import overrides
+from ...utils.override import overrides
 from ..boards.mem_mode import MemMode
 from .random_generator_core import RandomGeneratorCore
 

src/python/gem5/components/processors/random_generator_core.py

@@ -31,7 +31,7 @@ from m5.objects import PyTrafficGen, Port, BaseTrafficGen
 from .abstract_core import AbstractCore
 from .abstract_generator_core import AbstractGeneratorCore
 
-from ..utils.override import overrides
+from ...utils.override import overrides
 
 from typing import Iterator
 

src/python/gem5/components/processors/simple_core.py

@@ -25,12 +25,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from typing import Optional
-from ..runtime import get_runtime_isa
+from ...runtime import get_runtime_isa
 from ..processors.abstract_core import AbstractCore
 
 from .cpu_types import CPUTypes
-from ..isas import ISA
-from ..utils.override import overrides
+from ...isas import ISA
+from ...utils.override import overrides
 
 from m5.objects import (
     BaseMMU,

src/python/gem5/components/processors/simple_processor.py

@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-from ..utils.override import overrides
+from ...utils.override import overrides
 from ..boards.mem_mode import MemMode
 from ..processors.simple_core import SimpleCore
 

src/python/gem5/components/processors/simple_switchable_processor.py

@@ -30,7 +30,7 @@ from ..processors.simple_core import SimpleCore
 from ..processors.cpu_types import CPUTypes
 from .switchable_processor import SwitchableProcessor
 
-from ..utils.override import *
+from ...utils.override import *
 
 from m5.objects import KvmVM
 

src/python/gem5/components/processors/switchable_processor.py

@@ -35,7 +35,7 @@ from typing import Dict, Any, List
 
 from .abstract_processor import AbstractProcessor
 from ..boards.abstract_board import AbstractBoard
-from ..utils.override import *
+from ...utils.override import *
 
 
 class SwitchableProcessor(AbstractProcessor):