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
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
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
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
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
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
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
Ali Saidi [Thu, 24 Feb 2005 20:57:52 +0000 (15:57 -0500)]
if we have an invalid addr and it's not a miss-speculation panic
--HG--
extra : convert_revision :
4c906f68c6168100f7e8f2030b1f957c88900768
Ron Dreslinski [Thu, 24 Feb 2005 16:43:03 +0000 (11:43 -0500)]
Fix it so that using a sampler works with the occ and ocp configurations.
--HG--
extra : convert_revision :
a990503a6c01a156230d8910ad86876d09b4f1b3
Ron Dreslinski [Thu, 24 Feb 2005 16:34:58 +0000 (11:34 -0500)]
Print an error message if a Checkpoint number was defined, but no checkpoint file was sourced
--HG--
extra : convert_revision :
302c1d6720c0ee24fcfc266cd99f501af734a452
Nathan Binkert [Wed, 23 Feb 2005 17:26:35 +0000 (12:26 -0500)]
Fix the python panic message
sim/pyconfig/m5config.py:
Fix panic
--HG--
extra : convert_revision :
56d93398e992ed6e95380f6dcdb61cbee54b3893
Ali Saidi [Wed, 23 Feb 2005 16:47:49 +0000 (11:47 -0500)]
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
f149b8ea762d4a83ef76b3bb95f28e0709391ecf
Ali Saidi [Wed, 23 Feb 2005 16:46:28 +0000 (11:46 -0500)]
added two validation rcs files
--HG--
extra : convert_revision :
19e57e5192be3435d72652e3b36aac3b6e43d81c
Ali Saidi [Wed, 23 Feb 2005 16:45:25 +0000 (11:45 -0500)]
Added mmap start and end so detailed CPU can know if an access is
in a mmaped region
--HG--
extra : convert_revision :
e4ee0520c84d94a0d2e804d02035228766abe71f
Ali Saidi [Wed, 23 Feb 2005 16:43:18 +0000 (11:43 -0500)]
Updated Monet configurations
--HG--
extra : convert_revision :
8f9c875541adcf685effcfb2e138f2dbb8463137
Steve Reinhardt [Wed, 23 Feb 2005 04:53:34 +0000 (23:53 -0500)]
Small initial steps toward generating C++ param structs
from Python object descriptions. Mostly cleanup of Python
code based on things I encountered trying to figure out
what's going on. Main reason I'm committing this now is
to transfer work from my laptop to zizzer.
sim/pyconfig/m5config.py:
Small steps toward param struct generation: all param
objects should now have a _cppname attribute that holds
their corresponding C++ type name.
Made Param ptype attribute an actual type instead of a
string. String is still stored in ptype_string.
Get rid of AddToPath() and Import() (redundant copies
are in importer, and that seems to be the more logical
place for them).
Add a few comments, delete some unused code.
test/genini.py:
A few fixes to make the environment more compatible
with what really happens when configs are executed
from the m5 binary.
--HG--
extra : convert_revision :
9fc8f72cd0c22ba3deada02f37484787342534f2
Kevin Lim [Tue, 22 Feb 2005 21:03:30 +0000 (16:03 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
8a558785c64b7c33e64523d3d887ea6e760c3d2b
Nathan Binkert [Mon, 21 Feb 2005 23:06:09 +0000 (18:06 -0500)]
Set the proper job name for statistics if we're using a JOBNAME
and JOBFILE
--HG--
extra : convert_revision :
44253a39f40efcbbcda226701b0e97d8ea46cf1e
Nathan Binkert [Mon, 21 Feb 2005 22:32:57 +0000 (17:32 -0500)]
formatting fixes
--HG--
extra : convert_revision :
8b9bfed29b66e8bce11448f175273f5ebb6876b2
Nathan Binkert [Sat, 19 Feb 2005 16:46:41 +0000 (11:46 -0500)]
Clean up CPU stuff and make it use params structs
cpu/base_cpu.cc:
cpu/base_cpu.hh:
Convert the CPU stuff to use a params struct
cpu/memtest/memtest.cc:
The memory tester is really not a cpu, so don't derive from
BaseCPU since it just makes things a pain in the butt. Keep
track of max loads in the memtest class now that the base class
doesn't do it for us.
Don't have any default parameters.
cpu/memtest/memtest.hh:
The memory tester is really not a cpu, so don't derive from
BaseCPU since it just makes things a pain in the butt. Keep
track of max loads in the memtest class now that the base class
doesn't do it for us.
cpu/simple_cpu/simple_cpu.cc:
Convert to use a params struct.
remove default parameters
cpu/simple_cpu/simple_cpu.hh:
convert to use a params struct
cpu/trace/opt_cpu.cc:
cpu/trace/opt_cpu.hh:
cpu/trace/trace_cpu.cc:
cpu/trace/trace_cpu.hh:
this isn't really a cpu. don't derive from BaseCPU
objects/MemTest.mpy:
we only need one max_loads parameter
sim/main.cc:
Don't check for the number of CPUs since we may be doing something
else going on. If we don't have anything to simulate, the
simulator will exit anyway.
--HG--
extra : convert_revision :
2195a34a9ec90b5414324054ceb3bab643540dd5
Kevin Lim [Fri, 18 Feb 2005 00:22:42 +0000 (19:22 -0500)]
Include errno.h to fix compile errors in gcc 3.4
sim/main.cc:
Include errno.h
--HG--
extra : convert_revision :
ff91579ae590b3c1d11f7468b71f295e6f3edd68
Nathan Binkert [Thu, 17 Feb 2005 19:02:03 +0000 (14:02 -0500)]
rename the simple cpu's multiplier parameter. call it width.
it makes more sense and is less confusing.
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
width is a better name than multiplier
--HG--
extra : convert_revision :
ea2fa4faa160f5657aece41df469bbc9f7244b21
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
Kevin Lim [Fri, 11 Feb 2005 22:54:42 +0000 (17:54 -0500)]
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision :
11832134b169aa827a1d03c96ef89edddf4b3dab
Kevin Lim [Fri, 11 Feb 2005 22:54:33 +0000 (17:54 -0500)]
Fix up #defines to use full path; fix up code for g++ 3.4
SConscript:
Remove efence option from automatically being used.
--HG--
extra : convert_revision :
466bb8077aa341db0b409720e2a73535b1fa6b69
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
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
Kevin Lim [Fri, 4 Feb 2005 23:25:49 +0000 (18:25 -0500)]
Hand merge
--HG--
extra : convert_revision :
86c7399b79c17558041a73056745227f70fe8b3b
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