diff options
| author | Kevin Lim <ktlim@umich.edu> | 2007-03-23 13:20:19 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2007-03-23 13:20:19 -0400 |
| commit | 047f77102b5e5d63549663ee94cd799cdcf63516 (patch) | |
| tree | 3c214a93043533716044b1c61c9d12aba3388c42 /tests | |
| parent | 2c47413a7a4563c724d8470971d1059bdfe01c92 (diff) | |
| parent | 2330adfa28ec39035beab8dae52873ecd0e28889 (diff) | |
| download | gem5-047f77102b5e5d63549663ee94cd799cdcf63516.tar.xz | |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/tmp/clean2
src/cpu/base_dyn_inst.hh:
Hand merge. Line is no longer needed because it's handled in the ISA.
--HG--
extra : convert_revision : 0be4067aa38759a5631c6940f0167d48fde2b680
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/configs/o3-timing.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/configs/o3-timing.py b/tests/configs/o3-timing.py index a66cd436e..5600d9f22 100644 --- a/tests/configs/o3-timing.py +++ b/tests/configs/o3-timing.py @@ -1,4 +1,4 @@ -# Copyright (c) 2006 The Regents of The University of Michigan +# Copyright (c) 2006-2007 The Regents of The University of Michigan # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -37,7 +37,7 @@ class MyCache(BaseCache): mshrs = 10 tgts_per_mshr = 5 -cpu = DerivO3CPU() +cpu = DerivO3CPU(cpu_id=0) cpu.addTwoLevelCacheHierarchy(MyCache(size = '128kB'), MyCache(size = '256kB'), MyCache(size = '2MB')) |