Commit graph

1296 commits

Author SHA1 Message Date
Steve Reinhardt
7ba82a9c43 Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5

--HG--
extra : convert_revision : bf821e90a6f15a69dfa46fe37f7ab586698cd0c0
2004-11-16 17:20:49 -05:00
Steve Reinhardt
c9b0204e28 Add simple function-tracing support. Prints a message
every time the committed PC changes from one symbol scope
to another.
Set function_trace=y on target CPU to enable.
To defer start, use function_trace_start=<tick>
(in addition to setting function_trace=y).

cpu/base_cpu.cc:
cpu/base_cpu.hh:
    Add simple function-tracing support.
cpu/simple_cpu/simple_cpu.cc:
    Add function_trace, function_trace_start params
    Call traceFunctions() on instruction completion
cpu/simple_cpu/simple_cpu.hh:
    Add function_trace, function_trace_start params

--HG--
extra : convert_revision : 8a7f84028ccbaee585253629007f32fc8eae35e1
2004-11-16 17:20:38 -05:00
Nathan Binkert
b6f2e3f96d more ordering for .ini file.
--HG--
extra : convert_revision : 0b20009bd1688e7ccc52d4a5afd384180ada2e72
2004-11-16 16:05:53 -05:00
Ali Saidi
34b2014463 add asymmetric dual configurations
--HG--
extra : convert_revision : e1479f7033350982d729c0b7228f570d4302fe6b
2004-11-16 02:22:07 -05:00
Ali Saidi
44759118ac use the big swap disk
--HG--
extra : convert_revision : 87bae6fc4746e7b5b029ea45ab2b71e0d8cd58ae
2004-11-16 00:46:17 -05:00
Ali Saidi
0f82fb9d3b Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : ef573e6e6dab2516c930b6209b66442d8ad85be0
2004-11-16 00:35:05 -05:00
Ali Saidi
82235799d3 fixed for 768MB runs
--HG--
extra : convert_revision : c86b282788919d414470aaf551094fee1bebbbab
2004-11-16 00:34:45 -05:00
Nathan Binkert
8f362c7621 Fix default sampling periods
--HG--
extra : convert_revision : bc1f5c36fb6f7bb56e4a403f4ae0d87fee044459
2004-11-16 00:30:35 -05:00
Nathan Binkert
0ef1cac5c3 Dual core configuration for detailed simulation
--HG--
extra : convert_revision : 8f2e27631365a3ffe4aa7a9a1d29081ef786801b
2004-11-16 00:28:35 -05:00
Nathan Binkert
a5b3a0199f fix benchmark.ini ordering
--HG--
extra : convert_revision : 55580e2aa602479ff804bd27857d0b10250ce376
2004-11-16 00:15:14 -05:00
Nathan Binkert
1da2738d9b improve configs
--HG--
extra : convert_revision : 981568baeaa7ab78cccc9e3ac5112b2426a440ff
2004-11-16 00:03:03 -05:00
Nathan Binkert
e0c2ef317b All of these benchmarks use two systems
--HG--
extra : convert_revision : d3482d77b08b5ef040d0d933b3320c5db4781bb5
2004-11-15 23:26:10 -05:00
Nathan Binkert
605961fa1a setup memory sizes for the various benchmarks
--HG--
extra : convert_revision : a5861aaa53cc71c67e32bf633ce7bbe2d9c892ca
2004-11-15 23:23:04 -05:00
Steve Reinhardt
b1816cb837 Minor cleanup of symtab code/includes.
base/loader/symtab.cc:
base/loader/symtab.hh:
    Get rid of old unused calls.
cpu/simple_cpu/simple_cpu.hh:
    No need to include base/loader/symtab.hh
