Ron Dreslinski [Thu, 18 Nov 2004 04:32:48 +0000 (23:32 -0500)]
Fix typos about cpu3, should have been cpu2
--HG--
extra : convert_revision :
f5a188c50608809f8234a78cbfbf49c6e95b1c98
Ron Dreslinski [Thu, 18 Nov 2004 04:28:15 +0000 (23:28 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean
--HG--
extra : convert_revision :
e3bce987a3c33d8c5da9a9ab0458f153a56ba73f
Ron Dreslinski [Thu, 18 Nov 2004 04:26:43 +0000 (23:26 -0500)]
Changes to use siinic:
Changed SimpleCPU to not due functional access until the cache returns
Updated config file to use a simple cpu for second cpu in dual mode.
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
Update cache completion event to perform the functional read upon completion
--HG--
extra : convert_revision :
7a5b318d2040580fae92c165611425f513b14be9
Ali Saidi [Thu, 18 Nov 2004 03:12:01 +0000 (22:12 -0500)]
Move labels down slightly so they don't write over bottom of graph
--HG--
extra : convert_revision :
9a7b821bbf21a02ba437da915c12b25d03f85512
Ali Saidi [Thu, 18 Nov 2004 03:05:34 +0000 (22:05 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
950a2d6e131378be0af4ba76664a42235579bc75
Ali Saidi [Thu, 18 Nov 2004 03:05:29 +0000 (22:05 -0500)]
fixed swap disk, now it doesn't have a partition table
--HG--
extra : convert_revision :
a2b6ddd25e179b830dd58a1940ca8e1f20684b2e
Lisa Hsu [Thu, 18 Nov 2004 02:34:55 +0000 (21:34 -0500)]
Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5
--HG--
extra : convert_revision :
720fb90b6dd33a704697cd9219463ef9d6115313
Lisa Hsu [Thu, 18 Nov 2004 02:34:44 +0000 (21:34 -0500)]
nat.ini:
make packet dump work with both links in nat configuration
benchmark.ini:
make the packetdump work with both links in nat config.
--HG--
extra : convert_revision :
2676a2c44b295ce4161a4d8e6f35cc424da5a488
Nathan Binkert [Thu, 18 Nov 2004 02:04:02 +0000 (21:04 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
bc9d5460bc3b5aed0f1bf0e4aa6d5aed06598e74
Nathan Binkert [Thu, 18 Nov 2004 02:03:51 +0000 (21:03 -0500)]
serialization fix for the NS GigE driver
dev/ns_gige.cc:
We need to serialize the rxFragPtr
--HG--
extra : convert_revision :
1f68c9d7ae2dbeea69e60d988ea6392622104f52
Ron Dreslinski [Thu, 18 Nov 2004 01:47:03 +0000 (20:47 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean
--HG--
extra : convert_revision :
f6b12361683f1e5b423f83f2bd2b7b647861c310
Ron Dreslinski [Thu, 18 Nov 2004 01:46:56 +0000 (20:46 -0500)]
Enalbe the exclusive state to work. Now coherence works with MOSI and MOESI (using upgrades)
with a non-atomic bus on the top level of caches.
--HG--
extra : convert_revision :
dc9c2d72af062c8064b7447ad61d4ce37733a994
Ali Saidi [Wed, 17 Nov 2004 23:56:57 +0000 (18:56 -0500)]
Add the boot scripts for nfs tcp
--HG--
extra : convert_revision :
74625c44f2f7c9bcdc2718bbee891ea112f07583
Ali Saidi [Wed, 17 Nov 2004 23:56:56 +0000 (18:56 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
01fd8e27b9e428d7549192d6fc0f14d00888dad5
Ron Dreslinski [Wed, 17 Nov 2004 23:56:55 +0000 (18:56 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean
--HG--
extra : convert_revision :
5a4e20fdcb767687253fd462323084e0647b746a
Ron Dreslinski [Wed, 17 Nov 2004 23:56:00 +0000 (18:56 -0500)]
Add to the config files a two cpu version, fix error in unblocking code from the bus
--HG--
extra : convert_revision :
507bc441076bb3f70aa36dca1f0a63cb7364f0b4
Ali Saidi [Wed, 17 Nov 2004 23:07:04 +0000 (18:07 -0500)]
nfs tcp configs
--HG--
extra : convert_revision :
4ab87abc096506ee318a38602c32288c751dbd3c
Nathan Binkert [Wed, 17 Nov 2004 21:26:53 +0000 (16:26 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
e519436a2969406cacf13b62227d897eb03d5ba2
Nathan Binkert [Wed, 17 Nov 2004 21:24:58 +0000 (16:24 -0500)]
fix sinic unserialization
dev/sinic.cc:
we only use one address range in the sinic
--HG--
extra : convert_revision :
daa730a34ac9c9264060431556a1c5caa3252c5e
Ron Dreslinski [Wed, 17 Nov 2004 18:32:10 +0000 (13:32 -0500)]
Temporary fixes so that upgrades and writebacks function properly with timing coherence
Eventually we can change this so that we don't evict something we have an MSHR for
--HG--
extra : convert_revision :
2311fb47e51fbdc0e33e01c387b07eabd1f559b4
Lisa Hsu [Wed, 17 Nov 2004 18:04:50 +0000 (13:04 -0500)]
make fixes for NAT on the non-standard memory configurations. also configure 2nd etherdevs.
--HG--
extra : convert_revision :
08098a93ea16c09aa78590f708cafb53b1e1399e
Ron Dreslinski [Wed, 17 Nov 2004 14:54:38 +0000 (09:54 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean
--HG--
extra : convert_revision :
a64b84993c8852b19b1572c6913bf3dc6f6fc249
Ron Dreslinski [Wed, 17 Nov 2004 14:54:22 +0000 (09:54 -0500)]
Remove a hack placed in to work with an unimplemented mem-tester forcing the
mshr to satisfy targets in order even if they can be satisfied early.
--HG--
extra : convert_revision :
2590d0ae4d0ae29257c58c66503864fa218ba8de
Ali Saidi [Wed, 17 Nov 2004 09:05:30 +0000 (04:05 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
54dffc643884e98bf0a362ed848da73d2527cbc3
Ali Saidi [Wed, 17 Nov 2004 09:05:22 +0000 (04:05 -0500)]
added categories for all symbols
nate made the matching a much much much faster
--HG--
extra : convert_revision :
e3da92ead971628b0acf133cedf601c0d71b8f0d
Nathan Binkert [Wed, 17 Nov 2004 07:25:09 +0000 (02:25 -0500)]
tweak ini files
--HG--
extra : convert_revision :
6fb96ad5ad83c2bc5f55838ea9be4c67a821c896
Ali Saidi [Wed, 17 Nov 2004 07:09:11 +0000 (02:09 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
2d017be1a4ce42ffcef3176638afd2ff55675d8c
Ali Saidi [Wed, 17 Nov 2004 07:08:27 +0000 (02:08 -0500)]
added small block nfs script
--HG--
extra : convert_revision :
1fab69c3ccda27cab2cec1375bc1bd02b2b8f156
Steve Reinhardt [Wed, 17 Nov 2004 06:27:09 +0000 (01:27 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
7706acd42ffa2ef91b14ff61b97b1256db13a8e7
Nathan Binkert [Wed, 17 Nov 2004 06:27:08 +0000 (01:27 -0500)]
properly implement the fifo _reserved stuff.
dev/pktfifo.cc:
need to checkpoint _reserved
dev/pktfifo.hh:
When clearing, clear _reserved
size() is used for determining how many bytes are in the fifo
ready to be pulled, so we don't want to add _reserved
avail() on the other hand is used for determining how much
free space is in the fifo for adding packets.
adjust the implementation of empty() and full() to reflect this.
--HG--
extra : convert_revision :
3281972b4b70ea5833d39ae7ce1e73648b3573b0
Steve Reinhardt [Wed, 17 Nov 2004 05:52:55 +0000 (00:52 -0500)]
Add chart data output option to profile-top.
--HG--
extra : convert_revision :
1aa2435eb0771c1d46100700364b2d4dbff27a05
Nathan Binkert [Wed, 17 Nov 2004 05:28:42 +0000 (00:28 -0500)]
initialize _reserved
--HG--
extra : convert_revision :
a0f98c135734602b1d4b0890d8ff8cecc0e42f88
Steve Reinhardt [Wed, 17 Nov 2004 05:04:01 +0000 (00:04 -0500)]
Add categorization support to profile-top script.
--HG--
extra : convert_revision :
eaee8e5ee12b7cfcd77a65fa96d17c7019c94089
Lisa Hsu [Wed, 17 Nov 2004 05:04:00 +0000 (00:04 -0500)]
Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5
--HG--
extra : convert_revision :
3ad33afea5aebe67816f7d4e6b24a43636316ffa
Nathan Binkert [Wed, 17 Nov 2004 05:03:59 +0000 (00:03 -0500)]
Fix some commands.
util/stats/stats.py:
we only need the system if we're issuing one of the commands that
uses a stored formula.
--HG--
extra : convert_revision :
d129a00eeba46a03f7d600922d679aa0f43636be
Nathan Binkert [Wed, 17 Nov 2004 04:59:59 +0000 (23:59 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
00c450b42a18d645cc9029e7ef56b4797b7308c5
Nathan Binkert [Wed, 17 Nov 2004 04:59:51 +0000 (23:59 -0500)]
Fix a bug where we would improperly calculate if the FIFO was
full by adding a reserve feature to the packet fifo which allows
us to reserve space in the fifo if only part of a packet was
copied into the fifo.
dev/ns_gige.cc:
use the new reserve feature in the fifo to properly determine
when we're full. assert that adding a packet to the fifo suceeds.
dev/pktfifo.hh:
add the ability to reserve space in the fifo. This is useful for
partial writing of packets into the fifo.
--HG--
extra : convert_revision :
83f871f34fac237bb464c9513cf6490b5c62420e
Lisa Hsu [Wed, 17 Nov 2004 04:07:27 +0000 (23:07 -0500)]
nest the 2Int references inside #ifdefs so that the parser doesn't fart.
--HG--
extra : convert_revision :
0dbcefc327128674952782440639bac7b0b9e96e
Lisa Hsu [Wed, 17 Nov 2004 04:00:27 +0000 (23:00 -0500)]
Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5
--HG--
extra : convert_revision :
b0a61f2238bc92fca6576aed42d10aa8071d3290
Lisa Hsu [Wed, 17 Nov 2004 04:00:19 +0000 (23:00 -0500)]
make spec-surge use the specweb fileset.
--HG--
extra : convert_revision :
cc955b1c7a28cdcebc0b084b41f8fc52713e8d45
Ali Saidi [Wed, 17 Nov 2004 03:53:15 +0000 (22:53 -0500)]
merged noNAT and NFS small block changes
--HG--
extra : convert_revision :
81899edb511a4751e06e272451286a2176774860
Ali Saidi [Wed, 17 Nov 2004 03:46:56 +0000 (22:46 -0500)]
Add nfs small block benchmark
--HG--
extra : convert_revision :
488fa56c49b97ea46fa85c5f820565debb324e39
Steve Reinhardt [Wed, 17 Nov 2004 03:43:24 +0000 (22:43 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
3ddbfbc7ab9fdb15c35d86c27b3e23dd459028a8
Lisa Hsu [Wed, 17 Nov 2004 03:43:23 +0000 (22:43 -0500)]
Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5
--HG--
extra : convert_revision :
6c02cd3a846edcb915ba5d243bb938a9cc42f154
Lisa Hsu [Wed, 17 Nov 2004 03:43:12 +0000 (22:43 -0500)]
add support for NAT under netperf stream, maerts, and spec-surge.
configs/boot/spec-surge-client.rcS:
configs/boot/surge-client.rcS:
fix this rcS - don't sleep, instead wait for the server to tell you it's done.
configs/boot/spec-surge-server.rcS:
configs/boot/surge-server.rcS:
notify the client you're done starting the server.
--HG--
extra : convert_revision :
b708bd0a9147e248eed7c27e7078668fbd98b95e
Steve Reinhardt [Wed, 17 Nov 2004 03:42:33 +0000 (22:42 -0500)]
Modest enhancement to profile-top script
--HG--
extra : convert_revision :
19986c011852577a6b5bb6bca59b35e07dc083c3
Ali Saidi [Wed, 17 Nov 2004 03:09:28 +0000 (22:09 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
f54eb63785cbf774461dcb0cb092742732dde23e
Nathan Binkert [Wed, 17 Nov 2004 03:09:27 +0000 (22:09 -0500)]
more ini fixing
--HG--
extra : convert_revision :
27e946a3e620e045ef6d6b001dd9b3daccfa147e
Ali Saidi [Wed, 17 Nov 2004 02:59:12 +0000 (21:59 -0500)]
skip the nfs charecter by charecter and re-write stuff
configs/boot/nfs-client.rcS:
skip the charecter and rewrite test
--HG--
extra : convert_revision :
2630e1f1a2a52a4e96a45e12769a94de28ad5c93
Steve Reinhardt [Tue, 16 Nov 2004 22:23:54 +0000 (17:23 -0500)]
Add simple python utility for parsing function
profile output.
--HG--
extra : convert_revision :
99e227830088a8db96e0e8fbe04cae49005bd43f
Steve Reinhardt [Tue, 16 Nov 2004 22:20:49 +0000 (17:20 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
bf821e90a6f15a69dfa46fe37f7ab586698cd0c0
Steve Reinhardt [Tue, 16 Nov 2004 22:20:38 +0000 (17:20 -0500)]
Add simple function-tracing support. Prints a message
every time the committed PC changes from one symbol scope
to another.
Set function_trace=y on target CPU to enable.
To defer start, use function_trace_start=<tick>
(in addition to setting function_trace=y).
cpu/base_cpu.cc:
cpu/base_cpu.hh:
Add simple function-tracing support.
cpu/simple_cpu/simple_cpu.cc:
Add function_trace, function_trace_start params
Call traceFunctions() on instruction completion
cpu/simple_cpu/simple_cpu.hh:
Add function_trace, function_trace_start params
--HG--
extra : convert_revision :
8a7f84028ccbaee585253629007f32fc8eae35e1
Nathan Binkert [Tue, 16 Nov 2004 21:05:53 +0000 (16:05 -0500)]
more ordering for .ini file.
--HG--
extra : convert_revision :
0b20009bd1688e7ccc52d4a5afd384180ada2e72
Ali Saidi [Tue, 16 Nov 2004 07:22:07 +0000 (02:22 -0500)]
add asymmetric dual configurations
--HG--
extra : convert_revision :
e1479f7033350982d729c0b7228f570d4302fe6b
Ali Saidi [Tue, 16 Nov 2004 05:46:17 +0000 (00:46 -0500)]
use the big swap disk
--HG--
extra : convert_revision :
87bae6fc4746e7b5b029ea45ab2b71e0d8cd58ae
Ali Saidi [Tue, 16 Nov 2004 05:35:05 +0000 (00:35 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
ef573e6e6dab2516c930b6209b66442d8ad85be0
Ali Saidi [Tue, 16 Nov 2004 05:34:45 +0000 (00:34 -0500)]
fixed for 768MB runs
--HG--
extra : convert_revision :
c86b282788919d414470aaf551094fee1bebbbab
Nathan Binkert [Tue, 16 Nov 2004 05:30:35 +0000 (00:30 -0500)]
Fix default sampling periods
--HG--
extra : convert_revision :
bc1f5c36fb6f7bb56e4a403f4ae0d87fee044459
Nathan Binkert [Tue, 16 Nov 2004 05:28:35 +0000 (00:28 -0500)]
Dual core configuration for detailed simulation
--HG--
extra : convert_revision :
8f2e27631365a3ffe4aa7a9a1d29081ef786801b
Nathan Binkert [Tue, 16 Nov 2004 05:15:14 +0000 (00:15 -0500)]
fix benchmark.ini ordering
--HG--
extra : convert_revision :
55580e2aa602479ff804bd27857d0b10250ce376
Nathan Binkert [Tue, 16 Nov 2004 05:03:03 +0000 (00:03 -0500)]
improve configs
--HG--
extra : convert_revision :
981568baeaa7ab78cccc9e3ac5112b2426a440ff
Nathan Binkert [Tue, 16 Nov 2004 04:26:10 +0000 (23:26 -0500)]
All of these benchmarks use two systems
--HG--
extra : convert_revision :
d3482d77b08b5ef040d0d933b3320c5db4781bb5
Nathan Binkert [Tue, 16 Nov 2004 04:23:04 +0000 (23:23 -0500)]
setup memory sizes for the various benchmarks
--HG--
extra : convert_revision :
a5861aaa53cc71c67e32bf633ce7bbe2d9c892ca
Steve Reinhardt [Tue, 16 Nov 2004 01:30:51 +0000 (20:30 -0500)]
Minor cleanup of symtab code/includes.
base/loader/symtab.cc:
base/loader/symtab.hh:
Get rid of old unused calls.
cpu/simple_cpu/simple_cpu.hh:
No need to include base/loader/symtab.hh
kern/linux/linux_system.cc:
kern/tru64/tru64_system.cc:
Include base/loader/symtab.hh (since it's no longer included in system.hh)
sim/system.hh:
Replace include of base/loader/symtab.hh with forward class decl.
--HG--
extra : convert_revision :
3a778c2f409ec94e3b00eaa9b3859943cb39918c
Steve Reinhardt [Tue, 16 Nov 2004 00:57:11 +0000 (19:57 -0500)]
Minor fixes for pc sampling profile.
cpu/exetrace.cc:
Fix dumb mistake.
--HG--
extra : convert_revision :
9d5d0d09775133d1a60cf459f1bd47afa8480663
Nathan Binkert [Mon, 15 Nov 2004 23:21:36 +0000 (18:21 -0500)]
make benchmarks.ini a bit less confusing
--HG--
extra : convert_revision :
047ff4f84677d5b132b4d1fe80fbbf91a213a833
Nathan Binkert [Mon, 15 Nov 2004 23:20:43 +0000 (18:20 -0500)]
Fix up the spec-surge benchmark
configs/boot/spec-surge-client.rcS:
change the number of connections and add stuff for the
file set size and checkpointing
--HG--
extra : convert_revision :
9e0fe74f44300893c6050e3eb1ae302f71c02767
Nathan Binkert [Mon, 15 Nov 2004 21:11:30 +0000 (16:11 -0500)]
clean up benchmarks differentiate the two surge benchmarks
--HG--
extra : convert_revision :
8fd9717b34a5cdfa9e36a421e3df7cd957becb9c
Nathan Binkert [Mon, 15 Nov 2004 21:07:28 +0000 (16:07 -0500)]
more whitespace fixes
configs/boot/spec-surge-client.rcS:
configs/boot/spec-surge-server.rcS:
whitespace fixes
--HG--
extra : convert_revision :
90eb2a325a3cf4436081c992d6f3e0f903980ff7
Nathan Binkert [Mon, 15 Nov 2004 20:45:55 +0000 (15:45 -0500)]
more formatting
configs/boot/nfs-server.rcS:
fix whitespace
--HG--
extra : convert_revision :
d421d5fa1e041b041d7c47d36abe55a2dd3e7487
Nathan Binkert [Mon, 15 Nov 2004 20:44:25 +0000 (15:44 -0500)]
formatting
configs/boot/nfs-client.rcS:
fix whitespace
--HG--
extra : convert_revision :
dc384870de9431fe30b13a2c8c69d97b2d06dca9
Nathan Binkert [Mon, 15 Nov 2004 20:42:15 +0000 (15:42 -0500)]
cleanup the nfs server script
configs/boot/nfs-server.rcS:
don't need extra IP aliases
re-order the nfs daemons so they happen in the right order
and don't have the shell put them in the background since they
will auto detach anyway.
--HG--
extra : convert_revision :
a6b13ac91d1649878d346663f6ddff56d9a8a8ec
Nathan Binkert [Mon, 15 Nov 2004 20:40:35 +0000 (15:40 -0500)]
fix udp checksums
base/inet.hh:
tcp/udp/ip checksums are calculated/manipulated in NBO always,
so there's no need to convert to host endian.
--HG--
extra : convert_revision :
13d6aff025a6c072d9d829c2e9fad4f13399b1f7
Steve Reinhardt [Mon, 15 Nov 2004 07:44:23 +0000 (02:44 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
033375b63b56104a5c1823985eeee7bb6cdcc7de
Nathan Binkert [Mon, 15 Nov 2004 07:44:22 +0000 (02:44 -0500)]
mount surge image read-only
--HG--
extra : convert_revision :
b91a93f9dc004c587d3ec763ecde98e5bd241159
Steve Reinhardt [Mon, 15 Nov 2004 06:56:40 +0000 (01:56 -0500)]
Add support for sampled PC profiling to FullCPU.
Simple text list of symbol (or address) and count
will be dumped to m5prof.<cpu-name> if the cpu's
pc_sample_interval param is set.
SConscript:
Add cpu/full_cpu/pc_sample_profile.cc
base/callback.hh:
Add a comment about MakeCallback.
Fix type in another comment.
base/loader/symtab.cc:
Revamp findNearestSymbol() to provide addresses of both
nearest symbols (preceding and following) as well as
string for former.
Move global definition of debugSymbolTable here too.
base/loader/symtab.hh:
Revamp findNearestSymbol() to provide addresses of both
nearest symbols (preceding and following) as well as
string for former.
Move global declaration of debugSymbolTable here too.
cpu/exetrace.cc:
Use new findNearestSymbol() interface for trace symbols.
kern/linux/linux_system.cc:
sim/system.cc:
Remove extern of debugSymbolTable (now in symtab.hh)
sim/process.cc:
Initialize debugSymbolTable if binary has a symbol table.
--HG--
extra : convert_revision :
0b5393dc39c40ac88c953684708f1125da550671
Nathan Binkert [Mon, 15 Nov 2004 06:55:24 +0000 (01:55 -0500)]
make it so we can individually use the sampling cpu on
either the client or the server.
Make an ini file that makes our benchmarks easier to run.
--HG--
extra : convert_revision :
c270cd1c027cb40d5c5bcfc2ed63f9db4b155116
Ali Saidi [Mon, 15 Nov 2004 06:36:28 +0000 (01:36 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/tmp/m5
--HG--
extra : convert_revision :
3c7b8a86b528a61f5cb14c86ec7c1eb9276824af
Nathan Binkert [Mon, 15 Nov 2004 06:36:27 +0000 (01:36 -0500)]
Fix more of the stats python stuff
util/stats/info.py:
Make the binnings stuff work again.
util/stats/stats.py:
small patch for graphing
make it so we can print out bins for the stat command
--HG--
extra : convert_revision :
c0279ac7030fd5146dd00801baa41e7baf97d1f4
Ali Saidi [Mon, 15 Nov 2004 05:43:34 +0000 (00:43 -0500)]
commit ploticus code to repository
--HG--
extra : convert_revision :
861423a859d05e7915d9f83ef40c188fe21bcb31
Ali Saidi [Sun, 14 Nov 2004 23:52:04 +0000 (18:52 -0500)]
updated to make memory a touch slower in the HT case and the
make sure the interrupt controller is on cpu die
--HG--
extra : convert_revision :
07b7eadbec7694859957279c81b9bdb4ebd044a3
Nathan Binkert [Sun, 14 Nov 2004 22:41:56 +0000 (17:41 -0500)]
New system configurations that work around the bus bridge
memory system bug
--HG--
extra : convert_revision :
29aa265126691eee386bc73a86e5d382e12b59a9
Ron Dreslinski [Sun, 14 Nov 2004 22:31:59 +0000 (17:31 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean
--HG--
extra : convert_revision :
19dce611da2e93f85af1eef1d590d820e8db3c5f
Ron Dreslinski [Sun, 14 Nov 2004 22:31:43 +0000 (17:31 -0500)]
Fix some small bugs with bus blocking and adress arbitration
Fix it so that when snoop response is called on other interfaces besides master, it just does nothing
--HG--
extra : convert_revision :
d1e29b738c932642d53c011b50cfd915f67af51b
Nathan Binkert [Sun, 14 Nov 2004 22:22:33 +0000 (17:22 -0500)]
update graph generating code
util/stats/stats.py:
tweak the graphing stuff for the new configurations we have.
add more graph types.
nsgige -> etherdev
deal with memory hierarchy change by using L2 instead of L3
--HG--
extra : convert_revision :
55362e79d9f8d0d68aa08129f5af944b378a9f4c
Ron Dreslinski [Sun, 14 Nov 2004 21:19:11 +0000 (16:19 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean
--HG--
extra : convert_revision :
170f5fd8891b02ad3cc04112c6f304ede3254dae
Ali Saidi [Sun, 14 Nov 2004 20:26:48 +0000 (15:26 -0500)]
by default bin interrupts seperately from kernel code.
--HG--
extra : convert_revision :
fb890907402b7c1e873a2ac32e72cb6e0ed73f13
Ali Saidi [Sun, 14 Nov 2004 04:09:17 +0000 (23:09 -0500)]
patched nfs boot scripts
configs/boot/nfs-server.rcS:
made the partition size correct
--HG--
extra : convert_revision :
4e9bdbe3e465aea2a914fd928b47296031c2523b
Ali Saidi [Sun, 14 Nov 2004 04:08:08 +0000 (23:08 -0500)]
fixed nfs scripts hopefully for the last time
configs/boot/nfs-client.rcS:
lucky #3
--HG--
extra : convert_revision :
a55f29e4c087e7ab95ea584316ad6fe4ebb5df9a
Steve Reinhardt [Sun, 14 Nov 2004 02:13:25 +0000 (21:13 -0500)]
Get rid of obsolete sim/sim_stats.* files (looks like these
are replaced by sim/stats.hh and sim/stat_control.*)
dev/ns_gige.cc:
dev/sinic.cc:
Include sim/stats.hh instead of sim/sim_stats.hh
--HG--
extra : convert_revision :
5e07932eab45ae4fb719baa4f94c5f62092a8446
Nathan Binkert [Sat, 13 Nov 2004 22:10:48 +0000 (17:10 -0500)]
Add the Simple Integrated Network Interface Controller
--HG--
extra : convert_revision :
2bce25881a104e8282a5ed819769c6a7de414fb2
Nathan Binkert [Sat, 13 Nov 2004 22:05:13 +0000 (17:05 -0500)]
don't handle device specific configuration stuff in the base
class. While we're at it, very minor formatting.
--HG--
extra : convert_revision :
b7c719f92ece7234838434294b33833289adbada
Nathan Binkert [Sat, 13 Nov 2004 21:52:08 +0000 (16:52 -0500)]
Use the new PacketFifo class to avoid manual calculations
--HG--
extra : convert_revision :
afa193904b7ed4d5e5c50e9dcb78e8e855b00ecc
Nathan Binkert [Sat, 13 Nov 2004 21:46:56 +0000 (16:46 -0500)]
change the serialization of a packet so that we don't
do a nameOut. This fixes a subtle bug in serialization that
can pop up.
--HG--
extra : convert_revision :
b52df977dcbef1c9bd0d4405ba0b36dff3737cdf
Nathan Binkert [Sat, 13 Nov 2004 21:33:16 +0000 (16:33 -0500)]
we shouldn't ever pass around references to PacketPtrs,
const references are ok, or pass by value.
--HG--
extra : convert_revision :
7280a1c7d22b9294fddbe50f02f6f4c6ca9b2e5b
Nathan Binkert [Sat, 13 Nov 2004 21:24:47 +0000 (16:24 -0500)]
forgot a change in the previous commit. the ide controller
doesn't have its own interrupt functions
dev/ide_ctrl.hh:
oops. we don't have our own interrupt functions anymore
we get them from the base class.
--HG--
extra : convert_revision :
3eac228ec59f4fea0b0e49f961e8b21705dee27f
Nathan Binkert [Sat, 13 Nov 2004 21:04:33 +0000 (16:04 -0500)]
Make it possible for PioDevices to have unknown pio
latencies.
--HG--
extra : convert_revision :
08f2250efc078406c497a6820ae30f5fdf687ea5
Nathan Binkert [Sat, 13 Nov 2004 20:45:22 +0000 (15:45 -0500)]
Use parameter structs for initialization so it's easier
to add new devices. Abstract the Platform more so that
it is unnecessary to know know platform specifics for
interrupting or translating PCI DMA addresses.
dev/ide_ctrl.cc:
convert to parameter struct for initialization
use the interrupt functions in the PciDev base class
convert from tsunami to using platform
We don't need an interrupt controller here.
dev/ide_ctrl.hh:
don't use Tsunami, use Platform
make the IdeDisk a friend so that it can access my plaform
convert to parameter struct for construction
dev/ide_disk.cc:
don't use tsunami references, but platform references
dev/ns_gige.cc:
Convert to parameter struct for initialzation. Use code in
base class for interrupts so we don't need to know anything
about the platform. Don't need an IntrControl *.
dev/ns_gige.hh:
We don't need a Tsunami * anymore
convert to a parameter struct for construction
dev/pcidev.cc:
deal with new parameter struct
dev/pcidev.hh:
- Move all of the configuration parameters into a param struct
that we can pass into the constructor.
- Add a Platform * for accessing new generic interrupt post/clear
and dma address translation fuctions
- Create functions for posting/clearing interrupts and translating
dma addresses
dev/platform.cc:
have default functions that panic on pci calls
dev/platform.hh:
don't make the pci stuff pure virtual, but rather provide
default implementations that panic. Also, add dma address
translation.
dev/tsunami.cc:
this-> isn't necessary here.
add pci address translation
dev/tsunami.hh:
implement the pciToDma address translation
--HG--
extra : convert_revision :
7db27a2fa1f1bd84704921ec7ca0280b5653c43e
Nathan Binkert [Sat, 13 Nov 2004 19:46:02 +0000 (14:46 -0500)]
sort #includes
don't need to include ev5.hh anymore
--HG--
extra : convert_revision :
f80d2767936d3fb07a9cb7fd4709cafe9ea93e63
Nathan Binkert [Sat, 13 Nov 2004 19:01:38 +0000 (14:01 -0500)]
Macros are nasty, so let's get rid of them. Convert all
all macros in ev5.hh to inline functions or constant typed
variables and make them follow our style while we're at it.
All of the stuff in this file actually belongs in the ISA
traits code, but this is a first step at getting things done
in the right manner.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
arch/alpha/ev5.cc:
arch/alpha/isa_desc:
dev/ns_gige.cc:
kern/tru64/tru64_events.cc:
deal with changes in ev5.hh
arch/alpha/ev5.hh:
Macros are nasty, so let's get rid of them. Convert all
all macros to inline functions or constant typed variables.
Make them follow our style while we're at it.
All of the stuff in this file actually belongs in the ISA
traits code, but this is a first step at getting things done
in the right manner.
arch/alpha/isa_traits.hh:
move some of the ev5 specific code into the isa
arch/alpha/vtophys.cc:
base/remote_gdb.cc:
deal with isa addition
cpu/exec_context.hh:
be less isa specific and use the isa traits to figure out
what we can.
dev/alpha_console.cc:
dev/pciconfigall.cc:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart.cc:
deal with changes in ev5.hh
I don't believe this masking is actually necessary. We should
look at removing it later.
dev/ide_ctrl.cc:
sort #includes
deal with changes in ev5.hh
--HG--
extra : convert_revision :
c8a3adf0a4b1d198aefe38fc38b295abf289b08a