Steve Reinhardt [Wed, 29 Oct 2003 22:46:12 +0000 (14:46 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG--
extra : convert_revision :
4a94a6200bb5fb38983ae785d3fb20f2a3dd8fe7
Steve Reinhardt [Wed, 29 Oct 2003 22:43:04 +0000 (14:43 -0800)]
Add license to new isa_traits.cc file.
--HG--
extra : convert_revision :
fe7346e509c063d72def2298fa997fdec14b60be
Lisa Hsu [Wed, 29 Oct 2003 22:29:37 +0000 (17:29 -0500)]
bus.cc:
don't need to clear these stats runAddrLast and runDataLast in the bus constructor, since stats are automatically cleared on creation.
--HG--
extra : convert_revision :
a6ee5e5779e2b854c6b78dabfa4ed99978cbc41a
Steve Reinhardt [Wed, 29 Oct 2003 22:25:17 +0000 (14:25 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG--
extra : convert_revision :
f5ca2dfe3524e40f9d9db2b01e1846014dfb9a6f
Erik Hallnor [Wed, 29 Oct 2003 22:18:33 +0000 (17:18 -0500)]
Use the correct definition of the max DMA pages
--HG--
extra : convert_revision :
ab5221605d28cbb3d0159bc8c5da17c5bfda66b4
Steve Reinhardt [Wed, 29 Oct 2003 21:35:18 +0000 (13:35 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG--
extra : convert_revision :
abe99bd7f4632eea51fba97273ac024f81b0ddae
Steve Reinhardt [Wed, 29 Oct 2003 21:35:07 +0000 (13:35 -0800)]
Serialization support for Alpha TLBs, PhysicalMemory, and SimpleCPU.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
Serialize TLB contents.
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
Complete serialization of SimpleCPU (including owned events).
sim/eventq.cc:
sim/eventq.hh:
Basic serialization for events.
Still need to handle dynamic events (not owned by a SimObject).
sim/serialize.cc:
sim/serialize.hh:
Export serialization filename so PhysicalMemory can
derive its filename from that.
--HG--
extra : convert_revision :
4db851c5880f73f576ca092d5e5ad4256048eb51
Erik Hallnor [Wed, 29 Oct 2003 21:25:23 +0000 (16:25 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
9497a4015940e7fb7151e09f70e84134458ee877
Erik Hallnor [Wed, 29 Oct 2003 21:25:08 +0000 (16:25 -0500)]
Clear up doxygen warnings and serialize ScsiCtrl. We probably shouldn't decfine functions using type defs ala "RegFile" instead of "AlphaISA::RegFile".
base/inifile.hh:
Document findAppend
--HG--
extra : convert_revision :
ab5047590b3ca2a9126b75351e4902d300b5b5ad
Andrew Schultz [Wed, 29 Oct 2003 19:37:34 +0000 (14:37 -0500)]
Checkpointing support for all the tlaser_* files and Turbolaser
--HG--
extra : convert_revision :
a7c6cba25713ff334fb9a402817566bfb5eb6679
Nathan Binkert [Wed, 29 Oct 2003 18:06:34 +0000 (13:06 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
97a3b844f3b2f5dcb1e9add4080d5dffebba22c0
Nathan Binkert [Wed, 29 Oct 2003 17:46:31 +0000 (12:46 -0500)]
Make the ethernet device use only 32bit and 64bit accesses
This change requires an update of the es device driver in
the kernel as well.
--HG--
extra : convert_revision :
83b83570b8c487869c7bfc550dceb3672d19da10
Steve Reinhardt [Wed, 29 Oct 2003 16:50:25 +0000 (08:50 -0800)]
Flesh out ExecContext serialize/unserialize (including RegFile).
Add support for serializing enums.
arch/alpha/isa_traits.hh:
Add serialize/unserialize functions for RegFile
(defined in new isa_traits.cc).
cpu/exec_context.cc:
Flesh out serialize/unserialize.
sim/serialize.hh:
Add {UN}SERIALIZE_ENUM().
--HG--
extra : convert_revision :
9e30c7e7b3b290dc8ea0888ba3636fc93ee89052
Steve Reinhardt [Wed, 29 Oct 2003 08:46:26 +0000 (00:46 -0800)]
Rename SERIALIZE_MEMBER to SERIALIZE_SCALAR.
--HG--
extra : convert_revision :
848cfcf3323d224cdb2ff14df6f6996607a5c27f
Steve Reinhardt [Wed, 29 Oct 2003 08:41:24 +0000 (00:41 -0800)]
More progress on checkpointing... we can now write out a checkpoint and read it back in,
though most objects don't actually serialize any data.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
arch/alpha/isa_traits.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.hh:
dev/alpha_access.h:
dev/alpha_console.cc:
dev/alpha_console.hh:
dev/console.cc:
dev/console.hh:
Change unserialize param from IniFile& to const IniFile*.
cpu/simple_cpu/simple_cpu.cc:
Change unserialize param from IniFile& to const IniFile*.
Make unserialize call ExecContext::unserialize.
sim/eventq.cc:
Rename MainEventQueue (no spaces) for easier parsing in checkpoints.
Disable event serialization for now, so we can focus on the easy stuff.
sim/serialize.cc:
Change paramIn and arrayParamIn param from IniFile& to const IniFile*.
sim/serialize.hh:
Change unserialize, paramIn, and arrayParamIn params from IniFile& to const IniFile*.
--HG--
extra : convert_revision :
6e8853ed375eddec0e140c95a01dd51bd225f7b9
Steve Reinhardt [Wed, 29 Oct 2003 07:24:40 +0000 (23:24 -0800)]
Add a few configuration DPRINTFs.
Fix handling of chars (uint8_ts) in serialization.
Minor cleanup.
sim/param.cc:
Add specialization of showParam for char: output as ints, not as characters.
Clean up comments a bit.
--HG--
extra : convert_revision :
96349382447d892679dda9f83c028eec64252dc0
Steve Reinhardt [Wed, 29 Oct 2003 01:48:10 +0000 (17:48 -0800)]
Get new serialization code to link.
sim/param.cc:
Convert parseParam() and showParam() to templates,
andd explicitly instantiate them for common types.
sim/param.hh:
Add declarations for parseParam() and showParam() function templates,
so serialize.cc can use them.
sim/serialize.cc:
Don't need declarations for parseParam() and showParam() since
we put them in param.hh.
Also instantiate paramOut() etc. for bool.
--HG--
extra : convert_revision :
1d84d0fbec64481996cbfa8b84c67c13c6244385
Steve Reinhardt [Tue, 28 Oct 2003 20:56:17 +0000 (12:56 -0800)]
Merge zizzer:bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG--
extra : convert_revision :
50aa3791d27a17c4ea2fb4aee1a67011bd2abec1
Steve Reinhardt [Tue, 28 Oct 2003 20:55:12 +0000 (12:55 -0800)]
Revamp serialization to make it easier.
--HG--
extra : convert_revision :
c57a538d7cf606dbdf5fa244f92da46bd830e335
Steve Reinhardt [Tue, 28 Oct 2003 17:09:45 +0000 (09:09 -0800)]
Clean up a few spots where we weren't handling of misspeculation correctly.
arch/alpha/ev5.cc:
Don't call kernelStats.hwrei() or system->breakpoint() on misspeculated paths.
arch/alpha/isa_desc:
Don't write reegs.intrflag, do Annotate::Callpal, or call xc->syscall
on misspeculated paths.
--HG--
extra : convert_revision :
e73b96fbe4ac5be85fb20aa218fd05fd56d5b2f3
Nathan Binkert [Tue, 28 Oct 2003 15:05:58 +0000 (10:05 -0500)]
emulate callpal halt for non FULL_SYSTEM
in the process make m5_exit more generic
arch/alpha/ev5.cc:
arch/alpha/ev5.hh:
There's no reason that this needs to be in an arch specific file
arch/alpha/isa_desc:
m5_exit -> SimExit
Emulate callpal halt and cause the simulator to exit
while we're at it, sort #includes
sim/sim_events.cc:
sim/sim_events.hh:
move the m5_exit function here, renaming it to SimExit.
Also Allow the caller to pass in the termination message.
--HG--
extra : convert_revision :
54b43b17a412ab387b8672c27ef0b04fce10ee15
Nathan Binkert [Tue, 28 Oct 2003 00:58:37 +0000 (19:58 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
df464a46539df4d4870e1e1118bd1a566efe19a0
Andrew Schultz [Mon, 27 Oct 2003 19:43:05 +0000 (14:43 -0500)]
Added init_param line to specweb.ini
--HG--
extra : convert_revision :
1453fae160867ed3e111561eeb71fe0ac2dd6a82
Erik Hallnor [Mon, 27 Oct 2003 19:29:42 +0000 (14:29 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
782be2a26c1d0a416ff75bbc80cca5760b467fab
Erik Hallnor [Mon, 27 Oct 2003 19:29:09 +0000 (14:29 -0500)]
Add an exit condition for a set number of misses in any cache. Add writebacks into the overall cache statistics.
--HG--
extra : convert_revision :
76f460f5b7729fc6b85d465d8e21a7a249239a81
Nathan Binkert [Mon, 27 Oct 2003 18:01:25 +0000 (13:01 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
6b53813ed7ee4266ad716df5844070a72977341b
Nathan Binkert [Mon, 27 Oct 2003 17:58:47 +0000 (12:58 -0500)]
Add a strip target that will create m5.strip (a stripped
version of m5.opt)
--HG--
extra : convert_revision :
48a1542fb1b62804c59e68b7fed083c4eff03a20
Steve Reinhardt [Mon, 27 Oct 2003 07:03:51 +0000 (23:03 -0800)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
25f6c41b709b4dabe1a2e0a180508db05aa4263f
Nathan Binkert [Mon, 27 Oct 2003 07:02:37 +0000 (02:02 -0500)]
specweb.ini:
fix system name
--HG--
extra : convert_revision :
ce7438e314a829c102409c6164006712456c3b2b
Steve Reinhardt [Mon, 27 Oct 2003 06:38:53 +0000 (22:38 -0800)]
Minor serialization tweaks.
cpu/simple_cpu/simple_cpu.cc:
Serialize FP regs as integers (so we get exact bit representation).
sim/serialize.cc:
Don't panic on object rename... events come up named "event"
and need to get renamed. Also fix some DPRINTFs.
--HG--
extra : convert_revision :
62ad527a7aaf78ae623b70febc1331cf91cbad05
Steve Reinhardt [Mon, 27 Oct 2003 06:37:14 +0000 (22:37 -0800)]
Fix some problems with stats reset & floss counters.
arch/alpha/isa_desc:
Keep m5 pseudo-instructions (like resetstats) from taking effect
on misspeculated paths.
--HG--
extra : convert_revision :
7f0b0490164bca377ff2b14abc35a6c26bac9e6d
Nathan Binkert [Mon, 27 Oct 2003 04:04:17 +0000 (23:04 -0500)]
Clean up kernel .ini files. Factor out common stuff and use
#include to do stuff.
--HG--
extra : convert_revision :
65f2ad04f756cf3fdfe24620a13b04143bf660e0
Nathan Binkert [Mon, 27 Oct 2003 03:42:45 +0000 (22:42 -0500)]
Add an append= keyword that works in a somewhat similar way to
default=. In the append= case, when looking up an entry, it also
looks in the section named by the append= for something to append
to the entry
--HG--
extra : convert_revision :
b51915094ad3ca151d7f241c29e19b6b29d3a3c0
Nathan Binkert [Mon, 27 Oct 2003 03:40:03 +0000 (22:40 -0500)]
Make the tap work work again
util/tap/Makefile:
Make this stuff compile again
util/tap/tap.cc:
clean up some of the error messages
--HG--
extra : convert_revision :
4543d946b48c9e07bf19b812db6466f80ed6b851
Nathan Binkert [Mon, 27 Oct 2003 03:38:26 +0000 (22:38 -0500)]
only send data to a peer if the peer exists
dev/etherint.hh:
only send data to the peer if there is a peer
--HG--
extra : convert_revision :
33d90679ed91a2b2842ce4155ac4e58ec3defc22
Steve Reinhardt [Sun, 26 Oct 2003 16:21:11 +0000 (08:21 -0800)]
More tweaking of find-files script. FYI, I now have this hard-wired
into my 'grc' command under emacs.
--HG--
extra : convert_revision :
dad50adde069a2218059e628a986fced39b2123e
Steve Reinhardt [Sun, 26 Oct 2003 16:18:59 +0000 (08:18 -0800)]
Initialize startTick to 1 instead of 0. Fixes floss-check failure
in debug mode.
--HG--
extra : convert_revision :
b37d057e3fdb4d8556b7aa61126fb47a5a3d9edf
Steve Reinhardt [Sun, 26 Oct 2003 04:19:54 +0000 (21:19 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
b5f54dc24f6219426317c9d5cac3351de6b1a1bf
Steve Reinhardt [Sun, 26 Oct 2003 04:19:14 +0000 (21:19 -0700)]
Merge isabel.reinhardt.house:/z/stever/bk/m5
into isabel.reinhardt.house:/z/stever/bk2/m5
--HG--
extra : convert_revision :
84e69c15047423e683478dde1171a2c6348143fa
Steve Reinhardt [Sun, 26 Oct 2003 03:49:08 +0000 (20:49 -0700)]
New rundiff script.
util/rundiff:
Completely rewritten from scratch. Can work standalone (with simple built-in
diff algorithm) or use Algorithm::Diff package for better (but slower) diffs.
--HG--
extra : convert_revision :
bb66d937e92bfd1904bd259589bacb5eff404c02
Nathan Binkert [Sat, 25 Oct 2003 22:23:19 +0000 (18:23 -0400)]
Fix packet buffer management for receive packets
dev/etherlink.cc:
DPRINTF before the packet is sent to the other interface to
make the output a little more understandable
--HG--
extra : convert_revision :
9c7dd5dd6dbbbc416db70a52228e918af2e76d96
Nathan Binkert [Sat, 25 Oct 2003 22:19:32 +0000 (18:19 -0400)]
Add the directory where the ini file was found into the #include
search path
--HG--
extra : convert_revision :
9a6bceb931613b718bf5a561b354ba9ccb847a78
Steve Reinhardt [Sat, 25 Oct 2003 07:47:51 +0000 (00:47 -0700)]
Don't schedule tickEvent if it's already been scheduled.
--HG--
extra : convert_revision :
9cdfeb4df661b25fc000e35c1f34ee11cec6a668
Steve Reinhardt [Sat, 25 Oct 2003 06:37:28 +0000 (23:37 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
921d26b6fe29870fa532394b388bc0fe6cac183e
Steve Reinhardt [Sat, 25 Oct 2003 06:22:35 +0000 (23:22 -0700)]
Make util/find-files work from anywhere in the source tree (assuming you
name the root of your tree 'm5').
--HG--
extra : convert_revision :
1315c2864cbed941576d20e2fe895551992570a0
Steve Reinhardt [Sat, 25 Oct 2003 06:20:27 +0000 (23:20 -0700)]
Move some common full-system CPU initialization from the
SimpleCPU & FullCPU constructors to AlphaISA::initCPU().
cpu/simple_cpu/simple_cpu.cc:
Move some common full-system CPU initialization from the
SimpleCPU & FullCPU constructors to AlphaISA::initCPU().
Make 'fault' local to SimpleCPU::tick.
cpu/simple_cpu/simple_cpu.hh:
Make 'fault' local to SimpleCPU::tick (not an object member).
--HG--
extra : convert_revision :
e878dedfff06aac0548aca8b14d66c18b8916895
Steve Reinhardt [Sat, 25 Oct 2003 06:02:36 +0000 (23:02 -0700)]
Make FullCPU schedule its TickEvent when one of its contexts becomes active.
This fixes detailed-mpboot, which was broken as of my last change.
Also clean up some of the ExecContext status initialization.
cpu/base_cpu.hh:
CPU::execCtxStatusChg() now takes thread_num as an arg so the CPU knows
which execContext had the status change.
BaseCPU::registerExecContexts() no longer needs to be virtual.
cpu/exec_context.cc:
Initialize _status directly... don't use setStatus() as this will notify the CPU
of the change before it is ready.
CPU::execCtxStatusChg() now takes thread_num as an arg so the CPU knows
which execContext had the status change.
cpu/exec_context.hh:
Don't need initStatus() any more.
cpu/simple_cpu/simple_cpu.cc:
Move execCtxStatusChg() from header to .cc file.
No longer need specialized version of registerExecContexts to schedule TickEvent.
cpu/simple_cpu/simple_cpu.hh:
Move execCtxStatusChg() from header to .cc file.
CPU::execCtxStatusChg() now takes thread_num as arg (must be 0 for SimpleCPU).
No longer need specialized version of registerExecContexts to schedule TickEvent.
kern/tru64/tru64_system.cc:
Don't need initRegs; the PC etc. get initialized in the CPU constructor.
ExecContexts start out as Unallocated, so no need to set them to Unallocated here.
kern/tru64/tru64_system.hh:
Don't need initRegs; the PC etc. get initialized in the CPU constructor.
sim/prog.cc:
ExecContexts start out as Unallocated, so no need to set them to Unallocated here.
--HG--
extra : convert_revision :
e960ebbeb845960344633798e251b6c8bf1c0378
Andrew Schultz [Fri, 24 Oct 2003 20:28:04 +0000 (16:28 -0400)]
Added m5func "resetstats" to allow scriptable reset of statistics inside sim
--HG--
extra : convert_revision :
35a93fe085c2ca7ca1fc8bf887539e0b9c704aaf
Andrew Schultz [Fri, 24 Oct 2003 18:57:24 +0000 (14:57 -0400)]
Added new ini file for specwebssl
--HG--
extra : convert_revision :
df7fa6244f9a5a0660c9b5b30974b8544d12edcd
Steve Reinhardt [Fri, 24 Oct 2003 04:52:46 +0000 (21:52 -0700)]
A few minor fixes to sampling... seems to work now for the base case
of two CPUs and one switch-over event. Still some stats glitches though.
cpu/simple_cpu/simple_cpu.cc:
Schedule switched-to CPU right on curTick so we don't lose a cycle.
Remember to switch out old CPU.
--HG--
extra : convert_revision :
f1bf21cac054c74f59770d8b20b30118f46be6f1
Steve Reinhardt [Fri, 24 Oct 2003 02:09:18 +0000 (19:09 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
b0f93bd35d767fd3a520a9fed70a71d40b0056db
Steve Reinhardt [Fri, 24 Oct 2003 02:09:02 +0000 (19:09 -0700)]
If things go really wrong, panic() instead of fatal() so gdb gets control.
--HG--
extra : convert_revision :
40fddc2da0bca98542db0e97fa91092497977d2b
Steve Reinhardt [Fri, 24 Oct 2003 02:07:52 +0000 (19:07 -0700)]
Initial support for CPU switching. New SamplingCPU object encompasses a set
of CPUs that get switched round-robin (though currently we're only shooting for
two CPUs and one switch event, and even that doesn't quite work yet). Registration
of ExecContexts with System/Process object factored out so we can create two CPUs
but only register one of them at a time. Also worked at making behavior and naming
in System and Process objects more consistent.
arch/alpha/ev5.cc:
Rename ipr_init to initIPRs and get rid of unused mem arg.
arch/alpha/fake_syscall.cc:
Process:numCpus is now a function (not a data member).
base/remote_gdb.hh:
Support for ExecContext switching.
cpu/base_cpu.cc:
cpu/base_cpu.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.hh:
Support for ExecContext switching.
Renamed contexts array to execContexts to be consistent with Process.
CPU ID now auto-assigned by system object.
cpu/simple_cpu/simple_cpu.cc:
Support for ExecContext switching.
Renamed contexts array to execContexts to be consistent with Process.
CPU ID now auto-assigned by system object.
Cleaned up MP full-system initialization a bit.
dev/alpha_console.cc:
Renamed xcvec array to execContexts to be consistent with Process.
kern/tru64/tru64_system.cc:
kern/tru64/tru64_system.hh:
Support for ExecContext switching.
CPU ID now auto-assigned by system object.
sim/prog.cc:
sim/prog.hh:
Support for ExecContext switching.
Process:numCpus is now a function (not a data member).
sim/system.cc:
sim/system.hh:
Support for ExecContext switching.
Renamed xcvec array to execContexts to be consistent with Process.
--HG--
extra : convert_revision :
79649cffad5bf3e83de8df44236941907926d791
Steve Reinhardt [Fri, 24 Oct 2003 01:53:16 +0000 (18:53 -0700)]
Minor stats fix.
base/statistics.cc:
Small fix: don't exit early out of dist when nozero is set and a zero val is found.
--HG--
extra : convert_revision :
95ba3328c8a79f05f4c821d99071dba10f013ad6
Steve Reinhardt [Fri, 24 Oct 2003 01:51:12 +0000 (18:51 -0700)]
Print error message when we can't parse a .ini assignment line.
--HG--
extra : convert_revision :
b7e19ff42ddd9a21571e086c11e143d9290e0e38
Erik Hallnor [Thu, 23 Oct 2003 20:40:08 +0000 (16:40 -0400)]
Move to non-architecture specific MemReq
arch/alpha/alpha_memory.hh:
cpu/exec_context.hh:
cpu/pc_event.hh:
Move to non architecture specific MemReq
--HG--
extra : convert_revision :
2445943b6f1c8af86b90cfa9c2f9b1eb4a6a1aa2
Andrew Schultz [Thu, 23 Oct 2003 19:54:01 +0000 (15:54 -0400)]
New kernel-specweb.ini file for the new specweb99 setup.
--HG--
extra : convert_revision :
8f2bf5ee56ba4fc7484e6510acd3cb93a17174d3
Andrew Schultz [Wed, 22 Oct 2003 22:50:54 +0000 (18:50 -0400)]
Changed the init_param to a uint64_t from int
--HG--
extra : convert_revision :
fbd3d3bbaa539661f63e4f7991b0a6275992d60a
Steve Reinhardt [Wed, 22 Oct 2003 14:10:34 +0000 (07:10 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
db4330ff1258261d8a07fee2cc0e813839fbb9d6
Steve Reinhardt [Wed, 22 Oct 2003 14:10:12 +0000 (07:10 -0700)]
Canonicalize bus name capitalization: bus to Foo is toFooBus.
--HG--
extra : convert_revision :
27ccea6f1aaf84779fa172ae2e5fa1747957e35c
Lisa Hsu [Wed, 22 Oct 2003 13:45:39 +0000 (09:45 -0400)]
statistics.cc:
change printf to be printed only when something is binned so regression doesn't freak out.
base/statistics.cc:
change printf to be printed only when something is binned so regression doesn't freak out.
--HG--
extra : convert_revision :
cb60128fc3ab605aa7e915c7c7512cf93b156c96
Lisa Hsu [Wed, 22 Oct 2003 06:02:12 +0000 (02:02 -0400)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
--HG--
extra : convert_revision :
ac1087a763d62291ffe9858b10c8af82123a1826
Lisa Hsu [Wed, 22 Oct 2003 06:02:00 +0000 (02:02 -0400)]
statistics.hh:
forgot to doxygen comment binned()
base/statistics.hh:
forgot to doxygen comment binned()
--HG--
extra : convert_revision :
7e414a3291e49b7b92bcbfec18470c3ec8671a35
Steve Reinhardt [Wed, 22 Oct 2003 05:39:08 +0000 (22:39 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
64dca52045cab9a08aec2d4d18e9e9dad4ebaa89
Steve Reinhardt [Wed, 22 Oct 2003 05:38:40 +0000 (22:38 -0700)]
Similar refactoring of SimpleCPU-based .ini files.
Add simple-events.ini for busses w/do_events=true, as this is all that seems to work at this point.
--HG--
extra : convert_revision :
0c5e64488b8f5860e39fa14b443b6c9bcd16c8bf
Erik Hallnor [Wed, 22 Oct 2003 05:18:35 +0000 (01:18 -0400)]
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5
--HG--
extra : convert_revision :
29cabd1c72f81ec89db5556ff9cf0128fe8af034
Erik Hallnor [Wed, 22 Oct 2003 05:18:27 +0000 (01:18 -0400)]
bus.cc:
Update an assert to reflect the current state of the hierarchy
--HG--
extra : convert_revision :
33ddb05121c7614d12dcbf4b64fc6a8f4b97b0a3
Steve Reinhardt [Wed, 22 Oct 2003 05:07:21 +0000 (22:07 -0700)]
Restructure uni-*.ini configs as a single base config (uni-hier.ini)
with a bunch of variants that include this and then just do deltas.
Note how much shorter the files are! It's much easier to see what's going on,
too. For example, is it intentional that uni-hier-compressed does not set
do_data on the L2 (though it does on the L1 & L3)?
Also got rid of a couple of old broken ones (uni-default and uni-perfect-L2).
--HG--
extra : convert_revision :
70a12c06a8deb9b1c59def313b48f69ab62efce2
Lisa Hsu [Wed, 22 Oct 2003 05:05:00 +0000 (01:05 -0400)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
--HG--
extra : convert_revision :
8658302b64207390b03f9fe133ad722a1417e022
Steve Reinhardt [Wed, 22 Oct 2003 04:33:34 +0000 (21:33 -0700)]
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
070e7eadc64a104c9b176f911b0f05ab999deb47
Steve Reinhardt [Wed, 22 Oct 2003 04:32:15 +0000 (21:32 -0700)]
Don't need to include sim/param.hh in sim_object.hh anymore.
Add explicit include of sim/param.hh to .cc files as needed.
cpu/base_cpu.cc:
cpu/exetrace.cc:
dev/etherint.cc:
sim/system.cc:
Add include of sim/param.hh.
sim/sim_object.hh:
Don't need to include sim/param.hh.
--HG--
extra : convert_revision :
8ed13f25c2087680230056ab7abb623e6a7699cf
Lisa Hsu [Wed, 22 Oct 2003 04:30:04 +0000 (00:30 -0400)]
Automerge
--HG--
extra : convert_revision :
d14536880d6f55d4304c0bab1fa08a5121bd1846
Lisa Hsu [Wed, 22 Oct 2003 04:29:45 +0000 (00:29 -0400)]
nate's reset stuff merged with my work on bin printing.
--HG--
extra : convert_revision :
438c94c90bfb3caffec461ad2c14b266cdf61494
Steve Reinhardt [Wed, 22 Oct 2003 04:24:34 +0000 (21:24 -0700)]
New ini-file feature: += appends RHS to LHS.
Added doxygen comments to inifile.hh.
Updated initest. Some other minor cleanup.
base/inifile.cc:
Add support for '+=' append operation.
Factor common code from IniFile::load() and IniFile::add() into new Section::add().
Rename ConfigTable to SectionTable (more descriptive).
Fix bug in Section::dump().
base/inifile.hh:
Add doxygen comments.
Add support for '+=' append operation.
Factor common code from IniFile::load() and IniFile::add() into new Section::add().
Rename ConfigTable to SectionTable (more descriptive).
test/Makefile:
initest needs cprintf.o now.
test/foo.ini:
Add test of '+=' operator.
test/initest.cc:
Bring this up-to-date. Steal main loop from main.cc so we can test
multiple .ini files and command-line assignments too.
--HG--
extra : convert_revision :
982521677fbf464e93aa93798ff7d9611826f17c
Erik Hallnor [Wed, 22 Oct 2003 04:23:24 +0000 (00:23 -0400)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
c703dff6f52bd994f95597d824997adb125d3194
Erik Hallnor [Wed, 22 Oct 2003 04:22:25 +0000 (00:22 -0400)]
Probe is now in. You currently can't probe uncacheable (of course it doesn't make much sense either.
Also, probe doesn't currently support compressed data, but will as soon as I encapsulate the calls more.
cpu/memtest/memtest.cc:
Change memtest to not do probes on uncacheables.
--HG--
extra : convert_revision :
28ca4f793562e55da75e8b7fc3852bb5b1328ea9
Lisa Hsu [Wed, 22 Oct 2003 03:56:31 +0000 (23:56 -0400)]
statistics.hh:
same - bin printing
statistics.cc:
printing of bins! now all the nice binning functionality is actually useful cuz you can see the data it so nicely took. this prints out only the individual bin values. totals to come.
statistics.hh:
add a binned() function to each stat so that at print time, we can know if it's binned in order to print it right.
base/statistics.hh:
add a binned() function to each stat so that at print time, we can know if it's binned in order to print it right.
base/statistics.cc:
printing of bins! now all the nice binning functionality is actually useful cuz you can see the data it so nicely took. this prints out only the individual bin values. totals to come.
base/statistics.hh:
same - bin printing
--HG--
extra : convert_revision :
09df9aae62b0e522230ee6bedcb51079346735a4
Lisa Hsu [Wed, 22 Oct 2003 03:18:07 +0000 (23:18 -0400)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean
--HG--
extra : convert_revision :
112a99bde10ea9c56f2390389dd13c024e298331
Lisa Hsu [Wed, 22 Oct 2003 03:17:55 +0000 (23:17 -0400)]
statistics.hh:
fix up some very ambiguous doxygen comments about Formulas
base/statistics.hh:
fix up some very ambiguous comments about Formulas
--HG--
extra : convert_revision :
ad8d9579fd1933397590c78111bec7c0d19b0e14
Erik Hallnor [Wed, 22 Oct 2003 01:04:22 +0000 (21:04 -0400)]
Since we don't hand off writebacks anymore, need to actually copy the request when buffering it.
--HG--
extra : convert_revision :
f4b7fbd6b8eb3715cac9c7ac41e95b588951ffc4
Erik Hallnor [Tue, 21 Oct 2003 23:22:09 +0000 (19:22 -0400)]
I'll fix this screwup with the next change set
--HG--
extra : convert_revision :
4e1cef3aa3f3fbcfb59089298436face195b713f
Erik Hallnor [Tue, 21 Oct 2003 23:19:37 +0000 (19:19 -0400)]
mem_debug.hh:
Add debug callout for cache probes.
miss_queue.hh, miss_queue.cc, blocking_buffer.hh:
Add support for snooping the write buffer.
cache.cc:
Snoop the Write buffer for writebacks on probes.
--HG--
extra : convert_revision :
b183152acae6e802a49ff8b7c2ff02c455b2e02a
Erik Hallnor [Tue, 21 Oct 2003 23:15:03 +0000 (19:15 -0400)]
Merge ehallnor@zizzer:/bk/m5
into zazzer.eecs.umich.edu:/z/ehallnor/clean
--HG--
extra : convert_revision :
53e6b239f96abce99a4cdd34ebcc565902435a7c
Erik Hallnor [Tue, 21 Oct 2003 23:14:54 +0000 (19:14 -0400)]
When the Bus blocks now it lets the sender know it was a failed transmission. The request stays buffered in the sender, not on the bus like it used to be.
--HG--
extra : convert_revision :
f6a486653b7a4912608f921bd4f7ac7f9dfe9093
Andrew Schultz [Tue, 21 Oct 2003 21:18:17 +0000 (17:18 -0400)]
Created new M5 instruction to allow an integer parameter (init_param) to be specified in the INI and then read inside the simulator.
arch/alpha/isa_desc:
Added new M5FUNC instruction to put allow reading of init_param inside simulator
kern/tru64/tru64_system.cc:
kern/tru64/tru64_system.hh:
sim/system.cc:
sim/system.hh:
Added support for init_param
--HG--
extra : convert_revision :
8253f0b4239b194d4f04665c9deec1fcdf665c8a
Lisa Hsu [Tue, 21 Oct 2003 19:45:56 +0000 (15:45 -0400)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean
--HG--
extra : convert_revision :
d639282e403cb085c452223a76cec31933a529aa
Lisa Hsu [Tue, 21 Oct 2003 19:45:48 +0000 (15:45 -0400)]
statistics.hh:
change VectorDistProxy name to DistProxy - to be more consistent with other proxy namings.
base/statistics.hh:
change VectorDistProxy name to DistProxy - to be more consistent with other proxy namings.
--HG--
extra : convert_revision :
c470c93cf598506be56312db52f6c528c213a149
Erik Hallnor [Tue, 21 Oct 2003 05:53:41 +0000 (01:53 -0400)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
1fcdbd9d2efc1e0490716de46c81e94f4b28678b
Erik Hallnor [Tue, 21 Oct 2003 05:53:27 +0000 (01:53 -0400)]
memtest.cc:
Add probe calls to test update probe path.
cpu/memtest/memtest.cc:
Add probe calls to test update probe path.
--HG--
extra : convert_revision :
b0fb97b54b6ffce9c575fda680b778da63767b7c
Erik Hallnor [Tue, 21 Oct 2003 05:51:59 +0000 (01:51 -0400)]
Add the probe path to the hierarchy. Two flavors, one updates the location of the block in memory, the other just reads the most up to date data/writes data wherever it is found.
--HG--
extra : convert_revision :
d03776f9b6f181fc543efe54f5628e5338f1df41
Nathan Binkert [Tue, 21 Oct 2003 03:08:27 +0000 (23:08 -0400)]
Implement reset for stats.
base/statistics.cc:
base/statistics.hh:
Implement a reset for for the statistics package.
This will cause all stats to be set to their default value.
Only the currently enabled bin will be reset.
test/Makefile:
Make tests work again now that we're naming include dirs
explicitly
test/stattest.cc:
test reset
--HG--
extra : convert_revision :
8d21cedf6ee91ed0a2412042ea5cb12f79b90eb3
Nathan Binkert [Tue, 21 Oct 2003 01:38:32 +0000 (21:38 -0400)]
Clean up callbacks
base/callback.hh:
Don't remove a callback when it is processed.
Document the callback class
--HG--
extra : convert_revision :
9d15500434fe0e5d623c624aac86976708adf0eb
Nathan Binkert [Tue, 21 Oct 2003 00:17:01 +0000 (20:17 -0400)]
Separate the stuff for SimObject from SimObject builder.
This makes testing a bit easier.
arch/alpha/alpha_memory.cc:
cpu/intr_control.cc:
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
dev/alpha_console.cc:
dev/console.cc:
dev/disk_image.cc:
dev/etherbus.cc:
dev/etherdump.cc:
dev/etherlink.cc:
dev/ethertap.cc:
dev/simple_disk.cc:
kern/tru64/tru64_system.cc:
sim/main.cc:
sim/prog.cc:
Need to include builder.hh
sort #includes
sim/sim_object.cc:
sim/sim_object.hh:
Separate the SimObjectBuilder stuff into its own file
--HG--
extra : convert_revision :
e8395e0cc6ae1f180f9cd6f100795a1ac44aeed5
Nathan Binkert [Mon, 20 Oct 2003 13:23:17 +0000 (09:23 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
98fcdc0b893b77230ec69597930a71af227bc490
Lisa Hsu [Mon, 20 Oct 2003 05:05:07 +0000 (01:05 -0400)]
.del-post-incoming.regression~
db4d380a8de2f027:
Delete: BitKeeper/triggers/post-incoming.regression
--HG--
extra : convert_revision :
48529712a47aa7b72fe666b4cccb290a4fa4812e
Erik Hallnor [Mon, 20 Oct 2003 04:46:02 +0000 (00:46 -0400)]
simple_cpu.cc:
Add data to static memReq and make everything use it.
Add init of numLoads.
cpu/simple_cpu/simple_cpu.cc:
Add data to static memReq and make everything use it.
Add init of numLoads.
--HG--
extra : convert_revision :
47d98aae643c64dff4e5cf1dc770a36434122579
Steve Reinhardt [Mon, 20 Oct 2003 00:42:51 +0000 (17:42 -0700)]
Check in a first stab at a script to sort the #include lines in a source file.
Nate thought this would be cool, and I started on it, but lost interest.
I'm mostly committing this so bk stops bugging me about it. Nate, don't start
hacking on this until after the ISCA deadline!
--HG--
extra : convert_revision :
e0ecc54b118ee99d254e9707b1bba11d4078d7e0
Steve Reinhardt [Mon, 20 Oct 2003 00:30:26 +0000 (17:30 -0700)]
Get rid of obsolete code, most of it '#if 0'ed anyway.
Mostly vestiges of Dave's long-gone instruction prefetching stuff.
arch/alpha/isa_traits.hh:
Delete unused extractInstructionPrefetchTarget().
base/inifile.cc:
Delete '#if 0' code
cpu/base_cpu.hh:
Delete unused filterThisInstructionPrefetch() function.
cpu/exetrace.hh:
Delete '#if 0' code (obsolete flags).
--HG--
extra : convert_revision :
c8317f56ba0a0e568daa785825ee938584987bed
Nathan Binkert [Sun, 19 Oct 2003 09:50:53 +0000 (05:50 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
a07675b26bc39cf082e2f4486998718417d43946
Steve Reinhardt [Sun, 19 Oct 2003 04:21:14 +0000 (21:21 -0700)]
Add comment to elaborate on store-conditional result code (and remove
stale reference to machine.def).
arch/alpha/isa_desc:
Add comment describing store-conditional result code
cpu/exec_context.hh:
update comments
--HG--
extra : convert_revision :
ac59e0ad7a9440cb6656617fdf05495b59c68f55