Commit graph

1588 commits

Author SHA1 Message Date
Steve Reinhardt
0aaf8ec6b8 Add support for CPU models to execute the effective
address calculation and memory access portions separately.
Not currently used by any CPU models, but Kevin says he needs this.

Also clean up handling of execution tracing for memory accesses
(move it all into isa_desc and out of CPU models).

Got rid of some ancient unused code too.

arch/alpha/isa_desc:
    Add execute() methods to EAComp and MemAcc portions of memory
    access instructions, to allow CPU models to execute the effective
    address calculation and memory access portions separately.

    Requires the execution context to remember the effective address
    across the two invocations.  Added setEA() and getEA() methods to
    execution context to support this.  A model that does not use the
    split execution model can panic if these methods are called.

    Also added hook to call traceData->setAddr() after EA computation
    on any load or store operation.
arch/isa_parser.py:
    Call traceData->setData() on memory writes (stores).
cpu/simple_cpu/simple_cpu.cc:
    Get rid of unused code.
cpu/simple_cpu/simple_cpu.hh:
    Add (non-functional) setEA() and getEA() methods for new
    split memory access execution support.

--HG--
extra : convert_revision : bc2d2c758c4ca753812b9fa81f21038e55929ff0
2005-02-03 20:47:11 -05:00
Nathan Binkert
52403a5ddf get rid of defined and just access the env dict directly
get rid of the alias for true to True and false to False to keep
consistent python syntax.

util/stats/info.py:
    Fix typo

--HG--
extra : convert_revision : e69588a8de52424e043315e70008ca3a3ede7d5b
2005-02-03 17:04:54 -05:00
Nathan Binkert
936ad58402 small python config related fixes.
dev/simconsole.cc:
sim/universe.cc:
    isValid isn't compatible with new python stuff, so whack it.

--HG--
extra : convert_revision : 0c50038769a558650479c51122a8be5d92e7d9c4
2005-02-03 14:33:02 -05:00
Steve Reinhardt
15e1ad8f6b Fix minor doxygen problem.
--HG--
extra : convert_revision : c15b1c5ab1c87b8d1cea87ffa383d1f4d45f107c
2005-02-03 13:10:35 -05:00
Nathan Binkert
a736a8fab6 Update config file language to take simobj and no longer use siminst
objects/AlphaConsole.mpy:
objects/AlphaTLB.mpy:
objects/BadDevice.mpy:
objects/BaseCPU.mpy:
objects/BaseCache.mpy:
objects/BaseSystem.mpy:
objects/Bus.mpy:
objects/CoherenceProtocol.mpy:
objects/Device.mpy:
objects/DiskImage.mpy:
objects/Ethernet.mpy:
objects/Ide.mpy:
objects/IntrControl.mpy:
objects/MemTest.mpy:
objects/Pci.mpy:
objects/PhysicalMemory.mpy:
objects/Platform.mpy:
objects/Process.mpy:
objects/Repl.mpy:
objects/Root.mpy:
objects/SimConsole.mpy:
objects/SimpleDisk.mpy:
objects/Tsunami.mpy:
objects/Uart.mpy:
    simobj now requires a type= line if it is actually intended
    to be a type
sim/pyconfig/SConscript:
    keep track of the filename of embedded files for better
    error messages.
sim/pyconfig/m5config.py:
    Add support for the trickery done with the compiler to get the
    simobj language feature added to the importer.

    fix the bug that gave objects the wrong name in error messages.
test/genini.py:
    Globals have been fixed and use execfile

--HG--
extra : convert_revision : b74495fd6f3479a87ecea7f1234ebb6731279b2b
2005-02-02 21:13:01 -05:00
Lisa Hsu
45bb2bf14d some changes for a split lifo in the new python config.
objects/BaseCache.mpy:
    add all the Split parameters to the BaseCache simobj.

--HG--
extra : convert_revision : 4fcba3ce730f730ca8628ac7f4aa0fb9476474ab
2005-02-01 17:35:01 -05:00
Lisa Hsu
38e6d1f782 checking in outstanding changes for partitioning that never made it to the head in my mad prelim rush.
--HG--
extra : convert_revision : 59ca9cca2f2090d234708a695228bf4a91fc5f52
2005-02-01 15:40:02 -05:00
Ali Saidi
da269014da removed all tsunami dependence on tlaserreg.h (RTC defines) and
all but tlaser_node.cc dependence on tlaserreg.h

dev/tsunami_io.cc:
dev/tsunamireg.h:
    removed tlaserreg.h

--HG--
extra : convert_revision : 148a5d79530e5ed721a49279f684a48041deed2b
2005-01-30 16:58:39 -05:00
Lisa Hsu
c3aaf43c88 make nat runs used vegas congestion avoidance implementation.
--HG--
extra : convert_revision : 29d2c4b70c56f13642466bd88c82f36ba849ed9d
2005-01-28 15:57:40 -05:00
Ali Saidi
2aae3636ee Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : ed089f6062639ae5be930fbaea3dd7f7622653cc
2005-01-27 16:01:32 -05:00
Ali Saidi
7ec713edc8 added support for outputing Dot if pydot is installed
--HG--
extra : convert_revision : bdb1032cddb2478e999399647f893d320260ef7e
2005-01-27 16:01:25 -05:00
Kevin Lim
12ce227f0b Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/m5-patched/m5-new

