Partly revert [4f54b0f229b5] and move draining to m5.changeToTiming
Changeset 4f54b0f229b5 removed the call to doDrain in changeToTiming based on the assumption that the system does not need draining when running in atomic mode. This is a false assumption since at least the System class requires the system to be drained before it allows switching of memory modes. This patch reverts that part of the changeset.
This commit is contained in:
parent
3d98119717
commit
7e25052fee
2 changed files with 1 additions and 1 deletions
|
@ -453,7 +453,6 @@ def run(options, root, testsys, cpu_class):
|
||||||
# manually. You DON'T need to resume after just switching
|
# manually. You DON'T need to resume after just switching
|
||||||
# CPUs if you haven't changed anything on the system level.
|
# CPUs if you haven't changed anything on the system level.
|
||||||
|
|
||||||
m5.doDrain(testsys)
|
|
||||||
m5.changeToTiming(testsys)
|
m5.changeToTiming(testsys)
|
||||||
m5.switchCpus(switch_cpu_list)
|
m5.switchCpus(switch_cpu_list)
|
||||||
m5.resume(testsys)
|
m5.resume(testsys)
|
||||||
|
|
|
@ -207,6 +207,7 @@ def changeToTiming(system):
|
||||||
(type(system), objects.Root, objects.System)
|
(type(system), objects.Root, objects.System)
|
||||||
|
|
||||||
if system.getMemoryMode() != objects.params.timing:
|
if system.getMemoryMode() != objects.params.timing:
|
||||||
|
doDrain(system)
|
||||||
print "Changing memory mode to timing"
|
print "Changing memory mode to timing"
|
||||||
system.setMemoryMode(objects.params.timing)
|
system.setMemoryMode(objects.params.timing)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue