Commit graph

2031 commits

Author SHA1 Message Date
Ali Saidi
9df80550d4 added Request struct and updated Packet as per meeting 24/01/2006
--HG--
extra : convert_revision : 61cc36306412be178cc63d78b5274e6779af0f78
2006-01-24 20:09:51 -05:00
Steve Reinhardt
f383936348 Update interface from 1/17 meeting.
--HG--
extra : convert_revision : 6d3e52e609fde1acd08f7a79c6015fc177068dec
2006-01-17 17:47:53 -05:00
Steve Reinhardt
c4b2b2927d Couple more interface additions.
--HG--
extra : convert_revision : d51a67282e28e8a4e205e237b31efbfa5ab40ef3
2006-01-16 13:19:10 -05:00
Steve Reinhardt
0ecb25898d More evolution of the new interface.
--HG--
extra : convert_revision : 22212ba23f6684f38aa810b53d48bbe0bf07a0f1
2005-12-23 16:31:01 -05:00
Steve Reinhardt
dce0c77ca2 Add ChunkGenerator object for breaking arbitrary regions
into block- or page-sized chunks.

--HG--
extra : convert_revision : 3ebdd496f9ffc6d1fcd1847c33e98ac23f1bfe66
2005-12-23 14:06:27 -05:00
Steve Reinhardt
91192dbe97 Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem

--HG--
extra : convert_revision : 60b1d26505a7b17321840e2db4173c3e867a6a75
2005-12-23 13:51:12 -05:00
Steve Reinhardt
16bda9c03e 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
2005-12-23 13:50:35 -05:00
Steve Reinhardt
0cdcb08d90 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
2005-12-23 13:32:31 -05:00
Nathan Binkert
86722d8406 tweak try1.cc
--HG--
extra : convert_revision : 7679e736db499ed7f174a97ea12851c83bc27d13
2005-12-23 01:48:58 -05:00
Nathan Binkert
facbcf88fd Merge zizzer.eecs.umich.edu:/bk/m5
into  ziff.eecs.umich.edu:/z/binkertn/research/m5/newmem

--HG--
extra : convert_revision : 87481b470fca0197474c0c08443997d7c992d836
2005-12-23 01:48:15 -05:00
Nathan Binkert
a32a66c065 Move the memory hierarchy to oldmem and leave an empty
mem directory

--HG--
extra : convert_revision : 658a8f5e915407a45d639edf4806dce159591a10
2005-12-23 01:44:06 -05:00
Nathan Binkert
627f540e31 Updates to Memory system changes document.
--HG--
extra : convert_revision : a35a76d18a6183a0aaa5dd40c330f1ec0ef2244a
2005-12-23 01:39:53 -05:00
Steve Reinhardt
89d3cc8c94 Add a more refined stab at some of the new interface.
--HG--
extra : convert_revision : 9c3de70d83e6a1515566a9b7226e798ee077466f
2005-12-22 22:00:24 -05:00
Steve Reinhardt
1a19923ead Add notes from latest memory system redesign meetings.
--HG--
extra : convert_revision : 53389e8e784e471b0fc6053ec970cd967bfe1598
2005-12-22 14:41:49 -05:00
Nathan Binkert
3b35c698ec Make ScsiController a PioDevice so it works again.
--HG--
extra : convert_revision : cd610221edc6926d120d9f3978dd9ee89f501824
2005-12-21 22:19:33 -05:00
Nathan Binkert
45ecb2b69e Create the ProxyError Exception. Raise it when an unproxy
operation fails because information is wrong or not available.

--HG--
extra : convert_revision : 1fd90c1291618b09752179cfa6894f1df495fffd
2005-12-19 02:07:06 -05:00
Nathan Binkert
adf47c95b0 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
2005-12-19 02:02:58 -05:00
Steve Reinhardt
a95fcf7df0 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
2005-12-06 20:00:50 -05:00
Ron Dreslinski
ffc32970f6 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
2005-12-01 18:47:36 -05:00
Ali Saidi
481219caf6 Add support for multiple streams being configured with the INITPARAM
variable

