Andreas Sandberg has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/16000
Change subject: python: Fix param -> int conversion issues
......................................................................
python: Fix param -> int conversion issues
Python 3 doesn't convert params to integers automatically. Add
explicit conversions where necessary.
Change-Id: I2de6c9906d3bb7616f12ada6728b9e4b1928511c
Signed-off-by: Andreas Sandberg <andreas.sandb...@arm.com>
---
M src/cpu/BaseCPU.py
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/cpu/BaseCPU.py b/src/cpu/BaseCPU.py
index 60c86a4..d34a033 100644
--- a/src/cpu/BaseCPU.py
+++ b/src/cpu/BaseCPU.py
@@ -240,27 +240,28 @@
_uncached_master_ports += ["interrupts[0].int_master"]
def createInterruptController(self):
+ nthreads = int(self.numThreads)
if buildEnv['TARGET_ISA'] == 'sparc':
- self.interrupts = [SparcInterrupts() for i in
range(self.numThreads)]
+ self.interrupts = [SparcInterrupts() for i in range(nthreads)]
elif buildEnv['TARGET_ISA'] == 'alpha':
- self.interrupts = [AlphaInterrupts() for i in
range(self.numThreads)]
+ self.interrupts = [AlphaInterrupts() for i in range(nthreads)]
elif buildEnv['TARGET_ISA'] == 'x86':
self.apic_clk_domain = DerivedClockDomain(clk_domain =
Parent.clk_domain,
clk_divider = 16)
self.interrupts = [X86LocalApic(clk_domain =
self.apic_clk_domain,
pio_addr=0x2000000000000000)
- for i in range(self.numThreads)]
+ for i in range(nthreads)]
_localApic = self.interrupts
elif buildEnv['TARGET_ISA'] == 'mips':
- self.interrupts = [MipsInterrupts() for i in
range(self.numThreads)]
+ self.interrupts = [MipsInterrupts() for i in range(nthreads)]
elif buildEnv['TARGET_ISA'] == 'arm':
- self.interrupts = [ArmInterrupts() for i in
range(self.numThreads)]
+ self.interrupts = [ArmInterrupts() for i in range(nthreads)]
elif buildEnv['TARGET_ISA'] == 'power':
- self.interrupts = [PowerInterrupts() for i in
range(self.numThreads)]
+ self.interrupts = [PowerInterrupts() for i in range(nthreads)]
elif buildEnv['TARGET_ISA'] == 'riscv':
self.interrupts = \
- [RiscvInterrupts() for i in range(self.numThreads)]
+ [RiscvInterrupts() for i in range(nthreads)]
else:
print("Don't know what Interrupt Controller to use for
ISA %s" %
buildEnv['TARGET_ISA'])
@@ -315,12 +316,13 @@
self._cached_ports = ['l2cache.mem_side']
def createThreads(self):
+ nthreads = int(self.numThreads)
# If no ISAs have been created, assume that the user wants the
# default ISA.
if len(self.isa) == 0:
- self.isa = [ default_isa_class() for i in
range(self.numThreads) ]
+ self.isa = [ default_isa_class() for i in range(nthreads) ]
else:
- if len(self.isa) != int(self.numThreads):
+ if len(self.isa) != nthreads:
raise RuntimeError("Number of ISA instances doesn't "
"match thread count")
if self.checker != NULL:
@@ -365,7 +367,7 @@
warn("Platform not found for device tree generation; " \
"system or multiple CPUs may not start")
- freq = round(self.clk_domain.unproxy(self).clock[0].frequency)
+ freq = int(self.clk_domain.unproxy(self).clock[0].frequency)
node.append(FdtPropertyWords("clock-frequency", freq))
# Unique key for this CPU
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/16000
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: I2de6c9906d3bb7616f12ada6728b9e4b1928511c
Gerrit-Change-Number: 16000
Gerrit-PatchSet: 1
Gerrit-Owner: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
