Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/22039 )
Change subject: cpu: Apply the ARM TLB rework to the O3 checker CPU.
......................................................................
cpu: Apply the ARM TLB rework to the O3 checker CPU.
The TLBs now create the stage 2 MMUs as children, and since those are
specialized for instruction and data, the CPU needs to use ArmITB or
ArmDTB instead of ArmTLB which is the base class without an MMU. This
was changed for the BaseCPU and SimpleCPU checker already, but the TLBs
are added in the O3 checker CPU as well.
Change-Id: I498f247f376c8721fb70ce26c0f1b0815b12fe2d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22039
Reviewed-by: Daniel Carvalho <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Andreas Sandberg <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/cpu/o3/O3CPU.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
Daniel Carvalho: Looks good to me, but someone else must approve
kokoro: Regressions pass
diff --git a/src/cpu/o3/O3CPU.py b/src/cpu/o3/O3CPU.py
index 4a994f0..89744e9 100644
--- a/src/cpu/o3/O3CPU.py
+++ b/src/cpu/o3/O3CPU.py
@@ -181,14 +181,14 @@
def addCheckerCpu(self):
if buildEnv['TARGET_ISA'] in ['arm']:
- from m5.objects.ArmTLB import ArmTLB
+ from m5.objects.ArmTLB import ArmDTB, ArmITB
self.checker = O3Checker(workload=self.workload,
exitOnError=False,
updateOnError=True,
warnOnlyOnLoadError=True)
- self.checker.itb = ArmTLB(size = self.itb.size)
- self.checker.dtb = ArmTLB(size = self.dtb.size)
+ self.checker.itb = ArmITB(size = self.itb.size)
+ self.checker.dtb = ArmDTB(size = self.dtb.size)
self.checker.cpu_id = self.cpu_id
else:
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/22039
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I498f247f376c8721fb70ce26c0f1b0815b12fe2d
Gerrit-Change-Number: 22039
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
