Ron Dreslinski [Mon, 2 May 2005 18:25:54 +0000 (14:25 -0400)]
Add environment parameter for Allocation policy of DMA's
--HG--
extra : convert_revision :
444952065b0508c083e8c64fa5f9f5a761787900
Ron Dreslinski [Sat, 30 Apr 2005 16:54:28 +0000 (12:54 -0400)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/clean
--HG--
extra : convert_revision :
eb92d2799c76fad09f6b5a9476e4e9fc7c8dbfca
Ron Dreslinski [Sat, 30 Apr 2005 16:53:58 +0000 (12:53 -0400)]
Handle no_allocates as needing the response in miss_queue, like uncacheables
Add support for hit under miss of a no allocate (It seems as though DMA reads to the same block happen close together, is this an artifact of the header/payload splitting)
Make sure to respond to all targets of a no_allocate request
--HG--
extra : convert_revision :
a9d733f499face4039929524573ffc9500e93d83
Nathan Binkert [Sat, 30 Apr 2005 15:00:43 +0000 (11:00 -0400)]
Cleanup rcS files. Make sure there are enough tracked connections.
Delay before singalling peer to make sure that the peer is ready
configs/boot/nat-netperf-server.rcS:
delay before singalling to make sure that the natbox is ready
configs/boot/nat-netperf-stream-client.rcS:
increase the number of tracked connections
configs/boot/nat-spec-surge-client.rcS:
configs/boot/nfs-client-nhfsstone.rcS:
configs/boot/nfs-client-smallb.rcS:
configs/boot/nfs-client-tcp-smallb.rcS:
configs/boot/nfs-client-tcp.rcS:
configs/boot/nfs-client.rcS:
configs/boot/nfs-server.rcS:
configs/boot/spec-surge-client.rcS:
configs/boot/spec-surge-server.rcS:
configs/boot/surge-client.rcS:
configs/boot/surge-server.rcS:
increase the number of tracked connections
cleanup
configs/boot/nat-spec-surge-server.rcS:
configs/boot/natbox-netperf.rcS:
configs/boot/nfs-server-nhfsstone.rcS:
delay before singalling to make sure that the natbox is ready
increase the number of tracked connections
cleanup
configs/boot/natbox-spec-surge.rcS:
delay before singalling to make sure that the natbox is ready
increase the number of tracked connections
--HG--
extra : convert_revision :
9faa5ec11c9c02fed3d1cff922ca42c41d364204
Ron Dreslinski [Sat, 30 Apr 2005 01:01:43 +0000 (21:01 -0400)]
Add suport for no allocation of cache block on a dma read passing through a cache from the cpu-side interface
--HG--
extra : convert_revision :
0a3b3741924ed39c1c8710d0963e4c8f3e73f81a
Ron Dreslinski [Thu, 28 Apr 2005 21:24:04 +0000 (17:24 -0400)]
Clean up output for pc break events, and remove a unneeded break event.
cpu/pc_event.cc:
Add a newline to the printout to clean up output
kern/linux/linux_system.cc:
Remove the die_if_kernel pc break event, it is being called when not the kernel and leads to unneeded printouts
--HG--
extra : convert_revision :
c359532db31c961074894cc6c44c8452592caca8
Ron Dreslinski [Thu, 28 Apr 2005 20:13:30 +0000 (16:13 -0400)]
Make ip_conntrack table size larger
--HG--
extra : convert_revision :
bda54b29cb15144907b186f06517477dea13ba06
Nathan Binkert [Mon, 25 Apr 2005 01:32:32 +0000 (21:32 -0400)]
Add the m5 parameter to the ns83820 device model so that we
can pass simulator specific options to the device driver.
dev/ns_gige.cc:
Add the m5 register and parameter to the ns83820 device model
so that we can pass simulator specific options to the device
driver.
dev/ns_gige.hh:
dev/ns_gige_reg.h:
Add the m5 register to the ns83820 device model
--HG--
extra : convert_revision :
84674887560fa3b607e725b8e5bc8272761fcf09
Nathan Binkert [Mon, 25 Apr 2005 01:28:54 +0000 (21:28 -0400)]
cleanup mpy file
--HG--
extra : convert_revision :
ddde8f1b60dfa0c637d82d9217e713f071af6ccb
Nathan Binkert [Fri, 22 Apr 2005 17:12:03 +0000 (13:12 -0400)]
Make code more portable and port to cygwin
arch/alpha/alpha_tru64_process.cc:
getdirent isn't implemented by cygwin. panic if this function is
executed. (It shouldn't be too much to emulate it using opendir,
readdir, etc.)
arch/alpha/pseudo_inst.cc:
Use lseek once and read instead pread.
base/intmath.hh:
we want int, long, and long long variations of FloorLog2 instead
of int32_t, int64_t. Otherwise, we leave one out.
base/socket.cc:
Fix define that seems to be for apple
sim/serialize.cc:
don't use the intXX_t stuff, instead, use the real types
so we're sure that we cover all of them.
--HG--
extra : convert_revision :
9fccaff583100b06bbaafd95a162c4e19beed59e
Steve Reinhardt [Sun, 17 Apr 2005 04:41:50 +0000 (00:41 -0400)]
Mostly hacks for multiplying Frequency-type proxies by constants
(plus some small fixes).
python/m5/config.py:
Hacks to allow multiplication on Frequency/Latency-valued proxies.
Provide __rmul__ as well as __mul__ on Proxy objects.
test/genini.py:
Default value for -EFOO should be True not 1 (since 1 is no longer
convertable to Bool).
--HG--
extra : convert_revision :
f8a221fcd9e095fdd7b7db4be0ed0cdcd20074be
Ron Dreslinski [Thu, 14 Apr 2005 22:38:56 +0000 (18:38 -0400)]
Nathan Binkert [Wed, 13 Apr 2005 18:26:57 +0000 (14:26 -0400)]
Make multiple calls to SimExit work.
--HG--
extra : convert_revision :
91a5652913b7278efe6a3a4955e5e2f723ba59eb
Nathan Binkert [Wed, 13 Apr 2005 18:26:56 +0000 (14:26 -0400)]
Make the exit after max checkpoints code compile.
sim/serialize.cc:
call exitNow instead of SimExit. Include the header too.
--HG--
extra : convert_revision :
633a8533b23cac914a2b09bd2d3ea5d85243c675
Nathan Binkert [Wed, 13 Apr 2005 13:38:50 +0000 (09:38 -0400)]
Add support to limit the number of checkpoints dropped.
sim/serialize.hh:
Add variables to keep track of the number of checkpoints
dropped and maximum allowed.
--HG--
extra : convert_revision :
32241b90c58def6958ec84c53cc2cca996007506
Nathan Binkert [Mon, 11 Apr 2005 19:44:21 +0000 (15:44 -0400)]
Fixup split stats.
--HG--
extra : convert_revision :
5f3d162c3f4d90f481393f812e6138c659e4f6e2
Nathan Binkert [Mon, 11 Apr 2005 19:42:35 +0000 (15:42 -0400)]
Update for changes in the way latencies and bandwidths are dealt with.
--HG--
extra : convert_revision :
1d183bf47222599ee11154ab0c9eb9cd99a29806
Nathan Binkert [Mon, 11 Apr 2005 19:32:06 +0000 (15:32 -0400)]
Make the notion of a global event tick independent of the actual
CPU cycle ticks. This allows the user to have CPUs of different
frequencies, and also allows frequencies and latencies that are
not evenly divisible by the CPU frequency. For now, the CPU
frequency is still set to the global frequency, but soon, we'll
hopefully make the global frequency fixed at something like 1THz
and set all other frequencies independently.
arch/alpha/ev5.cc:
The cycles counter is based on the current cpu cycle.
cpu/base_cpu.cc:
frequency isn't the cpu parameter anymore, cycleTime is.
cpu/base_cpu.hh:
frequency isn't the cpu parameter anymore, cycleTime is.
create several public functions for getting the cpu frequency
and the numbers of ticks for a given number of cycles, etc.
cpu/memtest/memtest.cc:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/trace/trace_cpu.cc:
Now that ticks aren't cpu cycles, fixup code to advance
by the proper number of ticks.
cpu/memtest/memtest.hh:
cpu/trace/trace_cpu.hh:
Provide a function to get the number of ticks for a given
number of cycles.
dev/alpha_console.cc:
Update for changes in the way that frequencies and latencies are
accessed. Move some stuff to init()
dev/alpha_console.hh:
Need a pointer to the system and the cpu to get the frequency
so we can pass the info to the console code.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
dev/ide_disk.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
Add some extra debugging printfs
dev/platform.cc:
dev/sinic.cc:
dev/sinic.hh:
outline the constructor and destructor
dev/platform.hh:
outline the constructor and destructor.
don't keep track of the interrupt frequency. Only provide the
accessor function.
dev/tsunami.cc:
dev/tsunami.hh:
outline the constructor and destructor
Don't set the interrupt frequency here. Get it from the actual device
that does the interrupting.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make the interrupt interval a configuration parameter. (And convert
the interval to the new latency/frequency stuff in the python)
kern/linux/linux_system.cc:
update for changes in the way bandwidths are passed from
python to C++ to accomidate the new way that ticks works.
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
kern/tru64/tru64_system.cc:
For now, we must get the boot cpu's frequency as a parameter
since allowing the system to have a pointer to the boot cpu would
cause a cycle.
python/m5/config.py:
Fix support for cycle_time relative latencies and frequencies.
Add support for getting a NetworkBandwidth or a MemoryBandwidth.
python/m5/objects/BaseCPU.mpy:
All CPUs now have a cycle_time. The default is the global frequency,
but it is now possible to set the global frequency to some large value
(like 1THz) and set each CPU frequency independently.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ide.mpy:
Make this a Latency parameter
python/m5/objects/BaseSystem.mpy:
We need to pass the boot CPU's frequency to the system
python/m5/objects/Ethernet.mpy:
Update parameter types to use latency and bandwidth types
python/m5/objects/Platform.mpy:
this frequency isn't needed. We get it from the clock interrupt.
python/m5/objects/Tsunami.mpy:
The clock generator should hold the frequency
sim/eventq.hh:
Need to remove this assertion because the writeback event
queue is different from the CPU's event queue which can cause
this assertion to fail.
sim/process.cc:
Fix comment.
sim/system.hh:
Struct member to hold the boot CPU's frequency.
sim/universe.cc:
remove unneeded variable.
--HG--
extra : convert_revision :
51efe4041095234bf458d9b3b0d417f4cae16fdc
Nathan Binkert [Sat, 9 Apr 2005 01:33:45 +0000 (21:33 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/current
--HG--
extra : convert_revision :
84720ab5c8123e7bc72b20c877499a0846ea1a4f
Nathan Binkert [Sat, 9 Apr 2005 01:33:35 +0000 (21:33 -0400)]
full_system no longer exists as a parameter
--HG--
extra : convert_revision :
173cd24c130cb981036688d9cd8ba3e418d51068
Ron Dreslinski [Fri, 8 Apr 2005 22:26:00 +0000 (18:26 -0400)]
Hand merged a this-> statement for gcc3.4
--HG--
extra : convert_revision :
11daa94a0631da5e9c2e4262a448035491dd86e5
Ron Dreslinski [Fri, 8 Apr 2005 21:19:56 +0000 (17:19 -0400)]
Add Parameter to only do prefetch calculations on data accesses not instruction accesses
--HG--
extra : convert_revision :
85c987561a962f21466f0c1bd0473300d341c398
Nathan Binkert [Thu, 7 Apr 2005 04:07:48 +0000 (00:07 -0400)]
Support copying memory requests.
--HG--
extra : convert_revision :
783a778e5eeef36eab22a7c855a5474b83ff4488
Nathan Binkert [Thu, 7 Apr 2005 03:31:31 +0000 (23:31 -0400)]
Add support for acking writes with a configurable delay
as they are received by the bus bridge.
Better Bus debugging.
--HG--
extra : convert_revision :
c6329384276e0ebcf8ae12b86fddb377af66bbba
Nathan Binkert [Wed, 6 Apr 2005 22:00:44 +0000 (18:00 -0400)]
fix typo in python config stuff
python/m5/config.py:
fix typo
--HG--
extra : convert_revision :
2208453d93149ba4af140dd78c29be4c4943b397
Nathan Binkert [Wed, 6 Apr 2005 21:59:31 +0000 (17:59 -0400)]
Fix the python NetworkBandwidth conversion function
python/m5/convert.py:
Fix the NetworkBandwidth conversion function
--HG--
extra : convert_revision :
93d9856fe6b59827c116e15835d2ef51292bd6c4
Nathan Binkert [Wed, 6 Apr 2005 21:58:57 +0000 (17:58 -0400)]
formatting
--HG--
extra : convert_revision :
0b041556222c3892ee72e4d56c8acdda72bfc303
Nathan Binkert [Wed, 6 Apr 2005 21:47:32 +0000 (17:47 -0400)]
Cleanup diagnostic and error messages for the IDE disk
dev/ide_disk.cc:
Cleanup diagnostic and error messages
--HG--
extra : convert_revision :
fb1bc6d9f28a10961c9d3ee1dc81b540b92653b8
Nathan Binkert [Wed, 6 Apr 2005 21:39:25 +0000 (17:39 -0400)]
Better debugging output for the ide controller
dev/ide_ctrl.cc:
Better debugging
--HG--
extra : convert_revision :
854e17f9f36fe4a0b6b69fd48027d2b1b231e858
Nathan Binkert [Wed, 6 Apr 2005 21:05:30 +0000 (17:05 -0400)]
Add TcpPort and UdpPort as python types
python/m5/objects/SimConsole.mpy:
the listener port is a TcpPort
--HG--
extra : convert_revision :
c26fdd93d3bc35d9f1563ac1087a7f75471c9020
Nathan Binkert [Wed, 6 Apr 2005 21:00:31 +0000 (17:00 -0400)]
Move back to vmlinux-latest
--HG--
extra : convert_revision :
9a14f21768f075f0c84f90feebb6d3d897286e34
Nathan Binkert [Wed, 6 Apr 2005 20:58:40 +0000 (16:58 -0400)]
full_system isn't a useful parameter anymore, get rid of it.
python/m5/objects/Root.mpy:
sim/universe.cc:
util/stats/stats.py:
full_system isn't a useful parameter
--HG--
extra : convert_revision :
557091be1faa3cf121c55102aba4e6f4c1bd45ef
Kevin Lim [Tue, 5 Apr 2005 20:20:55 +0000 (16:20 -0400)]
Minor fixes for g++ 3.4
--HG--
extra : convert_revision :
cb3931c72cfa737414404b7ebebfad7cfea8ef8a
Ron Dreslinski [Mon, 4 Apr 2005 20:25:22 +0000 (16:25 -0400)]
Add more prefetcher support.
SConscript:
Add GHB prefetcher to build list
python/m5/objects/BaseCache.mpy:
Add parameters about when to remove prefetches and wether or not to use cpuid to differentiate access patterns
--HG--
extra : convert_revision :
1d3fef21910f2f34b8c28d01b5f6e86eef53357c
Ron Dreslinski [Mon, 4 Apr 2005 12:34:16 +0000 (08:34 -0400)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/prefetcher
--HG--
extra : convert_revision :
b89d95b6b09a70dc060747f9703643af008c2ddd
Ron Dreslinski [Sun, 3 Apr 2005 01:36:08 +0000 (20:36 -0500)]
Added support for multiple prefetch address from single access (depth of prefetch) also added the ability to squash some prefetchs to match the GHB technique
python/m5/objects/BaseCache.mpy:
Added parameters
--HG--
extra : convert_revision :
92b646eb61455d283a5c2ac0b3f8fbd62e39fb87
Ron Dreslinski [Sat, 2 Apr 2005 23:40:59 +0000 (18:40 -0500)]
Rework some statistics and add some prefetcher statistics. Also remove an unneeded function call.
--HG--
extra : convert_revision :
b40cfc16f237ec03aac15d42fe34d5676b0c71c1
Steve Reinhardt [Sat, 2 Apr 2005 06:20:47 +0000 (01:20 -0500)]
Fix up Python ParamContext support.
--HG--
extra : convert_revision :
cd2fe692b42016c4e2a84cd5c8f615c16217254a
Ron Dreslinski [Sat, 2 Apr 2005 02:08:03 +0000 (21:08 -0500)]
Set the time in the request to proprley calculate latencies
--HG--
extra : convert_revision :
cd54e924ad89cebbd797beda7dbbdae53eec66a7
Ron Dreslinski [Sat, 2 Apr 2005 02:07:08 +0000 (21:07 -0500)]
Make sure to calculate the new state properly in coherence protocol
--HG--
extra : convert_revision :
5a983f5d2e225d4be205faa9bacffc2258452efc
Ron Dreslinski [Sat, 2 Apr 2005 00:39:23 +0000 (19:39 -0500)]
Some hand merges
--HG--
rename : objects/BaseCache.mpy => python/m5/objects/BaseCache.mpy
extra : convert_revision :
b24ff4c1feb480cf280207d4bbdfe08ef80d1aa2
Ron Dreslinski [Sat, 2 Apr 2005 00:26:44 +0000 (19:26 -0500)]
Another pass at the prefetcher. Now it works with both miss and access reference streams.
Reworked how it is instattiated and how it communicates with other cache objects.
SConscript:
Compile all the prefetcher files
objects/BaseCache.mpy:
Add parameters for prefetcher
--HG--
extra : convert_revision :
2faa81c17673420ffae72a50a27e310d4c0f4135
Ron Dreslinski [Fri, 1 Apr 2005 23:25:34 +0000 (18:25 -0500)]
Remove a printf that shouldn't be there, Fix some errors with full system config files that wasn't using coherence in MP cases
--HG--
extra : convert_revision :
32670b9252fd4be61ab4dcc8d90f4251d9db5069
Ron Dreslinski [Wed, 30 Mar 2005 20:05:58 +0000 (15:05 -0500)]
Rework the way the prefetcher is used. Now we copy the request from the prefetch queue and into the mq when issued
objects/BaseCache.mpy:
Add some parameters for prefetcher
--HG--
extra : convert_revision :
1a2e6d2ce5359fab0a4d5d4639a701131101d68c
Ron Dreslinski [Wed, 30 Mar 2005 09:46:04 +0000 (04:46 -0500)]
First pass at a prefetcher
SConscript:
Add prefetcher to the compilation
base/traceflags.py:
Add a trace flag for hardware prefetches
--HG--
extra : convert_revision :
bc210192a2b75b1470b2cd9d5d470fc61cb11315
Nathan Binkert [Tue, 29 Mar 2005 12:55:44 +0000 (07:55 -0500)]
expose variables for number of global events per simulated second,
millisecond, microsecond, etc. so that the user can explicitly
convert between system ticks and time and know what sorts of
expensive operations are being used for that conversion.
arch/alpha/alpha_tru64_process.cc:
arch/alpha/pseudo_inst.cc:
dev/etherdump.cc:
dev/etherlink.cc:
dev/ns_gige.cc:
dev/sinic.cc:
dev/tsunami_io.cc:
dev/uart.cc:
sim/stat_control.cc:
sim/syscall_emul.hh:
Use the new variables for getting the event clock
dev/etherdump.hh:
delete variables that are no longer needed.
--HG--
extra : convert_revision :
d95fc7d44909443e1b7952a24ef822ef051c7cf2
Nathan Binkert [Mon, 28 Mar 2005 05:41:28 +0000 (00:41 -0500)]
If we find the mysql libraries on the machine, just compile
with mysql and remove the special compile type.
SConscript:
If we find the mysql libraries on the machine, just compile
with mysql.
build/SConstruct:
we always use mysql, and we got rid of the FS_MEASURE
--HG--
extra : convert_revision :
a7c4277c890e1b6390ef06288114c9bdde11b178
Nathan Binkert [Sat, 26 Mar 2005 04:03:31 +0000 (23:03 -0500)]
style
--HG--
extra : convert_revision :
3a45fb5dbd0975f60a37e0e0c3ab27450b7d749e
Nathan Binkert [Sat, 26 Mar 2005 03:59:29 +0000 (22:59 -0500)]
Better handling of latency/frequency parameter types
python/m5/config.py:
Addr is slightly different from memory size in that Addr
will take non strings.
Deal with the fact that the convert.toFoo functions only accept
strings.
Add RootFrequency as a special type for the Root.frequency
parameter which is not scaled.
Add ClockPeriod parameter type.
python/m5/convert.py:
Be more strict about what's allowed.
Only accept strings as inputs for these conversion functions.
If the user wants to accept something else, they need to deal
with the failure and convert other types on their own.
python/m5/objects/Bus.mpy:
Use the new ClockPeriod parameter type
python/m5/objects/Root.mpy:
Can't use integers for frequency anymore
python/m5/smartdict.py:
rename SmartDict.Proxy to just Variable. Create a new class
UndefinedVariable that is returned when the user tries to get
a variable that is not in the dict. Undefined variable evaluates
to false, and will cause an error elsewhere.
--HG--
extra : convert_revision :
1d55246fd1af65106f102396234827d6401ef9ce
Nathan Binkert [Sat, 26 Mar 2005 03:32:00 +0000 (22:32 -0500)]
Better exceptions in python config
python/m5/config.py:
Don't raise a new exception, just modify and re-raise the old one.
--HG--
extra : convert_revision :
47f6da3a8cb2ee18a6b400863e7ea80ab0c9a5ea
Ron Dreslinski [Thu, 24 Mar 2005 20:52:30 +0000 (15:52 -0500)]
Update so that statistics can be plotted correctly
util/stats/stats.py:
Changed some stuff for graphing purposes:
full_cpu is now full0
frequencies are now s,m,f,q not s,6,8,q
L2 is now l2
etherdev is now etherdev0
May want to consider fact that NAT box should be the sum of etherdev0 and etherdev1 (not in script yet)
--HG--
extra : convert_revision :
39a7d0bcf1b9354a77c12de5981e8277408ba791
Nathan Binkert [Thu, 24 Mar 2005 19:30:00 +0000 (14:30 -0500)]
Simple python cleanup
--HG--
extra : convert_revision :
1c2d3551f8057ae9fdb9fc5a6a853ad380afdc49
Nathan Binkert [Thu, 24 Mar 2005 17:25:34 +0000 (12:25 -0500)]
Improvements to send.py to allow the user to specify the jobfile
util/pbs/send.py:
Allow the user to specify the jobfile
--HG--
extra : convert_revision :
0e21d2b03355bb7e8938c828bbaa441dc51afd1a
Nathan Binkert [Thu, 24 Mar 2005 17:24:54 +0000 (12:24 -0500)]
Improve toBool
python/m5/convert.py:
an empty string should still be false
--HG--
extra : convert_revision :
dd9900794d94cd018b57ec81bcbce1d412e2a83e
Nathan Binkert [Thu, 24 Mar 2005 17:24:17 +0000 (12:24 -0500)]
Add Frequency and Latency as new parameter types and use them
where we can
python/m5/config.py:
Add two new parameter types: Frequency and Latency. These will soon
be an integral part of the tick is picosecond thing. If the value
can be converted directly to an integer without any special tricks,
we assume that the number is the exact value desired. Otherwise,
we convert the number assuming that it is in Hz or s.
python/m5/objects/Bus.mpy:
Use the new Latency and Frequency types where we can
--HG--
extra : convert_revision :
b3cff6020db83fb819507c348451c98697d1cf27
Nathan Binkert [Thu, 24 Mar 2005 03:58:47 +0000 (22:58 -0500)]
Formatting fixes
--HG--
extra : convert_revision :
9a726945b7a1decbecf460df6714257b88742dc8
Ali Saidi [Wed, 23 Mar 2005 20:57:38 +0000 (15:57 -0500)]
Add some new config files
--HG--
extra : convert_revision :
b454144b3c00c101e970269c6c084d601cee971f
Ali Saidi [Wed, 23 Mar 2005 20:57:10 +0000 (15:57 -0500)]
Change the colors slightly and text (this was for steve's talk way
back when)
--HG--
extra : convert_revision :
b24a30b613710fe657f05bea46d45e9b13912d8e
Ali Saidi [Wed, 23 Mar 2005 20:55:09 +0000 (15:55 -0500)]
update profile code to use shared categories file
util/stats/stats.py:
add database command to help
--HG--
extra : convert_revision :
5d77e9d3e142f884d08d34b730c385c41c6bcafb
Ali Saidi [Wed, 23 Mar 2005 20:52:03 +0000 (15:52 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
ed00a0f85ed796a19a3112d0dd5b775c1dbcf2b8
Ali Saidi [Wed, 23 Mar 2005 20:51:25 +0000 (15:51 -0500)]
Add nhfsstone benchmark and update the latencies of various Monet things
--HG--
extra : convert_revision :
37ff30f90e44a2db21582503ce8b181e0979c7a4
Ron Dreslinski [Wed, 23 Mar 2005 20:23:32 +0000 (15:23 -0500)]
Removing unneccasry dprintf that makes traces nearly impossible to read when busses have alot of devices connected to them
--HG--
extra : convert_revision :
1a23dd815840d5863bb0ab58698d8eab8382bf38
Nathan Binkert [Wed, 23 Mar 2005 18:25:48 +0000 (13:25 -0500)]
First step in fixing up parameter handling. Clean up the
way ranges work, more fully support metric prefixes for all
integer types, and convert memory sized parameters to the
MemorySize type.
python/m5/config.py:
- no more _Param and _ParamProxy stuff. Use the names
ParamBase and ParamFactory to hopefully make it clearer
what we intend.
- Get rid of RangeSize and the old Range class and more fully flesh
out the Range class to deal with types of parameters and different
kinds of ranges.
- Call toInteger on the CheckedInt types so we can use metric prefixes
in strings for all integers.
- Get rid of the K, M, and G constants. Use the proper type or call
one of the functions in the convert package.
python/m5/convert.py:
Simple way to deal with both floating point and integer strings.
python/m5/objects/BaseCache.mpy:
python/m5/objects/Ethernet.mpy:
This is a MemorySize typed parameter
--HG--
extra : convert_revision :
92b4ea662d723abdd6c0a49065b79c25400fac9b
Ali Saidi [Tue, 22 Mar 2005 21:32:51 +0000 (16:32 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
d5e2af1b6ed4dae9e7cc7912f84b9cab83a4d07c
Ali Saidi [Tue, 22 Mar 2005 21:32:44 +0000 (16:32 -0500)]
Yet another validation test
--HG--
extra : convert_revision :
41fd3b0b3edf06b0bae80fd70f7f7b3c46872dc7
Nathan Binkert [Tue, 22 Mar 2005 19:51:31 +0000 (14:51 -0500)]
style
python/m5/convert.py:
python/m5/smartdict.py:
follow our naming convention
--HG--
extra : convert_revision :
d57a103dfbad1fb6a076bfacdca226c4b1893fb8
Nathan Binkert [Tue, 22 Mar 2005 19:47:18 +0000 (14:47 -0500)]
Fix a bug introduced with the multidict commit.
python/m5/config.py:
search for any base class that is a confignode instead of those
that derive from param type so that non-type classes work
too. (Those that are just derived from ConfigNode and not
SimObject.)
--HG--
extra : convert_revision :
422181b2e5efd4675ec34adcffecfb58eee0e4e7
Nathan Binkert [Tue, 22 Mar 2005 19:42:05 +0000 (14:42 -0500)]
clean up python exceptions
python/m5/config.py:
clean up exception output a bit.
--HG--
extra : convert_revision :
a27e75276ffc9001f44c44595172cf2b455e5e23
Nathan Binkert [Tue, 22 Mar 2005 19:41:23 +0000 (14:41 -0500)]
Remove lisa's extra printf
--HG--
extra : convert_revision :
24c566c17a8fd10e5ecc0b18f36659b4ab2dcded
Nathan Binkert [Tue, 22 Mar 2005 05:53:01 +0000 (00:53 -0500)]
Use the multidict in the python config stuff. Makes code a bit
cleaner.
python/m5/config.py:
Use the multidict instead of the separately coded _getparam
and _getvalue stuff. While we're at it, when we see a default
parameter, we stick it into the dictionary right away.
--HG--
extra : convert_revision :
d6f6f5cc454a479e27718ec7952cd7559229ebe7
Nathan Binkert [Tue, 22 Mar 2005 05:40:21 +0000 (00:40 -0500)]
We don't support multiple inheritence very well, so we'll
just disable it for real.
--HG--
extra : convert_revision :
893b17fce3e2d9cc69d58bb2fc6a45d61e02d709
Nathan Binkert [Tue, 22 Mar 2005 05:08:54 +0000 (00:08 -0500)]
Sort the sim objects in the python output
python/m5/config.py:
Turn back on the sorting of sim objects so we get consistent
output. This can lead to slight changes in stats.
--HG--
extra : convert_revision :
8ef9bd534cd2344acd69af7f52ee90b8b1afeb24
Steve Reinhardt [Sat, 19 Mar 2005 13:47:19 +0000 (08:47 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5-head
--HG--
extra : convert_revision :
a1cca61433e2cc9fd99d1a2361d32ea5c91b09c7
Ron Dreslinski [Fri, 18 Mar 2005 22:17:35 +0000 (17:17 -0500)]
Make each etherdev have it's own pci_dev number
--HG--
extra : convert_revision :
362908e62452f38288e6720c6ff86bab2ef938d8
Ron Dreslinski [Fri, 18 Mar 2005 19:50:48 +0000 (14:50 -0500)]
Hand merged some changes
--HG--
extra : convert_revision :
e1650bedf602cea54dd59452ae853786b54724bd
Ron Dreslinski [Fri, 18 Mar 2005 19:43:06 +0000 (14:43 -0500)]
Use the correct version of linux
--HG--
extra : convert_revision :
04e0abb48c9bf6f015879c388bbef834c6f8014c
Ron Dreslinski [Fri, 18 Mar 2005 19:41:29 +0000 (14:41 -0500)]
Reworked the configurations to properly use dual/quad checkpoints
--HG--
extra : convert_revision :
65af704e9a19ae4d63f65a133b3c45aaaeb81f4f
Steve Reinhardt [Fri, 18 Mar 2005 18:34:28 +0000 (13:34 -0500)]
Byproducts of aborted attempt to refine 'parent' proxy semantics.
Mostly cleanup of mpy_importer.mpy_parse().
python/m5/__init__.py:
Move panic() up to top in case we want to use it
in mpy_importer (though I ended up not doing that
after all).
python/m5/config.py:
Add a couple of comments and a check for expressions
like parent.any.foo (which is illegal).
--HG--
extra : convert_revision :
dfc99ac9b1a2d91a736ca0b773b6d3c528a4f3cc
Lisa Hsu [Thu, 17 Mar 2005 21:08:01 +0000 (16:08 -0500)]
re-implement SplitLIFO so that LIFO now applies to individual sets (LRU-style sets) rather than across the whole partition.
--HG--
extra : convert_revision :
684fd9e39f9890181951b8b06f78236c950bf810
Lisa Hsu [Thu, 17 Mar 2005 20:32:10 +0000 (15:32 -0500)]
nake systems parameterizable in the number of NICS. appropriately hook up new nibridges and busses for this scenario.
--HG--
extra : convert_revision :
a6f3f2167300ba695bc4c92a5a9a5648bc897c6a
Lisa Hsu [Thu, 17 Mar 2005 19:34:03 +0000 (14:34 -0500)]
Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5/pact05
--HG--
extra : convert_revision :
a0a10fccc03edcc5164536ea853788b982e332d7
Lisa Hsu [Thu, 17 Mar 2005 19:31:08 +0000 (14:31 -0500)]
allow the call to len on Value proxy.
--HG--
extra : convert_revision :
1a0aaf8db5ef60e0e7fc053bf4605eb90bb6e9e0
Steve Reinhardt [Thu, 17 Mar 2005 04:10:22 +0000 (23:10 -0500)]
Merge zizzer.eecs.umich.edu:/z/stever/bk/m5-head
into zizzer.eecs.umich.edu:/z/stever/bk/m5-py
--HG--
extra : convert_revision :
39f30bd052c0f2b88524311d674bad7a0fae6358
Steve Reinhardt [Thu, 17 Mar 2005 04:10:17 +0000 (23:10 -0500)]
Allow proxies to refer to proxies in config files.
python/m5/config.py:
Allow proxies to refer to other proxies and resolve by recurseivly calling unproxy().
Not sure this works completely (since I don't have any examples to test it on)
but it doesn't seem to break any existing config scripts.
--HG--
extra : convert_revision :
d7fc272d0777d85f89104dfb5d1c5e4d8ddd6d6f
Nathan Binkert [Thu, 17 Mar 2005 01:32:37 +0000 (20:32 -0500)]
Make panic work in m5.config
python/m5/config.py:
get panic from the m5 package.
--HG--
extra : convert_revision :
0965c13086f5eef7214298227c34cd9693534555
Ron Dreslinski [Wed, 16 Mar 2005 23:31:20 +0000 (18:31 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
f7c6ead8e9b2d0b5682d7bb40f5a85d4fe402896
Ron Dreslinski [Wed, 16 Mar 2005 23:26:32 +0000 (18:26 -0500)]
No need for this ifdef, since the entire process.hh is surounded by an ifndef FULL_SYSTEM
--HG--
extra : convert_revision :
81009e5c468eaaee06c83c35f1d05ed2863299a4
Ron Dreslinski [Wed, 16 Mar 2005 23:18:59 +0000 (18:18 -0500)]
Make the stack size default to 16MB in eio processes
--HG--
extra : convert_revision :
1b34b36a8103d091a368917dcbb61c2cc51a471c
Ron Dreslinski [Wed, 16 Mar 2005 20:55:44 +0000 (15:55 -0500)]
Fixed the super/parent change fpr splash2 benchmarks
configs/splash2/run.mpy:
Change super to parent
--HG--
extra : convert_revision :
61d45880b5e334200ebebc24d757c97cbeb048f6
Ron Dreslinski [Wed, 16 Mar 2005 20:45:53 +0000 (15:45 -0500)]
Remove DUALCPU environment variable and add NUMCPUS, which will build NUMCPUS worth of CPU's. Default is 1 cpu.
--HG--
extra : convert_revision :
de6adf5a2b2a09eacb099b3904df0c288fd6b33c
Ron Dreslinski [Wed, 16 Mar 2005 20:00:56 +0000 (15:00 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/clean
--HG--
extra : convert_revision :
6cdd83efc43322d1ccb34976bdece2f01e7cba01
Ron Dreslinski [Wed, 16 Mar 2005 19:58:27 +0000 (14:58 -0500)]
Move the creation of the L2 out of the memory base (fix for Ali) and make a wrapper that does it
--HG--
extra : convert_revision :
1b878d01667b64be7f5c05faadbf52789bb51616
Lisa Hsu [Wed, 16 Mar 2005 18:55:58 +0000 (13:55 -0500)]
Some changes to NSGigE's DPRINTF's that helped when I was doing NAT stuff.
--HG--
extra : convert_revision :
d36c84a835667d4c67f46432a90b9557b0710eac
Ron Dreslinski [Wed, 16 Mar 2005 18:49:15 +0000 (13:49 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
109c051304ccbcffce039cbae94ce2d26e449a0b
Lisa Hsu [Wed, 16 Mar 2005 15:49:42 +0000 (10:49 -0500)]
Merge zizzer:/bk/m5
into zizzer.eecs.umich.edu:/.automount/zed/z/hsul/work/m5/pact05
--HG--
extra : convert_revision :
e7ff23f6ac4e434d8b3117275df12fec03964a55
Steve Reinhardt [Wed, 16 Mar 2005 15:39:02 +0000 (10:39 -0500)]
Forgot to commit run.mpy with last changeset (really belongs there).
--HG--
extra : convert_revision :
67055c33cc3b2b115595d3cd4a3df5356ca970f9
Ron Dreslinski [Wed, 16 Mar 2005 15:31:22 +0000 (10:31 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
848757d0f18cfb33620cfa4b084a9b102b2744c0
Ron Dreslinski [Wed, 16 Mar 2005 15:30:33 +0000 (10:30 -0500)]
Fix the bad addr check to check for allowable addresses in the nxm address space
arch/alpha/alpha_tru64_process.cc:
sim/process.cc:
sim/process.hh:
Add an address range for the nxm
sim/syscall_emul.hh:
Check to make sure that if we have an nxm config space that the mmap hasn't grown into it
--HG--
extra : convert_revision :
e479e5240080ae488080d228bafea488835d6e77
Steve Reinhardt [Wed, 16 Mar 2005 05:40:48 +0000 (00:40 -0500)]
Enhancements to python config proxy class.
python/m5/config.py:
- Enhanced Proxy class now supports subscripting, e.g.,
parent.cpu[0] or even parent.cpu[0].icache.
- Proxy also supports multiplication (e.g., parent.cycle * 3),
though this feature has not been tested.
- Subscript 0 works even on non-lists, so you can safely say
cpu[0] and get the first cpu even if there's only one.
- Changed name of proxy object from 'Super' to 'parent', and
changed "wild card" notation from plain 'Super' to 'parent.any'.
python/m5/objects/AlphaConsole.mpy:
python/m5/objects/BaseCPU.mpy:
python/m5/objects/BaseSystem.mpy:
python/m5/objects/Device.mpy:
python/m5/objects/Ethernet.mpy:
python/m5/objects/Ide.mpy:
python/m5/objects/IntrControl.mpy:
python/m5/objects/Pci.mpy:
python/m5/objects/PhysicalMemory.mpy:
python/m5/objects/Platform.mpy:
python/m5/objects/SimConsole.mpy:
python/m5/objects/SimpleDisk.mpy:
python/m5/objects/Tsunami.mpy:
python/m5/objects/Uart.mpy:
Change 'Super.foo' to 'parent.foo' (and 'Super' to 'parent.any').
--HG--
extra : convert_revision :
f996d0a3366d5e3e60ae5973691148c3d7cd497d
Steve Reinhardt [Wed, 16 Mar 2005 00:41:51 +0000 (19:41 -0500)]
Add a comment to smartdict.py.
python/m5/smartdict.py:
Add a comment explaining why this actually works.
--HG--
extra : convert_revision :
39cbde547f4bf6cf626ab1c0b6ef56a5788b09b8