Commit graph

668 commits

Author SHA1 Message Date
Steve Reinhardt b3b0a4705b Merge
--HG--
extra : convert_revision : dadfa2cd97908d769f1e2d5c645140f296ec6a82
2004-04-02 23:19:08 -08:00
Steve Reinhardt 782fb42992 Basic cleanup pass to get rid of a few things that made the Python
configuration unnecessarily awkward.  Biggest changes are:

- External and internal object names now match in all cases.  The
macros still allow them to be different; the only reason I didn't
get rid of that is that the macros themselves should be going away
soon.  In the few conflicting cases, I sometimes renamed the C++ object
and sometimes renamed the config object.  The latter sets of substitions
are:

s/BaseBus/Bus/;
s/MemoryObject/FunctionalMemory/;
s/MemoryControl/MemoryController/;
s/FUPool/FuncUnitPool/;

- SamplingCPU is temporarily broken... we need to change the model
of how this works in the .ini file.  Having it as a CPU proxy is
really awkward.

arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
cpu/simple_cpu/simple_cpu.cc:
sim/process.cc:
    Rename objects to match config name.
cpu/base_cpu.cc:
    Uncomment SimObject define since SamplingCPU no longer
    does this for us.
dev/ethertap.cc:
    Use unsigned instead of uint16_t for params.
kern/tru64/tru64_system.cc:
    Use unsigned instead of uint64_t for init_param param.
test/paramtest.cc:
    Fix old SimObjectParam.

