Commit graph

4378 commits

Author SHA1 Message Date
Nathan Binkert
989eb88576 Scripts that can be used with server.readfile and client.readfile
to run the netperf benchmark

--HG--
extra : convert_revision : a2ce490e0c44996d0876a6839ad333643ec252c8
2004-07-08 16:01:13 -04:00
Nathan Binkert
7c2084dcfe store the checkpoint to the proper directory
dev/disk_image.cc:
    store the disk checkpoint to the proper directory

--HG--
extra : convert_revision : f76347576691560f00c60b86ac2044960d5a193c
2004-07-08 15:59:46 -04:00
Andrew Schultz
7b2535d7bc Change mount command for mounting disk images
--HG--
extra : convert_revision : 450e8c7332c1e3162cdbef4177b7f54b47b1648a
2004-07-08 15:22:41 -04:00
Nathan Binkert
32df4eccb4 Fix the cache's address range.
**warning** this is still a hack.  The caches need to figure this
out on their own!

--HG--
extra : convert_revision : 4fbebf302bfbeaa35e5aad276934d8d1ce5c6baf
2004-07-08 14:23:49 -04:00
Lisa Hsu
9dba9e462f fix the failing regression. the sconscript ("makefile") was missing the etherbus.cc src file.
SConscript:
    THIS is why the regression keeps failing.  it's missing the the etherbus file in the sconscript.

--HG--
extra : convert_revision : adbcfb6036d8e8ecb51c4f484d0030059542684b
2004-07-08 09:05:26 -04:00
Ali Saidi
02dfbe92fc fixed a bad merge from linux<->tru64
--HG--
extra : convert_revision : d7a5acd89a2bdc013c8a2bd022cc7048a3920f01
2004-07-08 00:28:02 -04:00
Lisa Hsu
014f451d1f Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/linux-clean

--HG--
extra : convert_revision : e0192f56c189e595daf3c020a56e1c02010aefbc
2004-07-06 20:04:17 -04:00
Nathan Binkert
8d6fb1e9b5 disable the binned_fn stuff
cpu0 -> cpu since we're not all set up for MP in the
ini files just yet.

--HG--
extra : convert_revision : 69a5af791ea89fec7e647d55644cc4eeaf924651
2004-07-06 19:27:33 -04:00
Nathan Binkert
2fecc3c785 Make binning work with stuff other than FS_MEASURE
--HG--
extra : convert_revision : e3fa3cfbdf2f13dd3a8d2266dd64c2c335f998d6
2004-07-06 19:22:39 -04:00
Nathan Binkert
347166d908 Fix some ini stuff.
--HG--
extra : convert_revision : b870550f52901fe723eeab24a14ac4c1222ee1bd
2004-07-06 19:21:47 -04:00
Lisa Hsu
19fd3439c7 tag each mem_req as coming from the nic if it is DMA'd from the NIC. the NIC tells the DMA interface, which in turn sets a new nic_req flag in the MemReq it makes.
dev/ns_gige.cc:
    tell all outgoing dma events that this request is from the NIC

--HG--
extra : convert_revision : 62af17a2728a0ff729e7723dc29bd0d130ca5fe3
2004-07-06 17:55:16 -04:00
Lisa Hsu
151bb42173 Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/linux-clean

--HG--
extra : convert_revision : cd46aa31dab82e43c3c4f8bb6f0fe2e018acfd12
2004-07-06 17:42:58 -04:00
Erik Hallnor
4869ba881e Remove duplicate stat
cpu/trace/reader/m5_reader.cc:
    Wrap assert variable in NDEBUG

--HG--
extra : convert_revision : 8c79dc30eff2f2fa0110a04c30df17ec4417c28c
2004-07-06 11:29:23 -04:00
Ali Saidi
fe3a86e2ef updated to work on all platforms (actually map sure that the physical
address we are trying to access is mapped before accessing it.)

--HG--
extra : convert_revision : 104341334a3d2bb812a6b0b6277ab353f8f9b39e
2004-07-05 16:49:56 -04:00
Ali Saidi
3512904c74 Added code to read any location in memory a repetative number of and
average the results.

It works on alpha but I haven't got it working on x86 I think for
lack of knowing a good address to read.

