Kevin Lim [Tue, 15 Mar 2005 22:26:14 +0000 (17:26 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
8f25703b016c391217a7daae5f395bd942d589ef
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
Kevin Lim [Tue, 15 Mar 2005 20:13:24 +0000 (15:13 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
1391d03656a1d75809217c5b2e2aecca6f8a04ba
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
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
Kevin Lim [Mon, 14 Mar 2005 23:01:07 +0000 (18:01 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
ba27a3ba99b567f5a8a41d9cd3a09d38c820ed89
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
Kevin Lim [Mon, 14 Mar 2005 22:33:32 +0000 (17:33 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
1a30850bb81562f153f08e9af81aa9831a71a97a
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:50 +0000 (16:09 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
145a8416a65d91c8852c85b576d9259fd47a0887
Kevin Lim [Mon, 14 Mar 2005 21:09:36 +0000 (16:09 -0500)]
Fix for using Python 2.4
--HG--
extra : convert_revision :
1682c4b77a76137974d3cb0d28c36e3d02e4e5cd
Kevin Lim [Mon, 14 Mar 2005 20:40:51 +0000 (15:40 -0500)]
Merge
--HG--
extra : convert_revision :
22919164108afd74f30207606f59a38992991dae
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
Kevin Lim [Thu, 10 Mar 2005 20:53:27 +0000 (15:53 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
a58535776cf5a3d17f8d9f65144cdf8db54289aa
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
Kevin Lim [Wed, 9 Mar 2005 22:59:02 +0000 (17:59 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
936710126053a7f08b1d80b935df38f5ea837f79
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
Lisa Hsu [Wed, 9 Mar 2005 16:04:19 +0000 (11:04 -0500)]
fix typo in the fixed etherlink serialization.
dev/etherlink.cc:
fix type in serialization.
--HG--
extra : convert_revision :
87f47db14b90f414fef9a0db869da4d7ef72216a
Steve Reinhardt [Wed, 9 Mar 2005 05:22:42 +0000 (00:22 -0500)]
Fix tracediff to work with new parameter and output directory structure.
util/tracediff:
Fix to work with new parameter and output directory structure.
--HG--
extra : convert_revision :
421ed14fa02df7c9e95eb93f4d36b9ff046f1e39
Steve Reinhardt [Wed, 9 Mar 2005 05:17:20 +0000 (00:17 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5-head
--HG--
extra : convert_revision :
daaeb6a596b08fbedd6a14833dcb3825c637d486
Steve Reinhardt [Wed, 9 Mar 2005 05:17:09 +0000 (00:17 -0500)]
Fix a couple of bugs introduced (or tickled) by the .ini sorting change.
sim/pyconfig/m5config.py:
Don't sort child nodes, as this can change timing in memory system.
(Really ought to be fixed in memory system, but we'll just take the
sort back out for now to avoid intoducing gratuitous changes.)
--HG--
extra : convert_revision :
07e950c25911443cbc7a84435969ca596fb04348
Nathan Binkert [Wed, 9 Mar 2005 04:06:54 +0000 (23:06 -0500)]
Pass all scons defined pre-processor macro variables to the
python configuration stuff as environment variables.
sim/pyconfig/SConscript:
generate a python file that updates the env dict with all
variables in the CPPDEFINES so the python code can use those
variables in configuration scripts.
--HG--
extra : convert_revision :
50b0719b044f7adc87ce6ae1571d156ca0c5644c
Nathan Binkert [Wed, 9 Mar 2005 03:07:26 +0000 (22:07 -0500)]
Split the string importer from the rest of the mpy parsing
and importing stuff to avoid some confusion.
sim/pyconfig/SConscript:
Split the string importer from the rest of the importer code.
The importer.py code can be embedded like m5config.py
sim/pyconfig/m5config.py:
import what we need from importer
--HG--
extra : convert_revision :
9d57f43381b55e717b5b10adfb8f0a522280ac57
Kevin Lim [Wed, 9 Mar 2005 02:03:20 +0000 (21:03 -0500)]
Hand-merge static_inst.hh. These execute functions are within an external file in the new CPU case.
cpu/static_inst.hh:
Hand-merge. These execute functions are within an external file in the new CPU case.
--HG--
extra : convert_revision :
a34112f471fa31bdd5bb53552ddd704b9571c110
Lisa Hsu [Tue, 8 Mar 2005 22:38:08 +0000 (17:38 -0500)]
Merge zizzer:/bk/m5 into zed.eecs.umich.edu:/z/hsul/work/m5/pact05
--HG--
extra : convert_revision :
bfaaeebd7ec4ee8ee182909e928581f95ac2af93
Lisa Hsu [Tue, 8 Mar 2005 22:25:32 +0000 (17:25 -0500)]
make some changes to bonnie - now that the simulator uses more memory the old config didn't fit anymore in pools VM, this does fit.
--HG--
extra : convert_revision :
b5fef2896276be675f79791b084ba97dd953d4ca
Nathan Binkert [Tue, 8 Mar 2005 17:48:37 +0000 (12:48 -0500)]
By default, we don't want to be sampling
--HG--
extra : convert_revision :
77c1ec0f2425d24704a587ad2097dfaa6bab4a5c
Nathan Binkert [Tue, 8 Mar 2005 17:47:55 +0000 (12:47 -0500)]
Fix serialization of the EtherLink object
dev/etherlink.cc:
- The EtherLink::Link object is no lonver serializable, so it is now
necessary to prepend the object's name (as determined by the parent)
to all parameters.
- Fix the serialization of the LinkDelayEvent so it actually works
- Rename some variables to make serialization simpler
dev/etherlink.hh:
- Make the EtherLink::Link object *not* derive from serializeable.
Instead, the serialize function will take a base name from
the parent EtherLink object and prepend that base name to each of
its variable names when serializing. This is similar to the
PacketData and PacketFifo classes.
- Make the EtherLink::Link object keep a pointer to its parent and its
link number so the LinkDelayEvent can be properly serialized.
- Rename some variables to make serialization simpler.
--HG--
extra : convert_revision :
e5aa54cd9e07b5e033989809100e1640abfb8bed
Nathan Binkert [Tue, 8 Mar 2005 17:37:08 +0000 (12:37 -0500)]
Fix the singalling from server to client so that the
benchmark begins properly.
configs/boot/nat-netperf-maerts-client.rcS:
Fix the echo message
configs/boot/nat-netperf-server.rcS:
Wait a second before signalling the natbox to make sure it's
had time to boot.
Fix echo message.
--HG--
extra : convert_revision :
f9d32c98f24b9617ebf917790a4ca554b7b02bba
Nathan Binkert [Tue, 8 Mar 2005 17:35:17 +0000 (12:35 -0500)]
Only try to import cpt.mpy if we need it.
--HG--
extra : convert_revision :
bee61a5026221d47fa00705ccd96595e1415f220
Steve Reinhardt [Tue, 8 Mar 2005 01:56:17 +0000 (20:56 -0500)]
Merge zizzer:/bk/m5 into vm1.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
d5b97b8f5af42115989e7f9f4baa421d61a13b70
Steve Reinhardt [Tue, 8 Mar 2005 01:56:02 +0000 (20:56 -0500)]
More restructuring on Python config code for auto-generating
of Param structs.
objects/CoherenceProtocol.mpy:
objects/Ide.mpy:
Update for new Enum syntax.
sim/pyconfig/m5config.py:
More modest restructuring heading for auto-generating
of param structs.
- Revamped Enum handling: Enums are regular classes so they
know their names now (makes it easier for generating C++
equivalents).
- Created MetaSimObject class and moved some SimObject-specific
stuff there (i.e. does not apply to ConfigNodes in general).
--HG--
extra : convert_revision :
a93b40dda3b038ebe8bffecac97e9079c22af561
Ron Dreslinski [Mon, 7 Mar 2005 23:04:49 +0000 (18:04 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
34c73338a0552b59d4264a1cbc091ad3fc9a3a41
Nathan Binkert [Mon, 7 Mar 2005 18:05:41 +0000 (13:05 -0500)]
Make it easier to find a jobfile.
util/pbs/jobfile.py:
Search for the jobfile in sys.path
--HG--
extra : convert_revision :
50d2c2c13b6b9de4f6bc4e833961e309a98b0d2b
Ron Dreslinski [Mon, 7 Mar 2005 15:58:15 +0000 (10:58 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
2b73bffea88cb0e3bb5dff232a15afea8498f4e3
Steve Reinhardt [Sun, 6 Mar 2005 00:28:43 +0000 (19:28 -0500)]
Sort fields in .ini files generated by Python config
to make it easier to diff output from modified versions.
sim/pyconfig/m5config.py:
Sort .ini outputs for repeatable results across versions.
--HG--
extra : convert_revision :
fa918f2c53635eca3a02ce02af9b320eacd1f057
Lisa Hsu [Sat, 5 Mar 2005 20:16:29 +0000 (15:16 -0500)]
the client and server aren't rate-matched anymore and the timing of the netcats are off - add a sleep 1 to make it actually work.
--HG--
extra : convert_revision :
3fa730a94d9270945d34061513ab9ce0ab60e7ba
Lisa Hsu [Thu, 3 Mar 2005 16:43:20 +0000 (11:43 -0500)]
fix naming error - before we set CLIENT_MEMORY_SIZE and then when we wanted that value, used CLIENT_MEMSIZE! This caused the NFS failure I was seeing.
--HG--
extra : convert_revision :
845fd7f42d7df771c59ce9a3e77667aff22967c2
Steve Reinhardt [Wed, 2 Mar 2005 20:14:18 +0000 (15:14 -0500)]
Make AddToPath and LoadMpyFile visible inside .mpy modules
even though they're not in m5config anymore.
--HG--
extra : convert_revision :
1e49d5a432790ad1c92e47f1b5e6f1b34a422fa0
Ali Saidi [Wed, 2 Mar 2005 05:53:23 +0000 (00:53 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
cc69c3009fe34de4b4a658a383ce1d2750f227f6
Steve Reinhardt [Wed, 2 Mar 2005 03:32:14 +0000 (22:32 -0500)]
Two fixes to try and get TLB miss cost more in line with real platform:
1) Add fault_handler_delay param to FullCPU to wait N cycles after
committing faulting instruction before fetching fault handler.
2) Make hw_rei a serializing instruction (flushes pipe, basically).
arch/alpha/isa_desc:
Make hw_rei a serializing instruction (guarantees previous insts
complete before hw_rei will issue).
--HG--
extra : convert_revision :
704cef65b3869be9eee724055cedb22114a78359
Lisa Hsu [Tue, 1 Mar 2005 21:59:42 +0000 (16:59 -0500)]
add the new func unit into the overall list.
--HG--
extra : convert_revision :
2d425ec36de0443e094640fdbbc43754bfc7ed2e
Nathan Binkert [Tue, 1 Mar 2005 16:07:44 +0000 (11:07 -0500)]
add some comments.
sim/pyconfig/m5config.py:
Add some comments to indicate what the decorators mean.
--HG--
extra : convert_revision :
fbcbcbe4ad8cd62f2bd12af6b1f141c66752b870
Ali Saidi [Tue, 1 Mar 2005 07:08:39 +0000 (02:08 -0500)]
Add FUDesc for IprAccess
--HG--
extra : convert_revision :
42c5f8765185aba6a5ca59180d93c579ef759449
Ali Saidi [Tue, 1 Mar 2005 06:16:54 +0000 (01:16 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
439e7d84ea9a66177b0cc2cab4cd77ecb90aa6fe
Ali Saidi [Tue, 1 Mar 2005 06:03:37 +0000 (01:03 -0500)]
Updated Monet Configuration and validations tests
--HG--
extra : convert_revision :
d58aed18f8f809185ad2639eb92465a5fc6695de
Steve Reinhardt [Tue, 1 Mar 2005 05:41:19 +0000 (00:41 -0500)]
Fix stats incompatibility with g++ 3.4.
base/statistics.hh:
Get rid of operator%... g++ 3.4 complains that this isn't defined
for doubles (which makes sense). We never use it anyway.
--HG--
extra : convert_revision :
3ca724e1cc42559226549835f6cd3509308e02ca
Steve Reinhardt [Tue, 1 Mar 2005 05:39:57 +0000 (00:39 -0500)]
Add a new operation class for IPR accesses, and have IPR-accessing
instructions use it (instead of IntALU, as before). Default config
has a single non-pipelined 3-cycle unit. A bit conservative for the
ev6 (some are 1, some are 3).
arch/alpha/isa_desc:
Make hw_mfpr and hw_mtpr use IprAccessOp op class.
cpu/full_cpu/op_class.hh:
Add IprAccess.
--HG--
extra : convert_revision :
d4103da3343a586936839e29981fd15d6930d442
Steve Reinhardt [Sat, 26 Feb 2005 02:44:33 +0000 (21:44 -0500)]
Make all StaticInst methods const. StaticInst objects represent a
particular binary machine instruction and should be immutable after
they are constructed.
cpu/simple_cpu/simple_cpu.hh:
Make StaticInst parameters const.
--HG--
extra : convert_revision :
e535fa10c842ce173336323f39d9108c1847f8ba
Kevin Lim [Fri, 25 Feb 2005 23:01:19 +0000 (18:01 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
ba556bbc93275fcd920a0529383fd480bb7218de
Kevin Lim [Fri, 25 Feb 2005 23:00:49 +0000 (18:00 -0500)]
Initial light-weight OoO CPU checkin, along with gcc-3.4 fixes.
SConscript:
Include new files.
arch/alpha/isa_desc:
Make the eaCompPtr and memAccPtr non-const so that execute() can be called on them.
arch/alpha/isa_traits.hh:
Add enum for total number of data registers.
arch/isa_parser.py:
base/traceflags.py:
Include new light-weight OoO CPU model.
cpu/base_dyn_inst.cc:
cpu/base_dyn_inst.hh:
Changes to abstract more away from the base dyn inst class.
cpu/beta_cpu/2bit_local_pred.cc:
cpu/beta_cpu/2bit_local_pred.hh:
cpu/beta_cpu/tournament_pred.cc:
cpu/beta_cpu/tournament_pred.hh:
Remove redundant SatCounter class.
cpu/beta_cpu/alpha_dyn_inst.cc:
cpu/beta_cpu/alpha_full_cpu.cc:
cpu/beta_cpu/alpha_full_cpu.hh:
cpu/beta_cpu/bpred_unit.cc:
cpu/beta_cpu/inst_queue.cc:
cpu/beta_cpu/mem_dep_unit.cc:
cpu/beta_cpu/ras.cc:
cpu/beta_cpu/rename_map.cc:
cpu/beta_cpu/rename_map.hh:
cpu/beta_cpu/rob.cc:
Fix for gcc-3.4
cpu/beta_cpu/alpha_dyn_inst.hh:
cpu/beta_cpu/alpha_dyn_inst_impl.hh:
Fixes for gcc-3.4.
Include more variables and functions that are specific to AlphaDynInst which were once in BaseDynInst.
cpu/beta_cpu/alpha_full_cpu_builder.cc:
Make params match the current params inherited from BaseCPU.
cpu/beta_cpu/alpha_full_cpu_impl.hh:
Fixes for gcc-3.4
cpu/beta_cpu/full_cpu.cc:
Use new params pointer in BaseCPU.
Fix for gcc-3.4.
cpu/beta_cpu/full_cpu.hh:
Use new params class from BaseCPU.
cpu/beta_cpu/iew_impl.hh:
Remove unused function.
cpu/simple_cpu/simple_cpu.cc:
Remove unused global variable.
cpu/static_inst.hh:
Include OoODynInst for new lightweight OoO CPU
--HG--
extra : convert_revision :
34d9f2e64ca0313377391e0d059bf09c040286fa
Ron Dreslinski [Fri, 25 Feb 2005 20:12:05 +0000 (15:12 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
e7d839327b07393bfcda0b77758b0832eaf1c1c0
Steve Reinhardt [Fri, 25 Feb 2005 19:49:39 +0000 (14:49 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
312d9edd677afef6c973c0cb45af4f827a2b881a
Ron Dreslinski [Fri, 25 Feb 2005 19:39:55 +0000 (14:39 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
e314c70da4a9f4e05c9a8afec1de85000618ea4d
Nathan Binkert [Fri, 25 Feb 2005 19:38:00 +0000 (14:38 -0500)]
Make the SimConsole device dump its output to a file by default
--HG--
extra : convert_revision :
59cc7c3234d1bc96919d08dc0ec7584d8aff1d6f
Steve Reinhardt [Fri, 25 Feb 2005 17:41:08 +0000 (12:41 -0500)]
Fix timing modeling of faults: functionally the very next instruction after
a faulting instruction is the fault handler, which appears as an independent
instruction to the timing model. New code will stall fetch and not fetch the
fault handler as long as there's a faulting instruction in the pipeline (i.e.,
the faulting inst has to commit first).
Also fix Ali's bad-address assertion that doesn't apply to full system.
Added some more debugging support in the process. Hopefully we'll move to the new
cpu model soon and we won't need it anymore.
arch/alpha/alpha_memory.cc:
Reorganize lookup() so we can trace the result of the lookup as well.
arch/alpha/isa_traits.hh:
Add NoopMachInst (so we can insert them in the pipeline on ifetch faults).
base/traceflags.py:
Replace "Dispatch" flag with "Pipeline" (since I added similar
DPRINTFs in other pipe stages).
cpu/exetrace.cc:
Change default for printing mis-speculated instructions to true (since
that's often what we want, and right now you can't change it from the
command line...).
--HG--
extra : convert_revision :
a29a98a373076d62bbbb1d6f40ba51ecae436dbc
Ali Saidi [Thu, 24 Feb 2005 20:59:29 +0000 (15:59 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
a63405fac7237014c4ef8b765d31d59d3e1bb500