Ron Dreslinski [Thu, 17 Feb 2005 17:52:55 +0000 (12:52 -0500)]
Fix typo from my hand merge, missing a paren
--HG--
extra : convert_revision :
7199cd3195ee841f0311ff464dbb4325bb32329c
Ron Dreslinski [Thu, 17 Feb 2005 17:14:04 +0000 (12:14 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
88afcacc41f5b0fae0ed1ac1821b7ca88c407e85
Ron Dreslinski [Thu, 17 Feb 2005 17:13:37 +0000 (12:13 -0500)]
More changes so that asynchronus blocks work properly
--HG--
extra : convert_revision :
54f4d91be03da90bc77f65b62e5871e9dba6b904
Nathan Binkert [Thu, 17 Feb 2005 08:40:17 +0000 (03:40 -0500)]
Fix compile on linux
sim/main.cc:
For some unknown reason linux's basename doesn't take a const char *
--HG--
extra : convert_revision :
30289195881e16a05429f7025abab7914a9e3eb6
Nathan Binkert [Thu, 17 Feb 2005 07:50:34 +0000 (02:50 -0500)]
Make code more portable.
sim/main.cc:
basename is in libgen
--HG--
extra : convert_revision :
1af6ff2f492b4deee9e56edfa5ee6ea235cd4eb0
Nathan Binkert [Thu, 17 Feb 2005 07:48:56 +0000 (02:48 -0500)]
Several tweaks to make binning work in any simulation
configuration so that we can always have binning on.
base/statistics.cc:
If we're binning, and there is no bin active at the time
we check all stats stuff, create a bin.
base/statistics.hh:
FS_MEASURE doesn't exist anymore
base/stats/text.cc:
don't print out bin names if there is only one bin
sim/process.cc:
don't zero stats. It happens automatically.
Don't activate the context at the time it is registered,
instead activate the first context in a startup callback.
sim/process.hh:
Add startup callback to initialize the first exec context
--HG--
extra : convert_revision :
bcb23cdb184b0abf7cecd79902f8a59b50f71fe4
Ali Saidi [Tue, 15 Feb 2005 01:47:23 +0000 (20:47 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
c807a78d9c3f3be51763dab9685aa4b7361c585c
Ali Saidi [Tue, 15 Feb 2005 01:47:05 +0000 (20:47 -0500)]
undoing change per nates request
--HG--
extra : convert_revision :
c5c2fd88dfd8d893da51c2b80907260ec14a7593
Nathan Binkert [Tue, 15 Feb 2005 01:22:27 +0000 (20:22 -0500)]
Make it so we append jobs to the joblist in the for loop not
outside of the loop so we get all of the jobs, not just the
last one.
util/pbs/send.py:
fix indent
--HG--
extra : convert_revision :
eee9546b4945ff949fdfdf339fc95a23603b47d3
Ali Saidi [Mon, 14 Feb 2005 23:54:38 +0000 (18:54 -0500)]
output dir changes to python files
util/pbs/job.py:
pass output dir to m5 directly
--HG--
extra : convert_revision :
00d1568bb2da3b3e646fc75b4884314bf4cb2d71
Ali Saidi [Mon, 14 Feb 2005 04:05:47 +0000 (23:05 -0500)]
Merge
--HG--
extra : convert_revision :
10c28ac66c7e71615a239783e21ab36a47de992c
Ali Saidi [Mon, 14 Feb 2005 04:03:04 +0000 (23:03 -0500)]
build mysql version if libraries exist
add dprintf on alignment faults
fix RR benchmark rcS script name
Add Dual test without rcS script
Update Monet to be closer to the real thing
Fix p4/monet configs
Add a way to read the DRIR register with at 32bit access for validation
SConscript:
build/SConstruct:
always use mysql if the libraries are installed
arch/alpha/alpha_memory.cc:
Add a DPRINTF to print alignment faults when they happen
dev/tsunami_cchip.cc:
Add a way to read the DRIR for validation.
--HG--
extra : convert_revision :
8c112c958f36b785390c46e70a889a79c6bea015
Nathan Binkert [Fri, 11 Feb 2005 14:48:23 +0000 (09:48 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/merge
--HG--
extra : convert_revision :
5d73046310a64b80a6ba3832df3b30b55532d707
Nathan Binkert [Fri, 11 Feb 2005 14:47:41 +0000 (09:47 -0500)]
Rework the command line paramters for python output and how
output files and the output directory are are handled. Make
the output directory configuration via a command line parameter,
or an environment variable.
SConscript:
Add new output file stuff
base/misc.cc:
dev/simconsole.cc:
use new output file code
cpu/base_cpu.cc:
use new output file code to generate output streams
dev/etherdump.cc:
use the output file code to find the output directory
use a real stream instead of a pointer
dev/etherdump.hh:
use a real stream instead of a pointer
objects/Root.mpy:
output_dir and config_output_file are not longer configured here.
sim/main.cc:
- Completely rework the command line argument passing to deal with
changes in python and output files.
- Update help output to reflect changes.
- Remove all direct support for .ini files. They are strictly
for intermediate representation.
- Remove the --foo:bar=blah syntax for .ini files and add --foo.bar=blah
syntax for python. This will generate: foo.bar = 'blah' in the python
script.
- Add '-d' to set the output directory.
- Use new output file code to access the output stream.
sim/serialize.cc:
use the new code to find the output directory
sim/universe.cc:
Get rid of makeOutputStream. Use the new output file code.
Remove output_dir and config_output_file as parameters.
--HG--
extra : convert_revision :
df2f0e13d401c3a60cae1239aa1ec3511721544d
Nathan Binkert [Fri, 11 Feb 2005 06:40:49 +0000 (01:40 -0500)]
Make sure we have all values when trying to generate the ini file
sim/pyconfig/m5config.py:
When getting all values, make sure we get the ones that are
parameter defaults as well.
--HG--
extra : convert_revision :
2b1c4b2f27dfab17ef9df18d7e5936e4a00bb12e
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
Ron Dreslinski [Wed, 9 Feb 2005 21:23:56 +0000 (16:23 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
c12f7ad9143bc69d25c39132d30889f22c73edf1
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
Ron Dreslinski [Wed, 9 Feb 2005 17:56:24 +0000 (12:56 -0500)]
Merger
cpu/simple_cpu/simple_cpu.hh:
Merge
--HG--
extra : convert_revision :
1b6003ac731051fefacb7d7a30c317553b4bf1bc
Ron Dreslinski [Wed, 9 Feb 2005 15:27:00 +0000 (10:27 -0500)]
Some more useful debugging info for kernel panic and die events
Increase the default number of CSHR's, we should really fix this or make it a parameter
Use a setBlocked call to tell the bus it should block
New technique for sampling and switchover:
1) Sampler switchover event happens
2) All cpus in the current phase of sampling associated with this sampler are signaled to switchover
3) Each cpu drains it's pipe of things being executed (stops fetching and waits for empty pipe)
4) Once the pipe is empty the cpu calls back to the sampler to signal it has finished, and moves into the switchedout state (continues not to fetch)
5) The sampler collects all the signals, once all cpus are drained it calls the new cpu's in the next phase to takeover from the correct cpu
6) The statistics are reset and the next switchover time is calculated from this point
cpu/base_cpu.cc:
cpu/base_cpu.hh:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
Reconfigure the way the sampling switchover works
cpu/pc_event.cc:
More debugging information on kernel panic's
kern/linux/linux_system.cc:
More debug info for Kernel Die events
kern/linux/linux_system.hh:
More debug info for kernel die events
--HG--
extra : convert_revision :
61cc42e43ba738705aa1f1d167b65d4d6dee51ae
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
Ron Dreslinski [Fri, 21 Jan 2005 20:24:12 +0000 (15:24 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
20c65e224a5fbd396a98baa2111a0e22a1534586
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:30:40 +0000 (12:30 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
dcbdcd39ef8920e05a69cd5bc7fa7c9164268125
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
Ron Dreslinski [Fri, 21 Jan 2005 16:43:27 +0000 (11:43 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
193cb1585489c51f274f978f0adde7c8fbec050f
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:57:12 +0000 (04:57 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
cf9baafa40dbca1a89581484fd4c9d8336a26d66
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
Ron Dreslinski [Thu, 20 Jan 2005 22:21:42 +0000 (17:21 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
1892825b1e7ba47353e7a79ca4dcb84b64a73f79
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
Ron Dreslinski [Wed, 19 Jan 2005 18:22:38 +0000 (13:22 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
1064ec4c8624682b35f66163fb349fe04903411d
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
Ron Dreslinski [Wed, 19 Jan 2005 00:04:08 +0000 (19:04 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
76c2d853a7ce5cbea5e038e9b2b400b402fb4baa
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
Ron Dreslinski [Tue, 18 Jan 2005 22:57:16 +0000 (17:57 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
e12a7722391db473f6545d0bb4c0faedd43344c9
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
Ron Dreslinski [Tue, 18 Jan 2005 20:59:47 +0000 (15:59 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
7d2ac93eb7bc5dae778cdb7cbdbf42e35da44369
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
Ron Dreslinski [Tue, 18 Jan 2005 20:43:43 +0000 (15:43 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
84e365aeb30eafb72b7d4290b5bad0ff95da7039
Nathan Binkert [Tue, 18 Jan 2005 20:42:52 +0000 (15:42 -0500)]
fix typo
--HG--
extra : convert_revision :
7fe0b0b43534020ffd3e5d34a08efd24ba063e5a
Ron Dreslinski [Tue, 18 Jan 2005 20:30:33 +0000 (15:30 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
917c79ebe8f3fb250755464f3b7f45f744f5be09
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
Ron Dreslinski [Tue, 18 Jan 2005 17:01:45 +0000 (12:01 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
88c268655ed657735b0c09d8ab769e27d936edb4
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
Ron Dreslinski [Tue, 18 Jan 2005 04:49:01 +0000 (23:49 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
46721f5427b0549ec4d7125827a90dbc0007964b
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
Ron Dreslinski [Tue, 18 Jan 2005 03:37:37 +0000 (22:37 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
01eeeec7bedf73d34b60a7fa725f929421f84ed1
Nathan Binkert [Tue, 18 Jan 2005 03:30:10 +0000 (22:30 -0500)]
fix the exec of python
--HG--
extra : convert_revision :
08b542ae09e69e139e0f03279a51fe253c05e629
Ron Dreslinski [Mon, 17 Jan 2005 20:03:48 +0000 (15:03 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision :
da464558edb2a77dc02033464a88a59f2ae6355d