--HG--
extra : convert_revision : e2442de641741674d692245712aa92e258cf6d48
2004-07-05 15:49:42 -04:00
Lisa Hsu
5bbd57917f these changes are an undo from my last changeset. these are meant for later.
--HG--
extra : convert_revision : 0126918ef293cba02aaaa61dff3c471eb4743116
2004-07-05 11:20:53 -04:00
Lisa Hsu
7ca7b343ff almost forgot to do this - hope it doesn't mess up schedule.
dev/ns_gige.cc:
dev/ns_gige.hh:
    add the stats nate wanted

--HG--
extra : convert_revision : b59d586def7df31741b53cdb59cf3b19253caf26
2004-07-04 16:47:07 -04:00
Lisa Hsu
aab5f629ac fix some broken .ini's
--HG--
extra : convert_revision : c91b44b61919a10d3323601834d2959445308d0a
2004-07-04 12:08:54 -04:00
Nathan Binkert
a55cb1d28b fix makefile to work with traceflags.py change
--HG--
extra : convert_revision : 4aef47dc721684a786034aa85aea0c81822ec2eb
2004-07-03 10:10:43 -04:00
Steve Reinhardt
f1d268e99f Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : 64c0ab7d2095ea8327bfc95fdf2151cf3ee5fd16
2004-07-02 21:17:51 -07:00
Steve Reinhardt
b13e28afbb Initial SCons-based build system. See www.scons.org.
'cd build; scons' will build ALPHA/m5.debug.
Use e.g. 'scons KERNEL/m5.opt' to build other binaries.
Read the comments in build/SConstruct for more details.

base/traceflags.py:
    Take basename of generated cc/hh files from command line instead
    of hardwiring them.  Lets us call the script from a different
    directory and still have the files end up in the right place
    (e.g. "base/traceflags.py base/traceflags").

--HG--
extra : convert_revision : ee4dbb59040cf07590929275f6c1c01e8d4e00b4
2004-07-02 21:16:38 -07:00
Nathan Binkert
e2c62a13dd Fix byteswap on LP64 (amd64)
kern/linux/linux_system.cc:
    Formatting
sim/host.hh:
    When we say ULL and UL we really just want a 64-bit value, not
    necessarily a long long, so cast the integer to (u)int64_t
    this fixes a problem with byte swapping.

--HG--
extra : convert_revision : ad25ace5a7b92a7c928f2d52e531193c91f3f8c8
2004-07-02 16:40:23 -04:00
Nathan Binkert
0e575e9f26 Need to #include <unistd.h> to build with pread
--HG--
extra : convert_revision : 1e5b3e5f1eaba3853d7d3da5546387c16932ab6a
2004-07-02 12:30:06 -04:00
Nathan Binkert
6083c8280b implement the readfile pseudo instruction that will read
a realworld file.

arch/alpha/isa_desc:
arch/alpha/pseudo_inst.hh:
    implement the readfile pseudo instruction that will read a
    chunk of a realworld file.
arch/alpha/pseudo_inst.cc:
    implement the readfile pseudo instruction that will read a
    chunk of a realworld file.  The filename is a per system
    parameter and comes from the system itself.
kern/linux/linux_system.cc:
sim/system.hh:
    Create a per-system readfile parameter for use by the readfile
    pseudo instruction.  That way each system can get its own file.

--HG--
extra : convert_revision : 941b3a3e20702a6252b219ca66a6d90da2944c50
2004-07-01 18:03:05 -04:00
Nathan Binkert
671cff5937 rename CopyData to CopyOut and implement CopyIn to copy data
from the simulator into the simulatee

kern/tru64/dump_mbuf.cc:
    rename CopyData -> CopyOut

--HG--
extra : convert_revision : e3ef27a5762dfc495dcb84a372470464c27557d2
2004-07-01 18:00:18 -04:00
Nathan Binkert
12e8ab2b64 sort out common files into configs/kernel
fix up includes get stuff from the proper directories

--HG--
extra : convert_revision : 7226e211a5db0d11880684150670d1cd5bc998ab
2004-07-01 14:02:23 -04:00
Andrew Schultz
6428133e15 Add documentation for linux-dist system and make some small formatting
changes

