Gabe Black [Wed, 8 Feb 2006 07:17:47 +0000 (02:17 -0500)]
Moved the alpha isa_desc to conform to the new naming system.
--HG--
rename : arch/alpha/isa_desc => arch/alpha/isa/main.isa
extra : convert_revision :
a3cc14c202ae606db270c2c29847170d90c05216
Gabe Black [Wed, 8 Feb 2006 06:57:47 +0000 (01:57 -0500)]
Some fixups
arch/alpha/alpha_linux_process.cc:
arch/alpha/alpha_tru64_process.cc:
Replaced the namespace declaration with including arch/alpha/isa_traits.hh
--HG--
extra : convert_revision :
07cb73a9f30f0e165809668f9baff6a3e3f94580
Gabe Black [Wed, 8 Feb 2006 06:04:32 +0000 (01:04 -0500)]
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision :
c7caf571575fb0e7136770864371300d3f11787e
Gabe Black [Wed, 8 Feb 2006 06:03:55 +0000 (01:03 -0500)]
Alot of changes to push towards ISA independence. Highlights are renaming of the isa_desc files, movement of byte_swap.hh into sim, and the creation of arch/isa_traits.hh
SConscript:
Moved some files out of targetarch. The either no longer need to be there, never needed to be there, or should be referred to directly in arch/alpha due to there strictly alpha content.
arch/alpha/isa_traits.hh:
Added alpha's endianness to it's isa_traits.hh
arch/mips/isa_traits.hh:
Added MIPS endianness to it's isa_traits.hh
arch/sparc/isa_traits.hh:
Added SPARCs endianess to it's isa_traits.hh
build/SConstruct:
Added MIPS as a valid architecture
cpu/exec_context.hh:
Included arch/isa_traits.hh to bring in the endianness of the system.
cpu/o3/alpha_cpu.hh:
Included arch/isa_traits.hh to bring in the systems endianness, and removed the hardcoding of little endianness
cpu/o3/fetch_impl.hh:
kern/freebsd/freebsd_system.cc:
Included arch/isa_traits.hh to bring in the systems endianness, and removed the hardcoding to little endianness.
sim/system.cc:
Included arch/isa_traits.hh to bring in the systems endianness, and removed the hardcoding to little endian.
--HG--
extra : convert_revision :
b1ab34b7569db531cd1c74f273b24222e63f9007
Korey Sewell [Wed, 8 Feb 2006 00:28:19 +0000 (19:28 -0500)]
Actually we do need a separate class for Integer Ops with Immediates!!!
The extra class is needed because of the necessisty of an immediate member variable.
Also, added some 'very modest' python code to choose between the IntOp and
the IntImmOp based on the instruction name ...
--HG--
extra : convert_revision :
f109c12418202a99b40e270360134e8335739836
Korey Sewell [Tue, 7 Feb 2006 23:36:08 +0000 (18:36 -0500)]
name changes ... minor IntOP format change
arch/mips/isa/formats/int.format:
Looks like Integer Ops with Immediates may not need their own separate class because all those instructions are distinct from
their reg-reg counterparts
--HG--
rename : arch/mips/isa/bitfields.def => arch/mips/isa/bitfields.isa
rename : arch/mips/isa/decoder.def => arch/mips/isa/decoder.isa
rename : arch/mips/isa/formats.def => arch/mips/isa/formats.isa
rename : arch/mips/isa/includes.h => arch/mips/isa/includes.isa
rename : arch/mips/isa/operands.def => arch/mips/isa/operands.isa
extra : convert_revision :
8e354b4232b28c0264d98d333d55ef8b5a6589cc
Korey Sewell [Sat, 4 Feb 2006 23:59:44 +0000 (18:59 -0500)]
1st full draft switch statement actions for all integer arithmetic operations and the majority of the load & store operations (not all of FP-Ops),
Output,Format, & Template code needs to be adjusted to correctly take these "decoder.h" inputs ...
--HG--
extra : convert_revision :
3dcde1f2f587e2766fd61231a93d34d1d7727356
Korey Sewell [Sat, 4 Feb 2006 04:04:06 +0000 (23:04 -0500)]
mainly added minor support for the basic arithmetic operations (add, mult, shift)
arch/mips/isa/bitfields.def:
Add comment, move definition up in file
arch/mips/isa/decoder.def:
add basic arithmetic operations
arch/mips/isa/formats/fp.format:
change Integer -> FP words
arch/mips/isa/formats/int.format:
Add derived IntImm class
arch/mips/isa/operands.def:
change to MIPS sytle operands
--HG--
rename : arch/mips/isa/formats/fpop.format => arch/mips/isa/formats/fp.format
rename : arch/mips/isa/formats/integerop.format => arch/mips/isa/formats/int.format
extra : convert_revision :
a95da47bc981e56a9898421da4eeb9c442d1dc15
Korey Sewell [Fri, 3 Feb 2006 08:56:57 +0000 (03:56 -0500)]
.h -> .def
--HG--
rename : arch/mips/isa/bitfields.h => arch/mips/isa/bitfields.def
rename : arch/mips/isa/decoder.h => arch/mips/isa/decoder.def
rename : arch/mips/isa/formats.h => arch/mips/isa/formats.def
rename : arch/mips/isa/operands.h => arch/mips/isa/operands.def
extra : convert_revision :
45cb5485311d51982ebcaf1c7eec34e8751c31f5
Korey Sewell [Fri, 3 Feb 2006 08:39:08 +0000 (03:39 -0500)]
Rename: arch/mips/isa/formats/tlb.format -> arch/mips/isa/formats/tlbop.format
--HG--
rename : arch/mips/isa/formats/tlb.format => arch/mips/isa/formats/tlbop.format
extra : convert_revision :
5b1cfba4a5b687c9a271e1a3f67f75e3fa6c2dde
Korey Sewell [Fri, 3 Feb 2006 08:38:27 +0000 (03:38 -0500)]
Checkin (Merge?) files ... Added a few new format files
arch/mips/isa/formats/fpop.format:
Floating Point Formats
arch/mips/isa/formats/tlb.format:
TLB Ops Format
arch/mips/isa/mips.isa:
Name change to mips.isa
--HG--
rename : arch/mips/isa_desc/bitfields.h => arch/mips/isa/bitfields.h
rename : arch/mips/isa_desc/decoder.h => arch/mips/isa/decoder.h
rename : arch/mips/isa_desc/formats.h => arch/mips/isa/formats.h
rename : arch/mips/isa_desc/formats/basic.format => arch/mips/isa/formats/basic.format
rename : arch/mips/isa_desc/formats/branch.format => arch/mips/isa/formats/branch.format
rename : arch/mips/isa_desc/formats/integerop.format => arch/mips/isa/formats/integerop.format
rename : arch/mips/isa_desc/formats/mem.format => arch/mips/isa/formats/mem.format
rename : arch/mips/isa_desc/formats/noop.format => arch/mips/isa/formats/noop.format
rename : arch/mips/isa_desc/formats/trap.format => arch/mips/isa/formats/trap.format
rename : arch/mips/isa_desc/includes.h => arch/mips/isa/includes.h
rename : arch/mips/isa_desc/operands.h => arch/mips/isa/operands.h
extra : convert_revision :
069a24da405b613f688e693fd038ac7a30a4faed
Gabe Black [Fri, 3 Feb 2006 05:16:44 +0000 (00:16 -0500)]
byte_swap.hh was removed from arch/alpha/, and replaced by sim/byteswap.hh. The new file uses LittleEndianGuest and BigEndianGuest namespaces to allow selecting the appropriate functions.
arch/alpha/alpha_linux_process.cc:
arch/alpha/alpha_tru64_process.cc:
Added the endianness namespace. This may change.
cpu/exec_context.hh:
Changed the include path for byteswap, and forced LittleEndianness for lack of a better solution.
cpu/o3/alpha_cpu.hh:
Forced LittleEndianness, for lack of a better solution.
cpu/o3/alpha_cpu_impl.hh:
Cleared away some commented out code.
cpu/o3/fetch_impl.hh:
Changed the include patch for byteswap, and forced LittleEndianness for lack of a better solution.
cpu/simple/cpu.cc:
Added an include for byteswap.hh, and fixed the SimpleCPU to LittleEndian. This cpu only does alpha, so that's fine.
dev/disk_image.cc:
Changed the include path of byteswap.hh
kern/freebsd/freebsd_system.cc:
kern/linux/linux_system.cc:
Added an include for byteswap.hh, and forced LittleEndianness for lack of a better solution.
sim/system.cc:
Forced LittleEndianness for lack of a better solution.
--HG--
extra : convert_revision :
b95d3e1265a825e04bd77622a3ac09fbac6bd206
Ali Saidi [Wed, 1 Feb 2006 22:52:40 +0000 (17:52 -0500)]
Merge zizzer:/bk/multiarch
into zeep.eecs.umich.edu:/z/saidi/work/m5.multiarch
--HG--
extra : convert_revision :
88b5214973ecc2f5c0428da21b65b09c767ae31d
Gabe Black [Wed, 1 Feb 2006 22:41:03 +0000 (17:41 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch
--HG--
extra : convert_revision :
f2339d64cc63709e32c06892f4eabb40a806095e
Ali Saidi [Wed, 1 Feb 2006 18:13:05 +0000 (13:13 -0500)]
Fix a mistake, need to import SCons.Scanner
--HG--
extra : convert_revision :
c6b15c162e9826c6c00dbbf52fb8aa8819d56c23
Ali Saidi [Tue, 31 Jan 2006 18:52:23 +0000 (13:52 -0500)]
Add a scaner for .isa files. Ordering it turns out is rather important
here, so it has to be defined before the rule to that calls
isa_parser.py
--HG--
extra : convert_revision :
dbba3c7ee71ca8ca1fcbf5ee65ae83b4ecb63649
Nathan Binkert [Mon, 30 Jan 2006 19:32:00 +0000 (14:32 -0500)]
Make the M5 Emacs C style default to inserting spaces instead
of tabs so using different editors is consistent
util/emacs/m5-c-style.el:
Default to inserting spaces instead of tabs so using different
editors is consistent
--HG--
extra : convert_revision :
719e5e980e088b0f4787b198de18cddceabd0140
Korey Sewell [Sun, 29 Jan 2006 22:25:54 +0000 (17:25 -0500)]
sparc files that were removed from revision 1.888
--HG--
extra : convert_revision :
f285a442b64eee183f7d0f6c203f0b0aa7ea8586
Korey Sewell [Thu, 26 Jan 2006 22:07:01 +0000 (17:07 -0500)]
bitfields definition to support current decoder.h
--HG--
extra : convert_revision :
75ccc53181b857605d051024d86ef62ec43f3b7f
Korey Sewell [Thu, 26 Jan 2006 21:19:44 +0000 (16:19 -0500)]
"sparc" -> "mips"
arch/mips/isa_desc/formats.h:
arch/mips/isa_desc/formats/basic.format:
arch/mips/isa_desc/formats/branch.format:
arch/mips/isa_desc/formats/integerop.format:
arch/mips/isa_desc/formats/mem.format:
arch/mips/isa_desc/formats/noop.format:
arch/mips/isa_desc/formats/trap.format:
arch/mips/isa_traits.cc:
arch/mips/isa_traits.hh:
changing "sparc" strings to "mips" everywhere
--HG--
extra : convert_revision :
eaecf9eeac26e3ef0726deef2fb5d7e9ad172984
Korey Sewell [Thu, 26 Jan 2006 06:34:43 +0000 (01:34 -0500)]
decoder skeleton code: this should be able to read any MIPS instruction and decode it but NOT produce any C++ class object.
All of the code literals are empty as of now. As much as possible instructions were organized into relevant "formats"
and also references to the tables I used from the MIPS manual were noted via appropriate comments.
--HG--
extra : convert_revision :
9b44fb40e900061a4cdb290b6a5aaceb9750ae13
Korey Sewell [Wed, 25 Jan 2006 22:36:38 +0000 (17:36 -0500)]
more changes to the decoder ... Now does special 3 table
arch/mips/isa_desc/bitfields.h:
Change from table names to actual bitfield name ...
--HG--
extra : convert_revision :
ead69065eb9c3e9c4ea4f67587a6fb07091898ed
Korey Sewell [Wed, 25 Jan 2006 22:06:23 +0000 (17:06 -0500)]
first version of my decoder function skeleton
- this will decode the instructions but not doing anything to create the C++ object yet
(the 1st of many steps!)
arch/mips/isa_desc/bitfields.h:
initial bitfield constants ... copied some from original alpha bitfields
arch/mips/isa_desc/decoder.h:
decoder function skeleton pt.1
- this will decode the instructions but not doing anything to create the C++ object yet
(the 1st of many steps!)
--HG--
extra : convert_revision :
2b9a0f8160c78b17f9d3d5eaf5af5a4d2f074761
Korey Sewell [Wed, 25 Jan 2006 19:43:47 +0000 (14:43 -0500)]
initial changes to decoder.hh and copied files from arch/sparc directory
arch/mips/isa_desc/bitfields.h:
arch/mips/isa_desc/formats.h:
arch/mips/isa_desc/formats/basic.format:
arch/mips/isa_desc/formats/branch.format:
arch/mips/isa_desc/formats/integerop.format:
arch/mips/isa_desc/formats/mem.format:
arch/mips/isa_desc/formats/noop.format:
arch/mips/isa_desc/formats/trap.format:
arch/mips/isa_desc/includes.h:
arch/mips/isa_desc/operands.h:
arch/mips/isa_traits.cc:
arch/mips/isa_traits.hh:
copied from sparc ISA directory
arch/mips/isa_desc/decoder.h:
decoder I started to work on...
--HG--
rename : arch/sparc/isa_desc/bitfields.h => arch/mips/isa_desc/bitfields.h
rename : arch/sparc/isa_desc/decoder.h => arch/mips/isa_desc/decoder.h
rename : arch/sparc/isa_desc/formats.h => arch/mips/isa_desc/formats.h
rename : arch/sparc/isa_desc/formats/basic.format => arch/mips/isa_desc/formats/basic.format
rename : arch/sparc/isa_desc/formats/branch.format => arch/mips/isa_desc/formats/branch.format
rename : arch/sparc/isa_desc/formats/integerop.format => arch/mips/isa_desc/formats/integerop.format
rename : arch/sparc/isa_desc/formats/mem.format => arch/mips/isa_desc/formats/mem.format
rename : arch/sparc/isa_desc/formats/noop.format => arch/mips/isa_desc/formats/noop.format
rename : arch/sparc/isa_desc/formats/trap.format => arch/mips/isa_desc/formats/trap.format
rename : arch/sparc/isa_desc/includes.h => arch/mips/isa_desc/includes.h
rename : arch/sparc/isa_desc/operands.h => arch/mips/isa_desc/operands.h
rename : arch/sparc/isa_traits.cc => arch/mips/isa_traits.cc
rename : arch/sparc/isa_traits.hh => arch/mips/isa_traits.hh
extra : convert_revision :
d4f281960ecf2dce479fb665469c6f2c5dd3063e
Gabe Black [Wed, 25 Jan 2006 00:57:17 +0000 (19:57 -0500)]
Some stuff aparently didn't get committed which was from before the new repository was created.
SConscript:
There is a new SConscript in the arch/alpha directory which has the alpha specific files. To add files for an arch, a similar file should be created.
arch/isa_parser.py:
The isa parser now supports include directives. These are done with ##include
build/SConstruct:
The target directory is passed on so that the architecture specific SConscript can have it. Also, sparc was added as a valid architecture type.
arch/alpha/SConscript:
This SConscript adds the alpha specific source
arch/sparc/isa_desc/operands.h:
This sets up the operand types that the sparc isa uses
arch/sparc/isa_traits.cc:
Implementation of sparc specific things, like a register file with windows
build/build_options/default/SPARC_SE:
The default options for a sparc syscall emulation build.
--HG--
extra : convert_revision :
1afedae61dc8cae0d59d3bf1d41420d929be2efd
Gabe Black [Tue, 10 Jan 2006 19:57:37 +0000 (14:57 -0500)]
Adding the sparc ISA files which were worked on locally
arch/sparc/isa_desc/bitfields.h:
This file defines the bit fields used by the isa description system
arch/sparc/isa_desc/decoder.h:
This file describes the decoder for the isa description system
arch/sparc/isa_desc/formats.h:
This file declares the instruction formats
arch/sparc/isa_desc/formats/basic.format:
This file implements the "basic" instruction format
arch/sparc/isa_desc/formats/branch.format:
This file implements the "branch" instruction format
arch/sparc/isa_desc/formats/integerop.format:
This file implements the "integerop" instruction format
arch/sparc/isa_desc/formats/mem.format:
This file implements the "mem" instruction format
arch/sparc/isa_desc/formats/noop.format:
This file implements the "noop" instruction format
arch/sparc/isa_desc/formats/trap.format:
This file implements the "trap" instruction format
arch/sparc/isa_desc/includes.h:
This file is all of the inclues that are used by the isa description system
--HG--
extra : convert_revision :
12a2ffe949317b8b57d83263a4261131b9432c2a
Steve Reinhardt [Fri, 23 Dec 2005 18:50:35 +0000 (13:50 -0500)]
Fix roundUp function template so explicit arg is not
needed in a few more cases.
base/intmath.hh:
align arg to roundUp should be int, not template class
sim/process.cc:
sim/syscall_emul.hh:
No need for explicit template arg now that roundUp is fixed.
--HG--
extra : convert_revision :
f9f4639e022acb9f427e8d30d81c782504437c53
Steve Reinhardt [Fri, 23 Dec 2005 18:32:31 +0000 (13:32 -0500)]
Change base/intmath.{cc,hh} to follow m5 style.
arch/alpha/alpha_tru64_process.cc:
base/intmath.hh:
base/statistics.cc:
base/str.cc:
cpu/o3/btb.cc:
sim/process.cc:
sim/syscall_emul.hh:
Rename intmath.hh functions to follow m5 style
(RoundUp -> roundUp, etc.).
base/intmath.cc:
Rename intmath.hh functions to follow m5 style
(RoundUp -> roundUp, etc.).
Also reindent code in m5 style.
--HG--
extra : convert_revision :
57b853002bc3c9911e122599d9062b41a06d8e6a
Nathan Binkert [Fri, 23 Dec 2005 06:39:53 +0000 (01:39 -0500)]
Updates to Memory system changes document.
--HG--
extra : convert_revision :
a35a76d18a6183a0aaa5dd40c330f1ec0ef2244a
Steve Reinhardt [Fri, 23 Dec 2005 03:00:24 +0000 (22:00 -0500)]
Add a more refined stab at some of the new interface.
--HG--
extra : convert_revision :
9c3de70d83e6a1515566a9b7226e798ee077466f
Steve Reinhardt [Thu, 22 Dec 2005 19:41:49 +0000 (14:41 -0500)]
Add notes from latest memory system redesign meetings.
--HG--
extra : convert_revision :
53389e8e784e471b0fc6053ec970cd967bfe1598
Nathan Binkert [Thu, 22 Dec 2005 03:19:33 +0000 (22:19 -0500)]
Make ScsiController a PioDevice so it works again.
--HG--
extra : convert_revision :
cd610221edc6926d120d9f3978dd9ee89f501824
Nathan Binkert [Mon, 19 Dec 2005 07:07:06 +0000 (02:07 -0500)]
Create the ProxyError Exception. Raise it when an unproxy
operation fails because information is wrong or not available.
--HG--
extra : convert_revision :
1fd90c1291618b09752179cfa6894f1df495fffd
Nathan Binkert [Mon, 19 Dec 2005 07:02:58 +0000 (02:02 -0500)]
Add a little bit of support to grab info for making graphs
without using the jobfile.
util/stats/db.py:
util/stats/profile.py:
Make it possible to send job as a string and to set the system
separately from the job.
--HG--
extra : convert_revision :
08aaebd3f9a1643bd41953b43f3b80dc97e6592f
Steve Reinhardt [Wed, 7 Dec 2005 01:00:50 +0000 (20:00 -0500)]
Make simulation termination message less threatening... maybe
people won't think they're getting an error when they're not.
--HG--
extra : convert_revision :
7622360f4f88eed9edf44480dac551d153582d8b
Ron Dreslinski [Thu, 1 Dec 2005 23:47:36 +0000 (18:47 -0500)]
Two small fixes for mem_req's and Probe path with MOSI/MOESI
cpu/simple/cpu.cc:
Properly set the Instruction Read bit in the Memory Request
--HG--
extra : convert_revision :
e1a4756f32718fd8ef3ac3db16625bd6d8f07cc5
Ali Saidi [Tue, 29 Nov 2005 23:06:15 +0000 (18:06 -0500)]
Add support for multiple streams being configured with the INITPARAM
variable
--HG--
extra : convert_revision :
2cb20845cb7f32589882850156bdd42d9024db7a
Nathan Binkert [Mon, 28 Nov 2005 23:40:58 +0000 (18:40 -0500)]
Virtualized SINIC fixes
dev/pktfifo.hh:
we can't modify i because it's used further down to remove
the packet from the fifo. Instead, copy the iterator and
modify that to get the previous packet.
dev/sinic.cc:
- don't change the transmit state and kick the machine unless
we're at the head of the txList.
- add a couple of debugging statements to figure out how far
along we've gotten in processing a packet.
- assert that the current tx vnic has something to do when
we start processing the state machine.
--HG--
extra : convert_revision :
588fe2c7d810be0e3d8d39c5cc0ec8a72119517e
Nathan Binkert [Mon, 28 Nov 2005 23:33:48 +0000 (18:33 -0500)]
Make the debugger a bit more useful with m5.opt by moving stuff
from #ifdef DEBUG to #ifndef NDEBUG
base/remote_gdb.cc:
make the remote debugger gdb stuff work in m5.opt
sim/system.cc:
sim/system.hh:
make the console panic break event happen in m5.opt
--HG--
extra : convert_revision :
044a9b7cdacb058112388a31315e45c5d8cf70fd
Nathan Binkert [Fri, 25 Nov 2005 18:33:36 +0000 (13:33 -0500)]
Virtualize sinic
separate the rx thread and tx thread and get rid of the dedicated flag.
dev/ns_gige.cc:
dev/ns_gige.hh:
dev/ns_gige_reg.h:
python/m5/objects/Ethernet.py:
dedicated flag goes away, we have new individual flags for
rx thread and tx thread
dev/sinic.cc:
Virtualize sinic
- The io registers are replicated many times in memory, allowing the NIC to
differentiate among several virtual interfaces.
- On the TX side, this allows multiple CPUs to initiate transmits at the same
time without locking in the software. If a partial packet is transmitted,
then the state machine blocks waiting for that virtual interface to complete
its packet. Then the state machine will move on to the next virtual
interface. The commands are kept in fifo order.
- On the RX side, multiple partial transmits can be simultaneously done.
Though a packet does not deallocate its fifo space until all preceeding
packets in the fifo are deallocated. To enable multiple receives, it
is necessary for each virtual nic to keep its own information about its
progress through the state machine.
dev/sinic.hh:
Virtualize sinic
Receive state must be virtualized since we allow the receipt of packets in
parallel.
dev/sinicreg.hh:
Virtualize sinic
separate rx thread and tx thread
create a soft interrupt and add a command to trigger it.
pad out the reserved bits in the RxDone and TxDone regs
--HG--
extra : convert_revision :
c10bb23a46a89ffd1e08866c1f1621cb98069205
Nathan Binkert [Fri, 25 Nov 2005 16:22:41 +0000 (11:22 -0500)]
Add the capability to iterate through the packets in a pktfifo,
and to remove elements in the middle of the fifo. These elements
do not free space, they are just marked removed. Space is only
freed from the front of the fifo.
dev/etherpkt.cc:
serialize the current slack
dev/etherpkt.hh:
add "slack" to the ethernet packet. It is to be used by any fifo that
the packet is currently in to account for extra space that the packet
may be occupying due to the fifo organization.
--HG--
extra : convert_revision :
8e7c541ba316a9a76495c54cc5f707f8fc65b6d5
Nathan Binkert [Wed, 23 Nov 2005 02:50:34 +0000 (21:50 -0500)]
Major improvements in the graph output code. Mostly adding more
options, making existing options more visible and dealing with
holes in data better.
util/stats/barchart.py:
- move the options for BarChart to a base class ChartOptions so
they can be more easily set and copied.
- add an option to set the chart size (so you can adjust the aspect ratio)
- don't do the add_subplot thing, use add_axes directly so we can
affect the size of the figure itself to make room for the legend
- make the initial array bottom floating point so we don't lose precision
- add an option to set the limits on the y axis
- use a figure legend instead of an axes legend so we can put the legend
outside of the actual chart. Also add an option to set the fontsize of
the legend.
- initial hack at outputting csv files
util/stats/db.py:
don't print out an error when the run is missing from the database
just return None, the error will be print elsewhere.
util/stats/output.py:
- make StatOutput derive from ChartOptions so that it's easier to
set default chart options.
- make the various output functions (graph, display, etc.) take the
name of the data as a parameter instead of making it a parameter to
__init__. This allows me to create the StatOutput object with
generic parameters while still being able to specialize the name
after the fact
- add support for graph_group and graph_bars to be applied to multiple
configuration groups. This results in a cross product of the groups
to be generated and used.
- flush the html file output as we go so that we can load the file
while graphs are still being generated.
- make the proxy a parameter to the graph function so the proper system's
data can be graphed
- for any groups or bars that are completely missing, remove them from
the graph. This way, if we decide not to do a set of runs, there won't
be holes in the data.
- output eps and ps by default in addition to the png.
util/stats/profile.py:
- clean up the data structures that are used to store the function
profile information and try our best to avoid keeping extra data
around that isn't used.
- make get() return None if a job is missing so we know it was
missing rather than the all zeroes thing.
- make the function profile categorization stuff total up to 100%
- Fixup the x-axis and y-axis labels.
- fix the dot file output stuff.
util/stats/stats.py:
support the new options stuff for StatOutput
--HG--
extra : convert_revision :
fae35df8c57a36257ea93bc3e0a0e617edc46bb7
Nathan Binkert [Wed, 23 Nov 2005 02:20:36 +0000 (21:20 -0500)]
Change the set of statistics that are generated when specifying "all"
--HG--
extra : convert_revision :
8b803b1b3bbec0b35b6805593b0dd598e5b519cf
Nathan Binkert [Wed, 23 Nov 2005 02:18:11 +0000 (21:18 -0500)]
More changes from cpus named fullX to runX
--HG--
extra : convert_revision :
e3c117dc5751be13bd4b014a7fa6df0debfb48f0
Nathan Binkert [Wed, 23 Nov 2005 02:08:47 +0000 (21:08 -0500)]
Fix the system clock at 1THz making 1 simulation tick = 1 ps
--HG--
extra : convert_revision :
a4707af5f8dc193fbecfb602701b1170c32ae3e3
Nathan Binkert [Wed, 23 Nov 2005 02:05:02 +0000 (21:05 -0500)]
make the NUMCPUS parameter always refer to the total number of cpus
on the test system.
add an option for pio_delay_write to run.py
util/stats/stats.py:
full0 -> run0 due to run.py change
sim_ticks doesn't make sense with tick = ps, so use
one of the cpu's numCycles paramter
--HG--
extra : convert_revision :
db9dbe014549d823edc10395f5241db5e907df01
Nathan Binkert [Tue, 22 Nov 2005 18:36:30 +0000 (13:36 -0500)]
Make sure that the aiobench client has enough memory.
increase from 128MB to 512MB
--HG--
extra : convert_revision :
7b12febff200083aa0adbcaba612bc9e677ebe07
Nathan Binkert [Tue, 22 Nov 2005 18:33:28 +0000 (13:33 -0500)]
Clean up the newly updated iscsi-client script
configs/boot/iscsi-client.rcS:
Clean up the newly updated iscsi-client script.
Reduce the writeback period so writes occur more frequently.
--HG--
extra : convert_revision :
21c84f781c6537b28c753291561d23c2d0144627
Kevin Lim [Tue, 22 Nov 2005 17:08:08 +0000 (12:08 -0500)]
Apply patch for syscall emulation provided by Antti Miettinen (apm@brigitte.dna.fi). It provides support for more syscalls in syscall emulation mode.
arch/alpha/alpha_linux_process.cc:
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Apply patch for syscall emulation provided by Antti Miettinen (apm@brigitte.dna.fi).
--HG--
extra : convert_revision :
37fbc78a927110b7798343afd2c5f37a269e42b4
Nathan Binkert [Tue, 22 Nov 2005 05:17:05 +0000 (00:17 -0500)]
add the cpu number of the request to various panic and trace
output for sinic
dev/sinic.cc:
add the cpu number of the request to various panic and trace
output
--HG--
extra : convert_revision :
e778a5c925e194652bec47af678488acf48c1ae0
Nathan Binkert [Tue, 22 Nov 2005 04:43:15 +0000 (23:43 -0500)]
add support for delaying pio writes until the cache access occurs
dev/ns_gige.cc:
add support for delaying pio writes until the cache access occurs
the only write we delay are for CR_TXE and CR_RXE
dev/sinic.cc:
dev/sinic.hh:
the txPioRequest and rxPioRequest things were more or less bogus
add support for delaying pio writes until the cache access occurs
dev/sinicreg.hh:
Add delay_read and delay_write to the register information struct
for now, we won't delay any reads, and we'll delay the writes that
initiate DMAs
python/m5/objects/Ethernet.py:
add a parameter to delay pio writes until the timing access
actually occurs.
--HG--
extra : convert_revision :
79b18ea2812c2935d7d5ea6eff1f55265114d05d
Nathan Binkert [Tue, 22 Nov 2005 03:25:30 +0000 (22:25 -0500)]
expose an environment variable for setting the linux image.
--HG--
extra : convert_revision :
32be8bef3b594d29dae717857a96ff5bdd6e9ffa
Nathan Binkert [Tue, 22 Nov 2005 03:24:32 +0000 (22:24 -0500)]
change profile environment configurations.
--HG--
extra : convert_revision :
f05fb5e50a439da9db96b04547f58ed8cd9f1aa6
Nathan Binkert [Tue, 22 Nov 2005 03:22:40 +0000 (22:22 -0500)]
Rearrange the memory configurations.
--HG--
extra : convert_revision :
bab5b13e335f11ecb2dafd3371faf2351fbe9f10
Nathan Binkert [Tue, 22 Nov 2005 02:52:04 +0000 (21:52 -0500)]
have sinic use the new readBar/writeBar stuff that's in the
pci device base class
dev/sinic.cc:
dev/sinic.hh:
use the new readBar/writeBar stuff that's in the pci device
base class
--HG--
extra : convert_revision :
8a0b2bde3cc13597785d6ea75d6e6811680bb01b
Nathan Binkert [Mon, 21 Nov 2005 05:38:53 +0000 (00:38 -0500)]
Add a bunch of functions to manage the BAR addresses. This
makes it easier to implement PCI device models.
dev/pcidev.cc:
default implementations for read/write and readBarX/writeBarX functions
--HG--
extra : convert_revision :
bbe2e2a2a506e2dd94d98f8e0feaefef96380be9
Nathan Binkert [Mon, 21 Nov 2005 05:22:29 +0000 (00:22 -0500)]
Actually, you should'nt do math on Clock in the config files.
python/m5/config.py:
Clock should not be a NumericParamValue since math on it can be
ambiguous. (As the comment clearly says.)
--HG--
extra : convert_revision :
74f8ec846c6a980d92e0bf4bf1c7fac73a75b923
Nathan Binkert [Mon, 21 Nov 2005 05:02:39 +0000 (00:02 -0500)]
BARs now of type MemorySize32
python/m5/config.py:
Add MemorySize32 (a 32-bit value specified in bytes)
--HG--
extra : convert_revision :
bfeee501f7ff1aa2567a3682da129a5770cb7bd2
Nathan Binkert [Mon, 21 Nov 2005 04:57:26 +0000 (23:57 -0500)]
Make it so one can do math with a Clock type in the config files
python/m5/config.py:
Make Clock a NumericParamValue so you can do math with it
--HG--
extra : convert_revision :
7fa548d1a23c604a31d3ecae3853949b064a1830
Nathan Binkert [Mon, 21 Nov 2005 04:45:45 +0000 (23:45 -0500)]
Allow long as a multiplier in the python config
python/m5/config.py:
Allow long as a multiplier
--HG--
extra : convert_revision :
bdc45e9afc27bb7b0f2cd6aacf92758601b95ff8
Nathan Binkert [Mon, 21 Nov 2005 04:42:53 +0000 (23:42 -0500)]
Deal with divide by zero in the python stats stuff.
util/stats/info.py:
If an operation results in a divide by zero, just return None
--HG--
extra : convert_revision :
19cb4319734a3a9cf02bb1966fed42eb0c8a8ade
Nathan Binkert [Mon, 21 Nov 2005 04:30:13 +0000 (23:30 -0500)]
implement __str__ for all of the proxy stuff so we can
actually print out a statistic.
--HG--
extra : convert_revision :
043be6bd729e74d2220c5ae8aa1fc739aa247715
Nathan Binkert [Sun, 20 Nov 2005 23:49:54 +0000 (18:49 -0500)]
fixup benchmark names a bit
--HG--
extra : convert_revision :
5978318331eb4e1b7fae037a32086a2e0a554f2e
Nathan Binkert [Sun, 20 Nov 2005 23:42:12 +0000 (18:42 -0500)]
Serialize the symbol tables
base/loader/symtab.cc:
Add support for clearing out the symbol table
Add support for serializing the symbol table (clear on unserialize)
Don't allow empty symbols to be entered into the table
base/loader/symtab.hh:
Add support for clearing out the symbol table
Add support for serializing the symbol table
sim/system.cc:
Serialize the kernel, console, and palcode symbol tables so that
we can capture any dynamic symbols that are added and so that we
don't have to have the same kernel binary around to get the
symbols right
--HG--
extra : convert_revision :
779888c88aa530f3adcd37dc7600a335951d05f7
Nathan Binkert [Sun, 20 Nov 2005 23:39:31 +0000 (18:39 -0500)]
get rid of allSymtab
if we want something like allSymtab, we should create a symbol
table proxy class
--HG--
extra : convert_revision :
20ca551a693b0d6495c018cac8afd63af33f16da
Nathan Binkert [Sun, 20 Nov 2005 23:33:59 +0000 (18:33 -0500)]
switch all profiling stuff to the kernelSymtab since allSymtab
is going away
--HG--
extra : convert_revision :
405ec55615474d0812ed780f26fd4df98e5ec6f5
Nathan Binkert [Sun, 20 Nov 2005 23:33:17 +0000 (18:33 -0500)]
clear the function profile on a stats reset
cpu/profile.hh:
Add a placeholder for a reset callback
--HG--
extra : convert_revision :
7fa13e5d04daf1cf93eb35c8fdaf67a40ce3ef73
Nathan Binkert [Sun, 20 Nov 2005 23:32:22 +0000 (18:32 -0500)]
use Counter to avoid overflowing an int
cpu/profile.hh:
use Counter for the profile count to avoid overflow
--HG--
extra : convert_revision :
bb603b7d139d1736dced26ef0ce1f93ddea30de7
Nathan Binkert [Sun, 20 Nov 2005 23:25:43 +0000 (18:25 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/head
--HG--
extra : convert_revision :
941e76e4645a4a18c04409250f3257e590184871
Nathan Binkert [Sun, 20 Nov 2005 23:25:31 +0000 (18:25 -0500)]
better placement of database commits
better mysql error messages
base/stats/mysql.cc:
better placement of commit() calls to avoid failing transactions
due to what I think are timeouts.
print out the mysql error with every panic
--HG--
extra : convert_revision :
bfc5ae172bcff733461adceffe2b381601839e82
Nathan Binkert [Sun, 20 Nov 2005 22:55:11 +0000 (17:55 -0500)]
For SimpleCPU profiling code, only update the exec context's
profileNode if we got a new one
cpu/simple/cpu.cc:
Only update the exec context's profileNode if we got a new one
--HG--
extra : convert_revision :
a16a7410070b0d811032dc4b86b1368df913b2be
Nathan Binkert [Sun, 20 Nov 2005 22:44:58 +0000 (17:44 -0500)]
Cleanup the StackTrace interfaces and profile interfaces so they
are more efficient and reduce the number of new/delete calls
arch/alpha/stacktrace.cc:
- Change the StackTrace code so that the class can more easily be
cleaned out and reused to avoid extra allocations.
- Allow trace() to accept a static instruction pointer so it can
determine if the instruction is worth tracing. This is moved from
the CPU.
- provide constants for special meaning PCs (user, console, unknown),
instead of magic numbers
- switch to using kernelSymtab instead of allSymtab which will be
going away
- if the stack adjustment doesn't make any sense, exit and push
unknown so we don't get into an infinite loop or record garbage.
- check to see if we've made too many iterations through the stack
and panic to avoid an infinite loop
arch/alpha/stacktrace.hh:
- Change the StackTrace code so that the class can more easily be
cleaned out and reused to avoid extra allocations.
- Allow trace() to accept a static instruction pointer so it can
determine if the instruction is worth tracing. This is moved from
the CPU.
- provide constants for special meaning PCs (user, console, unknown),
instead of magic numbers
cpu/base.cc:
only clear the profile if we have one
include profile.hh here since base.hh doesn't do it anymore
cpu/base.hh:
no need to include cpu/profile.hh here
cpu/profile.cc:
use ProfileNode pointers instead of objects in the ChildList
Consume a vector of addresses since that's really all we
care about.
cpu/profile.hh:
Keep pointers to ProfileNodes to reduce the size of these structures
keep a StackTrace around so that we may reuse it.
provide consume functions that use the new StackTrace trace interface
one consume function is inline and tries to fastpath the no trace
condition, it calls the outlined consume function if a trace is generated.
cpu/simple/cpu.cc:
include cpu/profile.hh here since base.hh no longer does
use the new FunctionProfile::consume interface
(which contains the tracing functions)
--HG--
extra : convert_revision :
5a1d9265289a75f67a497b322926be1f8c2d8eb3
Nathan Binkert [Sun, 20 Nov 2005 22:28:57 +0000 (17:28 -0500)]
remove duplicate profile event code that is already in
the BaseCPU class
--HG--
extra : convert_revision :
fb400e243377840006a36c3274115006f8cd2e3d
Nathan Binkert [Sun, 20 Nov 2005 21:57:53 +0000 (16:57 -0500)]
io_bus is split out into pio_bus and dma_bus so that any device
can specify either independently.
python/m5/objects/Device.py:
io_bus is split out into pio_bus and dma_bus so that any device
can specify either independently.
dma_bus defaults to point to whatever pio_bus uses.
--HG--
extra : convert_revision :
d35d5374d0bf592f6b5df465c05203577b8b8763
Ali Saidi [Sat, 19 Nov 2005 06:25:34 +0000 (01:25 -0500)]
add symbol opcode
--HG--
extra : convert_revision :
e050d2c4fec33c41ac21b6f17b3be329b9521429
Ali Saidi [Fri, 11 Nov 2005 23:43:09 +0000 (18:43 -0500)]
Add checktrace.sh. Checks all the ethertrace files in */ethertrace
for retransmissions, out of order packets, lost packets, duplicate
ack, window full, etc. Easy way to see if you have a problem with a
run.
--HG--
extra : convert_revision :
95d8e8650b0fb3d120df107cd5281c56fefc3a1d
Ali Saidi [Fri, 11 Nov 2005 23:41:45 +0000 (18:41 -0500)]
Update random come to always have explict min/max
--HG--
extra : convert_revision :
a2d1f6f8aa1df24ea524792f687f4d3ee31101f0
Steve Reinhardt [Fri, 11 Nov 2005 02:08:33 +0000 (21:08 -0500)]
Actually free Process fd_map entries when a file is closed...
amazingly we never did that before. Caused us to run out of
file descriptors in twolf.
sim/process.cc:
Add free_fd() method to free closed target fd in simulator fd map.
Rename open_fd() to alloc_fd() for symmetry with free_fd().
sim/process.hh:
Add free_fd() method to free closed target fd in simulator fd map.
Rename open_fd() to alloc_fd() for symmetry with free_fd().
Crank up MAX_FD while we're at it.
sim/syscall_emul.cc:
Call free_fd() on process when target closes a file.
sim/syscall_emul.hh:
Process open_fd() renamed to alloc_fd().
--HG--
extra : convert_revision :
d780f4ccfd5a0989230b0afbdbd276212b87550c
Steve Reinhardt [Fri, 11 Nov 2005 02:05:31 +0000 (21:05 -0500)]
Syscall DPRINTF and warning cleanup.
base/trace.hh:
Need std:: on DPRINTFR reference to string class.
base/traceflags.py:
Remove SyscallWarnings trace flag... we should always print warnings
so nothing undesirable goes unnoticed. Replaced with (currently unused)
Syscall flag.
sim/syscall_emul.cc:
Change SyscallWarning DPRINTFs into warn() calls.
Uncomment SyscallVerbose DPRINTFs.
sim/syscall_emul.hh:
Change SyscallWarning DPRINTFs into warn() calls.
Call fatal() instead of ad-hoc termination.
--HG--
extra : convert_revision :
dc6c2ce3691a129f697b6a6ae5d889e2dbaab228
Steve Reinhardt [Fri, 11 Nov 2005 01:30:04 +0000 (20:30 -0500)]
Fix Lisa's CPU trace system check for syscall emulation.
cpu/exetrace.cc:
CPU system name check doesn't work under syscall emulation, so don't
compile it in.
--HG--
extra : convert_revision :
2c128bf759877222107652fd86323be6dc71a34c
Lisa Hsu [Wed, 9 Nov 2005 21:42:36 +0000 (16:42 -0500)]
just commit what i need for dumping traces compatible with intel's casper
--HG--
extra : convert_revision :
a0c4a68a576fa771fd553eaedd6a07255a04dca2
Lisa Hsu [Wed, 9 Nov 2005 21:40:51 +0000 (16:40 -0500)]
Merge zizzer:/bk/m5
into zed.eecs.umich.edu:/z/hsul/work/m5/intel
--HG--
extra : convert_revision :
729be2b6686f46f70440d258383180078c6b046c
Lisa Hsu [Wed, 9 Nov 2005 21:40:27 +0000 (16:40 -0500)]
new rcS file for open-iscsi rather than the old linux-iscsi
--HG--
extra : convert_revision :
0c12033b38e32f8b2ea69b52813dfed294ec5de4
Steve Reinhardt [Wed, 9 Nov 2005 14:52:07 +0000 (09:52 -0500)]
A couple of FP-related fixes (prompted by Adam having trouble
running SPEC FP codes).
arch/alpha/isa_desc:
Don't warn about non-standard trapping modes more than
once per static instruction. (Had the flag to suppress
these but forgot to check it!)
build/SConstruct:
Add USE_SSE2 option to enable compiling w/SSE2 (important
for getting IEEE-compliant FP on x86).
--HG--
extra : convert_revision :
eac69efb28cce7b48035480d8b7cb004782969f4
Steve Reinhardt [Thu, 3 Nov 2005 18:14:28 +0000 (13:14 -0500)]
Qdo should kill its subordinate qsub more aggressively
on a timeout.
util/qdo:
Qsub needs a kill -9 to die; kill -15 doesn't cut it.
--HG--
extra : convert_revision :
7696b3ecf1a084b68dd909b138ab6aa1b380b5a7
Steve Reinhardt [Thu, 3 Nov 2005 18:13:31 +0000 (13:13 -0500)]
Check for MySQL 4.1 or newer only
(3.23 does not work as we supposed it did).
--HG--
extra : convert_revision :
d87dbebe0b2387fde1f8aba52625d115d31baf1a
Ali Saidi [Wed, 2 Nov 2005 20:37:47 +0000 (15:37 -0500)]
allow conversion floats -> long so that 100e9 and such work as Ticks
--HG--
extra : convert_revision :
23511baca6153bb3aa9c57be8818ad1b65f02a71
Ali Saidi [Wed, 2 Nov 2005 20:29:08 +0000 (15:29 -0500)]
Don't call Random.uniform() unnecessarily
--HG--
extra : convert_revision :
82b092391f7c866f33ddb028070181038bdce0f8
Ali Saidi [Wed, 2 Nov 2005 20:23:21 +0000 (15:23 -0500)]
I left a printf in on accident.
--HG--
extra : convert_revision :
5a5c0a8c28153f4cf4c3dbebd8f75096e4c4ea94
Ali Saidi [Wed, 2 Nov 2005 20:22:09 +0000 (15:22 -0500)]
Changes to integer types broke this... Oops.
--HG--
extra : convert_revision :
e0ed251f4d75b5bf313a72772afed668fb7e38d2
Ali Saidi [Wed, 2 Nov 2005 19:56:18 +0000 (14:56 -0500)]
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
3cc23080d19cc464a8ba7c1c93b6e5d45af7d463
Ali Saidi [Wed, 2 Nov 2005 19:55:05 +0000 (14:55 -0500)]
Change the output of stability info a little bit
--HG--
extra : convert_revision :
bc467a40593234a1e3b694a741b4a7c2154a95ea
Ali Saidi [Wed, 2 Nov 2005 19:54:21 +0000 (14:54 -0500)]
add a few more options to the help menu
--HG--
extra : convert_revision :
b2481bedac786e4a6bb0d577954242d7f4c144a0
Ali Saidi [Wed, 2 Nov 2005 19:48:49 +0000 (14:48 -0500)]
Don't bother putting distributions in the DB, they aren't really
supported.
--HG--
extra : convert_revision :
a732fa169962632937ace368430cb3733c0e3cc6
Ali Saidi [Wed, 2 Nov 2005 19:47:37 +0000 (14:47 -0500)]
Add ability to slightly perturb latency of ethernet/memory
base/random.cc:
Change normal random function to Xrand48 so we have one source of
randomness for everything.
base/random.hh:
Add uniform distribution ability to random functions
dev/etherlink.cc:
dev/etherlink.hh:
Add ability to slightly perturb latency of ethernet
--HG--
extra : convert_revision :
f7f856761fd525c233ae2a6d993b1fd702b488f7
Ali Saidi [Wed, 2 Nov 2005 19:45:35 +0000 (14:45 -0500)]
Fix bug where simulation terminates same cycle as last stat dump causing a duplicate row in db
--HG--
extra : convert_revision :
45877c6feeaddf921eb0f4764246bf66e1705a1d
Ali Saidi [Wed, 2 Nov 2005 19:44:42 +0000 (14:44 -0500)]
Add Mem/Ethernet latency variability parameter
python/m5/objects/Ethernet.py:
Add Latency Variability Parameter
--HG--
extra : convert_revision :
db5431cccffea8c7247d0f72e4770d4d58bd25aa
Ali Saidi [Wed, 2 Nov 2005 19:43:35 +0000 (14:43 -0500)]
Update monet configuration files
--HG--
extra : convert_revision :
0cdfa6c5d57b7607c97b2ed08dff88e1b961718c
Nathan Binkert [Wed, 2 Nov 2005 17:19:08 +0000 (12:19 -0500)]
Simple updates to pbs and send.py
util/pbs/pbs.py:
Change the default so that we do not get mail under any circumstances
from pbs.
util/pbs/send.py:
Add a -n flag to send.py that causes the Base directory to *not*
sync with the Link directory
--HG--
extra : convert_revision :
6e872153b6b2c34b61ec2ddbf3e5536876f4b43b
Nathan Binkert [Wed, 2 Nov 2005 17:16:19 +0000 (12:16 -0500)]
silence g++ warning
--HG--
extra : convert_revision :
27226b774e0f0273e238d062241f4581c9bb1639