Nathan Binkert [Thu, 10 Feb 2005 05:02:51 +0000 (00:02 -0500)]
Some cosmetic changes to MyPOpen
util/pbs/pbs.py:
More tweaks that I forgot
--HG--
extra : convert_revision :
7298f91b80bc7d8d946be93fc622e5f9f6e155f9
Nathan Binkert [Thu, 10 Feb 2005 04:55:21 +0000 (23:55 -0500)]
More fixes to the pbs stuff to make it more robust.
sim/pyconfig/SConscript:
Embed the jobfile.py script into the binary so that we don't
need to copy it into the Base directory every time.
test/genini.py:
Add the util/pbs directory to the path so we can get to
jobfile.py
Add a -I argument to set to add to the path.
util/pbs/pbs.py:
Create a MyPOpen class. This is a lot like the popen2.Popen3 class
in the python library except that my version allows redirection of
standard in and standard out to a file instead of a pipe.
Use this popen class to execute qsub or ssh qsub. This was important
for the ssh version of qsub because we need to pipe the script into
standard in of ssh so that the script can get to the qsub command.
(Otherwise we have a problem discovering the path.)
util/pbs/send.py:
Tweak the script so it figures out paths in NFS correctly.
Use the new system for running qsub.
--HG--
extra : convert_revision :
1289915ba99cec6fd464b71215c32d2197ff2824
Nathan Binkert [Thu, 10 Feb 2005 03:21:58 +0000 (22:21 -0500)]
Fix bug in trace param context so we can compile
--HG--
extra : convert_revision :
667c76132adb143e1f2c0726c80ad3e567a530aa
Nathan Binkert [Wed, 9 Feb 2005 23:12:39 +0000 (18:12 -0500)]
More fixes for running from anywhere.
util/pbs/send.py:
always access the job directory via full path
--HG--
extra : convert_revision :
1792aadb39428e7c91953ac58f6da212b7f92835
Nathan Binkert [Wed, 9 Feb 2005 22:33:28 +0000 (17:33 -0500)]
enable the Trace, Statistics, and Serialize param contexts.
objects/Root.mpy:
Fake the param context stuff for now.
sim/param.cc:
Make empty vector enums work
sim/serialize.cc:
serialize_dir is always valid
--HG--
extra : convert_revision :
c46373f0f4c70e6a2f01a81c0fa6bacab72d4c4f
Nathan Binkert [Wed, 9 Feb 2005 21:20:53 +0000 (16:20 -0500)]
Fixes to thes pbs send script
util/pbs/send.py:
- add a -d to set the job root directory allowing one to run
send.py from anywhere.
- specify full paths to files instead of relative paths to make -d
work and to allow ssh qsub to work again.
- make the Link directory only copy links that point to regular files.
--HG--
extra : convert_revision :
dd330cee08b97c5d72c3d58ef123f83ac7ccede7
Nathan Binkert [Wed, 9 Feb 2005 18:46:23 +0000 (13:46 -0500)]
Add the split_first and split_last functions on strings.
base/str.cc:
base/str.hh:
Add a couple functions that allow you to split a string at
the first or last instance of a delimiter.
--HG--
extra : convert_revision :
2af22639e1b67ac61577c00475a555841a56f902
Nathan Binkert [Wed, 9 Feb 2005 18:41:53 +0000 (13:41 -0500)]
Fix the panic message so that it looks more like M5's panic.
Make it so the same path is not added to the system path twice.
--HG--
extra : convert_revision :
fe18db38cc4e335ad3525a364e9f8faf62b60e52
Nathan Binkert [Wed, 9 Feb 2005 18:40:02 +0000 (13:40 -0500)]
fix indent (so emacs and vi aren't screwed up.)
--HG--
extra : convert_revision :
589f37476fec14aa5e3c6e018631e291113d4e69
Nathan Binkert [Sat, 5 Feb 2005 18:50:25 +0000 (13:50 -0500)]
Tweak genini.
test/genini.py:
Make it possible to run genini from a different directory.
--HG--
extra : convert_revision :
57cfb010d6114512040bf334ea21c9ed87234be0
Nathan Binkert [Sat, 5 Feb 2005 18:49:17 +0000 (13:49 -0500)]
Make pbs submission scripts available to all.
Fix up configuration scrupts to have better support for
running on the simulation pool.
--HG--
extra : convert_revision :
0178c8600b193d6c0ca69163fb735a7fa0e70782
Ali Saidi [Fri, 4 Feb 2005 04:51:02 +0000 (23:51 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
0151e501074988eedb52d91254870c265935f229
Ali Saidi [Fri, 4 Feb 2005 04:50:57 +0000 (23:50 -0500)]
Add Monet configuration, update p4 parameters, couple of typo fixes
dev/tsunami_cchip.cc:
add a fake register to tsunami that we can do 32bit reads to.
Warn on access.
--HG--
extra : convert_revision :
d87860f3b527528151c23431556039bca6e12945
Steve Reinhardt [Fri, 4 Feb 2005 01:50:07 +0000 (20:50 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
aea0708fa6684e3203c03f17e8ae6ae87e893f04
Steve Reinhardt [Fri, 4 Feb 2005 01:49:14 +0000 (20:49 -0500)]
Minor bug fix/update to tracediff util.
util/tracediff:
Fix bug (used += instead of .= for string concatenation in Perl...
wrong language!).
Also updated for new config (s/Universe/root/).
--HG--
extra : convert_revision :
0db3f22794037dc51cc29f78a75bd22012a8ecd9
Steve Reinhardt [Fri, 4 Feb 2005 01:47:11 +0000 (20:47 -0500)]
Add support for CPU models to execute the effective
address calculation and memory access portions separately.
Not currently used by any CPU models, but Kevin says he needs this.
Also clean up handling of execution tracing for memory accesses
(move it all into isa_desc and out of CPU models).
Got rid of some ancient unused code too.
arch/alpha/isa_desc:
Add execute() methods to EAComp and MemAcc portions of memory
access instructions, to allow CPU models to execute the effective
address calculation and memory access portions separately.
Requires the execution context to remember the effective address
across the two invocations. Added setEA() and getEA() methods to
execution context to support this. A model that does not use the
split execution model can panic if these methods are called.
Also added hook to call traceData->setAddr() after EA computation
on any load or store operation.
arch/isa_parser.py:
Call traceData->setData() on memory writes (stores).
cpu/simple_cpu/simple_cpu.cc:
Get rid of unused code.
cpu/simple_cpu/simple_cpu.hh:
Add (non-functional) setEA() and getEA() methods for new
split memory access execution support.
--HG--
extra : convert_revision :
bc2d2c758c4ca753812b9fa81f21038e55929ff0
Nathan Binkert [Thu, 3 Feb 2005 22:04:54 +0000 (17:04 -0500)]
get rid of defined and just access the env dict directly
get rid of the alias for true to True and false to False to keep
consistent python syntax.
util/stats/info.py:
Fix typo
--HG--
extra : convert_revision :
e69588a8de52424e043315e70008ca3a3ede7d5b
Nathan Binkert [Thu, 3 Feb 2005 19:33:02 +0000 (14:33 -0500)]
small python config related fixes.
dev/simconsole.cc:
sim/universe.cc:
isValid isn't compatible with new python stuff, so whack it.
--HG--
extra : convert_revision :
0c50038769a558650479c51122a8be5d92e7d9c4
Steve Reinhardt [Thu, 3 Feb 2005 18:10:35 +0000 (13:10 -0500)]
Fix minor doxygen problem.
--HG--
extra : convert_revision :
c15b1c5ab1c87b8d1cea87ffa383d1f4d45f107c
Nathan Binkert [Thu, 3 Feb 2005 02:13:01 +0000 (21:13 -0500)]
Update config file language to take simobj and no longer use siminst
objects/AlphaConsole.mpy:
objects/AlphaTLB.mpy:
objects/BadDevice.mpy:
objects/BaseCPU.mpy:
objects/BaseCache.mpy:
objects/BaseSystem.mpy:
objects/Bus.mpy:
objects/CoherenceProtocol.mpy:
objects/Device.mpy:
objects/DiskImage.mpy:
objects/Ethernet.mpy:
objects/Ide.mpy:
objects/IntrControl.mpy:
objects/MemTest.mpy:
objects/Pci.mpy:
objects/PhysicalMemory.mpy:
objects/Platform.mpy:
objects/Process.mpy:
objects/Repl.mpy:
objects/Root.mpy:
objects/SimConsole.mpy:
objects/SimpleDisk.mpy:
objects/Tsunami.mpy:
objects/Uart.mpy:
simobj now requires a type= line if it is actually intended
to be a type
sim/pyconfig/SConscript:
keep track of the filename of embedded files for better
error messages.
sim/pyconfig/m5config.py:
Add support for the trickery done with the compiler to get the
simobj language feature added to the importer.
fix the bug that gave objects the wrong name in error messages.
test/genini.py:
Globals have been fixed and use execfile
--HG--
extra : convert_revision :
b74495fd6f3479a87ecea7f1234ebb6731279b2b
Lisa Hsu [Tue, 1 Feb 2005 22:35:01 +0000 (17:35 -0500)]
some changes for a split lifo in the new python config.
objects/BaseCache.mpy:
add all the Split parameters to the BaseCache simobj.
--HG--
extra : convert_revision :
4fcba3ce730f730ca8628ac7f4aa0fb9476474ab
Lisa Hsu [Tue, 1 Feb 2005 20:40:02 +0000 (15:40 -0500)]
checking in outstanding changes for partitioning that never made it to the head in my mad prelim rush.
--HG--
extra : convert_revision :
59ca9cca2f2090d234708a695228bf4a91fc5f52
Ali Saidi [Sun, 30 Jan 2005 21:58:39 +0000 (16:58 -0500)]
removed all tsunami dependence on tlaserreg.h (RTC defines) and
all but tlaser_node.cc dependence on tlaserreg.h
dev/tsunami_io.cc:
dev/tsunamireg.h:
removed tlaserreg.h
--HG--
extra : convert_revision :
148a5d79530e5ed721a49279f684a48041deed2b
Lisa Hsu [Fri, 28 Jan 2005 20:57:40 +0000 (15:57 -0500)]
make nat runs used vegas congestion avoidance implementation.
--HG--
extra : convert_revision :
29d2c4b70c56f13642466bd88c82f36ba849ed9d
Ali Saidi [Thu, 27 Jan 2005 21:01:32 +0000 (16:01 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
ed089f6062639ae5be930fbaea3dd7f7622653cc
Ali Saidi [Thu, 27 Jan 2005 21:01:25 +0000 (16:01 -0500)]
added support for outputing Dot if pydot is installed
--HG--
extra : convert_revision :
bdb1032cddb2478e999399647f893d320260ef7e
Kevin Lim [Tue, 25 Jan 2005 21:27:23 +0000 (16:27 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/m5-patched/m5-new
--HG--
extra : convert_revision :
2848966f3daf7aba741d4d38db9c87145d72ee26
Nathan Binkert [Tue, 25 Jan 2005 16:15:54 +0000 (11:15 -0500)]
We need more cshrs so we don't segfault.
--HG--
extra : convert_revision :
54b1987d86e3f307e13de0396cf149653f4f6e6a
Nathan Binkert [Tue, 25 Jan 2005 07:02:42 +0000 (02:02 -0500)]
Fix the stats ParamContext
--HG--
extra : convert_revision :
23e49ca8bd9f50be32a4c28ba435a358d7093f83
Nathan Binkert [Tue, 25 Jan 2005 07:00:01 +0000 (02:00 -0500)]
Fix pc_sample_interval default
--HG--
extra : convert_revision :
553b0489e8b8a83a4e8bbf9601eb82902436c761
Kevin Lim [Fri, 21 Jan 2005 23:31:30 +0000 (18:31 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new
--HG--
extra : convert_revision :
e802c800a478c297d3aa780a9ea3c6701453d91d
Nathan Binkert [Fri, 21 Jan 2005 20:49:46 +0000 (15:49 -0500)]
send output to the JOBDIR
--HG--
extra : convert_revision :
d53864c55f20aa00754106390878ce04a4ff468e
Nathan Binkert [Fri, 21 Jan 2005 20:13:27 +0000 (15:13 -0500)]
fix bug in python code
--HG--
extra : convert_revision :
67a931326e5a8e6b814ea6d3bcd384126b0cbba4
Nathan Binkert [Fri, 21 Jan 2005 20:09:42 +0000 (15:09 -0500)]
Fixup checkpointing with the new config stuff.
objects/Root.mpy:
add checkpointing as a parameter to the root object.
--HG--
extra : convert_revision :
3b809ebd776c8a9256a4ad6f8783cd96ab5cb1b3
Ron Dreslinski [Fri, 21 Jan 2005 17:23:03 +0000 (12:23 -0500)]
Make it so that with dual CPU's we create more writebuffers by default, so that we can handle more uncached access (we will get some from multiple processors)
--HG--
extra : convert_revision :
4bb913340cda47925321da5f95aaa2ff95dbe9dd
Nathan Binkert [Fri, 21 Jan 2005 16:29:19 +0000 (11:29 -0500)]
Fix some mysql code issues.
base/stats/events.cc:
cast this to an unsigned long long to make the compiler happy
on 64-bit platforms.
--HG--
extra : convert_revision :
e893d21bb228cbfb0c23adb7c4eeb1f62209ca1c
Nathan Binkert [Fri, 21 Jan 2005 16:27:14 +0000 (11:27 -0500)]
Add more options that we may want to tweak on a per-job basis.
Fix the nat config.
--HG--
extra : convert_revision :
22bd4f20408371b644b51fd8d6b79486e1e5a59b
Nathan Binkert [Fri, 21 Jan 2005 16:19:26 +0000 (11:19 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
47fe06540907f6810cd1bccfc96a8705fd38c4ba
Ron Dreslinski [Fri, 21 Jan 2005 09:55:55 +0000 (04:55 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/new_config
--HG--
extra : convert_revision :
8c87cd948d501b1fc58d57f1f505d1f72725ecde
Ron Dreslinski [Fri, 21 Jan 2005 09:55:43 +0000 (04:55 -0500)]
Fix annoying bug that lead to dropped packets in the P4 system
dev/pktfifo.cc:
Make it so that we don't unserialize the size of the fifo, clobering the fact that we were trying to make it bigger, and leading to a misleading config.out that states the un-overwritten max_size.
Perhaps this should instead be a panic if the size (amount that was serialized) is bigger than the maxsize that was assigned by the configuration file.
--HG--
extra : convert_revision :
d4b0527bfd7a584554ddc87c9b2103f7a3a72332
Nathan Binkert [Fri, 21 Jan 2005 09:34:01 +0000 (04:34 -0500)]
Add a couple statistics contexts.
arch/alpha/pseudo_inst.cc:
rename the context for consistency.
sim/pyconfig/m5config.py:
Add a ParamContext class so that param contexts work with
the new config stuff.
--HG--
extra : convert_revision :
3a6b583a25c86237baca7a2b4eccc9d12f86a384
Ali Saidi [Wed, 19 Jan 2005 23:40:09 +0000 (18:40 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
d5e6f6e696d7607f89894856d940afc89ae8e37b
Ali Saidi [Wed, 19 Jan 2005 23:40:02 +0000 (18:40 -0500)]
added total bytes/bandwidth/packets formulas to nics
cleaned up stability code and wrote some better help for stats.py
fixed sample bug in info.py
dev/ns_gige.cc:
dev/ns_gige.hh:
dev/sinic.cc:
dev/sinic.hh:
add total bandwidth/packets/bytes stats
util/stats/info.py:
fixed samples bug
util/stats/stats.py:
cleaned up stability code and wrote a bit better help
--HG--
extra : convert_revision :
cae06f4fac744d7a51ee0909f21f03509151ea8f
Lisa Hsu [Wed, 19 Jan 2005 23:18:15 +0000 (18:18 -0500)]
Add a new aggregate trace flag that doesn't print gobs of ethernet raw data, but prints everything else.
--HG--
extra : convert_revision :
ddb0636f5d5f0c746bd121eaafc0c685b422b006
Kevin Lim [Wed, 19 Jan 2005 21:34:35 +0000 (16:34 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new
--HG--
extra : convert_revision :
3b9413a6861eaddb8de753d76e217106d41cc347
Ron Dreslinski [Wed, 19 Jan 2005 21:26:19 +0000 (16:26 -0500)]
Fix serialization of txPacket (need to properly calculate the length before serialization)
--HG--
extra : convert_revision :
e93321495d19afb86949daf2c14102ffb6bcef41
Nathan Binkert [Wed, 19 Jan 2005 17:43:06 +0000 (12:43 -0500)]
fix unserialization of PacketFifo
dev/pktfifo.cc:
fix unserialization. calling resize on a list just sticks
uninitialized garbage into the list.
--HG--
extra : convert_revision :
1cbff596dd0b88560e23b9368ec75a7369beb9d9
Nathan Binkert [Wed, 19 Jan 2005 17:41:12 +0000 (12:41 -0500)]
Add the pc_sample_interval stuff
add a Sampler configuration for the P4
--HG--
extra : convert_revision :
45a8f67ff80b552925a5f1cb9b8c14e11c33b78c
Nathan Binkert [Wed, 19 Jan 2005 04:01:17 +0000 (23:01 -0500)]
Make the config stuff work on 64-bit machines
objects/Pci.mpy:
specify that the value is a long so that it is not
interpreted as a negative value.
--HG--
extra : convert_revision :
3b0df8711da5934aff0096ba54fb79da808e987b
Nathan Binkert [Tue, 18 Jan 2005 23:09:27 +0000 (18:09 -0500)]
remove assert that doesn't apply with the new configuration system
--HG--
extra : convert_revision :
9cec969a4f6fa391c05e3c152e3c1396646038f3
Nathan Binkert [Tue, 18 Jan 2005 23:06:22 +0000 (18:06 -0500)]
Yet again, another configuration fix
--HG--
extra : convert_revision :
e6683da3a35c57e742f572b0c5d5a79bfbecbdd9
Ali Saidi [Tue, 18 Jan 2005 22:55:42 +0000 (17:55 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
5cb8186e246698fb2606beb4af8fd10cedb1b2a9
Ali Saidi [Tue, 18 Jan 2005 22:55:35 +0000 (17:55 -0500)]
Ability to check formulas
--HG--
extra : convert_revision :
68a2a19cceb4a8cf8a2798ee5c019d25c0fca3cc
Nathan Binkert [Tue, 18 Jan 2005 22:54:17 +0000 (17:54 -0500)]
Add a missing variable to the simple CPU
--HG--
extra : convert_revision :
50997f58f44506a6c5349a559298e8fc58d79974
Nathan Binkert [Tue, 18 Jan 2005 20:51:53 +0000 (15:51 -0500)]
Fix the sampler for real this time
--HG--
extra : convert_revision :
e930f9ec59c2e160be9a43e6e45608decd3f49c5
Kevin Lim [Tue, 18 Jan 2005 20:46:00 +0000 (15:46 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new
--HG--
extra : convert_revision :
c51d9a7361d8e3c23e9494640c66df8505322b00
Nathan Binkert [Tue, 18 Jan 2005 20:42:52 +0000 (15:42 -0500)]
fix typo
--HG--
extra : convert_revision :
7fe0b0b43534020ffd3e5d34a08efd24ba063e5a
Nathan Binkert [Tue, 18 Jan 2005 20:28:34 +0000 (15:28 -0500)]
More configuration fixes
sim/pyconfig/m5config.py:
put panic, AddToPath, and Import here so they're always available.
--HG--
extra : convert_revision :
104dba5ccac0d64479b4109d477b5192c4b07a6e
Ali Saidi [Tue, 18 Jan 2005 18:35:04 +0000 (13:35 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
a799d615ab5a3d3447b24b1b1ce24cffcde361cd
Ali Saidi [Tue, 18 Jan 2005 18:34:58 +0000 (13:34 -0500)]
now really done with stability stats stuff
--HG--
extra : convert_revision :
9bdbcec972f5d06e3ecd99c418fcccfaef7f6f3a
Ali Saidi [Tue, 18 Jan 2005 18:25:55 +0000 (13:25 -0500)]
finished stability stats option
--HG--
extra : convert_revision :
3ad0a143f79b116c5b18321846653d627429882a
Kevin Lim [Tue, 18 Jan 2005 18:02:47 +0000 (13:02 -0500)]
Merge changes to make m5 g++ 3.4 compatible.
sim/param.cc:
Merge changes.
--HG--
extra : convert_revision :
b5044e1f7c48ae2d74d5233dd4fabfb7a801d7c8
Nathan Binkert [Tue, 18 Jan 2005 17:51:09 +0000 (12:51 -0500)]
Fix the p4 config
--HG--
extra : convert_revision :
64dac30ce221b71f0ac0e5bceed739fa95ab11a2
Nathan Binkert [Tue, 18 Jan 2005 16:54:46 +0000 (11:54 -0500)]
More configuration tweaks/fixes
--HG--
extra : convert_revision :
8094d88e9e58f9097e9e4ffde70787f81bb235e1
Kevin Lim [Tue, 18 Jan 2005 16:43:45 +0000 (11:43 -0500)]
Move trace data function to .cc file.
--HG--
extra : convert_revision :
8180068747489978a2bbaa096dc73b0cfd14b052
Nathan Binkert [Tue, 18 Jan 2005 04:41:35 +0000 (23:41 -0500)]
Config cleanups
sim/pyconfig/m5config.py:
Remove unused code
remove the defined() function that was masking the one
that I really wanted
test/genini.py:
Add the directory that a script was executed from to the
path
--HG--
extra : convert_revision :
a1861065b2de46d77c94691d0c5a7865cdce0f09
Nathan Binkert [Tue, 18 Jan 2005 03:30:10 +0000 (22:30 -0500)]
fix the exec of python
--HG--
extra : convert_revision :
08b542ae09e69e139e0f03279a51fe253c05e629
Nathan Binkert [Mon, 17 Jan 2005 06:35:33 +0000 (01:35 -0500)]
configuration tweaks
--HG--
extra : convert_revision :
360bcbb0c67f4f40e7fc41db1befb4864dbbd14f
Nathan Binkert [Mon, 17 Jan 2005 06:30:39 +0000 (01:30 -0500)]
get the exit condition for the python code right
sim/main.cc:
get the exit condition right
--HG--
extra : convert_revision :
0dada3d68492c46981c51d3de0de409b282bb13b
Nathan Binkert [Mon, 17 Jan 2005 06:23:50 +0000 (01:23 -0500)]
don't use dirname
--HG--
extra : convert_revision :
181cbae18174b1278937720de09e0df14f7ce5e9
Nathan Binkert [Mon, 17 Jan 2005 06:11:27 +0000 (01:11 -0500)]
fix dirname for linux
--HG--
extra : convert_revision :
751ce377d10e2f07ce83da8c1f44756ea62925d0
Nathan Binkert [Mon, 17 Jan 2005 05:54:32 +0000 (00:54 -0500)]
Remove all of the old param context description junk
--HG--
extra : convert_revision :
4df8112d713e83b4435f43edf40df87f5dda808f
Nathan Binkert [Mon, 17 Jan 2005 05:52:51 +0000 (00:52 -0500)]
Add the pentium 4 configuration. Add some command line options
to M5 to support the python configuration stuff.
sim/main.cc:
Make the -I option update the include path for phython as
well as cpp
Make the -P option pass a raw python string to the interpreter
Make the -E option add strings to the environment
Break up the various steps of python processing to accomidate
multiple files and the various new options
test/genini.py:
Make this executable
--HG--
extra : convert_revision :
6acc50d2e4367c5ceaee013db987c8a1db924df3
Nathan Binkert [Sat, 15 Jan 2005 09:12:25 +0000 (04:12 -0500)]
New and improved configuration mechanism. No more writing of
wierd ini files. The ini files are still used as an intermediate step,
but a sophisticated python library exists to help build them more
easily.
SConscript:
add the new embedded file stuff
remove all of the old object description junk
base/inifile.cc:
base/inifile.hh:
get rid of findDefault and findAppend since they were the source
of much evil.
base/trace.cc:
For now, if we don't have the dprintf_stream set up, dump
to standard out. We probably want a command line option
for this.
dev/alpha_console.cc:
PioDevice now takes a platform parameter.
All PioDevices must have a pio_latency parameter. We stick
a dummy parameter in here for now until we get rid of the
builder stuff.
dev/alpha_console.hh:
don't need Platform anymore
dev/baddev.cc:
PioDevice now takes a platform parameter.
All PioDevices must have a pio_latency parameter. We stick
a dummy parameter in here for now until we get rid of the
builder stuff. Same for the platform parameter, though we just
pass the PioDevice a null parameter since it isn't used by
this device and it's quicker.
dev/baddev.hh:
fix #include guards
dev/etherlink.cc:
rename parameters.
dev/ethertap.cc:
rename parameters
dev/ide_ctrl.cc:
All devices need an address even if it will get overwritten later.
dev/ide_disk.cc:
use an enum for the drive ID stuff.
rename disk_delay -> delay
Actually, I think that we should implement "cable select" and
have the controller tell the drive what it is.
dev/io_device.cc:
dev/io_device.hh:
All IO devices take a Platform *
dev/ns_gige.cc:
all devices need an io_bus. rename header_bus to io_bus
We don't need stuff for the interrupt controller since
it's all in the platform now.
dev/ns_gige.hh:
We don't need stuff for the interrupt controller now since
it's all in the platform.
dev/pciconfigall.cc:
Pass a dummy NULL to the PioDevice for the platform since
we don't need one.
dev/pcidev.cc:
Move a bunch of common functionality into the PciDev
dev/platform.hh:
remove unneeded code
dev/tsunami.cc:
remove unused param
dev/tsunami_cchip.cc:
pass platform pointer
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart.cc:
pass platform variable
dev/uart.hh:
don't need to keep a platform pointer. it's in the base class
kern/linux/linux_system.cc:
kern/tru64/tru64_system.cc:
rename some parameters
sim/builder.cc:
clean up builder code. use more parameters from the
config node. all sections with a type= are now created,
the old mechanisms no longer work
sim/builder.hh:
remove some extra variables since they are found in the ConfigNode
sim/main.cc:
add a quick hack command line argument -X to dump out the
embedded files. (probably should be fixed up a little.)
accept .mpy files
printing to the streams has to happen after the hierarchy
is built since we're moving away from param contexts
sim/param.cc:
add parsing support for ranges
sim/process.cc:
isValid isn't very useful anymore. interpret the names
stdout, stderr, cout, cerr for the file descriptors
sim/pyconfig/SConscript:
Add Action handlers for creating an embedded python file
and for creating an embedded C file.
use these action handlers to embed all objects found in the objects
tree into the binary along with the importer and the m5config stuff
sim/pyconfig/m5config.py:
Major changes to the original configuration file generator. These
changes largely involve implementing copy-on-write like semantics
for all of the SimObjects. Real documentation must be written.
sim/universe.cc:
Universe becomes a SimObject since we don't really have the notion of
param contexts in the python code.
--HG--
rename : sim/pyconfig/m5configbase.py => sim/pyconfig/m5config.py
extra : convert_revision :
c353453e5beb91c37f15755998fc0d8858c6829a
Kevin Lim [Fri, 14 Jan 2005 23:34:56 +0000 (18:34 -0500)]
Fixes so m5 compiles on gcc 3.4, which has much stricter syntax. Most changes come from templated code,
which is evaluated slightly differently than in previous versions of gcc.
arch/alpha/alpha_linux_process.cc:
Alphabetize includes.
arch/alpha/vptr.hh:
Change the constants that are being used for alpha pagebytes to come from the ISA.
base/random.hh:
cpu/static_inst.cc:
sim/param.cc:
Fix up template syntax.
base/range.hh:
Include iostream for << operator.
base/res_list.hh:
base/statistics.hh:
cpu/simple_cpu/simple_cpu.hh:
cpu/static_inst.hh:
sim/eventq.hh:
sim/param.hh:
Fixup for templated code to resolve different scope lookup in gcc 3.4. This defers the lookup of the
function/variable until actual instantiation time by making it dependent on the templated class/function.
base/trace.cc:
Fix call to new.
base/trace.hh:
Fix up #define to have full path.
cpu/base_cpu.cc:
Fix up call to new.
dev/etherlink.hh:
dev/ns_gige.hh:
dev/sinic.hh:
Fixup for friend class/function declaration. g++ 3.4 no longer allows typedefs to be declared as
a friend class.
dev/pcidev.hh:
Fix up re-definition of access level to params.
kern/linux/linux_syscalls.hh:
kern/tru64/tru64_syscalls.hh:
Fix up header. Fix up template syntax.
sim/serialize.cc:
Include errno.h.
sim/startup.cc:
Change startupq. queue was getting destructed before all things had called ~StartupCallback(), which lead
to a segfault. This puts startupq in global space, and we allocate it ourselves. Other code may be similar
to this and may need changing in the future.
sim/syscall_emul.hh:
Include cpu/exec_context.hh and sim/process.hh, as forward declarations are no longer sufficient.
sim/universe.cc:
Include errno.h
--HG--
extra : convert_revision :
e49d08ee89eb06a28351f02bafc028ca6652d5af
Ali Saidi [Fri, 14 Jan 2005 22:50:36 +0000 (17:50 -0500)]
added stats code to check stability
util/stats/db.py:
added working listticks (for printing) and retticks(for using in python) code
util/stats/stats.py:
added stability function that checks if all samples are within 10% of mean.
--HG--
extra : convert_revision :
7eb1714db75e456f248fe7cae73db1c57642947d
Ali Saidi [Fri, 14 Jan 2005 05:05:49 +0000 (00:05 -0500)]
automerged had issues with the options.XXXXX in stats.py
--HG--
extra : convert_revision :
44db6642c1fb46eb515acd5a6d8465859a40891a
Ali Saidi [Fri, 14 Jan 2005 04:59:39 +0000 (23:59 -0500)]
fix a display bug
add option to limit results to a set of ticks
fix ticks code to work
util/stats/info.py:
change samples -> ticks and pass all parameters
util/stats/stats.py:
add option to select a set of ticks and fix display bug
--HG--
extra : convert_revision :
eca80a8c6bb75cf82bf1624f3d0170690b2928af
Nathan Binkert [Wed, 12 Jan 2005 18:44:47 +0000 (13:44 -0500)]
More graph output junk
util/stats/stats.py:
Add the graphing output for 6GHz and 8GHz runs
--HG--
extra : convert_revision :
fae3763c213e4b839735761bf91fa37e1b4f343c
Nathan Binkert [Wed, 12 Jan 2005 18:41:06 +0000 (13:41 -0500)]
Update for newer MySQLdb
util/stats/db.py:
Update for newer MySQLdb, the result of a blob in a query is an
array.array now, so we need to convert that to a string
--HG--
extra : convert_revision :
32732983d3d7141755085ec4913fdae057edc67f
Steve Reinhardt [Thu, 23 Dec 2004 17:33:12 +0000 (12:33 -0500)]
Added notes from 12/22/04 memory system meeting
(plus a formatting fix found while browsing code
during the meeting).
--HG--
extra : convert_revision :
fb23edbe40a9dbf870ae49299e91e16906ea2c8a
Nathan Binkert [Wed, 22 Dec 2004 13:57:32 +0000 (08:57 -0500)]
Fix typo
--HG--
extra : convert_revision :
1716d3fb0b19406402989824f74e9c2bc2b5a9c0
Nathan Binkert [Sat, 18 Dec 2004 14:53:31 +0000 (09:53 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.int.chaotic.net:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
7a3b0009499c0b9c4685efb598f7e2dd61a49ecc
Nathan Binkert [Sat, 18 Dec 2004 14:53:18 +0000 (09:53 -0500)]
a bit of remote debugging info.
--HG--
extra : convert_revision :
ae44f49701839bb64950852a251440d86512a5b0
Ali Saidi [Wed, 15 Dec 2004 20:39:21 +0000 (15:39 -0500)]
add colors to graph
--HG--
extra : convert_revision :
0f1749a364516460d77882ef9301c06d86a329b3
Ali Saidi [Tue, 14 Dec 2004 19:52:32 +0000 (14:52 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
7746bf5a56475a821a05b29896ec95fc4e6f556c
Ali Saidi [Tue, 14 Dec 2004 19:52:26 +0000 (14:52 -0500)]
updated clustered bars graph to have a legend
--HG--
extra : convert_revision :
9a7e5f8a9693e24d2b3c8836d43803b42da6ca2c
Ron Dreslinski [Tue, 14 Dec 2004 18:15:54 +0000 (13:15 -0500)]
Modified to work with do_events
No multiple requests to the same block outstanding from the same tester
Using false sharing, each tester only access a single byte within the block based on which tester it is
Allow more cycles before signalling deadlock, with do_events it may take some time with NACK/retry and many proccessors
--HG--
extra : convert_revision :
4c8eab99082c53840a5ad2a926457dfc27f23b77
Nathan Binkert [Mon, 13 Dec 2004 17:55:13 +0000 (12:55 -0500)]
Fix up the random number stuff.
SConscript:
compile the random number generator stuff into m5
base/random.cc:
we need to define our destructor
base/random.hh:
Since there's no state, just makes all of these get functions static
--HG--
extra : convert_revision :
9d4b8abd57367391a8ecda3914b1d912d9c64185
Steve Reinhardt [Thu, 9 Dec 2004 06:07:08 +0000 (01:07 -0500)]
Change Bus template parameter to BusType (to avoid confusion with Bus class).
Change Mem template parameter to MemType while we're at it.
dev/io_device.hh:
Change Bus template parameter to BusType (to avoid confusion with Bus class).
--HG--
extra : convert_revision :
dca8effb177535b3624ef08a3d3b8afab720390b
Ali Saidi [Thu, 9 Dec 2004 00:54:10 +0000 (19:54 -0500)]
Change to not pound on the VM system quite so hard
--HG--
extra : convert_revision :
bf035976a7be75bd56f2df49d5489525675d3d57
Ali Saidi [Wed, 8 Dec 2004 23:30:06 +0000 (18:30 -0500)]
compress main memory in checkpoints
SConscript:
Add zlib to the build always
--HG--
extra : convert_revision :
fae49fbbba371660e171d7e8328894a74c846ec5
Ali Saidi [Mon, 6 Dec 2004 18:37:26 +0000 (13:37 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
02d8a72ee5c059543af790cca0712fd7dbf5f33c
Ali Saidi [Mon, 6 Dec 2004 17:06:16 +0000 (12:06 -0500)]
Add support for Tsunami with 64 processors
base/socket.cc:
Make panic print a more worthwhile message
dev/tsunami.hh:
Change max number of tsunami cpus to be 64
dev/tsunamireg.h:
Add new registers and register blocks for 64 cpu tsunami
--HG--
extra : convert_revision :
3ceaaa998518ded8613bc64edc04cb9120fd3d15
Lisa Hsu [Fri, 3 Dec 2004 20:49:37 +0000 (15:49 -0500)]
system.ini:
the SYSTEM_DETAIL configuration assumes that it's a TWO_SYSTEM. make it not do that
--HG--
extra : convert_revision :
4f630a06b333acd727c57a82bc7a9595b231c037
Lisa Hsu [Fri, 3 Dec 2004 20:42:26 +0000 (15:42 -0500)]
boot_detail.ini:
now that we've changed the memory system defined names, fix this file
--HG--
extra : convert_revision :
1ce3881c9d21ba0b37f17f802641b5029a042d17
Lisa Hsu [Fri, 3 Dec 2004 20:29:33 +0000 (15:29 -0500)]
system.ini:
Fix the Boot Detailed case so that IntrControl and AlphaConsole's cpu's are defined.
--HG--
extra : convert_revision :
d6e5073af27d5554b2bea719a0790ef891bf57be
Ali Saidi [Wed, 1 Dec 2004 22:01:27 +0000 (17:01 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
9be07505189d9dd54af423d28e7d48f1a4cd084b
Ali Saidi [Wed, 1 Dec 2004 22:00:39 +0000 (17:00 -0500)]
updated colors, and font adjustments
--HG--
extra : convert_revision :
a4ce055c73ec12a26c70d03bd833ee9d429adc23
Nathan Binkert [Wed, 24 Nov 2004 18:34:48 +0000 (13:34 -0500)]
Add a #define option for setting the sampling periods
--HG--
extra : convert_revision :
29163dc72e7e677b4cfafa76cb33a755ee2c50b2