--HG--
extra : convert_revision : 5371561a10156cdb8dd7c2b5688d07e45510bf76
2004-07-01 12:08:52 -04:00
Ali Saidi
bf32875fc4 Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : eec2cf5ef2f8452bca955fd8aecb062d07502b0b
2004-06-30 16:06:50 -04:00
Ali Saidi
1506e4a580 Update MAX ASN in kernel to 127 since that's what the ev5 supports
--HG--
extra : convert_revision : e1feca854301682a7ce58e8f4ff149b10d2beb4b
2004-06-30 16:06:47 -04:00
Nathan Binkert
16f53a7899 fix the -I flag stuff for CPP so it actually works right.
What was I smoking?

--HG--
extra : convert_revision : 24488707a35febe006ec50a1fa7c9fad4842eadc
2004-06-30 14:53:26 -04:00
Nathan Binkert
ee765958b4 add asn when tracing tlb stuff
--HG--
extra : convert_revision : abc774179b3d4c979efd98e32d1d071b142e7b48
2004-06-30 14:51:40 -04:00
Andrew Schultz
bdc7803694 Merge zizzer:/bk/m5 into zizzer.eecs.umich.edu:/z/alschult/m5
--HG--
extra : convert_revision : 0bd6506e79600775dd0f72996120321f249b3411
2004-06-30 09:47:32 -04:00
Andrew Schultz
bdf9044d9d Change assert to check on virtual addresses because the physical
address can be zero for a copy

--HG--
extra : convert_revision : c6089969396aee2d67fa695a31cb7c5aea794338
2004-06-30 09:47:23 -04:00
Lisa Hsu
31c52ac0a7 Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/linux-clean

--HG--
extra : convert_revision : a072c1560e1f8b5cac378ed5f047a8a9c86b97b9
2004-06-30 00:51:11 -04:00
Lisa Hsu
167c57f265 fix transmit side checksum offloading to not generate a pseudo header.
dev/ns_gige.cc:
    transmit side checksum offloading doesn't need pseudo header generation, it just takes the pseudo header checksum and uses it.

--HG--
extra : convert_revision : 9741bd650415c18ed37b06a453b23610d028135b
2004-06-30 00:50:56 -04:00
Ali Saidi
a2afbeecce Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : 7e1d8e3723f47338f0b24071ee95c66a9561dd2f
2004-06-29 16:08:33 -04:00
Ali Saidi
5a1340d046 Another fix for the too much work problem in 2.6. This should do it.
Both rx/tx interrupts are now scheduled for the future to give the
linux kernel time to get out of its loop.

--HG--
extra : convert_revision : 8fee0a25fde0ce0545c924f8547bed460602e006
2004-06-29 16:08:26 -04:00
Nathan Binkert
53e3d58549 Get rid of old ini files that haven't been used in a long time.
--HG--
extra : convert_revision : 43c21727952d46363a46ef3d8fe89546576edc08
2004-06-29 13:03:20 -04:00
Ali Saidi
38fe4d9a86 With the new uart code 300 cycles isn't quite enough, 350 seems to
work. When everything gets changed to seconds this should be updated.

--HG--
extra : convert_revision : 9f1064ff6fec5deceb591904f4571c9129ecc998
2004-06-28 21:23:10 -04:00
Nathan Binkert
838273a196 fix up the recordEvent stuff to support ignoring events
arch/alpha/ev5.cc:
cpu/simple_cpu/simple_cpu.cc:
    update for new event interface
base/stats/events.cc:
    implement the ignore event function which matches sim objects from which
    to ignore events.

    Make insert event like insert data and make it able to insert many
    events in a single transaction with the database.
base/stats/events.hh:
    Make it possible to ignore events
sim/sim_object.cc:
    make recordEvent a member function of SimObject to implement
    the ignore function easily
sim/sim_object.hh:
    implement the ignore event stuff in the sim object.  This is a
    bit of a hack, but an easy place to put it.

--HG--
extra : convert_revision : ba3f25a14ad03662c53fb35514860d69be8cd4f0
2004-06-28 16:49:35 -04:00
Nathan Binkert
19d5789db1 Don't serialize the absolute path so we can move checkpoints around.
sim/serialize.cc:
sim/serialize.hh:
    export the checkpoint directory