--HG--
extra : convert_revision : 2cb20845cb7f32589882850156bdd42d9024db7a
2005-11-29 18:06:15 -05:00
Nathan Binkert
36373fa465 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
2005-11-28 18:40:58 -05:00
Nathan Binkert
108cfe53d6 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
2005-11-28 18:33:48 -05:00
Nathan Binkert
47ff0af17e 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
2005-11-25 13:33:36 -05:00
Nathan Binkert
60e92986f7 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
2005-11-25 11:22:41 -05:00
Nathan Binkert
c0a4836077 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
2005-11-22 21:50:34 -05:00
Nathan Binkert
7819ca6b97 Change the set of statistics that are generated when specifying "all"
--HG--
extra : convert_revision : 8b803b1b3bbec0b35b6805593b0dd598e5b519cf
2005-11-22 21:20:36 -05:00
Nathan Binkert
634a0d8469 More changes from cpus named fullX to runX
--HG--
extra : convert_revision : e3c117dc5751be13bd4b014a7fa6df0debfb48f0
2005-11-22 21:18:11 -05:00
Nathan Binkert
690399614c Fix the system clock at 1THz making 1 simulation tick = 1 ps
--HG--
extra : convert_revision : a4707af5f8dc193fbecfb602701b1170c32ae3e3
2005-11-22 21:08:47 -05:00
Nathan Binkert
7584604fa9 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
2005-11-22 21:05:02 -05:00
Nathan Binkert
db2bf76755 Make sure that the aiobench client has enough memory.
increase from 128MB to 512MB

--HG--
extra : convert_revision : 7b12febff200083aa0adbcaba612bc9e677ebe07
2005-11-22 13:36:30 -05:00
Nathan Binkert
61f59f639c 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
2005-11-22 13:33:28 -05:00
Kevin Lim
6da93ea526 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
2005-11-22 12:08:08 -05:00
Nathan Binkert
fb3ae7264f 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
2005-11-22 00:17:05 -05:00
Nathan Binkert
f806a25c9e 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
2005-11-21 23:43:15 -05:00
Nathan Binkert
50ee8c6461 expose an environment variable for setting the linux image.
--HG--
extra : convert_revision : 32be8bef3b594d29dae717857a96ff5bdd6e9ffa
2005-11-21 22:25:30 -05:00
Nathan Binkert
582e5f76f5 change profile environment configurations.
--HG--
extra : convert_revision : f05fb5e50a439da9db96b04547f58ed8cd9f1aa6
2005-11-21 22:24:32 -05:00
Nathan Binkert
1182b487a6 Rearrange the memory configurations.
--HG--
extra : convert_revision : bab5b13e335f11ecb2dafd3371faf2351fbe9f10
2005-11-21 22:22:40 -05:00
Nathan Binkert
2b76b41b90 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
2005-11-21 21:52:04 -05:00
Nathan Binkert
48863a1a43 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
2005-11-21 00:38:53 -05:00
Nathan Binkert
d3a4781ac5 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
2005-11-21 00:22:29 -05:00
Nathan Binkert
c4678ece84 BARs now of type MemorySize32
python/m5/config.py:
    Add MemorySize32 (a 32-bit value specified in bytes)

--HG--
extra : convert_revision : bfeee501f7ff1aa2567a3682da129a5770cb7bd2
2005-11-21 00:02:39 -05:00
Nathan Binkert
d733d168ca 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
2005-11-20 23:57:26 -05:00
Nathan Binkert
3b8b838417 Allow long as a multiplier in the python config
python/m5/config.py:
    Allow long as a multiplier

--HG--
extra : convert_revision : bdc45e9afc27bb7b0f2cd6aacf92758601b95ff8
2005-11-20 23:45:45 -05:00
Nathan Binkert
a102318412 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
2005-11-20 23:42:53 -05:00
Nathan Binkert
67c276ed2e implement __str__ for all of the proxy stuff so we can
actually print out a statistic.

--HG--
extra : convert_revision : 043be6bd729e74d2220c5ae8aa1fc739aa247715
2005-11-20 23:30:13 -05:00
Nathan Binkert
d003c30a8c fixup benchmark names a bit
--HG--
extra : convert_revision : 5978318331eb4e1b7fae037a32086a2e0a554f2e
2005-11-20 18:49:54 -05:00
Nathan Binkert
63bb46b6d8 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
2005-11-20 18:42:12 -05:00
Nathan Binkert
4e393f38ec get rid of allSymtab
if we want something like allSymtab, we should create a symbol
table proxy class

--HG--
extra : convert_revision : 20ca551a693b0d6495c018cac8afd63af33f16da
2005-11-20 18:39:31 -05:00
Nathan Binkert
64fc410ecb switch all profiling stuff to the kernelSymtab since allSymtab
is going away

--HG--
extra : convert_revision : 405ec55615474d0812ed780f26fd4df98e5ec6f5
2005-11-20 18:33:59 -05:00
Nathan Binkert
b62e7d24ec clear the function profile on a stats reset
cpu/profile.hh:
    Add a placeholder for a reset callback

--HG--
extra : convert_revision : 7fa13e5d04daf1cf93eb35c8fdaf67a40ce3ef73
2005-11-20 18:33:17 -05:00