diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-06-21 20:35:25 +0000 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-06-21 20:35:25 +0000 |
commit | 49490b334af3bc145071a9a81f37012e7693af59 (patch) | |
tree | 7f07517e6d03bc004955f6a40a6c9dd3e02f7488 /tests | |
parent | 470a6a9a74eb28a5052e6492c0a3aa9724c57500 (diff) | |
parent | afd00820004984de085a727e60e25742a69d9c51 (diff) | |
download | gem5-49490b334af3bc145071a9a81f37012e7693af59.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-o3-micro
src/cpu/o3/fetch_impl.hh:
hand merge
--HG--
extra : convert_revision : 3f71f3ac2035eec8b6f7bceb6906edb4dd09c045
Diffstat (limited to 'tests')
-rw-r--r-- | tests/long/10.mcf/test.py | 2 | ||||
-rw-r--r-- | tests/long/20.parser/test.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/long/10.mcf/test.py b/tests/long/10.mcf/test.py index ffe2758f1..cb8acff22 100644 --- a/tests/long/10.mcf/test.py +++ b/tests/long/10.mcf/test.py @@ -29,5 +29,5 @@ m5.AddToPath('../configs/common') from cpu2000 import mcf -workload = mcf(isa, opsys, 'lgred') +workload = mcf(isa, opsys, 'smred') root.system.cpu.workload = workload.makeLiveProcess() diff --git a/tests/long/20.parser/test.py b/tests/long/20.parser/test.py index 82ab71c90..8e745ec26 100644 --- a/tests/long/20.parser/test.py +++ b/tests/long/20.parser/test.py @@ -29,5 +29,5 @@ m5.AddToPath('../configs/common') from cpu2000 import parser -workload = parser(isa, opsys, 'lgred') +workload = parser(isa, opsys, 'mdred') root.system.cpu.workload = workload.makeLiveProcess() |