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
Ali Saidi [Tue, 15 Mar 2005 23:07:46 +0000 (18:07 -0500)]
only increment invalid address loads on misspeculated instructions
--HG--
extra : convert_revision :
b68f730a1ea43c75ea1596c4219f66c0fce9dd0a
Ali Saidi [Tue, 15 Mar 2005 22:31:24 +0000 (17:31 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
b1307177467024b222e3ca0313601d8ccc122a41
Ali Saidi [Tue, 15 Mar 2005 22:31:18 +0000 (17:31 -0500)]
during a cache miss in the simple cpu we were finalizing the trace
data too early (before the cache miss completed) and therefore
writing freeded memory after the cache miss completed.
Also removed some spurious setAddr() and setData() calls.
--HG--
extra : convert_revision :
3da82540c69c4c417aba3ed155e167d09431a1b2
Nathan Binkert [Tue, 15 Mar 2005 22:11:54 +0000 (17:11 -0500)]
Hard code the SimObject::Params struct
sim/sim_object.cc:
Add a new constructor that can take the params struct and
tweak the old one to create a params struct if we use the
old constructor.
sim/sim_object.hh:
Hard code a Params struct for SimObject that all other params
structs can derive from. Move the name string into the struct
and update the code accordingly. New constructor that takes
the params struct.
--HG--
extra : convert_revision :
30761dab31d7257f9e8c864dcd6cae37309163f2
Nathan Binkert [Tue, 15 Mar 2005 20:26:32 +0000 (15:26 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/current
--HG--
extra : convert_revision :
772709acc6e5f9976464d6a05ca0e8d6ee748126
Nathan Binkert [Tue, 15 Mar 2005 19:56:40 +0000 (14:56 -0500)]
Reduce the client memory requirement for surge so the nat stuff
runs on the pool
--HG--
extra : convert_revision :
79963cc3c2dae681f920b5592129797af8dc4cc5
Lisa Hsu [Tue, 15 Mar 2005 19:21:39 +0000 (14:21 -0500)]
merge
--HG--
extra : convert_revision :
be1867a8f24eac0c520ec1af569eb4ca45c52fc0
Ali Saidi [Tue, 15 Mar 2005 18:38:14 +0000 (13:38 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
a94b7e62184ca45c91d5bbebb73c481ca1632236
Ali Saidi [Tue, 15 Mar 2005 18:37:39 +0000 (13:37 -0500)]
config file fixes
--HG--
extra : convert_revision :
f48bb05dfecb9fb994248cc3dd4b5fe6d40a120e
Nathan Binkert [Tue, 15 Mar 2005 18:22:47 +0000 (13:22 -0500)]
get rid of issequence and just use the isinstance builtin
--HG--
extra : convert_revision :
eca99aa35ad5c5c1c86325f55cf693ff585c9826
Nathan Binkert [Tue, 15 Mar 2005 17:17:22 +0000 (12:17 -0500)]
small cleanup to sampling cpu code.
cpu/base_cpu.cc:
By default we should panic if the system doesn't explicitly support
switchover.
--HG--
extra : convert_revision :
4da2ec316d609cfb351fc5ceaa6d8fe36be14d4e
Steve Reinhardt [Tue, 15 Mar 2005 17:12:32 +0000 (12:12 -0500)]
Fix comment.
--HG--
extra : convert_revision :
3656b0f1d784d51e6b9a65262a30894f2748f662
Steve Reinhardt [Tue, 15 Mar 2005 17:10:59 +0000 (12:10 -0500)]
Fix the fix, I hope...
--HG--
extra : convert_revision :
aca1c091d45fda1f3d1ec7394f338aa9723a7314
Lisa Hsu [Tue, 15 Mar 2005 16:33:11 +0000 (11:33 -0500)]
fetch.cc:
undo ron's one-line fix for No suppliers - this was causing the DEADLOCK
--HG--
extra : convert_revision :
07d57b479808b3a03aa097d92c84ff7ddba4fdc4
Lisa Hsu [Tue, 15 Mar 2005 16:28:24 +0000 (11:28 -0500)]
fetch.cc:
undo ron's fix that i checked in, it caused the deadlock.
--HG--
extra : convert_revision :
dab85d748ba651d3c2debdd6577c53b998f0d96e
Kevin Lim [Mon, 14 Mar 2005 23:00:46 +0000 (18:00 -0500)]
g++ 3.4 fixes.
arch/alpha/alpha_tru64_process.cc:
g++ 3.4 fixes. Must cast to an int prior to returning value.
--HG--
extra : convert_revision :
d8ccfd7aa7ca00d9bc2d76cff014b9f142d10640
Lisa Hsu [Mon, 14 Mar 2005 22:58:02 +0000 (17:58 -0500)]
helpful DPRINTF changes - more info is good!
--HG--
extra : convert_revision :
a2d820bb97cab2c635a7192562daedd8d7784ec8
Kevin Lim [Mon, 14 Mar 2005 21:43:03 +0000 (16:43 -0500)]
Bad addr check should be full system only.
--HG--
extra : convert_revision :
0127d70f400a4d841daf3f01e63f3e1152eac505
Kevin Lim [Mon, 14 Mar 2005 21:09:36 +0000 (16:09 -0500)]
Fix for using Python 2.4
--HG--
extra : convert_revision :
1682c4b77a76137974d3cb0d28c36e3d02e4e5cd
Ali Saidi [Mon, 14 Mar 2005 20:38:26 +0000 (15:38 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
9eed6f31249ff099464044b32b882b3cc041b57a
Ali Saidi [Mon, 14 Mar 2005 20:37:58 +0000 (15:37 -0500)]
put the syscall emulation error stuff to bed, finally
remove addr from pciconfig objects
and update Monet configuration for ron's changes
python/m5/objects/Pci.mpy:
I was a little over zelous in my removal of addr, this one should have stayed
--HG--
extra : convert_revision :
6c94b11d4c63d50ffe5568b16a131a4105654126
Steve Reinhardt [Mon, 14 Mar 2005 19:43:10 +0000 (14:43 -0500)]
Move adding SRCDIR/python to sys.path from
multiple SConscript files to SConstruct.
build/SConstruct:
Add SRCDIR/python to sys.path here.
python/SConscript:
Move adding SRCDIR/python to sys.path to SConstruct.
--HG--
extra : convert_revision :
f598d670650f5b4fd501caaf073fe38b44d21855
Steve Reinhardt [Mon, 14 Mar 2005 16:34:50 +0000 (11:34 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
9ac1a3bcbfce79300da3f1cb174239897275d8b4
Lisa Hsu [Mon, 14 Mar 2005 16:16:27 +0000 (11:16 -0500)]
print the daddr to pciconfigall DPRINTF.
--HG--
extra : convert_revision :
d13ce459d5dac026e596f0bb3ba801b1dbed9ed0
Lisa Hsu [Mon, 14 Mar 2005 16:15:41 +0000 (11:15 -0500)]
Ron's fix to some of the No supplier problems, don't deal with badaddrs.
--HG--
extra : convert_revision :
442edd3c49333fc59953dd089eaaaee4f7b23deb
Lisa Hsu [Mon, 14 Mar 2005 15:23:43 +0000 (10:23 -0500)]
fix the etherdev2 connection so that nat runs work.
--HG--
extra : convert_revision :
8ad4d460836b456b29e5b4ab03081d4af622fb38
Steve Reinhardt [Mon, 14 Mar 2005 12:52:41 +0000 (07:52 -0500)]
Move mpy_importer into m5 package (it logically
belongs there since it's so tied in with m5.config).
python/SConscript:
mpy_importer.py now in m5 package
--HG--
extra : convert_revision :
3cd7af4e1cd9338aa6bed5306c824ac5f0965085
Steve Reinhardt [Mon, 14 Mar 2005 12:46:26 +0000 (07:46 -0500)]
- Add capability to auto-generate Param structs from
.mpy SimObject descriptions. Structs are defined
in simobj/param/ObjectName.hh.
- Move compile-time python params (from CPPDEFINES) to
separate dict from run-time params (from os.environ).
The former are needed to generate proper param structs.
This also helps prevent users from messing things up
by setting the wrong environment vars (which could have
overridden compile-time settings in the old system).
- Other misc cleanup of m5 python package.
SConscript:
Include simobj/SConscript
build/SConstruct:
Fix type in comment
python/SConscript:
Move CPPDEFINES dict-generating code to m5scons.flatten_defines
python/m5/__init__.py:
- Generate a build_env SmartDict here to hold compile-time
params (passed in via __main__.m5_build_env).
- Move panic and env here from config.py.
python/m5/config.py:
Move panic, env to top level (m5/__init__.py)
python/m5/objects/BaseCPU.mpy:
Use build_env instead of env for compile-time params
python/m5/smartdict.py:
Add some comments.
sim/sim_object.hh:
Include auto-generated Param struct. Not used yet,
just here as proof of concept.
test/genini.py:
Put -E arguments in build_env as well as os.environ
--HG--
extra : convert_revision :
cf6f4a2565b230c495b33b18612d6030988adac5
Steve Reinhardt [Sun, 13 Mar 2005 06:21:23 +0000 (01:21 -0500)]
Minor Python config bug fix.
python/m5/config.py:
Add 'panic' to __all__ (some of Nate's scripts use it).
--HG--
extra : convert_revision :
ae3e2398dffe3edd17ee0155f38bc757d3552df2
Steve Reinhardt [Sun, 13 Mar 2005 05:54:34 +0000 (00:54 -0500)]
A few fixes after trying one of Nate's job scripts.
python/m5/config.py:
Add issequence to __all__ export list.
Added some more comments too.
--HG--
extra : convert_revision :
17cd9205e43fe276f71563fcb96ec3c5069fcc86
Steve Reinhardt [Sun, 13 Mar 2005 05:36:06 +0000 (00:36 -0500)]
Clean up import situation... key things are:
- global tracking of legitimate param types in
separate dict keeps us from having to import
objects in config.py, which gets rid of nasty
circular dependence
- use __all__ in config.py and restrict imports
from mpy_importer to reduce m5 namespace pollution
python/m5/__init__.py:
Try to limit namespace pollution by only importing
what's needed from mpy_importer.
Explicitly set up legal parameter types rather than
relying on eval().
python/m5/config.py:
Use empty ParamType base class to distinguish
types that are legitimate SimObject params.
Explicitly add these to global param_types map.
Rework CheckedInt and Range classes a little bit
to fit in better with the model.
No need to import objects here any longer.
Add __all__ list to specify subset of names that
get exported on 'from m5.config import *'.
--HG--
extra : convert_revision :
01c6e82e0b175fc9b3df25dd0cc80ecd842680bc
Nathan Binkert [Sat, 12 Mar 2005 14:42:08 +0000 (09:42 -0500)]
fix syntax error that affected split configurations.
--HG--
extra : convert_revision :
db462e57736ccd3b6d21a06f2014eb0850a9ae90
Ali Saidi [Sat, 12 Mar 2005 00:34:43 +0000 (19:34 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
rename : objects/Pci.mpy => python/m5/objects/Pci.mpy
extra : convert_revision :
6902e8f9c2a309eb1846094a94b38018587a3761
Ali Saidi [Sat, 12 Mar 2005 00:34:35 +0000 (19:34 -0500)]
remove addr from PciConfigDevice since it's not used
Random some small config file stuff
dev/pcidev.cc:
objects/Pci.mpy:
remove addr since it's not used
--HG--
extra : convert_revision :
aeb5993552d65a5e3b57f393bcb7d8aaadf6b5a2
Nathan Binkert [Fri, 11 Mar 2005 23:50:04 +0000 (18:50 -0500)]
I don't know why from m5 import * doesn't work. Steve?
--HG--
extra : convert_revision :
b89dcd4f329973545dc8a5660daeda9bca7050a1
Nathan Binkert [Fri, 11 Mar 2005 23:47:11 +0000 (18:47 -0500)]
move the conversion stuff that was in configs/kernel/Config.py into
the m5 package as convert.py
add a smartdict class which stores strings and can intelligently
interpret those string variables as several other types.
make the env dict use the smartdict class
python/m5/config.py:
move a bunch of conversion functions into convert.py
turn the env dict into a smartdict
adapt the _CheckedInt stuff to deal with derived types
python/m5/objects/BaseCPU.mpy:
env is now a smartdict and can properly convert to bool
--HG--
extra : convert_revision :
8abcd35a5ab14b82f280aea59020953869e33365
Nathan Binkert [Fri, 11 Mar 2005 23:32:36 +0000 (18:32 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/current
--HG--
extra : convert_revision :
abc24d21097770ad323a2c0d537d3e9424db0d7d
Nathan Binkert [Fri, 11 Mar 2005 23:30:44 +0000 (18:30 -0500)]
Make ConfigNodes as intermediate containers work again.
python/m5/config.py:
move the type stuff into the Node constructor and
only try to grab self.type if the realtype is a SimObject
--HG--
extra : convert_revision :
00f6ece47e3812f67f9e1f062fe9c060bd6dd1cf
Nathan Binkert [Fri, 11 Mar 2005 23:28:38 +0000 (18:28 -0500)]
stick all python stuff into a top level python directory.
create an m5 package in python/m5
move the objects package into the m5 package
move the m5config into the m5 package as config
leave both importers outside of the package.
SConscript:
sim/main.cc:
move sim/pyconfig/* -> python
python/SConscript:
m5config.py -> m5/config.py (now automatically embedded)
objects -> python/m5/objects
embed all python files in python/m5
python/m5/config.py:
importer renamed mpy_importer
move code to m5/__init__.py
test/genini.py:
deal with new python organization
keep track of paths we want to add and add them after parameters
are parsed.
--HG--
rename : sim/pyconfig/SConscript => python/SConscript
rename : sim/pyconfig/m5config.py => python/m5/config.py
rename : objects/AlphaConsole.mpy => python/m5/objects/AlphaConsole.mpy
rename : objects/AlphaTLB.mpy => python/m5/objects/AlphaTLB.mpy
rename : objects/BadDevice.mpy => python/m5/objects/BadDevice.mpy
rename : objects/BaseCPU.mpy => python/m5/objects/BaseCPU.mpy
rename : objects/BaseCache.mpy => python/m5/objects/BaseCache.mpy
rename : objects/BaseSystem.mpy => python/m5/objects/BaseSystem.mpy
rename : objects/Bus.mpy => python/m5/objects/Bus.mpy
rename : objects/CoherenceProtocol.mpy => python/m5/objects/CoherenceProtocol.mpy
rename : objects/Device.mpy => python/m5/objects/Device.mpy
rename : objects/DiskImage.mpy => python/m5/objects/DiskImage.mpy
rename : objects/Ethernet.mpy => python/m5/objects/Ethernet.mpy
rename : objects/Ide.mpy => python/m5/objects/Ide.mpy
rename : objects/IntrControl.mpy => python/m5/objects/IntrControl.mpy
rename : objects/MemTest.mpy => python/m5/objects/MemTest.mpy
rename : objects/Pci.mpy => python/m5/objects/Pci.mpy
rename : objects/PhysicalMemory.mpy => python/m5/objects/PhysicalMemory.mpy
rename : objects/Platform.mpy => python/m5/objects/Platform.mpy
rename : objects/Process.mpy => python/m5/objects/Process.mpy
rename : objects/Repl.mpy => python/m5/objects/Repl.mpy
rename : objects/Root.mpy => python/m5/objects/Root.mpy
rename : objects/SimConsole.mpy => python/m5/objects/SimConsole.mpy
rename : objects/SimpleDisk.mpy => python/m5/objects/SimpleDisk.mpy
rename : objects/Tsunami.mpy => python/m5/objects/Tsunami.mpy
rename : objects/Uart.mpy => python/m5/objects/Uart.mpy
extra : convert_revision :
aebf6ccda33028b1125974ca8b6aeab6f7570f30
Erik Hallnor [Fri, 11 Mar 2005 23:14:47 +0000 (18:14 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/ehallnor/work/m5
--HG--
extra : convert_revision :
a19b2143fe78625238ee0a8a4fac8193f673d933
Ron Dreslinski [Fri, 11 Mar 2005 23:07:07 +0000 (18:07 -0500)]
Added config files for splash2 benchmarks. Parameters:
ROOTDIR = root directory of the splash2 code
NP = number of proccessors
BENCHMARK = name of the splash2 benchmark (Cholesky, FFT, LUContig, LUNoncontig, Radix, Barnes, FMM, OceanContig, OceanNoncontig, Raytrace, WaterNSquared, or WaterSpatial)
SYSTEM = Type of system to simulate detailed or simple
Note: They use MOESI protocol and do_events is enabled (Multiple L1's and a shared L2)
--HG--
extra : convert_revision :
c39aa73825ea8108b6c32abd4a4fa4c23391ab09
Erik Hallnor [Fri, 11 Mar 2005 17:40:12 +0000 (12:40 -0500)]
Fixup after merging.
--HG--
extra : convert_revision :
7736a0e62dac7ca1d5c64a1847469d17d2221b35
Erik Hallnor [Fri, 11 Mar 2005 17:29:47 +0000 (12:29 -0500)]
Need to invalidate blocks by calling the invalidateBlk function, not setting status to 0.
--HG--
extra : convert_revision :
b46ad0b1d665c60bef03cb711a964cb75e4e1e29
Ron Dreslinski [Thu, 10 Mar 2005 19:53:34 +0000 (14:53 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
b75a46439477b3f21333a3cc9f1721923839d14c
Ali Saidi [Thu, 10 Mar 2005 19:20:21 +0000 (14:20 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
35d9f747fcc75b80b9e4c8674f94c8c18c259f00
Ali Saidi [Thu, 10 Mar 2005 19:20:12 +0000 (14:20 -0500)]
Removed unecessary constructor call at each return.
arch/alpha/isa_traits.hh:
updated copyright date
--HG--
extra : convert_revision :
30c5fc0eb94138ebd4ee047ebdbff5121f95e5f1
Nathan Binkert [Thu, 10 Mar 2005 18:52:39 +0000 (13:52 -0500)]
Fixup checkpoint directory name
--HG--
extra : convert_revision :
8b3d03a7902484889d58319f453c181c360154ea
Nathan Binkert [Thu, 10 Mar 2005 18:51:00 +0000 (13:51 -0500)]
Add better support for using checkpoints.
--HG--
extra : convert_revision :
4bd3f473be0bfae9ad2c39d982a579aedd68b6f1
Nathan Binkert [Thu, 10 Mar 2005 18:38:44 +0000 (13:38 -0500)]
update genini so it is more like m5
test/genini.py:
import m5config after environment variables are setup so
the behaviour is more like that of the simulator and so
what are normally compile-time variables like FULL_SYSTEM
can be properly set from the command line.
--HG--
extra : convert_revision :
1951d3015b091338724b66a3a86a818f9ac97b26
Ron Dreslinski [Thu, 10 Mar 2005 16:56:07 +0000 (11:56 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
a5ee8e5187503203058da35ca44918f1ff7ae1eb
Ali Saidi [Thu, 10 Mar 2005 07:06:27 +0000 (02:06 -0500)]
Updated to be frequency independent
--HG--
extra : convert_revision :
d1cf4183b650e10acb9c9954286b066b12e89855
Ali Saidi [Thu, 10 Mar 2005 07:01:43 +0000 (02:01 -0500)]
fix typo in SyscallReturn Object
--HG--
extra : convert_revision :
97d34a02a29a9ac3e2256d92194e3a46b9e8021e
Ali Saidi [Wed, 9 Mar 2005 20:56:29 +0000 (15:56 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
a61ddd67647fc6a6e8e12d918cc71ae9da69f869
Ali Saidi [Wed, 9 Mar 2005 20:55:59 +0000 (15:55 -0500)]
Added new ping and memory latency stride 8 test
--HG--
extra : convert_revision :
29ab825ea971a0fd06f7e2cdc001892cef884669
Ali Saidi [Wed, 9 Mar 2005 20:52:10 +0000 (15:52 -0500)]
Changed all syscalls to use syscall return object.
arch/alpha/alpha_linux_process.cc:
arch/alpha/alpha_tru64_process.cc:
cpu/exec_context.hh:
sim/process.hh:
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Changed all syscalls to use syscall return object
arch/alpha/isa_traits.hh:
Added syscall return object that packages return value and return
status into an object.
sim/process.cc:
renamed variable name to nm so base class function name() can be called
--HG--
extra : convert_revision :
6609c5ffecc9e3519d7a0cd160879fd21d54abfc
Nathan Binkert [Wed, 9 Mar 2005 19:42:30 +0000 (14:42 -0500)]
Add support for using the variables that m5 was compiled with for
determining which parameters belong to a class. This allows us to
remove the disable flag since it is not the correct model
for variable checking anyway.
objects/BaseCPU.mpy:
Use the FULL_SYSTEM environment variable to enable or disable
parameters.
sim/pyconfig/m5config.py:
remove the disable flag since it is not the correct model
for variable checking.
--HG--
extra : convert_revision :
a8ccb78ba16d23006225df282a09187d32557608
Nathan Binkert [Wed, 9 Mar 2005 19:39:35 +0000 (14:39 -0500)]
We should import m5config *after* we do the CPPDEFINES stuff,
otherwise m5config and the object descriptions cannot take
advantage of them.
sim/pyconfig/SConscript:
We should import m5config *after* we do the CPPDEFINES stuff,
otherwise m5config and the object descriptions cannot take
advantage of them. This means that we can't use the env dict
alias. We should instead use os.environ.
--HG--
extra : convert_revision :
392f99a3c15cfba74a5cde79a709ecfad3820e63
Ron Dreslinski [Wed, 9 Mar 2005 18:44:19 +0000 (13:44 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
0121d59e46f0961f753c2e1bd0fa1c63642d859e