Commit graph

1353 commits

Author SHA1 Message Date
Nathan Binkert
25890b9404 back out ron's memory system changes because they break dma
--HG--
extra : convert_revision : 3e0af11cd9dc97743f288cee5248fa44013baddd
2004-11-18 02:34:53 -05:00
Nathan Binkert
2a649076a4 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : a8a8e26bda81546b4de45983e99e57e24ddf8567
2004-11-18 00:25:17 -05:00
Nathan Binkert
44ef49bd2b undo simple CPU changes
--HG--
extra : convert_revision : dce0d9f7d34243899f699488c6534fb1ccea4849
2004-11-18 00:24:36 -05:00
Nathan Binkert
9bf39b1c60 Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 76698abf91aa5b1871663830da5349a6a113dbb3
2004-11-18 00:17:03 -05:00
Ron Dreslinski
addf543687 Fix typos about cpu3, should have been cpu2
--HG--
extra : convert_revision : f5a188c50608809f8234a78cbfbf49c6e95b1c98
2004-11-17 23:32:48 -05:00
Ron Dreslinski
d68a22f40f Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean

--HG--
extra : convert_revision : e3bce987a3c33d8c5da9a9ab0458f153a56ba73f
2004-11-17 23:28:15 -05:00
Ron Dreslinski
60e88ba7ad 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
2004-11-17 23:26:43 -05:00
Nathan Binkert
e04424737c Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 46a0ce7e098bab38b0df8d86e37dd16936c6eeb7
2004-11-17 22:44:12 -05:00
Ali Saidi
171ebf16be Move labels down slightly so they don't write over bottom of graph
--HG--
extra : convert_revision : 9a7b821bbf21a02ba437da915c12b25d03f85512
2004-11-17 22:12:01 -05:00
Nathan Binkert
91628e13a9 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : e1a178b33e9de6a6a04d4967b1abe9cc7fddcea3
2004-11-17 22:08:36 -05:00
Ali Saidi
1b374f4008 Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : 950a2d6e131378be0af4ba76664a42235579bc75
2004-11-17 22:05:34 -05:00
Ali Saidi
72aea04d8d fixed swap disk, now it doesn't have a partition table
--HG--
extra : convert_revision : a2b6ddd25e179b830dd58a1940ca8e1f20684b2e
2004-11-17 22:05:29 -05:00
Nathan Binkert
69039fe101 Reduce the amount of time we delay when dumping a checkpoint for
netperf runs

configs/boot/nat-netperf-maerts-client.rcS:
configs/boot/nat-netperf-stream-client.rcS:
configs/boot/netperf-maerts-client.rcS:
configs/boot/netperf-rr.rcS:
configs/boot/netperf-stream-client.rcS:
    dont' delay for so long when dumping a checkpoint

--HG--
extra : convert_revision : 25f35957ceef3f55c6edb77fa07be0044de5ec36
2004-11-17 21:38:08 -05:00
Lisa Hsu
873fb248dc Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5
--HG--
extra : convert_revision : 720fb90b6dd33a704697cd9219463ef9d6115313
2004-11-17 21:34:55 -05:00
Lisa Hsu
410917c428 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
2004-11-17 21:34:44 -05:00
Nathan Binkert
42de71bc9d Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : bc9d5460bc3b5aed0f1bf0e4aa6d5aed06598e74
2004-11-17 21:04:02 -05:00
Nathan Binkert
98ca4fa600 serialization fix for the NS GigE driver
dev/ns_gige.cc:
    We need to serialize the rxFragPtr

--HG--
extra : convert_revision : 1f68c9d7ae2dbeea69e60d988ea6392622104f52
2004-11-17 21:03:51 -05:00
Ron Dreslinski
fed826f6c3 Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean

--HG--
extra : convert_revision : f6b12361683f1e5b423f83f2bd2b7b647861c310
2004-11-17 20:47:03 -05:00
Ron Dreslinski
10f24ea5df 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
2004-11-17 20:46:56 -05:00
Ali Saidi
77e0868099 Add the boot scripts for nfs tcp
--HG--
extra : convert_revision : 74625c44f2f7c9bcdc2718bbee891ea112f07583
2004-11-17 18:56:57 -05:00
Ali Saidi
d65159f50f Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : 01fd8e27b9e428d7549192d6fc0f14d00888dad5
2004-11-17 18:56:56 -05:00
Ron Dreslinski
90080826d4 Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean

--HG--
extra : convert_revision : 5a4e20fdcb767687253fd462323084e0647b746a
2004-11-17 18:56:55 -05:00
Ron Dreslinski
dceb69a28a Add to the config files a two cpu version, fix error in unblocking code from the bus
--HG--
extra : convert_revision : 507bc441076bb3f70aa36dca1f0a63cb7364f0b4
2004-11-17 18:56:00 -05:00
Ali Saidi
3d57ca3da4 nfs tcp configs
--HG--
extra : convert_revision : 4ab87abc096506ee318a38602c32288c751dbd3c
2004-11-17 18:07:04 -05:00
Nathan Binkert
51a6399499 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : e519436a2969406cacf13b62227d897eb03d5ba2
2004-11-17 16:26:53 -05:00
Nathan Binkert
797661b6e1 fix sinic unserialization
dev/sinic.cc:
    we only use one address range in the sinic

