Lisa Hsu [Fri, 6 Oct 2006 04:42:39 +0000 (00:42 -0400)]
add an option for defining a directory in which to place all your checkpoints. if none, default is cwd.
--HG--
extra : convert_revision :
23a602c2d800c922346c9743cc0c583d178a0ee7
Lisa Hsu [Fri, 6 Oct 2006 04:39:49 +0000 (00:39 -0400)]
Merge zizzer:/bk/newmem
into zizzer.eecs.umich.edu:/z/hsul/newmem
--HG--
extra : convert_revision :
ecf61b323a93c9192450388c8812c26b919d06cb
Lisa Hsu [Fri, 6 Oct 2006 04:39:21 +0000 (00:39 -0400)]
update full system references for newest disk image from linux-dist.
--HG--
extra : convert_revision :
c1232dafff0d92d8041af1b9de1dc8c55ee50f40
Nathan Binkert [Fri, 6 Oct 2006 04:16:42 +0000 (21:16 -0700)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into iceaxe.:/Volumes/work/research/m5/incoming
--HG--
extra : convert_revision :
b4d6a36ee07d858829369027127e00a2aec097fd
Nathan Binkert [Fri, 6 Oct 2006 04:14:43 +0000 (21:14 -0700)]
remove traces of binning
--HG--
extra : convert_revision :
b33cc67cfde04c9af6f50cbef538104e1298bedc
Lisa Hsu [Thu, 5 Oct 2006 17:18:32 +0000 (13:18 -0400)]
fix the argument to m5.simulate() on a checkpoint.
src/sim/stat_control.cc:
add curTick to reset stats printf.
--HG--
extra : convert_revision :
da8cf5921e81b73f47d6831d539ca1fbdace3d1d
Nathan Binkert [Thu, 5 Oct 2006 10:37:43 +0000 (03:37 -0700)]
Static global object don't work well, if the variables are
accessed during the construction of another static global
object because there are no guarantees on ordering of
construction, so stick the static global into a function
as a static local and return a reference to the variable.
This fixes the exit callback stuff on my Mac.
--HG--
extra : convert_revision :
63a3844d0b5ee18e2011f1bc7ca7bb703284da94
Kevin Lim [Mon, 2 Oct 2006 22:13:42 +0000 (18:13 -0400)]
Oops, forgot to assign the option to the param context.
--HG--
extra : convert_revision :
022c3efaa3ade3fca3dfe554ececa4eeb396dc9c
Kevin Lim [Mon, 2 Oct 2006 22:12:21 +0000 (18:12 -0400)]
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
--HG--
extra : convert_revision :
1010a4ee8e1abec0e8290637feee523ca9ef9a9b
Kevin Lim [Mon, 2 Oct 2006 22:10:10 +0000 (18:10 -0400)]
Be sure to set progress interval.
--HG--
extra : convert_revision :
793ca7d6af1deedf6b1fb4676288b11114f583a6
Kevin Lim [Mon, 2 Oct 2006 16:06:30 +0000 (12:06 -0400)]
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem
--HG--
extra : convert_revision :
9bfd96dfbd1d58d56ceaf0e266807c31cb578c34
Kevin Lim [Mon, 2 Oct 2006 16:04:24 +0000 (12:04 -0400)]
Add in ability to start a trace at a specific cycle.
--HG--
extra : convert_revision :
54098f3974d2a05d60e57113f7ceb46cb7a26672
Kevin Lim [Mon, 2 Oct 2006 15:58:09 +0000 (11:58 -0400)]
Updates to fix merge issues and bring almost everything up to working speed. Ozone CPU remains untested, but everything else compiles and runs.
src/arch/alpha/isa_traits.hh:
This got changed to the wrong version by accident.
src/cpu/base.cc:
Fix up progress event to not schedule itself if the interval is set to 0.
src/cpu/base.hh:
Fix up the CPU Progress Event to not print itself if it's set to 0. Also remove stats_reset_inst (something I added to m5 but isn't necessary here).
src/cpu/base_dyn_inst.hh:
src/cpu/checker/cpu.hh:
Remove float variable of instResult; it's always held within the double part now.
src/cpu/checker/cpu_impl.hh:
Use thread and not cpuXC.
src/cpu/o3/alpha/cpu_builder.cc:
src/cpu/o3/checker_builder.cc:
src/cpu/ozone/checker_builder.cc:
src/cpu/ozone/cpu_builder.cc:
src/python/m5/objects/BaseCPU.py:
Remove stats_reset_inst.
src/cpu/o3/commit_impl.hh:
src/cpu/ozone/lw_back_end_impl.hh:
Get TC, not XCProxy.
src/cpu/o3/cpu.cc:
Switch out updates from the version of m5 I have. Also remove serialize code that got added twice.
src/cpu/o3/iew_impl.hh:
src/cpu/o3/lsq_impl.hh:
src/cpu/thread_state.hh:
Remove code that was added twice.
src/cpu/o3/lsq_unit.hh:
Add back in stats that got lost in the merge.
src/cpu/o3/lsq_unit_impl.hh:
Use proper method to get flags. Also wake CPU if we're coming back from a cache miss.
src/cpu/o3/thread_context_impl.hh:
src/cpu/o3/thread_state.hh:
Support profiling.
src/cpu/ozone/cpu.hh:
Update to use proper typename.
src/cpu/ozone/cpu_impl.hh:
src/cpu/ozone/dyn_inst_impl.hh:
Updates for newmem.
src/cpu/ozone/lw_lsq_impl.hh:
Get flags correctly.
src/cpu/ozone/thread_state.hh:
Reorder constructor initialization, use tc.
src/sim/pseudo_inst.cc:
Allow for loading of symbol file. Be sure to use ThreadContext and not ExecContext.
--HG--
extra : convert_revision :
c5657f84155807475ab4a1e20d944bb6f0d79d94
Steve Reinhardt [Sun, 1 Oct 2006 05:42:18 +0000 (01:42 -0400)]
Move Python setup into Configure section so we can test whether the
setup is correct and provide meeaningful error messages when it's not.
Also fix for building on Cygwin where python lib is in /bin and not /lib.
--HG--
extra : convert_revision :
7a29ba17463de60c72b3d8b04e4c4f81fc64bf61
Kevin Lim [Sun, 1 Oct 2006 03:43:23 +0000 (23:43 -0400)]
Merge ktlim@zamp:./local/clean/o3-merge/m5
into zamp.eecs.umich.edu:/z/ktlim2/clean/o3-merge/newmem
configs/boot/micro_memlat.rcS:
configs/boot/micro_tlblat.rcS:
src/arch/alpha/ev5.cc:
src/arch/alpha/isa/decoder.isa:
src/arch/alpha/isa_traits.hh:
src/cpu/base.cc:
src/cpu/base.hh:
src/cpu/base_dyn_inst.hh:
src/cpu/checker/cpu.hh:
src/cpu/checker/cpu_impl.hh:
src/cpu/o3/alpha/cpu_impl.hh:
src/cpu/o3/alpha/params.hh:
src/cpu/o3/checker_builder.cc:
src/cpu/o3/commit_impl.hh:
src/cpu/o3/cpu.cc:
src/cpu/o3/decode_impl.hh:
src/cpu/o3/fetch_impl.hh:
src/cpu/o3/iew.hh:
src/cpu/o3/iew_impl.hh:
src/cpu/o3/inst_queue.hh:
src/cpu/o3/lsq.hh:
src/cpu/o3/lsq_impl.hh:
src/cpu/o3/lsq_unit.hh:
src/cpu/o3/lsq_unit_impl.hh:
src/cpu/o3/regfile.hh:
src/cpu/o3/rename_impl.hh:
src/cpu/o3/thread_state.hh:
src/cpu/ozone/checker_builder.cc:
src/cpu/ozone/cpu.hh:
src/cpu/ozone/cpu_impl.hh:
src/cpu/ozone/front_end.hh:
src/cpu/ozone/front_end_impl.hh:
src/cpu/ozone/lw_back_end.hh:
src/cpu/ozone/lw_back_end_impl.hh:
src/cpu/ozone/lw_lsq.hh:
src/cpu/ozone/lw_lsq_impl.hh:
src/cpu/ozone/thread_state.hh:
src/cpu/simple/base.cc:
src/cpu/simple_thread.cc:
src/cpu/simple_thread.hh:
src/cpu/thread_state.hh:
src/dev/ide_disk.cc:
src/python/m5/objects/O3CPU.py:
src/python/m5/objects/Root.py:
src/python/m5/objects/System.py:
src/sim/pseudo_inst.cc:
src/sim/pseudo_inst.hh:
src/sim/system.hh:
util/m5/m5.c:
Hand merge.
--HG--
rename : arch/alpha/ev5.cc => src/arch/alpha/ev5.cc
rename : arch/alpha/freebsd/system.cc => src/arch/alpha/freebsd/system.cc
rename : arch/alpha/isa/decoder.isa => src/arch/alpha/isa/decoder.isa
rename : arch/alpha/isa/mem.isa => src/arch/alpha/isa/mem.isa
rename : arch/alpha/isa_traits.hh => src/arch/alpha/isa_traits.hh
rename : arch/alpha/linux/system.cc => src/arch/alpha/linux/system.cc
rename : arch/alpha/system.cc => src/arch/alpha/system.cc
rename : arch/alpha/tru64/system.cc => src/arch/alpha/tru64/system.cc
rename : cpu/base.cc => src/cpu/base.cc
rename : cpu/base.hh => src/cpu/base.hh
rename : cpu/base_dyn_inst.hh => src/cpu/base_dyn_inst.hh
rename : cpu/checker/cpu.hh => src/cpu/checker/cpu.hh
rename : cpu/checker/cpu.cc => src/cpu/checker/cpu_impl.hh
rename : cpu/o3/alpha_cpu_builder.cc => src/cpu/o3/alpha/cpu_builder.cc
rename : cpu/checker/o3_cpu_builder.cc => src/cpu/o3/checker_builder.cc
rename : cpu/o3/commit_impl.hh => src/cpu/o3/commit_impl.hh
rename : cpu/o3/cpu.cc => src/cpu/o3/cpu.cc
rename : cpu/o3/fetch_impl.hh => src/cpu/o3/fetch_impl.hh
rename : cpu/o3/iew.hh => src/cpu/o3/iew.hh
rename : cpu/o3/iew_impl.hh => src/cpu/o3/iew_impl.hh
rename : cpu/o3/inst_queue.hh => src/cpu/o3/inst_queue.hh
rename : cpu/o3/inst_queue_impl.hh => src/cpu/o3/inst_queue_impl.hh
rename : cpu/o3/lsq_impl.hh => src/cpu/o3/lsq_impl.hh
rename : cpu/o3/lsq_unit.hh => src/cpu/o3/lsq_unit.hh
rename : cpu/o3/lsq_unit_impl.hh => src/cpu/o3/lsq_unit_impl.hh
rename : cpu/o3/mem_dep_unit_impl.hh => src/cpu/o3/mem_dep_unit_impl.hh
rename : cpu/o3/rename.hh => src/cpu/o3/rename.hh
rename : cpu/o3/rename_impl.hh => src/cpu/o3/rename_impl.hh
rename : cpu/o3/thread_state.hh => src/cpu/o3/thread_state.hh
rename : cpu/o3/tournament_pred.cc => src/cpu/o3/tournament_pred.cc
rename : cpu/o3/tournament_pred.hh => src/cpu/o3/tournament_pred.hh
rename : cpu/checker/cpu_builder.cc => src/cpu/ozone/checker_builder.cc
rename : cpu/ozone/cpu.hh => src/cpu/ozone/cpu.hh
rename : cpu/ozone/cpu_builder.cc => src/cpu/ozone/cpu_builder.cc
rename : cpu/ozone/cpu_impl.hh => src/cpu/ozone/cpu_impl.hh
rename : cpu/ozone/front_end.hh => src/cpu/ozone/front_end.hh
rename : cpu/ozone/front_end_impl.hh => src/cpu/ozone/front_end_impl.hh
rename : cpu/ozone/inorder_back_end_impl.hh => src/cpu/ozone/inorder_back_end_impl.hh
rename : cpu/ozone/inst_queue_impl.hh => src/cpu/ozone/inst_queue_impl.hh
rename : cpu/ozone/lw_back_end.hh => src/cpu/ozone/lw_back_end.hh
rename : cpu/ozone/lw_back_end_impl.hh => src/cpu/ozone/lw_back_end_impl.hh
rename : cpu/ozone/lw_lsq.hh => src/cpu/ozone/lw_lsq.hh
rename : cpu/ozone/lw_lsq_impl.hh => src/cpu/ozone/lw_lsq_impl.hh
rename : cpu/ozone/simple_params.hh => src/cpu/ozone/simple_params.hh
rename : cpu/ozone/thread_state.hh => src/cpu/ozone/thread_state.hh
rename : cpu/simple/cpu.cc => src/cpu/simple/base.cc
rename : cpu/cpu_exec_context.cc => src/cpu/simple_thread.cc
rename : cpu/thread_state.hh => src/cpu/thread_state.hh
rename : dev/ide_disk.hh => src/dev/ide_disk.hh
rename : python/m5/objects/BaseCPU.py => src/python/m5/objects/BaseCPU.py
rename : python/m5/objects/AlphaFullCPU.py => src/python/m5/objects/O3CPU.py
rename : python/m5/objects/OzoneCPU.py => src/python/m5/objects/OzoneCPU.py
rename : python/m5/objects/Root.py => src/python/m5/objects/Root.py
rename : python/m5/objects/System.py => src/python/m5/objects/System.py
rename : sim/eventq.hh => src/sim/eventq.hh
rename : sim/pseudo_inst.cc => src/sim/pseudo_inst.cc
rename : sim/pseudo_inst.hh => src/sim/pseudo_inst.hh
rename : sim/serialize.cc => src/sim/serialize.cc
rename : sim/stat_control.cc => src/sim/stat_control.cc
rename : sim/stat_control.hh => src/sim/stat_control.hh
rename : sim/system.hh => src/sim/system.hh
extra : convert_revision :
135d90e43f6cea89f9460ba4e23f4b0b85886e7d
Kevin Lim [Thu, 28 Sep 2006 04:14:15 +0000 (00:14 -0400)]
Updates to Ozone CPU.
cpu/ozone/cpu_impl.hh:
Be sure to update rename tables.
cpu/ozone/front_end_impl.hh:
Handle serialize instructions slightly differently. This allows front end to continue even if back end hasn't processed it yet.
cpu/ozone/lw_back_end_impl.hh:
Handle stores with faults properly.
cpu/ozone/lw_lsq.hh:
Handle committed stores properly.
cpu/ozone/lw_lsq_impl.hh:
Handle uncacheable loads properly.
--HG--
extra : convert_revision :
093edc2eee890139a9962c97c938575e6d313f09
Kevin Lim [Thu, 28 Sep 2006 04:09:27 +0000 (00:09 -0400)]
Minor changes plus updates to O3.
cpu/base.cc:
Have output message regardless of build.
cpu/checker/cpu_builder.cc:
cpu/checker/o3_cpu_builder.cc:
Be sure to include all parameters.
cpu/o3/cpu.cc:
IEW also needs to switch out.
cpu/o3/iew_impl.hh:
Handle stores with faults properly.
cpu/o3/inst_queue_impl.hh:
Switch out properly, handle squashing properly.
cpu/o3/lsq_unit_impl.hh:
Minor fixes.
cpu/o3/mem_dep_unit_impl.hh:
Make sure mem dep unit is switched out properly.
cpu/o3/rename_impl.hh:
Switch out fix.
--HG--
extra : convert_revision :
b94deb83f724225c01166c84a1b3fdd3543cbe9a
Steve Reinhardt [Tue, 19 Sep 2006 00:12:46 +0000 (17:12 -0700)]
Add CoherenceProtocol object to objects list.
--HG--
extra : convert_revision :
46c14f37906c44100eaf4e7b66b882ff42fed014
Ali Saidi [Tue, 19 Sep 2006 00:12:45 +0000 (20:12 -0400)]
add boiler plate intel nic code
src/SConscript:
add intel nic to sconscript
src/dev/pcidev.cc:
fix bug with subsystemid value
src/python/m5/objects/Ethernet.py:
add intel nic to ethernet.py
src/python/m5/objects/Ide.py:
src/python/m5/objects/Pci.py:
Move config_latency into pci where it belogs
--HG--
extra : convert_revision :
7163aaf7b4098496518b0910cef62f2ce3dd574d
Gabe Black [Sun, 17 Sep 2006 07:46:30 +0000 (03:46 -0400)]
Adding what was tracedump but is now statetrace to the tree. Let me know if statetrace is also already taken.
util/statetrace/Makefile:
Makefile to build statetrace. Targets are:
statetrace: alias to build using the "native" compiler
statetrace-native: use the native compiler
statetrace-sparc: use the sparc cross compiler
I'll make this a little more fancy and capable later.
util/statetrace/arch/tracechild_i386.cc:
Implementation of i386 support
util/statetrace/arch/tracechild_i386.hh:
Declaration of i386 support
util/statetrace/arch/tracechild_sparc.cc:
implementation of SPARC support
util/statetrace/arch/tracechild_sparc.hh:
declaration of SPARC support
util/statetrace/printer.cc:
Implementation of the "Printer" objects which parse and output the state of the process after each instruction. There are currently two types of printers, nested ones and register ones. These are called NestingPrinter and RegPrinter respectively.
util/statetrace/printer.hh:
Declaration of "Printer" objects
util/statetrace/refcnt.hh:
This is copied from m5. I should use the one already in the tree, but I'll do that later.
util/statetrace/regstate.hh:
Interface for accessing registers.
util/statetrace/statetrace.cc:
Main file with argument parsing and the "main" function which contains the tracing loop.
util/statetrace/tracechild.cc:
Implementation of the base tracechild class.
util/statetrace/tracechild.hh:
Declaration of the base tracechild class.
util/statetrace/tracechild_arch.cc:
This file hooks in support for the appropriate architecture. Just the implementation is brought in, since the main program should ideally not have to know anything at all about an architecture other than it's interface.
util/statetrace/x86.format:
An example output template for x86. A few example SPARC templates will be added later.
--HG--
extra : convert_revision :
7c8bf8230907aba42ed1e707b9ca2d6da0d4e6d4
Gabe Black [Sun, 17 Sep 2006 07:00:55 +0000 (03:00 -0400)]
Finished changing how stat structures are translated, fixed the handling of various ids as LiveProcess parameters.
src/arch/alpha/linux/process.cc:
src/arch/alpha/linux/process.hh:
src/arch/alpha/process.cc:
src/arch/alpha/process.hh:
src/arch/alpha/tru64/process.cc:
src/arch/alpha/tru64/process.hh:
src/arch/mips/linux/process.cc:
src/arch/mips/linux/process.hh:
src/arch/mips/process.cc:
src/arch/mips/process.hh:
src/arch/sparc/linux/process.cc:
src/arch/sparc/linux/process.hh:
src/arch/sparc/process.cc:
src/arch/sparc/process.hh:
src/arch/sparc/solaris/process.cc:
src/arch/sparc/solaris/process.hh:
src/sim/process.cc:
src/sim/process.hh:
src/sim/syscall_emul.cc:
src/sim/syscall_emul.hh:
Changed Process to LiveProcess in syscall handlers and fixed the implementation of uid, euid, gid, egid, pid and ppid as LiveProcess parameters.
src/kern/tru64/tru64.hh:
Changed Process to LiveProcess in syscall handlers and fixed the implementation of uid, euid, gid, egid, pid and ppid as LiveProcess parameters. Also fit tru64 in with the new way to handle stat calls.
--HG--
extra : convert_revision :
0198b838e5c09a730065dc6f018738145bc96269
Gabe Black [Sat, 16 Sep 2006 01:43:12 +0000 (21:43 -0400)]
Changes to correct stat behavior
--HG--
extra : convert_revision :
43e5788105738aebd79acb05301bb7da68bfe129
Gabe Black [Fri, 15 Sep 2006 04:59:39 +0000 (00:59 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision :
91aacb435c223e8c37f6ba0a458b0dee55edcaf2
Ali Saidi [Mon, 11 Sep 2006 21:57:30 +0000 (17:57 -0400)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision :
14ac24236ff65b7e489c1ce4b4e9a295966013b8
Ali Saidi [Mon, 11 Sep 2006 21:57:20 +0000 (17:57 -0400)]
add annotation code to m5
configs/common/Benchmarks.py:
add annotate test app
src/SConscript:
add annotate.cc to lis
src/arch/alpha/isa/decoder.isa:
add annotate instructions
src/base/traceflags.py:
Add annotate trace flag
src/sim/pseudo_inst.cc:
src/sim/pseudo_inst.hh:
add annotate pseudo ops
util/m5/m5op.S:
util/m5/m5op.h:
add anotate ops
--HG--
extra : convert_revision :
7f965c0d84e41ce34f2ec8ec27a009276d67d8d6
Steve Reinhardt [Fri, 8 Sep 2006 23:22:25 +0000 (19:22 -0400)]
Added cscope-find.py utility to generate file list for cscope.
--HG--
extra : convert_revision :
80f2db90f1c2406039d0447b84aa0442b7b974f8
Steve Reinhardt [Fri, 8 Sep 2006 23:10:11 +0000 (19:10 -0400)]
Add support for assigning lists of ports or proxies to VectorPorts.
Includes support for printing readable VectorPort and Proxy names
(via __str__).
--HG--
extra : convert_revision :
c48534a498b3036fe6ac45ff1606656546c79afb
Steve Reinhardt [Thu, 7 Sep 2006 06:07:06 +0000 (02:07 -0400)]
Update port numbers from new unproxy ordering.
--HG--
extra : convert_revision :
514d2c53bd6afa6bea43c37c1242b6775e86c556
Steve Reinhardt [Thu, 7 Sep 2006 05:37:35 +0000 (22:37 -0700)]
Try to make unproxy order more deterministic.
--HG--
extra : convert_revision :
0bc543014dced6dfed4122d4c1b8f22e6c8d7a13
Steve Reinhardt [Wed, 6 Sep 2006 22:36:50 +0000 (15:36 -0700)]
Delete some output files that never should have been
committed.
--HG--
extra : convert_revision :
29780a4cc82dc397681a2b4a61eaa658e6eed83e
Steve Reinhardt [Wed, 6 Sep 2006 05:04:34 +0000 (22:04 -0700)]
Enable proxies (Self/Parent) for specifying ports.
Significant revamp of Port code.
Some cleanup of SimObject code too, particularly to
make the SimObject and MetaSimObject implementations of
__setattr__ more consistent.
Unproxy code split out of print_ini().
src/python/m5/multidict.py:
Make get() return None by default, to match semantics
of built-in dictionary objects.
--HG--
extra : convert_revision :
db73b6cdd004a82a08b2402afd1e16544cb902a4
Steve Reinhardt [Tue, 5 Sep 2006 20:24:47 +0000 (16:24 -0400)]
Update reference config.ini files to include port mappings.
--HG--
extra : convert_revision :
f9e91a60fa09b707d2a26be57f265b7ab1c07263
Steve Reinhardt [Tue, 5 Sep 2006 19:22:47 +0000 (12:22 -0700)]
Print ports in config.ini as well.
--HG--
extra : convert_revision :
703d3a57250613315735709de8f40a9956cee6e2
Steve Reinhardt [Tue, 5 Sep 2006 00:14:07 +0000 (17:14 -0700)]
More Python hacking to deal with config.py split
and resulting recursive import trickiness.
--HG--
extra : convert_revision :
1ea93861eb8d260c9f3920dda0b8106db3e03705
Steve Reinhardt [Mon, 4 Sep 2006 17:52:26 +0000 (10:52 -0700)]
Split config.py into multiple files.
Some tweaking to deal with mutually recursive imports.
--HG--
rename : src/python/m5/config.py => src/python/m5/SimObject.py
extra : convert_revision :
166f7bfabfd20100e93d26a89382469465859988
Steve Reinhardt [Mon, 4 Sep 2006 17:40:33 +0000 (10:40 -0700)]
config.py:
Import of changes for auto-generation of C++ param structs
from my old m5 working directory.
This code is *broken* because pieces need to be shuffled around
to satisfy name dependencies, but that really messes up the
diff, so I want to make an intermediate commit here.
src/python/m5/config.py:
Import of changes for auto-generation of C++ param structs
from my old m5 working directory.
This code is *broken* because pieces need to be shuffled around
to satisfy name dependencies, but that really messes up the
diff, so I want to make an intermediate commit here.
--HG--
extra : convert_revision :
cb25ee1f4f77d1902511ee9aa766403733dd8841
Gabe Black [Sun, 3 Sep 2006 06:12:11 +0000 (02:12 -0400)]
Made system calls use the uid, etc parameters from the live process.
--HG--
extra : convert_revision :
2aadb87b4602324423aadb903010f5b49fcef41b
Gabe Black [Sun, 3 Sep 2006 06:10:05 +0000 (02:10 -0400)]
Fix up the parameters to getInstRecord
--HG--
extra : convert_revision :
0fac43035a2510d3a3f596d3d8f57193045570f6
Gabe Black [Sun, 3 Sep 2006 06:09:25 +0000 (02:09 -0400)]
Make the ASI constants available to the decoder.
--HG--
extra : convert_revision :
65f2e02ce8f5e4f0c8727ebf16c927c7a6a4fe7f
Gabe Black [Sun, 3 Sep 2006 06:08:24 +0000 (02:08 -0400)]
Make the auxiliary vectors use the uid, euid, gid and egid parameters from the live process
--HG--
extra : convert_revision :
945b5883a15a6df35709edea2731f54a2448e418
Gabe Black [Sun, 3 Sep 2006 06:05:44 +0000 (02:05 -0400)]
Fixing up parameters of getInstRecord
--HG--
extra : convert_revision :
4ce06ac4f7d135cc04b39cf0e957a2539c7e946d
Gabe Black [Sun, 3 Sep 2006 06:04:25 +0000 (02:04 -0400)]
Added uid, euid, gid, egid, pid and ppid parameters to a live process.
--HG--
extra : convert_revision :
2101be8000bcdaf683730cfc079b4b78e34365d0
Gabe Black [Sun, 3 Sep 2006 06:02:56 +0000 (02:02 -0400)]
A quick fix to isolate the tracing code to SPARC
--HG--
extra : convert_revision :
90c77f4d01101cad55f60d528b2a8be92d2f9aba
Steve Reinhardt [Sat, 2 Sep 2006 15:20:54 +0000 (08:20 -0700)]
regress:
Clean up help output.
util/regress:
Clean up help output.
--HG--
extra : convert_revision :
8375d58a9d72e1871a15690991dc8fc60d47a2b3
Steve Reinhardt [Sat, 2 Sep 2006 00:12:43 +0000 (17:12 -0700)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into vm1.(none):/home/stever/bk/newmem-head
--HG--
extra : convert_revision :
8b0fbb6b1ea38d01d048381f18fd95ab63c4c0f1
Steve Reinhardt [Sat, 2 Sep 2006 00:11:50 +0000 (20:11 -0400)]
Get rid of extra stuff in util/regress only needed by cron job,
to make it more usable by regular folks.
util/regress:
Get rid of extra stuff only needed by cron job,
to make it more usable by regular folks.
--HG--
extra : convert_revision :
e113c05af5eec846db526d734cce8ff66aa95d72
Steve Reinhardt [Fri, 1 Sep 2006 21:59:36 +0000 (17:59 -0400)]
Add o3-timing configuration for ALPHA_SE "Hello world" tests.
build_opts/ALPHA_SE:
Add O3CPU to default CPU model list.
tests/SConscript:
Add o3-timing configuration.
--HG--
extra : convert_revision :
378feacc07cefdaf1e2df9080c9b9d5d71e4d2a1
Steve Reinhardt [Fri, 1 Sep 2006 20:27:24 +0000 (16:27 -0400)]
diff-out:
Don't consider it a success if no stats at all were found.
tests/diff-out:
Don't consider it a success if no stats at all were found.
--HG--
extra : convert_revision :
733f10abdf17d1f7eeca912f84f3df37e56fe510
Steve Reinhardt [Fri, 1 Sep 2006 16:59:48 +0000 (12:59 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
--HG--
extra : convert_revision :
54c63c9a8c7146bb45ecfa9a177ab0bda9541d1b
Steve Reinhardt [Fri, 1 Sep 2006 00:58:46 +0000 (17:58 -0700)]
Tweak proxy resolution error message.
--HG--
extra : convert_revision :
3b186209515975be0d8bc9acc214425adcaa16f2
Korey Sewell [Fri, 1 Sep 2006 00:51:30 +0000 (20:51 -0400)]
add ISA_HAS_DELAY_SLOT directive instead of "#if THE_ISA == ALPHA_ISA" throughout CPU models
src/arch/alpha/isa_traits.hh:
src/arch/mips/isa_traits.hh:
src/arch/sparc/isa_traits.hh:
define 'ISA_HAS_DELAY_SLOT'
src/cpu/base_dyn_inst.hh:
src/cpu/o3/bpred_unit_impl.hh:
src/cpu/o3/commit_impl.hh:
src/cpu/o3/cpu.cc:
src/cpu/o3/cpu.hh:
src/cpu/o3/decode_impl.hh:
src/cpu/o3/fetch_impl.hh:
src/cpu/o3/iew_impl.hh:
src/cpu/o3/inst_queue_impl.hh:
src/cpu/o3/rename_impl.hh:
src/cpu/simple/base.cc:
use ISA_HAS_DELAY_SLOT instead of THE_ISA == ALPHA_ISA
--HG--
extra : convert_revision :
24c7460d9391e8d443c9fe08e17c331ae8e9c36a
Steve Reinhardt [Wed, 30 Aug 2006 23:24:26 +0000 (16:24 -0700)]
Move more common functionality into SimpleTimingPort,
allowing derived classes to be simplified.
--HG--
extra : convert_revision :
c980d3aec5e6c044d8f41e96252726fe9a256605
Gabe Black [Wed, 30 Aug 2006 23:08:24 +0000 (19:08 -0400)]
Change the cpu pointer in the InstRecord object to a thread context pointer.
--HG--
extra : convert_revision :
7efb2680cef4219281b94d680a4a7c75c123f89d
Gabe Black [Wed, 30 Aug 2006 22:33:47 +0000 (18:33 -0400)]
Forgot some commas
--HG--
extra : convert_revision :
d178c87ba156be6302f871f1ab1030889586168f
Steve Reinhardt [Wed, 30 Aug 2006 16:57:46 +0000 (09:57 -0700)]
Minor include file & formatting cleanup.
--HG--
extra : convert_revision :
fa23563b2897687752379d63ddab5cccb92484ba
Steve Reinhardt [Tue, 29 Aug 2006 21:36:35 +0000 (14:36 -0700)]
Add FULL_SYSTEM check to example/fs.py.
--HG--
extra : convert_revision :
4cab46e73f29d2c9d24d9c0c847d598bf6d5c389
Steve Reinhardt [Tue, 29 Aug 2006 21:14:29 +0000 (14:14 -0700)]
Add missing cpu mem param to example/se.py.
configs/example/se.py:
Add missing cpu mem param.
--HG--
extra : convert_revision :
29a11b09524612f079b8998e99b8f5ee8c67c8a6
Gabe Black [Tue, 29 Aug 2006 20:08:56 +0000 (16:08 -0400)]
ASI constants.
--HG--
extra : convert_revision :
888024c9f7e909fa377de6d67a41ea1d4cf9945a
Gabe Black [Tue, 29 Aug 2006 20:07:22 +0000 (16:07 -0400)]
Set both xcc.c and icc.c on return from a syscall.
--HG--
extra : convert_revision :
9c2b32d735b816021cdd3af24002f309e22a8d64
Gabe Black [Tue, 29 Aug 2006 20:06:27 +0000 (16:06 -0400)]
Don't store if there's a fault.
--HG--
extra : convert_revision :
fc852bee572b36daab7a34ee1820f856ccd71ca5
Gabe Black [Tue, 29 Aug 2006 20:04:28 +0000 (16:04 -0400)]
Extended the reg delta output.
--HG--
extra : convert_revision :
61c714a8c4faeb30d784b1ef1da0295474b8dc45
Gabe Black [Tue, 29 Aug 2006 20:02:54 +0000 (16:02 -0400)]
Fiddled with the floating point accessors.
--HG--
extra : convert_revision :
78cbd0c28d3fa1109eb2eacaf2a8009f13158a9b
Gabe Black [Tue, 29 Aug 2006 06:40:24 +0000 (02:40 -0400)]
Cleaned up floating point by removing unnecessary conversions and by implementing faligndata more correctly.
--HG--
extra : convert_revision :
44e778ce8f8d8606b6a50f3f12f0b87e1bf0ed66
Steve Reinhardt [Mon, 28 Aug 2006 18:17:49 +0000 (11:17 -0700)]
Clean up BAR setting code.
--HG--
extra : convert_revision :
8378be6cd6f55af7a199296cb2ff61ee94849bf7
Steve Reinhardt [Mon, 28 Aug 2006 18:01:25 +0000 (11:01 -0700)]
Get rid of unneeded union.
Verify that BAR sizes are powers of two.
--HG--
extra : convert_revision :
ce8dca07aaf1a340cc166b99b5858613a954e2fd
Steve Reinhardt [Mon, 28 Aug 2006 17:34:15 +0000 (10:34 -0700)]
Get rid of unused BARAddrs[] in PciConfigData object.
--HG--
extra : convert_revision :
a82e05326ca6150c70cb288b28f9f6eee89ad93d
Steve Reinhardt [Mon, 28 Aug 2006 17:28:31 +0000 (10:28 -0700)]
Cleanup: formatting, comments, DPRINTFs.
--HG--
extra : convert_revision :
565ab099f1c0744a13959e721c19dd03b7630f04
Steve Reinhardt [Mon, 28 Aug 2006 16:58:03 +0000 (09:58 -0700)]
Fix remote gdb buffer overflow.
--HG--
extra : convert_revision :
e5e5206bdd48120cebcb1e339b1dab2e10f4b6cf
Steve Reinhardt [Mon, 28 Aug 2006 16:55:13 +0000 (09:55 -0700)]
Make address formats consistent in DPRINTFs.
--HG--
extra : convert_revision :
73c6616aa9228c08e21fcc134dd0e675cd57aee6
Steve Reinhardt [Mon, 28 Aug 2006 16:48:31 +0000 (09:48 -0700)]
Fix command for new options processing.
--HG--
extra : convert_revision :
49eee05a6deddae378013f7c2117eabe621b69d9
Steve Reinhardt [Mon, 28 Aug 2006 14:39:56 +0000 (07:39 -0700)]
Add dup() support (from Antti Miettinen).
--HG--
extra : convert_revision :
72c834666afa3c353da026617ad5e7a762eb645f
Steve Reinhardt [Fri, 25 Aug 2006 19:17:25 +0000 (15:17 -0400)]
Update for 2.0 beta 1 patch 1
--HG--
extra : convert_revision :
01c1a993bc111127e7bd51564e8c9a8adbeaffd4
Steve Reinhardt [Fri, 25 Aug 2006 17:04:21 +0000 (13:04 -0400)]
Update for new regression test structure.
--HG--
extra : convert_revision :
f533bc237710c2c634a20e51733f66f9f5dd0929
Kevin Lim [Thu, 24 Aug 2006 22:01:07 +0000 (18:01 -0400)]
Updates to configs to support various sampling forms, truncated execution forms.
--HG--
extra : convert_revision :
a6cf77f6c902e5f4f0a96206093d123eec2e0167
Kevin Lim [Thu, 24 Aug 2006 21:51:35 +0000 (17:51 -0400)]
Stats updates.
dev/ide_disk.cc:
dev/ide_disk.hh:
Add in stats.
sim/stat_control.cc:
sim/stat_control.hh:
Allow setup event to be called with a specific queue.
--HG--
extra : convert_revision :
9310b132b70f967a198cb2e646433f3a5332671e
Kevin Lim [Thu, 24 Aug 2006 21:47:24 +0000 (17:47 -0400)]
Updated sampler stuff.
--HG--
extra : convert_revision :
36c9777550f74910057dd48f4aeba686341a44e1
Kevin Lim [Thu, 24 Aug 2006 21:45:04 +0000 (17:45 -0400)]
Ozone updates.
cpu/ozone/front_end.hh:
cpu/ozone/front_end_impl.hh:
cpu/ozone/lw_back_end.hh:
Support latency for Ozone FE and BE.
cpu/ozone/lw_back_end_impl.hh:
Support latency for Ozone FE and BE.
Also fixes for switching out, profiling.
cpu/ozone/lw_lsq.hh:
cpu/ozone/lw_lsq_impl.hh:
Fixes for switching out.
cpu/ozone/simple_params.hh:
Updated parameters.
--HG--
extra : convert_revision :
21d4846a59a2239bfdf8fe92e47fd0972debe4f5
Kevin Lim [Thu, 24 Aug 2006 21:43:08 +0000 (17:43 -0400)]
Support profiling.
--HG--
extra : convert_revision :
eab02dea68442bd3f8c5d1d16b7f93f43cbda2a5
Kevin Lim [Thu, 24 Aug 2006 21:29:34 +0000 (17:29 -0400)]
Switch out fixups for the CPUs.
cpu/cpu_exec_context.cc:
Be sure to switch over the kernel stats so things don't get messed up. This may lead to weird stats files for sampling runs (detailed stats should be correct, regardless of which kernel stats this is defined on).
cpu/o3/cpu.cc:
Updates for switching out. Also include a bunch of debug info if needed.
cpu/o3/fetch_impl.hh:
Switch out properly.
cpu/o3/inst_queue.hh:
cpu/o3/inst_queue_impl.hh:
Comment out unused stats (they made the stats file huge).
cpu/o3/lsq_unit.hh:
cpu/o3/lsq_unit_impl.hh:
Add in new stat.
cpu/o3/rename.hh:
Fix up for switching out.
cpu/o3/rename_impl.hh:
Fix up for switching out. Be sure to mark any Misc regs as ready if their renamed inst got squashed from being switched out.
cpu/ozone/cpu_impl.hh:
cpu/simple/cpu.cc:
Switch out fixup.
sim/eventq.hh:
Make CPU switching more immediate.
Also comment out the assertion, as it doesn't apply if we're putting it on an inst-based queue.
--HG--
extra : convert_revision :
f40ed40604738993f061e0c628810ff37a920562
Kevin Lim [Thu, 24 Aug 2006 21:22:31 +0000 (17:22 -0400)]
Update checker.
cpu/checker/cpu.cc:
Print better error messages.
cpu/checker/cpu.hh:
Fix up small bug (similar to Ozone's DynInsts with FPs and float/doubles), output better messages.
--HG--
extra : convert_revision :
0e199b3dbbcdb5917cdfbebb4c5c18e4b9056c86
Kevin Lim [Thu, 24 Aug 2006 20:06:45 +0000 (16:06 -0400)]
Stats reset, profiling stuff.
cpu/base.cc:
Be sure to deschedule the profile event so it doesn't take profiles while the CPU is switched out.
Also include the option to reset stats at a specific instruction.
cpu/base.hh:
Include the option to reset stats at a specific instruction.
cpu/checker/cpu_builder.cc:
Handle stats reset inst.
cpu/o3/alpha_cpu_builder.cc:
Handle stats reset inst, allow for profiling.
cpu/ozone/cpu_builder.cc:
Handle profiling, stats reset event, slightly different parameters.
python/m5/objects/BaseCPU.py:
Add in stats reset.
--HG--
extra : convert_revision :
e27a78f7fb8fd19c53d9f2c1e6edce4a98cbafdb
Steve Reinhardt [Thu, 24 Aug 2006 18:31:31 +0000 (14:31 -0400)]
Update a few bogus reference outputs
tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr:
tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt:
tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout:
Update reference outputs
--HG--
extra : convert_revision :
4b7837c90c14f0822b38d36bd821bc9eed316fd0
Kevin Lim [Wed, 23 Aug 2006 20:57:07 +0000 (16:57 -0400)]
Support loading in a symbol file.
arch/alpha/freebsd/system.cc:
arch/alpha/isa/decoder.isa:
arch/alpha/linux/system.cc:
arch/alpha/system.cc:
arch/alpha/tru64/system.cc:
Let symbol files be read in so that profiling can happen on the binaries as well.
python/m5/objects/System.py:
Add in symbol files.
sim/pseudo_inst.cc:
Load in a specified symbol file.
sim/pseudo_inst.hh:
Allow for symbols to be loaded.
sim/system.hh:
Support symbol file.
util/m5/m5.c:
util/m5/m5op.S:
Add support to m5 util for loading symbols (and readfile).
--HG--
extra : convert_revision :
f10c1049bcd7b22b98c73052c0666b964aff222b
Ron Dreslinski [Tue, 22 Aug 2006 20:09:34 +0000 (16:09 -0400)]
Still need LL/SC support in cache, add hack to always return success for now
--HG--
extra : convert_revision :
b354bd91be8c1bbb3aca7b4ba9e7e3e117ced164
Ron Dreslinski [Tue, 22 Aug 2006 20:08:18 +0000 (16:08 -0400)]
Commiting a version of the multi-phase snoop atomic bus so people can see the framework. Doesn't work, but also doesn't break uni-processor systems.
Working on pulling out the changes in the cache so that it remains working.
src/mem/bus.cc:
Changes for multi-phase snoop
Some code for registering snoop ranges (a version that compiles and runs, but does nothing)
src/mem/bus.hh:
Changes for multi-phase snoop
src/mem/packet.hh:
Flag for multi-phase snoop
src/mem/port.hh:
Status for multi-phase snoop
--HG--
extra : convert_revision :
4c2e5263bba16e3bcf03aabe36ff45ec36de4720
Ron Dreslinski [Tue, 22 Aug 2006 15:09:53 +0000 (11:09 -0400)]
Merge zizzer:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem
--HG--
extra : convert_revision :
ccbca1320471d809d25a6359b79d9f2d46c6ce73
Ron Dreslinski [Tue, 22 Aug 2006 15:08:02 +0000 (11:08 -0400)]
Update refs for tru64 with initialized cache stats
--HG--
extra : convert_revision :
708553b57307c353d6a8e403dc1ed4deb6dd2dfb
Gabe Black [Tue, 22 Aug 2006 02:41:57 +0000 (22:41 -0400)]
Fix annulled unconditional branches
--HG--
extra : convert_revision :
698b0ce38c7a47306f97df2cc80cdae4a51b22c7
Gabe Black [Mon, 21 Aug 2006 22:25:34 +0000 (18:25 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision :
46e14792cfd18e4e27935b848c9953a7c44e9334
Steve Reinhardt [Mon, 21 Aug 2006 22:25:33 +0000 (18:25 -0400)]
SConstruct:
Add checks for swig & libz, version check for swig.
Factor out version check code into function, use for mysql too.
SConstruct:
Add checks for swig & libz, version check for swig.
Factor out version check code into function, use for mysql too.
--HG--
extra : convert_revision :
a077d961ae52011141fbf5021b167485f8638139
Gabe Black [Mon, 21 Aug 2006 19:09:18 +0000 (15:09 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision :
15d8fd51f0c70da4d2e52c11864f3ab0f3f62811
Ron Dreslinski [Mon, 21 Aug 2006 19:09:17 +0000 (15:09 -0400)]
Update REFs for statistics patch in cache
--HG--
extra : convert_revision :
8987d3ab62ea4b2fa18ebd40fc980b30561d7e45
Gabe Black [Mon, 21 Aug 2006 18:29:50 +0000 (14:29 -0400)]
Got rid of the aux_data array since it shouldn't have existed.
Added in the filename parameter which is provided for the user space linker.
Fix the ordering and alignment of stack elements.
Made mmap start with the address it has been seen starting with "in the wild"
--HG--
extra : convert_revision :
8734753145f59a6cb433e4f92f43cb28a44b56d4
Gabe Black [Mon, 21 Aug 2006 18:25:51 +0000 (14:25 -0400)]
Fixed the parameters to memset. sizeof(regSegments[x]) may have been returning the size of a pointer to an IntReg
--HG--
extra : convert_revision :
02c04ffceb447b7683ba5ebd4752819d0014cc19
Gabe Black [Mon, 21 Aug 2006 18:23:39 +0000 (14:23 -0400)]
Two bugs found by my tracing tool.
1. alignaddr wrote it's address to a floating point register rather than a gpr.
2. sethi was sign extending it's immediate value.
--HG--
extra : convert_revision :
9aa30a6485bc4cba916367973b986d439b7c7588
Ron Dreslinski [Mon, 21 Aug 2006 17:20:35 +0000 (13:20 -0400)]
Merge zizzer:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/newmem
src/python/m5/objects/BaseCPU.py:
Merge duplicate change
--HG--
extra : convert_revision :
214e57999ee78aadfc86e1f0b7198ff0d981ce16
Ron Dreslinski [Mon, 21 Aug 2006 17:16:46 +0000 (13:16 -0400)]
Changes so that time in the packet is actually set properly.
src/mem/packet.hh:
Make sure packets set the time parameter correctly.
--HG--
extra : convert_revision :
e381d2789e0aaa1b6c2fbde417b7ba5815deec61
Steve Reinhardt [Mon, 21 Aug 2006 16:31:59 +0000 (12:31 -0400)]
fs.py:
Add temporary cpu.mem parameter settings.
configs/example/fs.py:
Add temporary cpu.mem parameter settings.
--HG--
extra : convert_revision :
d7c2fcd8df8dc809b0511485877b2a85769aaf43
Steve Reinhardt [Mon, 21 Aug 2006 06:13:35 +0000 (23:13 -0700)]
TEST_CPU_MODELS isn't used anymore.
--HG--
extra : convert_revision :
742bda87e79657573cec404b8650fa26d189d1a1
Steve Reinhardt [Mon, 21 Aug 2006 02:48:30 +0000 (22:48 -0400)]
Add Alpha Linux version of "hello world" test.
--HG--
extra : convert_revision :
22cd31c58f18fd92bd61ee4b4a218926f7290045