Kevin Lim [Tue, 18 Jan 2005 20:46:00 +0000 (15:46 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new
--HG--
extra : convert_revision :
c51d9a7361d8e3c23e9494640c66df8505322b00
Nathan Binkert [Tue, 18 Jan 2005 20:42:52 +0000 (15:42 -0500)]
fix typo
--HG--
extra : convert_revision :
7fe0b0b43534020ffd3e5d34a08efd24ba063e5a
Nathan Binkert [Tue, 18 Jan 2005 20:28:34 +0000 (15:28 -0500)]
More configuration fixes
sim/pyconfig/m5config.py:
put panic, AddToPath, and Import here so they're always available.
--HG--
extra : convert_revision :
104dba5ccac0d64479b4109d477b5192c4b07a6e
Ali Saidi [Tue, 18 Jan 2005 18:35:04 +0000 (13:35 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
a799d615ab5a3d3447b24b1b1ce24cffcde361cd
Ali Saidi [Tue, 18 Jan 2005 18:34:58 +0000 (13:34 -0500)]
now really done with stability stats stuff
--HG--
extra : convert_revision :
9bdbcec972f5d06e3ecd99c418fcccfaef7f6f3a
Ali Saidi [Tue, 18 Jan 2005 18:25:55 +0000 (13:25 -0500)]
finished stability stats option
--HG--
extra : convert_revision :
3ad0a143f79b116c5b18321846653d627429882a
Kevin Lim [Tue, 18 Jan 2005 18:02:47 +0000 (13:02 -0500)]
Merge changes to make m5 g++ 3.4 compatible.
sim/param.cc:
Merge changes.
--HG--
extra : convert_revision :
b5044e1f7c48ae2d74d5233dd4fabfb7a801d7c8
Nathan Binkert [Tue, 18 Jan 2005 17:51:09 +0000 (12:51 -0500)]
Fix the p4 config
--HG--
extra : convert_revision :
64dac30ce221b71f0ac0e5bceed739fa95ab11a2
Nathan Binkert [Tue, 18 Jan 2005 16:54:46 +0000 (11:54 -0500)]
More configuration tweaks/fixes
--HG--
extra : convert_revision :
8094d88e9e58f9097e9e4ffde70787f81bb235e1
Kevin Lim [Tue, 18 Jan 2005 16:43:45 +0000 (11:43 -0500)]
Move trace data function to .cc file.
--HG--
extra : convert_revision :
8180068747489978a2bbaa096dc73b0cfd14b052
Nathan Binkert [Tue, 18 Jan 2005 04:41:35 +0000 (23:41 -0500)]
Config cleanups
sim/pyconfig/m5config.py:
Remove unused code
remove the defined() function that was masking the one
that I really wanted
test/genini.py:
Add the directory that a script was executed from to the
path
--HG--
extra : convert_revision :
a1861065b2de46d77c94691d0c5a7865cdce0f09
Nathan Binkert [Tue, 18 Jan 2005 03:30:10 +0000 (22:30 -0500)]
fix the exec of python
--HG--
extra : convert_revision :
08b542ae09e69e139e0f03279a51fe253c05e629
Nathan Binkert [Mon, 17 Jan 2005 06:35:33 +0000 (01:35 -0500)]
configuration tweaks
--HG--
extra : convert_revision :
360bcbb0c67f4f40e7fc41db1befb4864dbbd14f
Nathan Binkert [Mon, 17 Jan 2005 06:30:39 +0000 (01:30 -0500)]
get the exit condition for the python code right
sim/main.cc:
get the exit condition right
--HG--
extra : convert_revision :
0dada3d68492c46981c51d3de0de409b282bb13b
Nathan Binkert [Mon, 17 Jan 2005 06:23:50 +0000 (01:23 -0500)]
don't use dirname
--HG--
extra : convert_revision :
181cbae18174b1278937720de09e0df14f7ce5e9
Nathan Binkert [Mon, 17 Jan 2005 06:11:27 +0000 (01:11 -0500)]
fix dirname for linux
--HG--
extra : convert_revision :
751ce377d10e2f07ce83da8c1f44756ea62925d0
Nathan Binkert [Mon, 17 Jan 2005 05:54:32 +0000 (00:54 -0500)]
Remove all of the old param context description junk
--HG--
extra : convert_revision :
4df8112d713e83b4435f43edf40df87f5dda808f
Nathan Binkert [Mon, 17 Jan 2005 05:52:51 +0000 (00:52 -0500)]
Add the pentium 4 configuration. Add some command line options
to M5 to support the python configuration stuff.
sim/main.cc:
Make the -I option update the include path for phython as
well as cpp
Make the -P option pass a raw python string to the interpreter
Make the -E option add strings to the environment
Break up the various steps of python processing to accomidate
multiple files and the various new options
test/genini.py:
Make this executable
--HG--
extra : convert_revision :
6acc50d2e4367c5ceaee013db987c8a1db924df3
Nathan Binkert [Sat, 15 Jan 2005 09:12:25 +0000 (04:12 -0500)]
New and improved configuration mechanism. No more writing of
wierd ini files. The ini files are still used as an intermediate step,
but a sophisticated python library exists to help build them more
easily.
SConscript:
add the new embedded file stuff
remove all of the old object description junk
base/inifile.cc:
base/inifile.hh:
get rid of findDefault and findAppend since they were the source
of much evil.
base/trace.cc:
For now, if we don't have the dprintf_stream set up, dump
to standard out. We probably want a command line option
for this.
dev/alpha_console.cc:
PioDevice now takes a platform parameter.
All PioDevices must have a pio_latency parameter. We stick
a dummy parameter in here for now until we get rid of the
builder stuff.
dev/alpha_console.hh:
don't need Platform anymore
dev/baddev.cc:
PioDevice now takes a platform parameter.
All PioDevices must have a pio_latency parameter. We stick
a dummy parameter in here for now until we get rid of the
builder stuff. Same for the platform parameter, though we just
pass the PioDevice a null parameter since it isn't used by
this device and it's quicker.
dev/baddev.hh:
fix #include guards
dev/etherlink.cc:
rename parameters.
dev/ethertap.cc:
rename parameters
dev/ide_ctrl.cc:
All devices need an address even if it will get overwritten later.
dev/ide_disk.cc:
use an enum for the drive ID stuff.
rename disk_delay -> delay
Actually, I think that we should implement "cable select" and
have the controller tell the drive what it is.
dev/io_device.cc:
dev/io_device.hh:
All IO devices take a Platform *
dev/ns_gige.cc:
all devices need an io_bus. rename header_bus to io_bus
We don't need stuff for the interrupt controller since
it's all in the platform now.
dev/ns_gige.hh:
We don't need stuff for the interrupt controller now since
it's all in the platform.
dev/pciconfigall.cc:
Pass a dummy NULL to the PioDevice for the platform since
we don't need one.
dev/pcidev.cc:
Move a bunch of common functionality into the PciDev
dev/platform.hh:
remove unneeded code
dev/tsunami.cc:
remove unused param
dev/tsunami_cchip.cc:
pass platform pointer
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart.cc:
pass platform variable
dev/uart.hh:
don't need to keep a platform pointer. it's in the base class
kern/linux/linux_system.cc:
kern/tru64/tru64_system.cc:
rename some parameters
sim/builder.cc:
clean up builder code. use more parameters from the
config node. all sections with a type= are now created,
the old mechanisms no longer work
sim/builder.hh:
remove some extra variables since they are found in the ConfigNode
sim/main.cc:
add a quick hack command line argument -X to dump out the
embedded files. (probably should be fixed up a little.)
accept .mpy files
printing to the streams has to happen after the hierarchy
is built since we're moving away from param contexts
sim/param.cc:
add parsing support for ranges
sim/process.cc:
isValid isn't very useful anymore. interpret the names
stdout, stderr, cout, cerr for the file descriptors
sim/pyconfig/SConscript:
Add Action handlers for creating an embedded python file
and for creating an embedded C file.
use these action handlers to embed all objects found in the objects
tree into the binary along with the importer and the m5config stuff
sim/pyconfig/m5config.py:
Major changes to the original configuration file generator. These
changes largely involve implementing copy-on-write like semantics
for all of the SimObjects. Real documentation must be written.
sim/universe.cc:
Universe becomes a SimObject since we don't really have the notion of
param contexts in the python code.
--HG--
rename : sim/pyconfig/m5configbase.py => sim/pyconfig/m5config.py
extra : convert_revision :
c353453e5beb91c37f15755998fc0d8858c6829a
Kevin Lim [Fri, 14 Jan 2005 23:34:56 +0000 (18:34 -0500)]
Fixes so m5 compiles on gcc 3.4, which has much stricter syntax. Most changes come from templated code,
which is evaluated slightly differently than in previous versions of gcc.
arch/alpha/alpha_linux_process.cc:
Alphabetize includes.
arch/alpha/vptr.hh:
Change the constants that are being used for alpha pagebytes to come from the ISA.
base/random.hh:
cpu/static_inst.cc:
sim/param.cc:
Fix up template syntax.
base/range.hh:
Include iostream for << operator.
base/res_list.hh:
base/statistics.hh:
cpu/simple_cpu/simple_cpu.hh:
cpu/static_inst.hh:
sim/eventq.hh:
sim/param.hh:
Fixup for templated code to resolve different scope lookup in gcc 3.4. This defers the lookup of the
function/variable until actual instantiation time by making it dependent on the templated class/function.
base/trace.cc:
Fix call to new.
base/trace.hh:
Fix up #define to have full path.
cpu/base_cpu.cc:
Fix up call to new.
dev/etherlink.hh:
dev/ns_gige.hh:
dev/sinic.hh:
Fixup for friend class/function declaration. g++ 3.4 no longer allows typedefs to be declared as
a friend class.
dev/pcidev.hh:
Fix up re-definition of access level to params.
kern/linux/linux_syscalls.hh:
kern/tru64/tru64_syscalls.hh:
Fix up header. Fix up template syntax.
sim/serialize.cc:
Include errno.h.
sim/startup.cc:
Change startupq. queue was getting destructed before all things had called ~StartupCallback(), which lead
to a segfault. This puts startupq in global space, and we allocate it ourselves. Other code may be similar
to this and may need changing in the future.
sim/syscall_emul.hh:
Include cpu/exec_context.hh and sim/process.hh, as forward declarations are no longer sufficient.
sim/universe.cc:
Include errno.h
--HG--
extra : convert_revision :
e49d08ee89eb06a28351f02bafc028ca6652d5af
Ali Saidi [Fri, 14 Jan 2005 22:50:36 +0000 (17:50 -0500)]
added stats code to check stability
util/stats/db.py:
added working listticks (for printing) and retticks(for using in python) code
util/stats/stats.py:
added stability function that checks if all samples are within 10% of mean.
--HG--
extra : convert_revision :
7eb1714db75e456f248fe7cae73db1c57642947d
Ali Saidi [Fri, 14 Jan 2005 05:05:49 +0000 (00:05 -0500)]
automerged had issues with the options.XXXXX in stats.py
--HG--
extra : convert_revision :
44db6642c1fb46eb515acd5a6d8465859a40891a
Ali Saidi [Fri, 14 Jan 2005 04:59:39 +0000 (23:59 -0500)]
fix a display bug
add option to limit results to a set of ticks
fix ticks code to work
util/stats/info.py:
change samples -> ticks and pass all parameters
util/stats/stats.py:
add option to select a set of ticks and fix display bug
--HG--
extra : convert_revision :
eca80a8c6bb75cf82bf1624f3d0170690b2928af
Nathan Binkert [Wed, 12 Jan 2005 18:44:47 +0000 (13:44 -0500)]
More graph output junk
util/stats/stats.py:
Add the graphing output for 6GHz and 8GHz runs
--HG--
extra : convert_revision :
fae3763c213e4b839735761bf91fa37e1b4f343c
Nathan Binkert [Wed, 12 Jan 2005 18:41:06 +0000 (13:41 -0500)]
Update for newer MySQLdb
util/stats/db.py:
Update for newer MySQLdb, the result of a blob in a query is an
array.array now, so we need to convert that to a string
--HG--
extra : convert_revision :
32732983d3d7141755085ec4913fdae057edc67f
Steve Reinhardt [Thu, 23 Dec 2004 17:33:12 +0000 (12:33 -0500)]
Added notes from 12/22/04 memory system meeting
(plus a formatting fix found while browsing code
during the meeting).
--HG--
extra : convert_revision :
fb23edbe40a9dbf870ae49299e91e16906ea2c8a
Nathan Binkert [Wed, 22 Dec 2004 13:57:32 +0000 (08:57 -0500)]
Fix typo
--HG--
extra : convert_revision :
1716d3fb0b19406402989824f74e9c2bc2b5a9c0
Nathan Binkert [Sat, 18 Dec 2004 14:53:31 +0000 (09:53 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.int.chaotic.net:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
7a3b0009499c0b9c4685efb598f7e2dd61a49ecc
Nathan Binkert [Sat, 18 Dec 2004 14:53:18 +0000 (09:53 -0500)]
a bit of remote debugging info.
--HG--
extra : convert_revision :
ae44f49701839bb64950852a251440d86512a5b0
Ali Saidi [Wed, 15 Dec 2004 20:39:21 +0000 (15:39 -0500)]
add colors to graph
--HG--
extra : convert_revision :
0f1749a364516460d77882ef9301c06d86a329b3
Ali Saidi [Tue, 14 Dec 2004 19:52:32 +0000 (14:52 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
7746bf5a56475a821a05b29896ec95fc4e6f556c
Ali Saidi [Tue, 14 Dec 2004 19:52:26 +0000 (14:52 -0500)]
updated clustered bars graph to have a legend
--HG--
extra : convert_revision :
9a7e5f8a9693e24d2b3c8836d43803b42da6ca2c
Ron Dreslinski [Tue, 14 Dec 2004 18:15:54 +0000 (13:15 -0500)]
Modified to work with do_events
No multiple requests to the same block outstanding from the same tester
Using false sharing, each tester only access a single byte within the block based on which tester it is
Allow more cycles before signalling deadlock, with do_events it may take some time with NACK/retry and many proccessors
--HG--
extra : convert_revision :
4c8eab99082c53840a5ad2a926457dfc27f23b77
Nathan Binkert [Mon, 13 Dec 2004 17:55:13 +0000 (12:55 -0500)]
Fix up the random number stuff.
SConscript:
compile the random number generator stuff into m5
base/random.cc:
we need to define our destructor
base/random.hh:
Since there's no state, just makes all of these get functions static
--HG--
extra : convert_revision :
9d4b8abd57367391a8ecda3914b1d912d9c64185
Steve Reinhardt [Thu, 9 Dec 2004 06:07:08 +0000 (01:07 -0500)]
Change Bus template parameter to BusType (to avoid confusion with Bus class).
Change Mem template parameter to MemType while we're at it.
dev/io_device.hh:
Change Bus template parameter to BusType (to avoid confusion with Bus class).
--HG--
extra : convert_revision :
dca8effb177535b3624ef08a3d3b8afab720390b
Ali Saidi [Thu, 9 Dec 2004 00:54:10 +0000 (19:54 -0500)]
Change to not pound on the VM system quite so hard
--HG--
extra : convert_revision :
bf035976a7be75bd56f2df49d5489525675d3d57
Ali Saidi [Wed, 8 Dec 2004 23:30:06 +0000 (18:30 -0500)]
compress main memory in checkpoints
SConscript:
Add zlib to the build always
--HG--
extra : convert_revision :
fae49fbbba371660e171d7e8328894a74c846ec5
Ali Saidi [Mon, 6 Dec 2004 18:37:26 +0000 (13:37 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
02d8a72ee5c059543af790cca0712fd7dbf5f33c
Ali Saidi [Mon, 6 Dec 2004 17:06:16 +0000 (12:06 -0500)]
Add support for Tsunami with 64 processors
base/socket.cc:
Make panic print a more worthwhile message
dev/tsunami.hh:
Change max number of tsunami cpus to be 64
dev/tsunamireg.h:
Add new registers and register blocks for 64 cpu tsunami
--HG--
extra : convert_revision :
3ceaaa998518ded8613bc64edc04cb9120fd3d15
Lisa Hsu [Fri, 3 Dec 2004 20:49:37 +0000 (15:49 -0500)]
system.ini:
the SYSTEM_DETAIL configuration assumes that it's a TWO_SYSTEM. make it not do that
--HG--
extra : convert_revision :
4f630a06b333acd727c57a82bc7a9595b231c037
Lisa Hsu [Fri, 3 Dec 2004 20:42:26 +0000 (15:42 -0500)]
boot_detail.ini:
now that we've changed the memory system defined names, fix this file
--HG--
extra : convert_revision :
1ce3881c9d21ba0b37f17f802641b5029a042d17
Lisa Hsu [Fri, 3 Dec 2004 20:29:33 +0000 (15:29 -0500)]
system.ini:
Fix the Boot Detailed case so that IntrControl and AlphaConsole's cpu's are defined.
--HG--
extra : convert_revision :
d6e5073af27d5554b2bea719a0790ef891bf57be
Ali Saidi [Wed, 1 Dec 2004 22:01:27 +0000 (17:01 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
9be07505189d9dd54af423d28e7d48f1a4cd084b
Ali Saidi [Wed, 1 Dec 2004 22:00:39 +0000 (17:00 -0500)]
updated colors, and font adjustments
--HG--
extra : convert_revision :
a4ce055c73ec12a26c70d03bd833ee9d429adc23
Nathan Binkert [Wed, 24 Nov 2004 18:34:48 +0000 (13:34 -0500)]
Add a #define option for setting the sampling periods
--HG--
extra : convert_revision :
29163dc72e7e677b4cfafa76cb33a755ee2c50b2
Ron Dreslinski [Wed, 24 Nov 2004 18:34:47 +0000 (13:34 -0500)]
Fix duplicate statistic name and description
Uncacheables don't change the request cmd, so use req->cmd instead of mshr->originalCmd]
--HG--
extra : convert_revision :
2f31df4911e29cb941138ed493f01f11b1109722
Steve Reinhardt [Tue, 23 Nov 2004 05:13:11 +0000 (00:13 -0500)]
Fix typo (from Nate's commit, I believe)
--HG--
extra : convert_revision :
87e1a3ac1b5fcd53a6ed7fa63d5323ae33423f56
Steve Reinhardt [Tue, 23 Nov 2004 05:00:59 +0000 (00:00 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
8c257ce0f25c1a9deab4cbad1c81ada006b10b8d
Ali Saidi [Tue, 23 Nov 2004 03:32:50 +0000 (22:32 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
dac88be32ea326e8966d68925bc49c7bea90a01b
Ali Saidi [Tue, 23 Nov 2004 03:32:37 +0000 (22:32 -0500)]
Print a warning if two devices are sharing the same interrupt
Update profile-top to print 2 or 4 graphs depending on a command line
option
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/pcidev.hh:
Print a warning if two devices are sharing the same interrupt
--HG--
extra : convert_revision :
0ef99cac92fbf2916ab8e5b1125d520eb4b5ac7d
Nathan Binkert [Tue, 23 Nov 2004 00:10:36 +0000 (19:10 -0500)]
Make it so we can easily disable compiling of some of the caches.
All that needs to be done is comment out the stuff you don't care
about in the header files in the mem/config.
For now, the default is to leave everything on.
--HG--
extra : convert_revision :
a3638ab3927339d92803479bc0c30728f0b977ad
Ali Saidi [Fri, 19 Nov 2004 00:57:24 +0000 (19:57 -0500)]
move y axis label closer
--HG--
extra : convert_revision :
329c2f4553febf70f346debcd8f71f275576dc17
Ali Saidi [Fri, 19 Nov 2004 00:44:54 +0000 (19:44 -0500)]
small tweaks to label positions
--HG--
extra : convert_revision :
6bfbb6500fa3f2e46be06cfdb32bf7f7713d5999
Ali Saidi [Thu, 18 Nov 2004 23:35:48 +0000 (18:35 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
5670f5958efda65295777c621a916568b61ecc3f
Ali Saidi [Thu, 18 Nov 2004 23:29:58 +0000 (18:29 -0500)]
graphing updates
--HG--
extra : convert_revision :
8264cdb40f3679189e9c343b3a376e5938c3e13c
Nathan Binkert [Thu, 18 Nov 2004 21:23:33 +0000 (16:23 -0500)]
don't share the PCI Header data among all devices. Make them independent.
--HG--
extra : convert_revision :
2aeb7db098f4fcdaea2a37d0a55ee2dbc08c853c
Nathan Binkert [Thu, 18 Nov 2004 21:23:32 +0000 (16:23 -0500)]
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 :
3127ab9f076b5ecce897a1c7de2678b58b73f7fb
Nathan Binkert [Thu, 18 Nov 2004 21:23:31 +0000 (16:23 -0500)]
always initalize the size of a packet (forgotten on checkpoints
in some places). use the constructor for setting the size.
--HG--
extra : convert_revision :
fad322c1d45b1952804cf35942b5685d70128e59
Lisa Hsu [Thu, 18 Nov 2004 21:23:31 +0000 (16:23 -0500)]
Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5
--HG--
extra : convert_revision :
2a0544b4cb75e768a54d10a49c752a3169f7ae5c
Nathan Binkert [Thu, 18 Nov 2004 21:23:30 +0000 (16:23 -0500)]
fixup natbox configuration
--HG--
extra : convert_revision :
9744ff67691f6a8fd7c20f1b84d899acdfcd1cf8
Nathan Binkert [Thu, 18 Nov 2004 21:23:29 +0000 (16:23 -0500)]
stats python fixes for dealing with vectors better. graph tweaking
ipkb stat and formulas from the command line.
util/stats/info.py:
no need to raise an attribute error if two values aren't found
in the exact same set of runs. Would be good to check that each
run is the same though.
util/stats/stats.py:
more graph tweaking
command to execute a formula from the command line.
add interrupts per kilobyte of data
--HG--
extra : convert_revision :
78d6b14d340d08edcbc69e4c1c5a4c1dd9bb10dd
Nathan Binkert [Thu, 18 Nov 2004 21:23:28 +0000 (16:23 -0500)]
add a no touch stream benchmark clean up a little
--HG--
extra : convert_revision :
41ff3dc85492e1d57fc30389f923d564156b4237
Ron Dreslinski [Thu, 18 Nov 2004 21:23:27 +0000 (16:23 -0500)]
Change so second CPU on sampler is a simpleCPU
--HG--
extra : convert_revision :
530d463e5356cd67cec6b4529867909006336454
Ron Dreslinski [Thu, 18 Nov 2004 21:01:34 +0000 (16:01 -0500)]
Add statistics to MSHR about the number of uncacheable accesses that occur
//Still need to add similar stats to the cache
--HG--
extra : convert_revision :
e7719c12b67d977e017ea7caf29a3fc8b1003a6f
Lisa Hsu [Thu, 18 Nov 2004 20:46:01 +0000 (15:46 -0500)]
add a bunch of stats for interrupt classification, coalescing characterization, and dropped packets.
--HG--
extra : convert_revision :
421af424ec104afc352c073408a166fce6a31c70
Ron Dreslinski [Thu, 18 Nov 2004 18:38:54 +0000 (13:38 -0500)]
Ron Dreslinski [Thu, 18 Nov 2004 18:26:12 +0000 (13:26 -0500)]
Don't Count uncacheables as misses
--HG--
extra : convert_revision :
c1d7c6d61ab9cd39f192e14da18720000c440e77
Steve Reinhardt [Thu, 18 Nov 2004 15:59:30 +0000 (10:59 -0500)]
Merge
--HG--
extra : convert_revision :
9d499125f4e8c8659f214c3290cb51679ad0ade2
Steve Reinhardt [Thu, 18 Nov 2004 15:53:25 +0000 (10:53 -0500)]
Add PC to MemReq for tracing/debugging.
--HG--
extra : convert_revision :
c3fe4872698f6d46d6fe1db10fdde92c2b8d772c
Steve Reinhardt [Thu, 18 Nov 2004 15:52:56 +0000 (10:52 -0500)]
Minor fixes.
base/loader/ecoff_object.cc:
Only warn (not die) if we can't load symbols from an ecoff object.
sim/debug.cc:
Compile in functioning debug_break unless NDEBUG,
not only if DEBUG. Print warning if we hit breakpoint
when compiled with NDEBUG.
sim/debug.hh:
Compile in functioning debug_break unless NDEBUG,
not only if DEBUG.
--HG--
extra : convert_revision :
baef2caac4a9c88e1389660823eaa7c42b1d19c8
Lisa Hsu [Thu, 18 Nov 2004 09:57:23 +0000 (04:57 -0500)]
Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5
--HG--
extra : convert_revision :
709355b794095ff656ea5bd81041b4138fc5c51d
Lisa Hsu [Thu, 18 Nov 2004 09:57:09 +0000 (04:57 -0500)]
change the configs for nat so that each ethernet device has it's own interrupt line.
--HG--
extra : convert_revision :
940c937459452aed6677114337c9e6e2249da479
Nathan Binkert [Thu, 18 Nov 2004 07:34:53 +0000 (02:34 -0500)]
back out ron's memory system changes because they break dma
--HG--
extra : convert_revision :
3e0af11cd9dc97743f288cee5248fa44013baddd
Nathan Binkert [Thu, 18 Nov 2004 05:25:17 +0000 (00:25 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
a8a8e26bda81546b4de45983e99e57e24ddf8567
Nathan Binkert [Thu, 18 Nov 2004 05:24:36 +0000 (00:24 -0500)]
undo simple CPU changes
--HG--
extra : convert_revision :
dce0d9f7d34243899f699488c6534fb1ccea4849
Nathan Binkert [Thu, 18 Nov 2004 05:17:03 +0000 (00:17 -0500)]
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
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
Nathan Binkert [Thu, 18 Nov 2004 03:44:12 +0000 (22:44 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
46a0ce7e098bab38b0df8d86e37dd16936c6eeb7
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
Nathan Binkert [Thu, 18 Nov 2004 03:08:36 +0000 (22:08 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
e1a178b33e9de6a6a04d4967b1abe9cc7fddcea3
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
Nathan Binkert [Thu, 18 Nov 2004 02:38:08 +0000 (21:38 -0500)]
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
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