--HG--
extra : convert_revision : daa730a34ac9c9264060431556a1c5caa3252c5e
2004-11-17 16:24:58 -05:00
Ron Dreslinski
dc26d69b7d 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
2004-11-17 13:32:10 -05:00
Lisa Hsu
016a23ae97 make fixes for NAT on the non-standard memory configurations. also configure 2nd etherdevs.
--HG--
extra : convert_revision : 08098a93ea16c09aa78590f708cafb53b1e1399e
2004-11-17 13:04:50 -05:00
Ron Dreslinski
f9ff53241f Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean

--HG--
extra : convert_revision : a64b84993c8852b19b1572c6913bf3dc6f6fc249
2004-11-17 09:54:38 -05:00
Ron Dreslinski
ec636ed43f 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
2004-11-17 09:54:22 -05:00
Ali Saidi
7da367d5dd Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : 54dffc643884e98bf0a362ed848da73d2527cbc3
2004-11-17 04:05:30 -05:00
Ali Saidi
091bded6cd added categories for all symbols
nate made the matching a much much much faster

--HG--
extra : convert_revision : e3da92ead971628b0acf133cedf601c0d71b8f0d
2004-11-17 04:05:22 -05:00
Nathan Binkert
4e8bc3f125 tweak ini files
--HG--
extra : convert_revision : 6fb96ad5ad83c2bc5f55838ea9be4c67a821c896
2004-11-17 02:25:09 -05:00
Ali Saidi
6487c5eabf Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : 2d017be1a4ce42ffcef3176638afd2ff55675d8c
2004-11-17 02:09:11 -05:00
Ali Saidi
95fdc9e47b added small block nfs script
--HG--
extra : convert_revision : 1fab69c3ccda27cab2cec1375bc1bd02b2b8f156
2004-11-17 02:08:27 -05:00
Steve Reinhardt
b1bc7d8a7d Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5

--HG--
extra : convert_revision : 7706acd42ffa2ef91b14ff61b97b1256db13a8e7
2004-11-17 01:27:09 -05:00
Nathan Binkert
5f6328d9c6 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
2004-11-17 01:27:08 -05:00
Steve Reinhardt
0c056556b1 Add chart data output option to profile-top.
--HG--
extra : convert_revision : 1aa2435eb0771c1d46100700364b2d4dbff27a05
2004-11-17 00:52:55 -05:00
Nathan Binkert
c43c3f2af3 initialize _reserved
--HG--
extra : convert_revision : a0f98c135734602b1d4b0890d8ff8cecc0e42f88
2004-11-17 00:28:42 -05:00
Steve Reinhardt
82e2fc3994 Add categorization support to profile-top script.
--HG--
extra : convert_revision : eaee8e5ee12b7cfcd77a65fa96d17c7019c94089
2004-11-17 00:04:01 -05:00
Lisa Hsu
62ee766e50 Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5
--HG--
extra : convert_revision : 3ad33afea5aebe67816f7d4e6b24a43636316ffa
2004-11-17 00:04:00 -05:00
Nathan Binkert
ee962a6b0b 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
2004-11-17 00:03:59 -05:00
Nathan Binkert
f427445753 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 00c450b42a18d645cc9029e7ef56b4797b7308c5
2004-11-16 23:59:59 -05:00
Nathan Binkert
a109296bde 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
2004-11-16 23:59:51 -05:00
Lisa Hsu
95ce45ade9 nest the 2Int references inside #ifdefs so that the parser doesn't fart.
--HG--
extra : convert_revision : 0dbcefc327128674952782440639bac7b0b9e96e
2004-11-16 23:07:27 -05:00
Lisa Hsu
5331fd197b Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5
--HG--
extra : convert_revision : b0a61f2238bc92fca6576aed42d10aa8071d3290
2004-11-16 23:00:27 -05:00
Lisa Hsu
87612a032c make spec-surge use the specweb fileset.
--HG--
extra : convert_revision : cc955b1c7a28cdcebc0b084b41f8fc52713e8d45
2004-11-16 23:00:19 -05:00
Ali Saidi
8de12dc09a merged noNAT and NFS small block changes
--HG--
extra : convert_revision : 81899edb511a4751e06e272451286a2176774860
2004-11-16 22:53:15 -05:00
Ali Saidi
8a2975074f Add nfs small block benchmark
--HG--
extra : convert_revision : 488fa56c49b97ea46fa85c5f820565debb324e39
2004-11-16 22:46:56 -05:00
Steve Reinhardt
8e85445f3d Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5

--HG--
extra : convert_revision : 3ddbfbc7ab9fdb15c35d86c27b3e23dd459028a8
2004-11-16 22:43:24 -05:00