a1d208a65d
Merge zizzer:/z/m5/Bitkeeper/newmem into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem
Ron Dreslinski
2006-07-06 15:16:15 -04:00
329e32f8c6
Now timing reads work in single level of cache with simple cpu
Ron Dreslinski
2006-07-06 15:15:37 -04:00
c8a37ce715
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-07-06 14:54:09 -04:00
4b74110071
Merge zizzer:/bk/newmem into zeep.pool:/z/saidi/work/m5.newmem
Ali Saidi
2006-07-06 14:41:09 -04:00
93839380e7
Add default responder to bus Update configuration for new default responder on bus Update to devices to handle their own pci config space without pciconfigall Remove most of pciconfigall, it now is a dumbdevice which gets it's address based on the bus it's supposed to respond for Remove need for pci config space from platform, add registerPciDevice function to prevent more than one device from having same bus:dev:func and interrupt Remove pciconfigspace from pci devices, and py files Add calcConfigAddr that returns address for config space based on bus/dev/function + offset
Ali Saidi
2006-07-06 14:41:01 -04:00
05eef5ee15
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-07-06 13:59:13 -04:00
30c516d51c
Support for draining, and the new method of switching out. Now switching out happens after the pipeline has been drained, deferring the three way handshake to the normal drain mechanism. The calls of switchOut() and takeOverFrom() both take action immediately.
Kevin Lim
2006-07-06 13:59:02 -04:00
8c547d80b1
Change the return value of drain. False means the object wasn't able to drain yet.
Kevin Lim
2006-07-06 13:57:21 -04:00
e60f998e29
Had to add this because for some reason gcc wasnt recognizing "THE_ISA == ALPHA_ISA"... wierd but OK
Korey Sewell
2006-07-06 12:29:34 -04:00
a35898c18d
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3
Korey Sewell
2006-07-06 12:19:29 -04:00
03fa13b27c
Use O3DynInst in cpu_models.py and in static_inst_exec_sigs.hh instead of a specific ISA dyn. inst.
Korey Sewell
2006-07-06 12:18:55 -04:00
eceba1405a
For now using the checkpoint or switchcpu pseudo instructions will return control to Python, returning the cause to be the instruction name. The user's script must then interpret the reason for exiting the simulation loop and handle the action accordingly. This may change in the future.
Kevin Lim
2006-07-05 23:38:11 -04:00
d598061dd6
Remove sampler and serializer. Now they are handled through C++ interacting with Python.
Kevin Lim
2006-07-05 21:14:36 -04:00
b36796914a
Merge zizzer:/bk/newmem into zeep.pool:/z/saidi/work/m5.newmem.head
Ali Saidi
2006-07-05 20:30:45 -04:00
d8fd09cc15
Rename quiesce to drain to avoid confusion with the pseudo instruction.
Kevin Lim
2006-07-05 17:59:33 -04:00
bd26dbdb13
Checker ignores any faults that occur in syscall emulation mode for now.
Kevin Lim
2006-07-05 17:25:37 -04:00
ea9697250c
Fix up some merge problems.
Kevin Lim
2006-07-05 16:54:24 -04:00
b973fae85d
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-07-05 16:08:18 -04:00
ec72f6534c
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
Kevin Lim
2006-07-05 16:01:38 -04:00
ae78c46531
Need to change state upon quiescing.
Kevin Lim
2006-07-05 15:57:02 -04:00
e41fd9cb63
Alphabetize traceflags, rename FullCPUAll flag to O3CPUAll.
Kevin Lim
2006-07-05 15:55:45 -04:00
b0ed531bd8
Split off files that are shared across the O3 and Ozone models.
Kevin Lim
2006-07-05 15:53:22 -04:00
b84103811d
Add some different parameters. The main change is that the writeback count is now limited so that it doesn't overflow the buffer.
Kevin Lim
2006-07-05 15:51:36 -04:00
4201ec84b2
Fix some unset values in the request in the timing CPU. Properly implement the MSHR allocate function.
Ron Dreslinski
2006-07-05 15:13:27 -04:00
c33b5b3fc4
Merge ktlim@zamp:/z/ktlim2/clean/newmem-merge into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
Kevin Lim
2006-07-05 13:22:46 -04:00
f4c5609988
Fix for FS O3CPU compile ... missing forward class declaration/header file after files got split for ISA-independence
Korey Sewell
2006-07-03 12:19:35 -04:00
19083bc4ce
Added hook to check for SMT workloads. SMT is identified by adding a semicolon between the workloads.
Korey Sewell
2006-07-03 01:10:19 -04:00
62961a2916
fix cpu builder to build the correct name...
Korey Sewell
2006-07-01 18:52:02 -04:00
ed821702e0
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3
Korey Sewell
2006-06-30 20:51:07 -04:00
51261196bd
now O3CPU is totally independent of the ISA... all alpha specific stuff is the cpu/o3/alpha directory
Korey Sewell
2006-06-30 20:49:31 -04:00
d9ef772e8d
Make O3CPU model independent of the ISA
Korey Sewell
2006-06-30 19:52:08 -04:00
7a49298134
AtomicSimpleCPU with a cache now runs the hello world! test program. Need to clean up a bunch of flags/hacks in the code. Then onto Timming mode.
Ron Dreslinski
2006-06-30 17:21:58 -04:00
1bdc65b00f
First pass, now compiles with current head of tree. Compile and initialization work, still working on functionality.
Ron Dreslinski
2006-06-30 16:25:35 -04:00
dea1a19b2d
Fix the packet data allocation methods. Small fixes from changesets after my initial work.
Ron Dreslinski
2006-06-30 11:34:27 -04:00
971bb55369
Merge zizzer:/z/m5/Bitkeeper/newmem into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmem
Ron Dreslinski
2006-06-30 10:25:50 -04:00
335fa4bde3
All files compile in the mem directory except cache_builder
Ron Dreslinski
2006-06-30 10:25:25 -04:00
0fbecab797
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-29 21:38:16 -04:00
ad6788493c
Remove function that no longer can be used. We should figure out if we want to allow the m5checkpoint pseudoinstruction or not.
Kevin Lim
2006-06-29 21:34:01 -04:00
77d0c0e28a
Merge ktlim@zamp:/z/ktlim2/clean/newmem-merge into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
Kevin Lim
2006-06-29 19:45:53 -04:00
2416ba606a
Various fixes for the CPU models to support the features that have been moved to python.
Kevin Lim
2006-06-29 19:45:24 -04:00
f64c175f9a
Add in support for quiescing the system, taking checkpoints, restoring from checkpoints, changing memory modes, and switching CPUs.
Kevin Lim
2006-06-29 19:40:12 -04:00
de90be3482
Update the readme to point people to m5.eecs.umich.edu start a new release section in RELEASE_NOTES add AUTHORS file that still needs work
Ali Saidi
2006-06-29 16:52:47 -04:00
eafb5c4936
Still missing prefetch and tags directories as well as cache builder. Some implementation details were left blank still, need to fill them in.
Ron Dreslinski
2006-06-29 16:07:19 -04:00
0d323c753d
More Changes, working towards cache.cc compiling. Headers cleaned up.
Ron Dreslinski
2006-06-28 17:28:33 -04:00
fc281d0b64
Backing in more changsets, getting closer to compile base_cache.cc compiles, continuing on
Ron Dreslinski
2006-06-28 14:35:00 -04:00
ed8564a6b9
Was having difficulty with merging the cache, reverted to an early version and will add back in the patches to make it work soon.
Ron Dreslinski
2006-06-28 11:02:14 -04:00
ecab4b426c
change the page table from map to hash_map and create small cache to to speed up lookups
Ali Saidi
2006-06-27 15:04:11 -04:00
07cd37c48b
Make full CPU handle SE faults
Ali Saidi
2006-06-27 14:59:38 -04:00
88c9b17cb9
Add help strings for options
Ali Saidi
2006-06-27 14:58:46 -04:00
833d80db2d
Fix import command.
Kevin Lim
2006-06-27 13:57:44 -04:00
a23f15641e
Merge zizzer:/bk/newmem into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
Ali Saidi
2006-06-26 17:50:58 -04:00
60454042aa
don't depend on the memory system to return the atomic cpu a multiple of cpu cycles.
Ali Saidi
2006-06-26 17:50:48 -04:00
b1cfe01b57
remove extern "C" from the functions we all from gdb. This isn't requried and trips up GDB sometimes when i thinks the extern name should be mangled, but it isn't
Ali Saidi
2006-06-26 17:49:49 -04:00
d80acd37bd
add python options for input file and command line options for live process
Ali Saidi
2006-06-26 16:50:19 -04:00
c4be6f1e64
add syscall emulation page table fault so we can allocate more stack pages
Ali Saidi
2006-06-26 16:49:05 -04:00
f1a24337a8
Allow ports to be created without a name.
Kevin Lim
2006-06-25 00:24:50 -04:00
4787d357d5
Make OzoneCPU work again in SE/FS.
Kevin Lim
2006-06-25 00:22:41 -04:00
63bdaeedfa
Checker related updates.
Kevin Lim
2006-06-22 23:43:45 -04:00
fa9c774421
Delete old unused files in the Ozone directory.
Kevin Lim
2006-06-22 23:34:37 -04:00
17f870f6d8
Changes to get OzoneCPU to compile once more. The changes largely are fixing up the memory accesses to use ports/Requests/Packets, supporting the splitting off of instantiation of template classes, and handling some of the reorganization that happened.
Kevin Lim
2006-06-22 23:33:26 -04:00
e6c04b1584
Change ThreadState constructor ordering to match the rest of the ThreadStates.
Kevin Lim
2006-06-22 18:10:17 -04:00
6e95bcd333
Misc fixes.
Kevin Lim
2006-06-22 18:09:31 -04:00
9ca5427c03
Split Checker up properly into templated and non-templated definitions.
Kevin Lim
2006-06-22 18:05:12 -04:00
0fc3055e96
Fix to have the static inst exec sigs also dependent on the CPU models used.
Kevin Lim
2006-06-22 18:03:08 -04:00
ca25e70907
use 'tick' instead of 'cycle'
Korey Sewell
2006-06-18 15:58:14 -04:00
d21fa52c09
Merge zizzer.eecs.umich.edu:/bk/newmem into tpx31.:C:/cygwin/home/stever/bk/newmem
Steve Reinhardt
2006-06-18 12:31:24 -04:00
7171811cad
Put sconsign in bulid dir.
Steve Reinhardt
2006-06-18 12:30:24 -04:00
deaf940946
Merge zizzer:/bk/newmem into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
Ali Saidi
2006-06-18 11:10:19 -04:00
69c34554e5
minor device fixups
Ali Saidi
2006-06-18 11:10:08 -04:00
14b9cda9f6
Minor updates.
Kevin Lim
2006-06-17 22:55:00 -04:00
d5b2abab9e
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-17 22:33:40 -04:00
8f0d04cd10
Delete old doxygen docs... now on wiki. Update release scripts for new tree structure.
Steve Reinhardt
2006-06-17 22:28:40 -04:00
bc3d009aba
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-17 22:05:02 -04:00
393e77fbe9
Change options back to just being flags instead of taking in a True/False value.
Kevin Lim
2006-06-17 22:04:48 -04:00
dfe0ea6cba
Fix up code to be able to use the Checker.
Kevin Lim
2006-06-17 22:01:30 -04:00
f3d74759ca
Split off instantiation into separate CC files for each of the models. This makes it easier to be able to specify only certain CPU models.
Kevin Lim
2006-06-17 21:39:25 -04:00
d91f4d172a
include misc.hh for panic
Nathan Binkert
2006-06-17 19:18:53 -04:00
8dfc475a9d
add mac os x fast byte swap code
Ali Saidi
2006-06-17 19:06:28 -04:00
e5d20ad48e
Merge zizzer:/bk/newmem into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
Ali Saidi
2006-06-17 18:44:42 -04:00
174f7753ae
minor header cleanups
Ali Saidi
2006-06-17 18:40:40 -04:00
989562bed9
Merge zizzer.eecs.umich.edu:/bk/newmem into tpx31.:C:/cygwin/home/stever/bk/newmem
Steve Reinhardt
2006-06-17 18:28:21 -04:00
c698c03705
Fixes to compile under Cygwin.
Steve Reinhardt
2006-06-17 18:27:28 -04:00
78ea17ea30
Make the system paths more configurable
Nathan Binkert
2006-06-17 18:14:16 -04:00
cd6da4569e
Merge zizzer.eecs.umich.edu:/bk/newmem into iceaxe.:/Volumes/work/research/m5/newmem
Nathan Binkert
2006-06-17 18:12:44 -04:00
1edb205892
remove byte_swap.hh since it's not used
Ali Saidi
2006-06-17 17:56:33 -04:00
306043f62e
remove profile.cc
Ali Saidi
2006-06-17 17:50:11 -04:00
e76a12834b
Add myself to list of authors
Nathan Binkert
2006-06-17 17:49:38 -04:00
8a12988221
Merge zizzer:/bk/newmem into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
Ali Saidi
2006-06-17 17:17:43 -04:00
d96d28e56d
Rename SWIG "main" module to "cc_main" so it's clear from the Python side that this is the interface to C++.
Steve Reinhardt
2006-06-17 12:08:19 -04:00
4a9c0a7dfc
Add --outdir option. Didn't call it "-d" since that's already being used for "detailed cpu". Needed to add extra function for user script to pass parsed options back to m5 module.
Steve Reinhardt
2006-06-17 09:58:10 -04:00
7efd0eafd8
Minor fixes in comments.
Steve Reinhardt
2006-06-17 09:26:08 -04:00
e889b82423
Add in some of the commonly used Trace/ExeTrace/Debug options.
Kevin Lim
2006-06-16 21:18:19 -04:00
aa1efe3e72
Update this with the same option as single_fs.py
Kevin Lim
2006-06-16 18:04:34 -04:00
4e07f6ca52
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-16 17:53:33 -04:00
0bbd909f02
Reorganization to move FuncUnit, FUDesc, and OpDesc out of the encumbered directory and into the normal cpu directory.
Kevin Lim
2006-06-16 17:52:15 -04:00
def9ea38b5
Add in exec_context.hh, which is a file for documentation purposes only. It describes the ExecContext interface that the ISA uses to access CPU state. Also #ifdef Erik's old copy code from the decoder so ExecContext doesn't need his two specific copy functions.
Kevin Lim
2006-06-16 17:19:36 -04:00
Ron Dreslinski