Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/52498 )
Change subject: sim,configs: Default m5ops_base to 0 (disabled) on x86.
......................................................................
sim,configs: Default m5ops_base to 0 (disabled) on x86.
This is already the default for other platforms. This is most important
when using KVM, where this mechanism is the only way to trigger pseudo
instructions, or in SE mode to also trigger system calls.
Change-Id: I0094e6814898ba397c7425e0fe76d84853bb17ad
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52498
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M configs/common/FSConfig.py
M src/sim/System.py
M configs/example/se.py
M configs/example/apu_se.py
M src/python/gem5/components/boards/x86_board.py
5 files changed, 25 insertions(+), 4 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 8b8fb4e..a7ba815 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -445,6 +445,8 @@
def makeX86System(mem_mode, numCPUs=1, mdesc=None, workload=None,
Ruby=False):
self = System()
+ self.m5ops_base = 0xffff0000
+
if workload is None:
workload = X86FsWorkload()
self.workload = workload
diff --git a/configs/example/apu_se.py b/configs/example/apu_se.py
index 882d181..532fb98 100644
--- a/configs/example/apu_se.py
+++ b/configs/example/apu_se.py
@@ -544,6 +544,7 @@
have_kvm_support = 'BaseKvmCPU' in globals()
if have_kvm_support and buildEnv['TARGET_ISA'] == "x86":
system.vm = KvmVM()
+ system.m5ops_base = 0xffff0000
for i in range(len(host_cpu.workload)):
host_cpu.workload[i].useArchPT = True
host_cpu.workload[i].kvmInSE = True
diff --git a/configs/example/se.py b/configs/example/se.py
index a3b5cb9..3a8203d 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -200,6 +200,7 @@
if ObjectList.is_kvm_cpu(CPUClass) or ObjectList.is_kvm_cpu(FutureClass):
if buildEnv['TARGET_ISA'] == 'x86':
system.kvm_vm = KvmVM()
+ system.m5ops_base = 0xffff0000
for process in multiprocesses:
process.useArchPT = True
process.kvmInSE = True
diff --git a/src/python/gem5/components/boards/x86_board.py
b/src/python/gem5/components/boards/x86_board.py
index 6f53001..f777392 100644
--- a/src/python/gem5/components/boards/x86_board.py
+++ b/src/python/gem5/components/boards/x86_board.py
@@ -99,6 +99,8 @@
# Set up all of the I/O.
self._setup_io_devices()
+ self.m5ops_base = 0xffff0000
+
def _setup_io_devices(self):
""" Sets up the x86 IO devices.
diff --git a/src/sim/System.py b/src/sim/System.py
index 596e25c..c5b7a82 100644
--- a/src/sim/System.py
+++ b/src/sim/System.py
@@ -124,10 +124,8 @@
# SE mode doesn't use the ISA System subclasses, and so we need to set
an
# ISA specific value in this class directly.
- m5ops_base = Param.Addr(
- 0xffff0000 if buildEnv['TARGET_ISA'] == 'x86' else 0,
- "Base of the 64KiB PA range used for memory-mapped m5ops. Set to
0 "
- "to disable.")
+ m5ops_base = Param.Addr(0, "Base of the 64KiB PA range used for "
+ "memory-mapped m5ops. Set to 0 to disable.")
if buildEnv['USE_KVM']:
kvm_vm = Param.KvmVM(NULL, 'KVM VM (i.e., shared memory domain)')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/52498
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: I0094e6814898ba397c7425e0fe76d84853bb17ad
Gerrit-Change-Number: 52498
Gerrit-PatchSet: 19
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby Bruce <[email protected]>
Gerrit-Reviewer: Earl Ou <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matt Sinclair <[email protected]>
Gerrit-Reviewer: Matthew Poremba <[email protected]>
Gerrit-Reviewer: Yu-hsin Wang <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