kern/linux/linux_system.cc:
kern/tru64/tru64_system.cc:
    Include base/loader/symtab.hh (since it's no longer included in system.hh)
sim/system.hh:
    Replace include of base/loader/symtab.hh with forward class decl.

--HG--
extra : convert_revision : 3a778c2f409ec94e3b00eaa9b3859943cb39918c
2004-11-15 20:30:51 -05:00
Steve Reinhardt
26c666b4f3 Minor fixes for pc sampling profile.
cpu/exetrace.cc:
    Fix dumb mistake.

--HG--
extra : convert_revision : 9d5d0d09775133d1a60cf459f1bd47afa8480663
2004-11-15 19:57:11 -05:00
Nathan Binkert
e904ef3763 make benchmarks.ini a bit less confusing
--HG--
extra : convert_revision : 047ff4f84677d5b132b4d1fe80fbbf91a213a833
2004-11-15 18:21:36 -05:00
Nathan Binkert
eb7b873b05 Fix up the spec-surge benchmark
configs/boot/spec-surge-client.rcS:
    change the number of connections and add stuff for the
    file set size and checkpointing

--HG--
extra : convert_revision : 9e0fe74f44300893c6050e3eb1ae302f71c02767
2004-11-15 18:20:43 -05:00
Nathan Binkert
f08cb65703 clean up benchmarks differentiate the two surge benchmarks
--HG--
extra : convert_revision : 8fd9717b34a5cdfa9e36a421e3df7cd957becb9c
2004-11-15 16:11:30 -05:00
Nathan Binkert
63dbaccdc4 more whitespace fixes
configs/boot/spec-surge-client.rcS:
configs/boot/spec-surge-server.rcS:
    whitespace fixes

--HG--
extra : convert_revision : 90eb2a325a3cf4436081c992d6f3e0f903980ff7
2004-11-15 16:07:28 -05:00
Nathan Binkert
abbbea57a7 more formatting
configs/boot/nfs-server.rcS:
    fix whitespace

--HG--
extra : convert_revision : d421d5fa1e041b041d7c47d36abe55a2dd3e7487
2004-11-15 15:45:55 -05:00
Nathan Binkert
2cc34a34df formatting
configs/boot/nfs-client.rcS:
    fix whitespace

--HG--
extra : convert_revision : dc384870de9431fe30b13a2c8c69d97b2d06dca9
2004-11-15 15:44:25 -05:00
Nathan Binkert
49d470a3b5 cleanup the nfs server script
configs/boot/nfs-server.rcS:
    don't need extra IP aliases

    re-order the nfs daemons so they happen in the right order
    and don't have the shell put them in the background since they
    will auto detach anyway.

--HG--
extra : convert_revision : a6b13ac91d1649878d346663f6ddff56d9a8a8ec
2004-11-15 15:42:15 -05:00
Nathan Binkert
f7323aebe8 fix udp checksums
base/inet.hh:
    tcp/udp/ip checksums are calculated/manipulated in NBO always,
    so there's no need to convert to host endian.

--HG--
extra : convert_revision : 13d6aff025a6c072d9d829c2e9fad4f13399b1f7
2004-11-15 15:40:35 -05:00
Steve Reinhardt
c250a16e05 Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5

--HG--
extra : convert_revision : 033375b63b56104a5c1823985eeee7bb6cdcc7de
2004-11-15 02:44:23 -05:00
Nathan Binkert
bd4f5f843d mount surge image read-only
--HG--
extra : convert_revision : b91a93f9dc004c587d3ec763ecde98e5bd241159
2004-11-15 02:44:22 -05:00
Steve Reinhardt
fed64a3b36 Add support for sampled PC profiling to FullCPU.
Simple text list of symbol (or address) and count
will be dumped to m5prof.<cpu-name> if the cpu's
pc_sample_interval param is set.

SConscript:
    Add cpu/full_cpu/pc_sample_profile.cc
base/callback.hh:
    Add a comment about MakeCallback.
    Fix type in another comment.
base/loader/symtab.cc:
    Revamp findNearestSymbol() to provide addresses of both
    nearest symbols (preceding and following) as well as
    string for former.

    Move global definition of debugSymbolTable here too.
base/loader/symtab.hh:
    Revamp findNearestSymbol() to provide addresses of both
    nearest symbols (preceding and following) as well as
    string for former.

    Move global declaration of debugSymbolTable here too.
cpu/exetrace.cc:
    Use new findNearestSymbol() interface for trace symbols.
kern/linux/linux_system.cc:
sim/system.cc:
    Remove extern of debugSymbolTable (now in symtab.hh)
sim/process.cc:
    Initialize debugSymbolTable if binary has a symbol table.

--HG--
extra : convert_revision : 0b5393dc39c40ac88c953684708f1125da550671
2004-11-15 01:56:40 -05:00
Nathan Binkert
928656aecb make it so we can individually use the sampling cpu on
either the client or the server.

Make an ini file that makes our benchmarks easier to run.

--HG--
extra : convert_revision : c270cd1c027cb40d5c5bcfc2ed63f9db4b155116
2004-11-15 01:55:24 -05:00
Ali Saidi
0097ab1ecb Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/tmp/m5
--HG--
extra : convert_revision : 3c7b8a86b528a61f5cb14c86ec7c1eb9276824af
2004-11-15 01:36:28 -05:00
Nathan Binkert
10e88b43fd Fix more of the stats python stuff
util/stats/info.py:
    Make the binnings stuff work again.
util/stats/stats.py:
    small patch for graphing
    make it so we can print out bins for the stat command

--HG--
extra : convert_revision : c0279ac7030fd5146dd00801baa41e7baf97d1f4
2004-11-15 01:36:27 -05:00
Ali Saidi
e462e9627a commit ploticus code to repository
--HG--
extra : convert_revision : 861423a859d05e7915d9f83ef40c188fe21bcb31
2004-11-15 00:43:34 -05:00
Ali Saidi
ed1ff7fca9 updated to make memory a touch slower in the HT case and the
make sure the interrupt controller is on cpu die

--HG--
extra : convert_revision : 07b7eadbec7694859957279c81b9bdb4ebd044a3
2004-11-14 18:52:04 -05:00
Nathan Binkert
53b606683b New system configurations that work around the bus bridge
memory system bug

--HG--
extra : convert_revision : 29aa265126691eee386bc73a86e5d382e12b59a9
2004-11-14 17:41:56 -05:00
Ron Dreslinski
9eedd19cfb Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean

--HG--
extra : convert_revision : 19dce611da2e93f85af1eef1d590d820e8db3c5f
2004-11-14 17:31:59 -05:00
Ron Dreslinski
050ea6c522 Fix some small bugs with bus blocking and adress arbitration
Fix it so that when snoop response is called on other interfaces besides master, it just does nothing

--HG--
extra : convert_revision : d1e29b738c932642d53c011b50cfd915f67af51b
2004-11-14 17:31:43 -05:00
Nathan Binkert
9d80d88a71 update graph generating code
util/stats/stats.py:
    tweak the graphing stuff for the new configurations we have.
    add more graph types.
    nsgige -> etherdev
    deal with memory hierarchy change by using L2 instead of L3

--HG--
extra : convert_revision : 55362e79d9f8d0d68aa08129f5af944b378a9f4c
2004-11-14 17:22:33 -05:00
Ron Dreslinski
f7d1166e04 Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/clean

--HG--
extra : convert_revision : 170f5fd8891b02ad3cc04112c6f304ede3254dae
2004-11-14 16:19:11 -05:00
Ali Saidi
6650da85e7 by default bin interrupts seperately from kernel code.
--HG--
extra : convert_revision : fb890907402b7c1e873a2ac32e72cb6e0ed73f13
2004-11-14 15:26:48 -05:00
Ali Saidi
a89398e262 patched nfs boot scripts
configs/boot/nfs-server.rcS:
    made the partition size correct

--HG--
extra : convert_revision : 4e9bdbe3e465aea2a914fd928b47296031c2523b
2004-11-13 23:09:17 -05:00
Ali Saidi
f63dd31f4e fixed nfs scripts hopefully for the last time
configs/boot/nfs-client.rcS:
    lucky #3

--HG--
extra : convert_revision : a55f29e4c087e7ab95ea584316ad6fe4ebb5df9a
2004-11-13 23:08:08 -05:00
Steve Reinhardt
2e0695ec9a Get rid of obsolete sim/sim_stats.* files (looks like these
are replaced by sim/stats.hh and sim/stat_control.*)

dev/ns_gige.cc:
dev/sinic.cc:
    Include sim/stats.hh instead of sim/sim_stats.hh

--HG--
extra : convert_revision : 5e07932eab45ae4fb719baa4f94c5f62092a8446
2004-11-13 21:13:25 -05:00
Nathan Binkert
7e4229fb8f Add the Simple Integrated Network Interface Controller
--HG--
extra : convert_revision : 2bce25881a104e8282a5ed819769c6a7de414fb2
2004-11-13 17:10:48 -05:00
Nathan Binkert
9f8db6f446 don't handle device specific configuration stuff in the base
class.  While we're at it, very minor formatting.

--HG--
extra : convert_revision : b7c719f92ece7234838434294b33833289adbada
2004-11-13 17:05:13 -05:00
Nathan Binkert
4760ae46c6 Use the new PacketFifo class to avoid manual calculations
--HG--
extra : convert_revision : afa193904b7ed4d5e5c50e9dcb78e8e855b00ecc
2004-11-13 16:52:08 -05:00
Nathan Binkert
8922d69953 change the serialization of a packet so that we don't
do a nameOut.  This fixes a subtle bug in serialization that
can pop up.

--HG--
extra : convert_revision : b52df977dcbef1c9bd0d4405ba0b36dff3737cdf
2004-11-13 16:46:56 -05:00
Nathan Binkert
acb98fb0f6 we shouldn't ever pass around references to PacketPtrs,
const references are ok, or pass by value.

--HG--
extra : convert_revision : 7280a1c7d22b9294fddbe50f02f6f4c6ca9b2e5b
2004-11-13 16:33:16 -05:00
Nathan Binkert
bd3e3c0230 forgot a change in the previous commit. the ide controller
doesn't have its own interrupt functions

dev/ide_ctrl.hh:
    oops. we don't have our own interrupt functions anymore
    we get them from the base class.

--HG--
extra : convert_revision : 3eac228ec59f4fea0b0e49f961e8b21705dee27f
2004-11-13 16:24:47 -05:00
Nathan Binkert
b0fd676a25 Make it possible for PioDevices to have unknown pio
latencies.

--HG--
extra : convert_revision : 08f2250efc078406c497a6820ae30f5fdf687ea5
2004-11-13 16:04:33 -05:00
Nathan Binkert
b031888038 Use parameter structs for initialization so it's easier
to add new devices.  Abstract the Platform more so that
it is unnecessary to know know platform specifics for
interrupting or translating PCI DMA addresses.

dev/ide_ctrl.cc:
    convert to parameter struct for initialization
    use the interrupt functions in the PciDev base class
    convert from tsunami to using platform
    We don't need an interrupt controller here.
dev/ide_ctrl.hh:
    don't use Tsunami, use Platform
    make the IdeDisk a friend so that it can access my plaform
    convert to parameter struct for construction
dev/ide_disk.cc:
    don't use tsunami references, but platform references
dev/ns_gige.cc:
    Convert to parameter struct for initialzation. Use code in
    base class for interrupts so we don't need to know anything
    about the platform. Don't need an IntrControl *.
dev/ns_gige.hh:
    We don't need a Tsunami * anymore
    convert to a parameter struct for construction
dev/pcidev.cc:
    deal with new parameter struct
dev/pcidev.hh:
    - Move all of the configuration parameters into a param struct
    that we can pass into the constructor.
    - Add a Platform * for accessing new generic interrupt post/clear
    and dma address translation fuctions
    - Create functions for posting/clearing interrupts and translating
    dma addresses
dev/platform.cc:
    have default functions that panic on pci calls
dev/platform.hh:
    don't make the pci stuff pure virtual, but rather provide
    default implementations that panic.  Also, add dma address
    translation.
dev/tsunami.cc:
    this-> isn't necessary here.
    add pci address translation
dev/tsunami.hh:
    implement the pciToDma address translation

--HG--
extra : convert_revision : 7db27a2fa1f1bd84704921ec7ca0280b5653c43e
2004-11-13 15:45:22 -05:00
Nathan Binkert
e9f3279334 sort #includes
don't need to include ev5.hh anymore

--HG--
extra : convert_revision : f80d2767936d3fb07a9cb7fd4709cafe9ea93e63
2004-11-13 14:46:02 -05:00
Nathan Binkert
425dda00df Macros are nasty, so let's get rid of them. Convert all
all macros in ev5.hh to inline functions or constant typed
variables and make them follow our style while we're at it.

All of the stuff in this file actually belongs in the ISA
traits code, but this is a first step at getting things done
in the right manner.

arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
arch/alpha/ev5.cc:
arch/alpha/isa_desc:
dev/ns_gige.cc:
kern/tru64/tru64_events.cc:
    deal with changes in ev5.hh
arch/alpha/ev5.hh:
    Macros are nasty, so let's get rid of them.  Convert all
    all macros to inline functions or constant typed variables.
    Make them follow our style while we're at it.

    All of the stuff in this file actually belongs in the ISA
    traits code, but this is a first step at getting things done
    in the right manner.
arch/alpha/isa_traits.hh:
    move some of the ev5 specific code into the isa
arch/alpha/vtophys.cc:
base/remote_gdb.cc:
    deal with isa addition
cpu/exec_context.hh:
    be less isa specific and use the isa traits to figure out
    what we can.
dev/alpha_console.cc:
dev/pciconfigall.cc:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
dev/uart.cc:
    deal with changes in ev5.hh
    I don't believe this masking is actually necessary.  We should
    look at removing it later.
dev/ide_ctrl.cc:
    sort #includes
    deal with changes in ev5.hh

--HG--
extra : convert_revision : c8a3adf0a4b1d198aefe38fc38b295abf289b08a
2004-11-13 14:01:38 -05:00