--HG--
extra : convert_revision : 2848966f3daf7aba741d4d38db9c87145d72ee26
2005-01-25 16:27:23 -05:00
Nathan Binkert
534ad6bc7e We need more cshrs so we don't segfault.
--HG--
extra : convert_revision : 54b1987d86e3f307e13de0396cf149653f4f6e6a
2005-01-25 11:15:54 -05:00
Nathan Binkert
e8d70bcd45 Fix the stats ParamContext
--HG--
extra : convert_revision : 23e49ca8bd9f50be32a4c28ba435a358d7093f83
2005-01-25 02:02:42 -05:00
Nathan Binkert
8b62d41f11 Fix pc_sample_interval default
--HG--
extra : convert_revision : 553b0489e8b8a83a4e8bbf9601eb82902436c761
2005-01-25 02:00:01 -05:00
Kevin Lim
e6b99b0768 Merge zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new

--HG--
extra : convert_revision : e802c800a478c297d3aa780a9ea3c6701453d91d
2005-01-21 18:31:30 -05:00
Nathan Binkert
fa7fa5a909 send output to the JOBDIR
--HG--
extra : convert_revision : d53864c55f20aa00754106390878ce04a4ff468e
2005-01-21 15:49:46 -05:00
Ron Dreslinski
bc0661a3da Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : 20c65e224a5fbd396a98baa2111a0e22a1534586
2005-01-21 15:24:12 -05:00
Nathan Binkert
2b78a9c132 fix bug in python code
--HG--
extra : convert_revision : 67a931326e5a8e6b814ea6d3bcd384126b0cbba4
2005-01-21 15:13:27 -05:00
Nathan Binkert
f3ff5fe28d Fixup checkpointing with the new config stuff.
objects/Root.mpy:
    add checkpointing as a parameter to the root object.

--HG--
extra : convert_revision : 3b809ebd776c8a9256a4ad6f8783cd96ab5cb1b3
2005-01-21 15:09:42 -05:00
Ron Dreslinski
a40bc2ba77 Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : dcbdcd39ef8920e05a69cd5bc7fa7c9164268125
2005-01-21 12:30:40 -05:00
Ron Dreslinski
77ae088345 Make it so that with dual CPU's we create more writebuffers by default, so that we can handle more uncached access (we will get some from multiple processors)
--HG--
extra : convert_revision : 4bb913340cda47925321da5f95aaa2ff95dbe9dd
2005-01-21 12:23:03 -05:00
Ron Dreslinski
f3aac53458 Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : 193cb1585489c51f274f978f0adde7c8fbec050f
2005-01-21 11:43:27 -05:00
Nathan Binkert
2b57a1b8c1 Fix some mysql code issues.
base/stats/events.cc:
    cast this to an unsigned long long to make the compiler happy
    on 64-bit platforms.

--HG--
extra : convert_revision : e893d21bb228cbfb0c23adb7c4eeb1f62209ca1c
2005-01-21 11:29:19 -05:00
Nathan Binkert
be12fb379f Add more options that we may want to tweak on a per-job basis.
Fix the nat config.

--HG--
extra : convert_revision : 22bd4f20408371b644b51fd8d6b79486e1e5a59b
2005-01-21 11:27:14 -05:00
Nathan Binkert
1c31e247e7 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 47fe06540907f6810cd1bccfc96a8705fd38c4ba
2005-01-21 11:19:26 -05:00
Ron Dreslinski
40a2fa3e12 Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : cf9baafa40dbca1a89581484fd4c9d8336a26d66
2005-01-21 04:57:12 -05:00
Ron Dreslinski
7f10e948a5 Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/new_config

--HG--
extra : convert_revision : 8c87cd948d501b1fc58d57f1f505d1f72725ecde
2005-01-21 04:55:55 -05:00
Ron Dreslinski
867d80d55d Fix annoying bug that lead to dropped packets in the P4 system
dev/pktfifo.cc:
    Make it so that we don't unserialize the size of the fifo, clobering the fact that we were trying to make it bigger, and leading to a misleading config.out that states the un-overwritten max_size.
    Perhaps this should instead be a panic if the size (amount that was serialized) is bigger than the maxsize that was assigned by the configuration file.

--HG--
extra : convert_revision : d4b0527bfd7a584554ddc87c9b2103f7a3a72332
2005-01-21 04:55:43 -05:00
Nathan Binkert
6cbce7631a Add a couple statistics contexts.
arch/alpha/pseudo_inst.cc:
    rename the context for consistency.
sim/pyconfig/m5config.py:
    Add a ParamContext class so that param contexts work with
    the new config stuff.