--HG--
extra : convert_revision : ba5b796fd930ab0487a502beefcf76bd6bb7c366
2004-06-28 15:54:05 -04:00
Nathan Binkert
efd119881a add support to add a string to indicate a particular sample of a run
name to make statistical sampling easier.

--HG--
extra : convert_revision : b24db4ef747b8ef00a0131db237e97de60c27dc3
2004-06-28 15:53:06 -04:00
Steve Reinhardt
75ed8090bf Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : ad13cd0c7d700ec75ed98f517cbde3147e698940
2004-06-27 15:17:16 -07:00
Ali Saidi
c75eadc2b2 allow the use of old console code and update elf_object not to rely on EM_ALPHA value.
base/loader/elf_object.cc:
    EM_ALPHA value isn't official, so perhaps we shouldn't use it
dev/alpha_console.cc:
dev/alpha_console.hh:
    this change allows the use of old console code

--HG--
extra : convert_revision : cfacd64ae7fd2595158ca1a83ebcdb66ee7e119b
2004-06-27 14:33:55 -04:00
Ali Saidi
4cd030de9f removed LINUX system dir, all we really need is one that both tru64 and linux can share
--HG--
extra : convert_revision : 7417031db632255749d2a8201d761a001fb7de2e
2004-06-26 21:43:17 -04:00
Ali Saidi
54b49f933a rewrote uart and renamed console.cc to simconsole to reduce confusion
base/traceflags.py:
    removed TsunamiUart/TlaserUart and added a plain Uart
dev/alpha_console.cc:
    updated for new simconsole
dev/platform.hh:
    added a uart member to platform
dev/simconsole.cc:
dev/simconsole.hh:
    removed lots of legacy code, it should all be ours now.
    converted tabs to 8 spaces
    added our copyright
dev/tsunami.cc:
    uses simconsole.hh rather than console.hh
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
    never needed console.hh
dev/tsunami_io.hh:
    this does need eventq.hh and it just happend to be working whenn console.hh was
    included everywhere
dev/tsunamireg.h:
    added a couple more 8250/16550 uart defines
dev/uart.cc:
    new uart code, rewritten to support both tlaser and tsunami (both a 8250 and 8530
    uart).
dev/uart.hh:
    updated for new uart, legacy code removed

--HG--
rename : dev/console.cc => dev/simconsole.cc
rename : dev/console.hh => dev/simconsole.hh
rename : dev/tsunami_uart.cc => dev/uart.cc
rename : dev/tsunami_uart.hh => dev/uart.hh
extra : convert_revision : e663352d49d4c2d3c95643030cf73c0e85ba2f08
2004-06-26 21:26:28 -04:00
Ali Saidi
4799a7b874 minor changes to endian code so that it runs on x86 linux
base/intmath.hh:
    only need FloorLog2(size_t) on a mac, so ifdefed for this
dev/alpha_console.cc:
    Actually allocate the alphaAccess struct.

--HG--
extra : convert_revision : 1f50b1a025c8ee728a9f3d2c603ea38347234f54
2004-06-23 18:39:11 -04:00
Ali Saidi
17bfb1540e Merge zizzer:/bk/linux into zeep.eecs.umich.edu:/z/saidi/work/m5-endian
--HG--
extra : convert_revision : d4938c6011173d3017f47fd592c4b5e4c8d543a3
2004-06-23 17:55:54 -04:00
Andrew Schultz
06d8f0af5d Fix to properly shadow the DEV bit in the Drive/Head register so other
disks are properly detected and handled

--HG--
extra : convert_revision : ffc3046deb68458ee2ef6fa5263dc471488abc45
2004-06-23 15:37:05 -04:00
Ali Saidi
231fac0a2b more modifications for cross-endian support. linux now gets to pciconfig
dev/alpha_console.cc:
    rather than acessing a byte array for alpha access, access the members
    **this requires an updated console**
dev/pcidev.cc:
    correctly type all the pci data and store in in little endian no
    matter what system we are on
dev/tsunami_uart.cc:
    correct a bug with the data type.
kern/linux/linux_system.cc:
    system type in hwprb needs to be endian happy as well.

--HG--
extra : convert_revision : 8de9bb69365b5d30fceaf4fa342a1639f92d7a83
2004-06-23 15:07:09 -04:00