--HG--
extra : convert_revision : 378ebbc6a71ad0694501d09979a44d111a59e8dc
2004-04-02 22:57:08 -08:00
Erik Hallnor ae06629947 Add new range functions to DmaInterface as well.
--HG--
extra : convert_revision : 3a7aa3e6495de86c365128b4bd1ef41fe8ff4142
2004-04-02 04:13:48 -05:00
Erik Hallnor 92c1584f1a Add automatic bus bridge address range setting/resetting. You can no longer directly set a address range on a bus bridge.
--HG--
extra : convert_revision : 708fb67b82c619f340f2b5a95f4542b573004774
2004-04-02 03:03:30 -05:00
Steve Reinhardt 3622f332f9 Fix dependencies (broken since Nate's tree-build change).
--HG--
extra : convert_revision : 7be203a46c53ac7cf464ac3857e27259a846dcfb
2004-04-01 22:18:00 -08:00
Erik Hallnor ac016ab4b0 Add a average references to a cache block stat.
--HG--
extra : convert_revision : ba0ff82985a44c8e2de129194b1f755199469f8f
2004-04-01 18:23:17 -05:00
Nathan Binkert 13483c98be Get rid of the printExtraOutput stuff
--HG--
extra : convert_revision : d82718ad4b3c5dd56a99c727e78b39917f9d4541
2004-03-26 05:43:29 -05:00
Nathan Binkert f299bb01ac Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : f210926c232d2999703bbb0adf08899d8c041729
2004-03-25 05:46:35 -05:00
Nathan Binkert ae48fb794c Get rid of symlink hack in makefile
--HG--
extra : convert_revision : c1bc90a1d823f8034da692afd6005456ef98831b
2004-03-25 05:46:16 -05:00
Steve Reinhardt aeb8e8ccb7 Minor cleanup from building & diffing behavior
on various platforms.

base/hashmap.hh:
    gcc on Alpha doesn't always define __LP64__,
    even though it arguably should.
cpu/exec_context.cc:
    Clear register file on non-full-system too (even though
    it typically gets overwritten by the initial regs from
    the Process object).
sim/process.cc:
    Clear initial register copy in Process object.
    Not all regs get initialized when the executable is loaded.

--HG--
extra : convert_revision : f1fe4734a5ea81331d70994cb5284b1e9db0dceb
2004-03-24 23:29:10 -08:00
Nathan Binkert 97c11561ff Don't indent namespaces because it just wastes space
--HG--
extra : convert_revision : 2236838a40bf77689a3d75df718c0da410c3fbb6
2004-03-24 10:25:18 -05:00
Nathan Binkert 438c7f5b64 Get rid of the old VPATH stuff for getting at source files
instead, require a path for each file.

--HG--
extra : convert_revision : 9ecab85eefd10ee988edce06dd6c94e8df42ad95
2004-03-24 10:00:29 -05:00
Nathan Binkert 2ae06f42b3 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : b0af82ea6028d1f7f6756edf266945732c25ad52
2004-03-24 05:16:13 -05:00
Nathan Binkert 8b0f69166e Hacks to make the libelf stuff work in openbsd.
base/loader/elf_object.cc:
    The symbol versioning stuff screws up OpenBSD.  We don't need it anyway

--HG--
extra : convert_revision : 736d5c1baaf7f5727665f84cc08e3781e193b389
2004-03-24 05:13:49 -05:00
Erik Hallnor 6cb02394c0 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : d950120ed0f96421bb953a96db94fb4aecf2241d
2004-03-24 04:41:27 -05:00
Erik Hallnor 81882c0d10 A few memory system performance enhancements.
base/compression/lzss_compression.cc:
base/compression/lzss_compression.hh:
    Rework for better performance

--HG--
extra : convert_revision : b13d706e0e23cbe7122b611258354c66cf5f3c70
2004-03-24 04:41:19 -05:00
Nathan Binkert 5e3b1f09c8 memory.ini:
make the default width narrower

--HG--
extra : convert_revision : eb25a979d065e9e3aaf030417a22c581209d8630
2004-03-24 04:39:22 -05:00
Nathan Binkert 2484aeaee7 Minor changes to Time
base/time.cc:
base/time.hh:
    Don't set the current time in the constructor.  Use a flag and
    make the default to not set the time.
    Change reset() to set().  Dunno.  Just seems right.

--HG--
extra : convert_revision : 5a3b09ed30376d4863b45b2bae551ba1c3aff8e1
2004-03-24 04:35:48 -05:00
Nathan Binkert 832a0917cf ULL()
--HG--
extra : convert_revision : 543313ec248457e6cb2f8315881f030545e8cf45
2004-03-24 02:59:43 -05:00
Erik Hallnor b18a36a6f2 Fix to compile m5.fast
--HG--
extra : convert_revision : b557975e2b03944abd5243ab9ea3e3ff6a915981
2004-03-22 13:59:51 -05:00
Erik Hallnor ea604923aa Update to store uncompressed data in the cache blocks at all times. This will allow us to simulate compression without paying the uncompress penalty on reads.
This also had the side-effect of getting copies and compression working together (collecting of code in helper function made this easier.)

--HG--
extra : convert_revision : f81d3d7254b5a0c1cc82a7389c95a0b71ff67fc0
2004-03-21 01:20:19 -05:00
Erik Hallnor 2d38766e09 Pass cache block pointer when we have it.
--HG--
extra : convert_revision : 453690e0d7b53ecb7a9a3eb75a6365d13fd27573
2004-03-15 21:24:50 -05:00
Erik Hallnor 7f3a9e0f95 Use the specific tag type where we can.
--HG--
extra : convert_revision : f6a8f9630a58486df026bea61fcfe46e223dc8e8
2004-03-11 00:54:54 -05:00
Erik Hallnor 2c60d7aa9e Performance improvement for unaligned copy
--HG--
extra : convert_revision : 36a67874c119c4ef5dbd6692292dae1a5dcfded0
2004-03-07 01:26:16 -05:00
Lisa Hsu 532374bf2b change the naming of MainBins. didn't check this in before because i had random debug statements i didn't want to push along with it.
kern/tru64/tru64_system.cc:
    change the naming of Bins, add some DPRINTFs

--HG--
extra : convert_revision : 65eeb61caa3132adc45972feff891e4a969c06c5
2004-03-05 19:18:58 -05:00
Lisa Hsu 6eebb270be fix ALPHA
cpu/exec_context.cc:
    put this code between #ifdef FULL_SYSTEM

--HG--
extra : convert_revision : b934c7085d2a4337149ab8180a7d50851fbbf170
2004-03-05 15:15:23 -05:00
Lisa Hsu 34576de15a changes that affect post checkpoint runs.
cpu/exec_context.cc:
    you can't delete an element of an array that you newed.  oops.
kern/tru64/tru64_events.cc:
    changes to reflect .ini changes, and also b/c es_intr and ipintr can happen at ANY point, even within a current calling path being tracked.
sim/system.cc:
    can't delete an element of a newed array.  must new them separately.

--HG--
extra : convert_revision : 21573327b7b7f20bf9a3fcfb5854526433e17e17
2004-03-05 08:16:33 -05:00
Lisa Hsu d9689c58d3 bin user and kernel stats
--HG--
extra : convert_revision : 66e6181ad3e8b6567da9f2b82d87e7af49f28eaf
2004-03-05 06:15:30 -05:00
Lisa Hsu 12662c0b6d nother fix
cpu/exec_context.cc:
    nother little bug...forgot to pop off stack as i read off it
sim/system.cc:
    forgot to pop off stack as i read off it

--HG--
extra : convert_revision : d1f691c0a9f0fa22281c717ee465d8a5f1e45c13
2004-03-05 06:14:33 -05:00
Lisa Hsu 8434ae9b03 Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/work/bk/bincleanup
--HG--
extra : convert_revision : e4303df381e5f397d15c37eb05377be1860f89be
2004-03-05 05:54:54 -05:00
Lisa Hsu 9c48327145 forgot to check this in
--HG--
extra : convert_revision : 3090da3ab1077736bae52519143b44b08dd5ddb9
2004-03-05 05:54:46 -05:00
Nathan Binkert 01f493a28a Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 51b3fd809a77e146b8370636b2cc60ddf1075195
2004-03-05 05:50:33 -05:00
Nathan Binkert a57bc93e82 Don't dump an ethertrace by default
Update the system dir for the addition of parallel and dirty netperf

--HG--
extra : convert_revision : e46efb32e0d6c21047507d444d41e7d55fbfb770
2004-03-05 05:50:19 -05:00
Nathan Binkert 66325a2a30 Make payload splitting accessible with a #define
--HG--
extra : convert_revision : 90b86b270a84cffaf3d13a2b83c04f33bb442e44
2004-03-05 05:49:49 -05:00
Nathan Binkert adc176d13f add a mechanism for delayed interrupts (aka. interrupt coalescing)
re-do fixed dma latency

--HG--
extra : convert_revision : b91e6b69682f66e424782e89500d3ad47b797e25
2004-03-05 05:48:56 -05:00
Nathan Binkert c74cb77fa4 Add support for a propagation delay on the link. The electrical
delay is more or less folded into the packet time, but an additional
delay is possible representing crossing a long haul link, or some
switches, etc.

--HG--
extra : convert_revision : 8fd689c2a7e3051e77f47a4cd5f51c6999d92c8f
2004-03-05 05:47:05 -05:00
Nathan Binkert ec6265b044 constructor option to make the wrapped event autodelete
--HG--
extra : convert_revision : 8663c874c533685adf21eea968b08b40b7d7b665
2004-03-05 05:45:45 -05:00
Nathan Binkert 34d36c45bf use %#x so we know that it is hex
--HG--
extra : convert_revision : 7da77cd9a16ba70eeb0382c3c79b1475554a2d4c
2004-03-05 05:44:46 -05:00
Nathan Binkert 4992680ea2 add ticks per picosecond
--HG--
extra : convert_revision : 1585e7f89340b941e699db6b81080af58500a7c2
2004-03-05 05:44:11 -05:00
Lisa Hsu 1a300ef60d small bugfix, forgot to increment iter
sim/system.cc:
    oops, forgot to increment iter.

--HG--
extra : convert_revision : 95fcd337d00157ccf072f0eb301b76f280480839
2004-03-05 05:38:04 -05:00
Lisa Hsu 4fa703f2ec serialization for binning. it is WAAAAAAAY past my bedtime.
cpu/exec_context.cc:
sim/system.cc:
sim/system.hh:
    serialization for binning

--HG--
extra : convert_revision : f8417794a3a5ec7f2addc9c2da0f48e851899112
2004-03-05 05:09:05 -05:00
Lisa Hsu 2ef27db62c Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/work/bk/bincleanup
--HG--
extra : convert_revision : 7b5dc465231a861f0b460e3cbf9ee2ad2b2f5246
2004-03-04 21:57:17 -05:00
Lisa Hsu f3861d0cc7 Overall gist of this is to 'dynamicize' the tracking of functions so you can choose them at the .ini stage rather than at compile time.
to do it:
in .ini file set binned_fns=foo null bar foo

what this says is, track foo when it is called by null (i.e. anything).  bin bar only when it is called by foo.
essentially, if you have a path of functions to track, the 0th, 2nd, 4th fn listed are the fns to track, and the 1st, 3rd, 5th are their respective callers.

base/statistics.hh:
    turn it back to FS_MEASURE since we already have a build in place
kern/tru64/tru64_events.cc:
    remove FS_MEASURE #defs.  add more DPRINTF's.  manage an anomaly that happens when tracking idle_thread.
kern/tru64/tru64_events.hh:
    remove FS_MEASURE #defs
kern/tru64/tru64_system.cc:
    make DumpState print all the time, but only with DPRINTF.  add a new parameter to tru64System a vector<string> binned_fns, to read in from .ini file.  now all this binning stuff is dynamically generated.
kern/tru64/tru64_system.hh:
    remove all static binning stuff, add support for dynamic
sim/system.cc:
    change nonPath bin name to Kernel, remove FS_MEASURE
sim/system.hh:
    change nonPath to Kernel

--HG--
extra : convert_revision : 9ee813c0a64273bab4125815b7bc8145c5897ec1
2004-03-04 21:57:09 -05:00
Erik Hallnor 1d09cd71a4 Reenable functioning copies.
arch/alpha/isa_desc:
    Reenable copies.

--HG--
extra : convert_revision : 99259c0ff65e742e617cba1c14f5d1bf4be2fee8
2004-03-04 20:03:38 -05:00
Erik Hallnor 8ad803058f Automerged
--HG--
extra : convert_revision : 7b56535ee32551f27db8d98172159f63e5099835
2004-03-04 15:06:34 -05:00
Erik Hallnor 7c089b2001 Copy implementations
arch/alpha/isa_desc:
    Need to return fault for copy operations.
cpu/exec_context.hh:
    Add temporary storage to pass source address from copy load to copy store
cpu/simple_cpu/simple_cpu.cc:
    Implement copy functions.
cpu/simple_cpu/simple_cpu.hh:
    Return fault

--HG--
extra : convert_revision : 98e5ce563449d6057ba45c70eece9235f1649a90
2004-03-04 14:57:57 -05:00
Andrew Schultz b91ea433b9 Script and ini file for new specweb images (the threaded ones)
--HG--
extra : convert_revision : 82f66462bb2607e427db40147d7f8cc705ed3853
2004-03-02 22:02:33 -05:00
Erik Hallnor 5537f02d49 Add some stats to track latencies of small and large DMA transactions.
--HG--
extra : convert_revision : 1792d396f00bd24e9577f7883461b389e96ef803
2004-03-02 18:45:08 -05:00
Ron Dreslinski 430a1700c6 Reduce redundant code, fix so that if the dma request is only as big as
the header, and fix so that it doesn't keep requesting the payload bus
if the sendRequest was unsuccesful.

--HG--
extra : convert_revision : 7fda85ccf38ea99a457ae0d6902704cb2ba053cd
2004-03-02 15:13:01 -05:00
Ron Dreslinski b05d7f99ac Make sure to arbitrate for the payload bus in the header splitting case,
and to free up the header bus by returning false.  If there is no
header splitting it will work normally.

--HG--
extra : convert_revision : 4f6dd07e33e510502806256b1b8089d85d600233
2004-03-02 12:59:24 -05:00