--HG--
extra : convert_revision : 3a6b583a25c86237baca7a2b4eccc9d12f86a384
2005-01-21 04:34:01 -05:00
Ron Dreslinski
9bb66e7766 Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : 1892825b1e7ba47353e7a79ca4dcb84b64a73f79
2005-01-20 17:21:42 -05:00
Ali Saidi
29789443ba Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : d5e6f6e696d7607f89894856d940afc89ae8e37b
2005-01-19 18:40:09 -05:00
Ali Saidi
886f905785 added total bytes/bandwidth/packets formulas to nics
cleaned up stability code and wrote some better help for stats.py
fixed sample bug in info.py

dev/ns_gige.cc:
dev/ns_gige.hh:
dev/sinic.cc:
dev/sinic.hh:
    add total bandwidth/packets/bytes stats
util/stats/info.py:
    fixed samples bug
util/stats/stats.py:
    cleaned up stability code and wrote a bit better help

--HG--
extra : convert_revision : cae06f4fac744d7a51ee0909f21f03509151ea8f
2005-01-19 18:40:02 -05:00
Lisa Hsu
db00ac3bc6 Add a new aggregate trace flag that doesn't print gobs of ethernet raw data, but prints everything else.
--HG--
extra : convert_revision : ddb0636f5d5f0c746bd121eaafc0c685b422b006
2005-01-19 18:18:15 -05:00
Kevin Lim
6ac7954242 Merge zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new

--HG--
extra : convert_revision : 3b9413a6861eaddb8de753d76e217106d41cc347
2005-01-19 16:34:35 -05:00
Ron Dreslinski
10371be698 Fix serialization of txPacket (need to properly calculate the length before serialization)
--HG--
extra : convert_revision : e93321495d19afb86949daf2c14102ffb6bcef41
2005-01-19 16:26:19 -05:00
Ron Dreslinski
51d52a3834 Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : 1064ec4c8624682b35f66163fb349fe04903411d
2005-01-19 13:22:38 -05:00
Nathan Binkert
b65f365474 fix unserialization of PacketFifo
dev/pktfifo.cc:
    fix unserialization.  calling resize on a list just sticks
    uninitialized garbage into the list.

--HG--
extra : convert_revision : 1cbff596dd0b88560e23b9368ec75a7369beb9d9
2005-01-19 12:43:06 -05:00
Nathan Binkert
40160ef074 Add the pc_sample_interval stuff
add a Sampler configuration for the P4

--HG--
extra : convert_revision : 45a8f67ff80b552925a5f1cb9b8c14e11c33b78c
2005-01-19 12:41:12 -05:00
Nathan Binkert
cd79f6b698 Make the config stuff work on 64-bit machines
objects/Pci.mpy:
    specify that the value is a long so that it is not
    interpreted as a negative value.

--HG--
extra : convert_revision : 3b0df8711da5934aff0096ba54fb79da808e987b
2005-01-18 23:01:17 -05:00
Ron Dreslinski
19bd52c935 Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : 76c2d853a7ce5cbea5e038e9b2b400b402fb4baa
2005-01-18 19:04:08 -05:00
Nathan Binkert
e8d5895f3f remove assert that doesn't apply with the new configuration system
--HG--
extra : convert_revision : 9cec969a4f6fa391c05e3c152e3c1396646038f3
2005-01-18 18:09:27 -05:00
Nathan Binkert
6c1bef0270 Yet again, another configuration fix
--HG--
extra : convert_revision : e6683da3a35c57e742f572b0c5d5a79bfbecbdd9
2005-01-18 18:06:22 -05:00
Ron Dreslinski
6d0d9a06d0 Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : e12a7722391db473f6545d0bb4c0faedd43344c9
2005-01-18 17:57:16 -05:00
Ali Saidi
3040d2a9fe Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision : 5cb8186e246698fb2606beb4af8fd10cedb1b2a9
2005-01-18 17:55:42 -05:00
Ali Saidi
cd56e4e08e Ability to check formulas
--HG--
extra : convert_revision : 68a2a19cceb4a8cf8a2798ee5c019d25c0fca3cc
2005-01-18 17:55:35 -05:00
Nathan Binkert
d68ea8a2f8 Add a missing variable to the simple CPU
--HG--
extra : convert_revision : 50997f58f44506a6c5349a559298e8fc58d79974
2005-01-18 17:54:17 -05:00
Ron Dreslinski
b79a8faee5 Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/timing_L1

--HG--
extra : convert_revision : 7d2ac93eb7bc5dae778cdb7cbdbf42e35da44369
2005-01-18 15:59:47 -05:00
Nathan Binkert
92533214b6 Fix the sampler for real this time
--HG--
extra : convert_revision : e930f9ec59c2e160be9a43e6e45608decd3f49c5
2005-01-18 15:51:53 -05:00
Kevin Lim
554dc7831f Merge zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new

--HG--
extra : convert_revision : c51d9a7361d8e3c23e9494640c66df8505322b00
2005-01-18 15:46:00 -05:00