Steve Reinhardt [Wed, 12 Nov 2003 18:36:12 +0000 (10:36 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
bb9bba89ad0b25b0a4748bf46b714e2259321ad9
Steve Reinhardt [Wed, 12 Nov 2003 18:35:48 +0000 (10:35 -0800)]
Change setup scheme to split base configurations from configuration options.
Completely backward compatible except for setup file locations.
See comment in setup script for more details.
--HG--
extra : convert_revision :
4e4a28bcbe36e0c6fd688dd133274bb80ae442f5
Erik Hallnor [Wed, 12 Nov 2003 16:59:04 +0000 (11:59 -0500)]
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5
--HG--
extra : convert_revision :
7835ada99c5ff47a9013d2827311a24e1447ac16
Erik Hallnor [Wed, 12 Nov 2003 16:58:56 +0000 (11:58 -0500)]
Create a compressed cache if there is a compressed bus or data should be stored compressed
--HG--
extra : convert_revision :
eade8951bed25a222e5e1ee370d431ec5c0a200d
Steve Reinhardt [Wed, 12 Nov 2003 16:41:09 +0000 (08:41 -0800)]
Add config for simple purely functional simulation (no caches).
--HG--
extra : convert_revision :
e2466d051e67d76e841416deeb95974c8f9516fe
Steve Reinhardt [Wed, 12 Nov 2003 16:40:32 +0000 (08:40 -0800)]
Rewrite getdirentries to replace SS-derived version.
--HG--
extra : convert_revision :
72eced315bbb331d3068279e60f1f0a390eb687a
Steve Reinhardt [Mon, 10 Nov 2003 04:36:54 +0000 (20:36 -0800)]
Minor enhancements to rundiff script.
util/rundiff:
Make sure Algorithm::Diff is loaded only if you need it
(so it's ok if you don't have it installed).
Add command-line options for things you might want to change:
- diff algorithm
- # of context lines
- # of lines of lookahead
--HG--
extra : convert_revision :
b3ba02e1816eee286f47eb28ab578fa4734bac3a
Steve Reinhardt [Sun, 9 Nov 2003 18:39:44 +0000 (10:39 -0800)]
Setup to build with gcc 3.3.2.
--HG--
extra : convert_revision :
27e73ded6c1a2089427391bfdf1afa1f020ba14f
Steve Reinhardt [Sun, 9 Nov 2003 18:03:33 +0000 (10:03 -0800)]
ISCA hack is for FULL_SYSTEM only.
--HG--
extra : convert_revision :
a90fec583e6147bda8023da7f405aeecdb469128
Steve Raasch [Fri, 7 Nov 2003 22:49:50 +0000 (17:49 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/y/sraasch/new_head
--HG--
extra : convert_revision :
05dbe5ff1097b16430b647e599e56c556683c026
Steve Raasch [Fri, 7 Nov 2003 22:45:59 +0000 (17:45 -0500)]
updates for the new stats format
--HG--
extra : convert_revision :
7da435e2369a0ab4647f033e9ce16125ac7b9302
Steve Raasch [Fri, 7 Nov 2003 13:35:55 +0000 (08:35 -0500)]
It's important that there be white-space between each element
of a printed statistics line.
base/statistics.cc:
Add spaces between printed elements
--HG--
extra : convert_revision :
edcc9460fa178c39f7e3c15b3bad866ef9b263e4
Nathan Binkert [Fri, 7 Nov 2003 10:06:22 +0000 (05:06 -0500)]
add a couple of hacks to get thigns going for ISCA
arch/alpha/pseudo_inst.hh:
Give temporary access of these functions to full cpu junk
(this is a hack!)
--HG--
extra : convert_revision :
35499d6bf03b1c21dc918ccc09a6d21719262120
Lisa Hsu [Fri, 7 Nov 2003 06:39:17 +0000 (01:39 -0500)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
--HG--
extra : convert_revision :
60b307d827220ba76b607d3f18d4fa00ab3fb1d5
Nathan Binkert [Fri, 7 Nov 2003 06:24:49 +0000 (01:24 -0500)]
save and restore the current bin during reset since we
should continue in whatever bin we were in.
--HG--
extra : convert_revision :
30a891ccb03afa0c1dd0c98942ab3ea5ba800660
Lisa Hsu [Fri, 7 Nov 2003 06:03:26 +0000 (01:03 -0500)]
add a numTicks stat to detailed cpu.
--HG--
extra : convert_revision :
91ba6216d4d309670b2366729b8bcf1ddc4d2198
Lisa Hsu [Fri, 7 Nov 2003 05:14:38 +0000 (00:14 -0500)]
track the idle_thread() function in the kernel, so that we can know if we are idle during a run.
kern/tru64/tru64_system.cc:
autogen for new tracked function
add to fn name map
kern/tru64/tru64_system.hh:
autogen
--HG--
extra : convert_revision :
322d54df3070824a039085dc3742660c82cf750d
Lisa Hsu [Fri, 7 Nov 2003 04:18:47 +0000 (23:18 -0500)]
change the path that i track from two separate paths to one.
kern/tru64/tru64_system.cc:
the automatic generated code...
also, change the way i populate the map. now, instead of tcp_ouput being
the head of its own path, put it under tcp_sosend, which is under sosend.
kern/tru64/tru64_system.hh:
automatically generatd changes
--HG--
extra : convert_revision :
005bac336a3088e32b3b5fcc5e72afd80f7f1934
Nathan Binkert [Fri, 7 Nov 2003 01:34:45 +0000 (20:34 -0500)]
Quick hack to make the simulator exit after the last period.
--HG--
extra : convert_revision :
54c9ae025539aaadf5b2cc79a6ba3e3602938356
Ron Dreslinski [Fri, 7 Nov 2003 01:08:45 +0000 (20:08 -0500)]
"remove SWContext * from map when it is context switched in"
--HG--
extra : convert_revision :
5c58046c36edce07ae8ffc14f1e889e614bfc271
Ron Dreslinski [Thu, 6 Nov 2003 23:47:33 +0000 (18:47 -0500)]
Make sure to serialize the bool that signifies a pending interrupt
--HG--
extra : convert_revision :
c614b3432077ccf8b138549be827edce7e50cd43
Erik Hallnor [Thu, 6 Nov 2003 23:40:08 +0000 (18:40 -0500)]
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5
--HG--
extra : convert_revision :
de8422f1e91f1defabe3a021236c813504bd3cab
Erik Hallnor [Thu, 6 Nov 2003 23:39:26 +0000 (18:39 -0500)]
Various fixes to memory code.
cpu/memtest/memtest.cc:
Disable probes until the work in all cases
util/rundiff:
Comment out Algorithm::Diff since its not needed.
--HG--
extra : convert_revision :
40e76ae8926650986a170a0ba6ef331519aceb19
Steve Raasch [Thu, 6 Nov 2003 17:57:06 +0000 (12:57 -0500)]
Nat's fix for compile bug
base/statistics.hh:
Too many "const"'s
--HG--
extra : convert_revision :
b38303f2e6b415e6bcc520da80e89d99b6976d23
Nathan Binkert [Thu, 6 Nov 2003 07:28:27 +0000 (02:28 -0500)]
better binning of Average stats
base/statistics.hh:
Try to make binning of Average statistics work a little better.
This solution is far from perfect though since we really need
to call set(p.current, p) when the binning takes place.
To fix the binning, we need to have the current value non-binned,
to do that, we make make the current value part of the Params struct.
This means that we can't pass around const Params structs
Maybe we need a binswap callback :/
--HG--
extra : convert_revision :
c2892387dbabe011bdcd6f0d99005c1c50653720
Nathan Binkert [Thu, 6 Nov 2003 05:41:14 +0000 (00:41 -0500)]
Little fixes to make more of the stats reset correctly.
base/statistics.cc:
formatting
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
Make numInsts reset by adding a resetStats function
sim/sim_object.cc:
Register the reset callback in a slightly cleaner way to avoid
potential static member constructor ordering issues
--HG--
extra : convert_revision :
408073b4b0397fbf9dfd9c548a313f1c8c3fc031
Lisa Hsu [Thu, 6 Nov 2003 04:38:57 +0000 (23:38 -0500)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
--HG--
extra : convert_revision :
99fc513b9154a180711dc2229dcba488d45fe71d
Lisa Hsu [Thu, 6 Nov 2003 04:38:51 +0000 (23:38 -0500)]
add things to track read and soo_read for specweb.
kern/tru64/tru64_events.cc:
don't need this - it was commented out anyway.
kern/tru64/tru64_system.cc:
generated code from instrum_codegen.pl also, populateMap with the correct orderings.
kern/tru64/tru64_system.hh:
generated code from instrum_codegen.pl
--HG--
extra : convert_revision :
237366a4bae31a07dfc245d090a704afd2bd4833
Nathan Binkert [Thu, 6 Nov 2003 02:17:13 +0000 (21:17 -0500)]
Ok, actually call resetStats on all stats
minor gratuitous cleanup in printAllExtraOutput.
(only create one end iterator)
Fix average stats reset
base/statistics.hh:
Shouldn't reset average stats this way. The current stat value
should stay the same.
sim/sim_object.cc:
Ok, actually call resetStats on all stats
minor gratuitous cleanup in printAllExtraOutput.
(only create one end iterator)
--HG--
extra : convert_revision :
13090ebe490a93757b8eb7d7c6a9697983095e41
Nathan Binkert [Wed, 5 Nov 2003 23:21:18 +0000 (18:21 -0500)]
Add a virtual function resetStats() that any SimObject can inherit
from that will get called any time stats are reset.
sim/sim_object.cc:
sim/sim_object.hh:
add a virtual function resetStats that any simObject can reset
when a statistics reset is initiated
--HG--
extra : convert_revision :
fdad673142f6ff811f84c246d80e5d41e3c9d4d1
Nathan Binkert [Wed, 5 Nov 2003 22:57:41 +0000 (17:57 -0500)]
Fix stats reset
make SIGUSR2 dump and reset stats
Make resetting time work
base/statistics.cc:
Fix statistics reset so that it works again, and correctly
reset bins as well. (The old code wouldn't reset if you didn't
have any bins, and then would actually only reset the first
bin)
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
convert idleCycles/idleFraction into a single Average stat
to make reset work more simply
sim/main.cc:
handle SIGUSR2 to dump and reset stats
(SIGUSR1 only dumps them)
sim/sim_time.cc:
sim/sim_time.hh:
Add support for resetting the time
--HG--
extra : convert_revision :
ea43e03c50c0a4bb826dc0842a8c4fa1a9289e0a
Steve Raasch [Wed, 5 Nov 2003 20:37:21 +0000 (15:37 -0500)]
fix equations
add averaging mechansim for binning
--HG--
extra : convert_revision :
2b84ba97b0a016008937a134461af4d46198843f
Steve Raasch [Wed, 5 Nov 2003 17:51:54 +0000 (12:51 -0500)]
Fix for minor oops found by insure
--HG--
extra : convert_revision :
3b0d4242bcbb188ac649bd96ca876e1475c60214
Steve Raasch [Wed, 5 Nov 2003 16:29:23 +0000 (11:29 -0500)]
Fix initialization bug. No apparent change in external behavior.
--HG--
extra : convert_revision :
b884f2fcba51b36520dd55110d225f83e6f5280a
Nathan Binkert [Wed, 5 Nov 2003 04:45:06 +0000 (23:45 -0500)]
This is M5!
dev/console.cc:
Simplescalar -> m5
--HG--
extra : convert_revision :
c559258c68b5cae6862718240958171e1258ee2b
Ron Dreslinski [Wed, 5 Nov 2003 00:19:41 +0000 (19:19 -0500)]
Properly serialize the clock event
--HG--
extra : convert_revision :
f61234d150cf1cf6ed87d79e71c75f2fa2108b74
Lisa Hsu [Tue, 4 Nov 2003 23:19:40 +0000 (18:19 -0500)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/m5
--HG--
extra : convert_revision :
81a644bebf1b9fe11ac767c097c2d457c5698e73
Lisa Hsu [Tue, 4 Nov 2003 23:19:03 +0000 (18:19 -0500)]
Hack to enable perl totaling of standard deviation statistics.
statistics.hh:
same
statistics.cc:
Hack to enable perl totaling.
make FancyDisplay print a total parameter to enable totaling standard deviations for bins after a run is over with perl. currently a total hack.
base/statistics.cc:
Hack to enable perl totaling.
make FancyDisplay print a total parameter to enable totaling standard deviations for bins after a run is over with perl. currently a total hack.
base/statistics.hh:
same
--HG--
extra : convert_revision :
c4087a138543e66acee4e395617ce7fd7e458a39
Nathan Binkert [Tue, 4 Nov 2003 22:43:57 +0000 (17:43 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
b4e94c075fdb58f6ac66aedf4f6a8f792988ed13
Nathan Binkert [Tue, 4 Nov 2003 22:43:41 +0000 (17:43 -0500)]
A little bit of code here and there to get more access to
what the console output is.
base/circlebuf.hh:
base/circlebuf.cc:
add stuff to spit to an ostream
prepend _ in front of protected member variables
formatting
dev/console.hh:
dev/console.cc:
Add DPRINTF to spit out the lines of console data
dev/console.cc:
little hack to append name() to the file so that we can
easily get multiple output files.
dev/console.hh:
TRACING_ON == 1 not defined(TRACING_ON)
--HG--
extra : convert_revision :
bbe80715fb97ee4c4ed6b484955ef71289f09fc9
Andrew Schultz [Tue, 4 Nov 2003 21:20:35 +0000 (16:20 -0500)]
Added setup-spec and setup-specweb scripts to modify spec, specweb, and
specwebssl run parameters
--HG--
extra : convert_revision :
169b97eba6c1c5694de22957119f532958950dec
Lisa Hsu [Tue, 4 Nov 2003 20:21:04 +0000 (15:21 -0500)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/realclean
--HG--
extra : convert_revision :
32bbe481ee748785f0bcffb0a711017d51c987a0
Lisa Hsu [Tue, 4 Nov 2003 20:20:58 +0000 (15:20 -0500)]
statistics.cc:
on Database::reset(), reset all stats in every bin, not just current one.
base/statistics.cc:
on Database::reset(), reset all stats in every bin, not just current one.
--HG--
extra : convert_revision :
0f3443b36ee00952810818a035c99267da8871d9
Lisa Hsu [Tue, 4 Nov 2003 20:15:24 +0000 (15:15 -0500)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/clean
--HG--
extra : convert_revision :
0074df284e85bc2ebe6ccc2dbe765fabda9ab041
Lisa Hsu [Tue, 4 Nov 2003 20:15:12 +0000 (15:15 -0500)]
Add the ability to track stats in user defined sets of function calls. code can be generated via the base/instrum_codegen.pl script to easily change the functions being tracked. the only thing the user needs to do is add code in tru64System to change how the callerMap is populated.
command line:
m5.* <config file> <args> --server.system:bin=true to track function calls in the server
m5.* <config file> <args> --client.system:bin=true to track function calls in the client
base/statistics.cc:
make an adjustment to the way stats are printed for FS_MEASURE
base/statistics.hh:
add a name() virtual function to GenBin. add a debug printf for activate().
add amake MainBin the default bin when FS_MEASURE.
cpu/exec_context.cc:
initialize swCtx to null upon creation of an xc
cpu/exec_context.hh:
add a SWContext pointer to every execution context.
cpu/simple_cpu/simple_cpu.cc:
process calls and returns for FS_MEASURE
cpu/simple_cpu/simple_cpu.hh:
add this so idleCycles will not be accessed before all stats are constructed
kern/tru64/tru64_events.cc:
add a FnEvent that fires whenever a function we're tracking is called. implement the process() virtual function for it.
kern/tru64/tru64_events.hh:
add FnEvent
kern/tru64/tru64_system.cc:
send bin parameter to System constructor. add bin parameter to Tru64System object. initialize all the FnEvent and MainBin members of Tru64system. also, populate the calling map that indicates whether a function call is on the path we're tracking.
kern/tru64/tru64_system.hh:
modify the Tru64System class to support FS_MEASURE
sim/system.cc:
add a bin parameter to System class. initialize a MainBin to hold the stats for nonPath.
sim/system.hh:
add a map of to match bins to function names. add a swCtx map to map pcb addresses to SWContext *s. Add some supporting functions.
--HG--
extra : convert_revision :
af3eadd798cb2d2aed9b54e1059dcedf244dd526
Nathan Binkert [Tue, 4 Nov 2003 17:48:21 +0000 (12:48 -0500)]
fix type! argh
dev/etherlink.cc:
int -> Tick
--HG--
extra : convert_revision :
33c45ea306e6532b91d84018702b220b25de463e
Steve Reinhardt [Tue, 4 Nov 2003 04:35:05 +0000 (20:35 -0800)]
Automerge
--HG--
extra : convert_revision :
2ca18ecbf04a1de72391073d0a5309fdbbdfefda
Steve Reinhardt [Tue, 4 Nov 2003 04:31:15 +0000 (20:31 -0800)]
Fix bugs in and expand syscall emulation code.
arch/alpha/fake_syscall.cc:
Fix a couple of bugs:
- error return codes weren't making it through due to inadvertent cast to unsigned
- sigreturn broken in not one but two ways
- make all file descriptors look like plain files (not ttys)
Added implementations of setuid, getgid, fcntl, and getdirentries from Dave Oehmke
--HG--
extra : convert_revision :
53d3f13e1b05e3bde9e68ada3774ca39fa4c0d4c
Steve Reinhardt [Tue, 4 Nov 2003 04:26:51 +0000 (20:26 -0800)]
Minor changes to instruction trace output.
arch/alpha/isa_desc:
A few disassembly changes to make it easier to compare with old machine.def traces:
- Make lds prefetches print f31 instead of r31 as dest.
- Don't print mode suffixes on FP if SS_COMPATIBLE_DISASSEMBLY
cpu/exetrace.cc:
Left-justify instruction in field, and increase width by 1.
--HG--
extra : convert_revision :
9ffd56728f1bb772aa3ccda5f027b93d4c3a4135
Andrew Schultz [Mon, 3 Nov 2003 23:40:09 +0000 (18:40 -0500)]
Fix unserialize issues with etherdev (used to leave junk as callbacks which
would segfault)
--HG--
extra : convert_revision :
3b99b507c2df576622b9304215010bbfecedf8f1
Nathan Binkert [Mon, 3 Nov 2003 21:47:53 +0000 (16:47 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
2029fb26a8c971a791161c9e24dfdc1135f3aaf8
Nathan Binkert [Mon, 3 Nov 2003 21:47:08 +0000 (16:47 -0500)]
Make it so the quiesce instruction is conditionally enabled
arch/alpha/isa_desc:
move the quiesce instruction out of here so I can conditionally
enable it.
arch/alpha/pseudo_inst.cc:
conditionally enable quiesce
arch/alpha/pseudo_inst.hh:
add quiesce
--HG--
extra : convert_revision :
e1c474c4bf8761ff58073785d82b2bec9f632885
Ron Dreslinski [Mon, 3 Nov 2003 21:43:59 +0000 (16:43 -0500)]
Fix sampling cpu switchover of suspended contexts, and make some changes
to sampling config files to allow for different periods of the server and client
systems.
--HG--
extra : convert_revision :
ac4b6679266884d9bc3c20abb2a817f69873cc39
Andrew Schultz [Mon, 3 Nov 2003 21:29:32 +0000 (16:29 -0500)]
Fix etherdev so it serializes txPacket and rxPacket and fixes up the DmaRequest
correctly and remove previous serialization of DmaPhys
--HG--
extra : convert_revision :
65e919ceb573a7554c07947951a74ae321f0f4c0
Andrew Schultz [Mon, 3 Nov 2003 19:33:02 +0000 (14:33 -0500)]
Added serialization for DmaPhys structs and serialize DmaRequest::phys
--HG--
extra : convert_revision :
04f36fc5e6636c08ccb04d244a44017c7d0969ac
Ron Dreslinski [Mon, 3 Nov 2003 17:17:55 +0000 (12:17 -0500)]
Fix unserialize so that it still gos through the entire tree,
but warns if it doesn't find a section. Used to stop if a section
didn't exist, but it's children might still exist.
--HG--
extra : convert_revision :
d3f511b69bec26a80cb004d83c385df3de13f004
Ron Dreslinski [Mon, 3 Nov 2003 16:03:13 +0000 (11:03 -0500)]
Fix segfault from unserialization, add system_sample as a configuration
--HG--
extra : convert_revision :
41604400cb4b334dcffded44b77fa63658d8b096
Steve Reinhardt [Mon, 3 Nov 2003 05:49:15 +0000 (21:49 -0800)]
Print a warning rather than failing if we're unserializing and there's an
object in the config that was not in the checkpointed config.
This code compiles, but I haven't tested it... I'm committing it so Ron
can have it. Should not effect anything that currently works.
base/inifile.cc:
base/inifile.hh:
Add sectionExists() method so you can query whether a section exists
without knowing any of the entry names that would be in it.
sim/serialize.cc:
sim/serialize.hh:
Add Checkpoint::sectionExists() (pass through to IniFile).
--HG--
extra : convert_revision :
905db122afdfe55946ab8493ccac0b1e715bc7c6
Ron Dreslinski [Mon, 3 Nov 2003 04:20:50 +0000 (23:20 -0500)]
Merge zizzer:/m5/Bitkeeper/m5
into zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/unclean
--HG--
extra : convert_revision :
e142f9ad3528027accf9e03366357c006a9a1857
Nathan Binkert [Mon, 3 Nov 2003 03:12:20 +0000 (22:12 -0500)]
ok, let's get this right
arch/alpha/pseudo_inst.cc:
yes is not a real value, use true
--HG--
extra : convert_revision :
30b998ae6f13641d70c9158777a12b00df8742fe
Nathan Binkert [Mon, 3 Nov 2003 02:58:23 +0000 (21:58 -0500)]
Fix a bug in the pseudo instruction context
arch/alpha/pseudo_inst.cc:
Don't forget the descriptions
--HG--
extra : convert_revision :
f208ea24d5b34283e962916cb4c7dff976406285
Ron Dreslinski [Mon, 3 Nov 2003 01:56:41 +0000 (20:56 -0500)]
Merge zizzer:/m5/Bitkeeper/m5
into zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/unclean
--HG--
extra : convert_revision :
e388676c83f75c5f19d58b5ed42d41942ff5e2cb
Nathan Binkert [Mon, 3 Nov 2003 01:52:40 +0000 (20:52 -0500)]
Add the option to ignore some of the pseudo instructions
--HG--
extra : convert_revision :
2010782749ca9c5dd029f71480956b8a1fa96394
Nathan Binkert [Mon, 3 Nov 2003 01:43:39 +0000 (20:43 -0500)]
Move the m5 pseudo instructions into their own file
arch/alpha/isa_desc:
Move the pseudo instructions out of the isa_desc, into their own
file and call out to them when they're to be accessed
sim/sim_events.cc:
sim/sim_events.hh:
sim/sim_exit.hh:
move SimExit to sim_exit.cc
--HG--
extra : convert_revision :
1c393adb1c18bd0fef065057d7f4e9cf60ac4197
Ron Dreslinski [Mon, 3 Nov 2003 00:38:51 +0000 (19:38 -0500)]
Merge zizzer:/m5/Bitkeeper/m5
into zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/unclean
--HG--
extra : convert_revision :
40b955025db858628804bca3d0a155813ea81bf7
Ron Dreslinski [Mon, 3 Nov 2003 00:38:22 +0000 (19:38 -0500)]
General fixes for Sampling CPU in full system mode, and serialization of sampling CPU
cpu/intr_control.cc:
Fix the reference to the cpu, to look up which cpu is being used
In sampling mode can't use an absolute pointer to the cpu, use the
exeContexts vector
cpu/intr_control.hh:
Add two new functions to simplify MP interrupts, fix it for sampling CPU model
--HG--
extra : convert_revision :
a69cdbb81e6aefa3fd5385416713c689300bbea8
Steve Raasch [Mon, 3 Nov 2003 00:29:28 +0000 (19:29 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/y/sraasch/head
--HG--
extra : convert_revision :
f63c01cd6e002028879925e4c2c051de038f5e44
Steve Raasch [Mon, 3 Nov 2003 00:29:14 +0000 (19:29 -0500)]
Add binning support
--HG--
extra : convert_revision :
edb922d3a4422cedc5c0c7efbac7124b5184165f
Nathan Binkert [Sun, 2 Nov 2003 23:02:58 +0000 (18:02 -0500)]
Implement more m5 pseduo opcodes:
resetstats
dumpstats
dumpresetstats
m5checkpoint
Lots of cleanup of serialization and stats dumping/resetting to
work with these new instructions
arch/alpha/isa_desc:
Implement more m5 pseduo opcodes:
resetstats
dumpstats
dumpresetstats
m5checkpoint
All of these functions take two optional parameters, the first is a delay,
and the second is a period. The delay tells the simulator to wait the
specified number of nanoseconds before triggering the event, the period
tells the simulator to repeat the event with a specified frequency
base/statistics.cc:
base/statistics.hh:
regReset RegResetCallback
dev/disk_image.cc:
serializeFilename -> CheckpointFile()
sim/debug.cc:
Move this debugging statement to sim_stats.cc
sim/eventq.cc:
Don't AutoDelete an event if it is scheduled since the process()
function could potentially schedule the event again.
sim/main.cc:
DumpStatsEvent is now Statistics::SetupEvent(Dump, curTick)
sim/serialize.cc:
Change the serialize event so that it's possible to cause the
event to repeat. Also make the priority such that the event
happens just before the simulator would exit if both events
were scheduled for the same cycle.
get rid of the serializeFilename variable and provide a CheckpointFile()
function. This function takes a basename that is set in the
configuration, and appends the current cycle to the name so that
multiple checkpoints can be dumped from the same simulation.
Also, don't exit the simulation when a checkpoint file is dumped.
sim/serialize.hh:
serializeFilename -> CheckpointFile()
SetupCheckpoint function to tell the simulator to prepare
to checkpoint at a certain time with a certain period
sim/sim_events.cc:
DumpStatsEvent stuff gets move to sim_stats.(cc|hh)
The context stuff gets moved into the already existing
stats context in stat_context.cc
sim/sim_events.hh:
DumpStatsEvent stuff gets move to sim_stats.(cc|hh)
sim/universe.cc:
Provide some simple functions for converting times into
ticks. These use floating point math to get as close as
possible to the real values. Multipliers are set up ahead
of time
--HG--
extra : convert_revision :
d06ef26a9237529a1e5060cb1ac2dcc04d4ec252
Nathan Binkert [Sun, 2 Nov 2003 18:05:14 +0000 (13:05 -0500)]
Prevent make from being smart about sccs
--HG--
extra : convert_revision :
d9fdb32c87c8511aace91850867fc00d00855fe6
Nathan Binkert [Sun, 2 Nov 2003 18:01:08 +0000 (13:01 -0500)]
SimExit takes a time now
arch/alpha/isa_desc:
regen
--HG--
extra : convert_revision :
a9da9d2a5fc8a0414491e437747cde48dfb61a20
Nathan Binkert [Sun, 2 Nov 2003 07:13:04 +0000 (02:13 -0500)]
If a filter isn't specified, don't try to do any filtering
If pcap_lookupnet fails, just assume the netmask is 0xffffff00
that's all we really wanted from it anyway.
--HG--
extra : convert_revision :
ac0a390ddb7a6b0a4e4c6d2885bfa7bd059faf36
Nathan Binkert [Sun, 2 Nov 2003 07:07:31 +0000 (02:07 -0500)]
deprecate the m5exit instruction and rename it to m5exit_old
Implement a new m5exit instruction with an optional delay
arch/alpha/isa_desc:
move m5exit to m5exit old. The old version of the
instruction is now deprecated
Implement the new exit instruction with the optional delay
sim/sim_events.cc:
sim/sim_events.hh:
Make SimExit take a cycle
sim/universe.cc:
provide ticksPerMS, ticksPerUS, and ticksPerNS so we don't
have to do math during the cycle
--HG--
extra : convert_revision :
e2ed47a2e5cfcd57c82086c6fcb4a28bf801c214
Nathan Binkert [Sun, 2 Nov 2003 06:09:10 +0000 (01:09 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
7fd03e2b9f776bf035ad8c758aaf349c35cee47f
Nathan Binkert [Sun, 2 Nov 2003 06:08:59 +0000 (01:08 -0500)]
add several new functions that can be called from the guest
to tell the simulator to do something.
exit -> exit_old (deprecated
exit now takes an optional parameter that tells it to execute at a
specified time in the future
The next four functions have two optional parameters. The first
specifies a delay for how long to wait to issue the instruction.
The second will tell the simulator to repeat that command
at the specified interval.
checkpoint will trigger a checkpoint
dumpstats will cause the simulator to dump stats
resetstats will cause all stats to be reset
dumpreset will dump and reset stats
all times are in nanoseconds
util/m5/Makefile:
Clean up to make it a bit easier to muck with
util/m5/m5.c:
Add a bunch of new commands and clean up the command parsing path
Convert atoi to strtoul so that we can use 64bit numbers and even
hex if we want to. (this runs on alpha, so a long is 64bit)
util/m5/m5op.h:
add prototypes for new m5 instructions
use uint64_t since it's nicer
--HG--
extra : convert_revision :
664ff00f0f0dfc5263c4e873d82fd9996a4521e9
Lisa Hsu [Sun, 2 Nov 2003 06:07:43 +0000 (01:07 -0500)]
iqueue.cc:
don't clear stat fullCount in the constructor for iq.
it comes cleared.
--HG--
extra : convert_revision :
80e09cfbdebd67615892cd1178bb0f8cfb5fc04f
Nathan Binkert [Sun, 2 Nov 2003 05:35:40 +0000 (00:35 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
8f2ced105b0a14bd4b0c0b52ed9c7b1c2ddc6e18
Nathan Binkert [Sun, 2 Nov 2003 05:35:31 +0000 (00:35 -0500)]
Add basic.ini which is a barebones system that has nothing
disk1.ini provides #defines that can be set to configure a second disk
--HG--
extra : convert_revision :
0997063cd97dd66aea36402712998f65e23714b3
Ron Dreslinski [Sun, 2 Nov 2003 04:03:17 +0000 (23:03 -0500)]
Merge zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/clean
into zamp.eecs.umich.edu:/amd/brio/y/rdreslin/m5bk/unclean
--HG--
extra : convert_revision :
89cecb54210ad4ec1b5062f091d7355b18b324e6
Ron Dreslinski [Sun, 2 Nov 2003 04:00:40 +0000 (23:00 -0500)]
Fix overwritting and ordering issues with serialization routines
dev/disk_image.cc:
seperate serialization output files for different cow images
--HG--
extra : convert_revision :
b62551f8e3f6315bb92ae3cb44e077d8084cbfe7
Lisa Hsu [Sat, 1 Nov 2003 23:17:46 +0000 (18:17 -0500)]
statistics.hh:
add enum to Bin::VectorBin
base/statistics.hh:
add enum to Bin::VectorBin
--HG--
extra : convert_revision :
a05aef30ca85bf5c0d1f5155e1dff3fb34fd7777
Nathan Binkert [Sat, 1 Nov 2003 22:53:39 +0000 (17:53 -0500)]
Factor out the client/server network part into its own
.ini file that we #include and add a DUMPFILE option
for dumping a ethertrace
--HG--
extra : convert_revision :
96fec0710a6f788890f3764e4ef078d53723c6dd
Nathan Binkert [Sat, 1 Nov 2003 21:26:19 +0000 (16:26 -0500)]
gah! how did this ever work? time uses Tick, not unsigned!
--HG--
extra : convert_revision :
caf246d12be97988573d4775325a41ff94c9afe1
Nathan Binkert [Sat, 1 Nov 2003 19:11:29 +0000 (14:11 -0500)]
Licenses
--HG--
extra : convert_revision :
ce47fdfaa5c59480a1fb38d86eed7d16ab7b5fc1
Steve Reinhardt [Sat, 1 Nov 2003 18:59:06 +0000 (10:59 -0800)]
Make error messages more informative on a non-full-system fault.
base/misc.cc:
Add curTick to panic and warn messages.
Reformat fatal message a bit for consistency.
--HG--
extra : convert_revision :
171da2fe6ca5e25982058ee1af67473292659103
Nathan Binkert [Sat, 1 Nov 2003 18:53:23 +0000 (13:53 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zans.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
3536754864ead5d7c95a2a8a1b6edd2fb70f5a88
Nathan Binkert [Sat, 1 Nov 2003 18:53:08 +0000 (13:53 -0500)]
.cvsignore files don't really do anything for us anymore, so
let's make bitkeeper ignore the stuff.
--HG--
extra : convert_revision :
8ea2a403c7ba2a3c9bd44269a2c0ede9294c92d4
Steve Reinhardt [Sat, 1 Nov 2003 18:45:23 +0000 (10:45 -0800)]
Get rid of obsolete backtrace code.
--HG--
extra : convert_revision :
3f5b938e0f64fac5e1c060d82d7f6906521b2174
Nathan Binkert [Sat, 1 Nov 2003 18:20:44 +0000 (13:20 -0500)]
Commit a command for use inside a simulated system for communicating
with the simulator. This program is generally compiled as the name
m5 and installed in /usr/local/bin
This command uses opcodes that are invalid on a normal system, so
don't expect it to do anything on a real system.
--HG--
extra : convert_revision :
fcbae99d4b0d38ff4a9950f1ab53923baa1f667a
Andrew Schultz [Sat, 1 Nov 2003 03:09:18 +0000 (22:09 -0500)]
eventq.cc, eventq.hh:
Cleaned up serialization
sim/eventq.hh:
sim/eventq.cc:
Cleaned up serialization
--HG--
extra : convert_revision :
b75696d75f1aee16ebca2076fdd3cd4913593762
Andrew Schultz [Fri, 31 Oct 2003 23:38:52 +0000 (18:38 -0500)]
Fix mistake, used readRequest.name twice
--HG--
extra : convert_revision :
0f8fa5f5487223c78402af79b42cf18f7b5022c0
Nathan Binkert [Fri, 31 Oct 2003 23:28:05 +0000 (18:28 -0500)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zans/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
3134761fa4c572a672558dfb6f9252aaef7b7062
Nathan Binkert [Fri, 31 Oct 2003 23:27:17 +0000 (18:27 -0500)]
Make the to_number function work better.
base/str.cc:
Make some fixes for the to_number function.
Fix overflow calculation for maximum decimal value.
(Note: minimum decimal value for signed numbers does not
work correctly, e.g. it will overflow on -128 for a signed char
though -127 will work)
Fix overflow calculation for hex values being converted into
signed types
Fix up the debugging stuff a little to make sure the values are
always printed as numbers.
test/strnumtest.cc:
using namespace std for g++ 3
--HG--
extra : convert_revision :
b00bb1296c85c3d64d8864283c9374e1563bfa31
Andrew Schultz [Fri, 31 Oct 2003 23:05:12 +0000 (18:05 -0500)]
Merge zizzer:/bk/m5
into ascender.eecs.umich.edu:/.automount/zizzer/z/alschult/sandbox/m5-change
--HG--
extra : convert_revision :
1ce2a98c531502cbf0c8eb4b365f14a893dc0f5d
Andrew Schultz [Fri, 31 Oct 2003 23:05:00 +0000 (18:05 -0500)]
Serialization support for serializing between DmaHolder simobjects and DmaEngine
--HG--
extra : convert_revision :
85de62b4066595a3139029a6ccc1c1e84526a0be
Andrew Schultz [Fri, 31 Oct 2003 22:32:04 +0000 (17:32 -0500)]
Changed the naming of Serializeable derived objects. Serializeable no longer has
objName as a member, instead it has the pure virtual function name(). SimObject
now has a objName member, and all classes derived directly from Serializeable
have to implement a name() function (which now makes them unique by pointer value)
cpu/simple_cpu/simple_cpu.cc:
Change initialization of Event to get rid of Serializeable naming
dev/etherlink.cc:
dev/etherlink.hh:
Seralizeable derived naming changes
sim/eventq.cc:
Serializeable derived naming changes, also changed serialization process so it
doesn't need to use nameChildren
sim/eventq.hh:
Serializeable derived naming changes, remove constructor for specifying event name
sim/serialize.cc:
Serializeable derived naming changes, remove setName function and the child naming
pass for serialization
sim/serialize.hh:
Serializeable derived naming changes, removed nameChildren, setName
sim/sim_object.cc:
sim/sim_object.hh:
Serializeable derived naming changes
--HG--
extra : convert_revision :
67bcc275b6c210f7049f98a1ad0d22e8f5596a63
Steve Reinhardt [Fri, 31 Oct 2003 18:10:45 +0000 (10:10 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
6a2131478dcc1965313d51436613cf48d85af524
Steve Reinhardt [Fri, 31 Oct 2003 18:10:34 +0000 (10:10 -0800)]
New 'greprevs' script to grep through old revs of a file.
util/greprevs:
Add descriptive comment.
--HG--
extra : convert_revision :
4fffef1327c04bdae7c7151db405920e2cc4eec8
Lisa Hsu [Fri, 31 Oct 2003 05:23:53 +0000 (00:23 -0500)]
I forgot - also to typedef the default type of bin choice given to every visible stat type (NoBin or BinType). this way a little #define does it all for you.
statistics.hh:
add #includes needed for CeilPow2
statistics.cc:
rm unneeded #includes for CeilPow2
base/statistics.cc:
rm unneeded #includes for CeilPow2
base/statistics.hh:
add #includes needed for CeilPow2
--HG--
extra : convert_revision :
818028b276e97735a8b8d21d6514f41a80350514
Lisa Hsu [Fri, 31 Oct 2003 00:20:18 +0000 (19:20 -0500)]
statistics.hh:
oops - remove a debug printf
base/statistics.hh:
oops - remove a debug printf
--HG--
extra : convert_revision :
a6ecab93f79ce0a5cb6ff129750d8f6a2de8d38c