Alex Richardson has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/68757?usp=email )
Change subject: tests: Fix import path in simple_binary_run.py
......................................................................
tests: Fix import path in simple_binary_run.py
We should be using gem5.components instead of python.gem5.components.
In https://gem5-review.git.corp.google.com/c/public/gem5/+/68518 I was
seeing the RISC-V tests fail with
`ModuleNotFoundError: No module
named 'python.gem5.components.processors.base_cpu_core'`.
This fixes the issue for me with the RISC-V tests. I also searched for
other similar imports and I've removed a similar (unused) one in
x86_boot_exit_run.py.
Change-Id: I61a0c4c27724854956f778f14e1fcfafea927ffd
---
M tests/gem5/configs/simple_binary_run.py
M tests/gem5/configs/x86_boot_exit_run.py
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/tests/gem5/configs/simple_binary_run.py
b/tests/gem5/configs/simple_binary_run.py
index fbb0313..5540e80 100644
--- a/tests/gem5/configs/simple_binary_run.py
+++ b/tests/gem5/configs/simple_binary_run.py
@@ -40,6 +40,7 @@
from gem5.components.boards.simple_board import SimpleBoard
from gem5.components.cachehierarchies.classic.no_cache import NoCache
from gem5.components.processors.simple_processor import SimpleProcessor
+from gem5.components.processors.base_cpu_core import BaseCPUCore
from gem5.components.processors.base_cpu_processor import BaseCPUProcessor
from gem5.components.processors.simple_core import SimpleCore
from gem5.components.boards.mem_mode import MemMode
@@ -52,8 +53,6 @@
import argparse
import importlib
-from python.gem5.components.processors.base_cpu_core import BaseCPUCore
-
cpu_types_string_map = {
CPUTypes.ATOMIC: "AtomicSimpleCPU",
CPUTypes.O3: "O3CPU",
diff --git a/tests/gem5/configs/x86_boot_exit_run.py
b/tests/gem5/configs/x86_boot_exit_run.py
index b1cbc64..5458b6d 100644
--- a/tests/gem5/configs/x86_boot_exit_run.py
+++ b/tests/gem5/configs/x86_boot_exit_run.py
@@ -46,9 +46,6 @@
import argparse
import importlib
-from python.gem5.components.boards.kernel_disk_workload import (
- KernelDiskWorkload,
-)
parser = argparse.ArgumentParser(
description="A script to run the gem5 boot test. This test boots the "
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/68757?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I61a0c4c27724854956f778f14e1fcfafea927ffd
Gerrit-Change-Number: 68757
Gerrit-PatchSet: 1
Gerrit-Owner: Alex Richardson <alexrichard...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
