Gabe Black [Wed, 8 Nov 2006 13:12:19 +0000 (08:12 -0500)]
Major clean up of the fault code.
--HG--
extra : convert_revision :
eb7e016a127417cbb0e1e2c733b17f82469c2f24
Gabe Black [Sat, 28 Oct 2006 08:44:05 +0000 (04:44 -0400)]
This one really needs to be arch/faults.hh
--HG--
extra : convert_revision :
aad1ee04ade9f4394c9ef0386f23d6f2ca373412
Gabe Black [Sat, 28 Oct 2006 08:00:24 +0000 (04:00 -0400)]
Include the right version of faults.hh
--HG--
extra : convert_revision :
4762b8ab46ac755726cc658a378c2cf5b2061dc3
Gabe Black [Sat, 28 Oct 2006 07:48:23 +0000 (03:48 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem
--HG--
extra : convert_revision :
9883fb35fd9c36e1819153f9976f8bdc73dbe8f3
Gabe Black [Sat, 28 Oct 2006 07:44:55 +0000 (03:44 -0400)]
One last adjustment to get rid of skew in the simple atomic cpu.
--HG--
extra : convert_revision :
8e46929ed7da5dae6888f773de4e1ecc9b249fe0
Lisa Hsu [Fri, 27 Oct 2006 20:40:06 +0000 (16:40 -0400)]
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/newmem
configs/example/fs.py:
configs/example/se.py:
hand merge
--HG--
extra : convert_revision :
13d248add87ac373d2653bb42adf4ac065f75ce3
Lisa Hsu [Fri, 27 Oct 2006 20:32:26 +0000 (16:32 -0400)]
factor out common run code from se.py and fs.py.
configs/example/fs.py:
factor out common code.
configs/example/se.py:
factor out common code
--HG--
extra : convert_revision :
72a1f653c84eae1b7d281e0a5e60ee116ad6b27d
Ali Saidi [Fri, 27 Oct 2006 13:11:02 +0000 (09:11 -0400)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision :
b8b8a4428b2462d2df600e2ec7a9014a08246df8
Ali Saidi [Fri, 27 Oct 2006 13:10:50 +0000 (09:10 -0400)]
add packet_access.hh
--HG--
extra : convert_revision :
7fe4958549101fca9613baa4a317d96f4970d432
Gabe Black [Fri, 27 Oct 2006 11:09:14 +0000 (07:09 -0400)]
A more complete attempt to fix the clock skew.
--HG--
extra : convert_revision :
b2d505de51fc5fcae5177b2a13140729474e249e
Gabe Black [Fri, 27 Oct 2006 10:51:28 +0000 (06:51 -0400)]
Potential fix to clock skew problem.
--HG--
extra : convert_revision :
51572523190a886fd0ff64817edc88e260c5fa9d
Gabe Black [Fri, 27 Oct 2006 06:34:26 +0000 (02:34 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem
--HG--
extra : convert_revision :
ec35a9276ae21e0b9fe820bd700c020e4440a350
Gabe Black [Fri, 27 Oct 2006 06:21:09 +0000 (02:21 -0400)]
Update stats for fill/spill handlers
--HG--
extra : convert_revision :
2ed2e868ccbb3316f84ea691497d2e0dd4ec2416
Gabe Black [Fri, 27 Oct 2006 05:43:51 +0000 (01:43 -0400)]
Got rid of some outdated comments.
--HG--
extra : convert_revision :
30fa768c4a934cf5f9dc0ad84e0e421327ccbed3
Gabe Black [Fri, 27 Oct 2006 05:43:26 +0000 (01:43 -0400)]
Made the regfile compatible with the new definitions in MiscRegFile
--HG--
extra : convert_revision :
d63ea6fb1e549e737204ee6653c06f89ec5e43ef
Gabe Black [Fri, 27 Oct 2006 05:36:42 +0000 (01:36 -0400)]
Clean up MiscRegFile
--HG--
extra : convert_revision :
3bc792596c99df3a5c2c82da58b801a63ccf6ddb
Gabe Black [Fri, 27 Oct 2006 02:48:02 +0000 (22:48 -0400)]
Reorganized the MiscRegFile
--HG--
extra : convert_revision :
088112c9b8a4ea09c8015da5a0b65ed2fc9398d2
Gabe Black [Fri, 27 Oct 2006 02:47:17 +0000 (22:47 -0400)]
Cleaned up the decoder slightly.
--HG--
extra : convert_revision :
a7050aa8768c132f0161f00ba17ae02d71f0b829
Gabe Black [Fri, 27 Oct 2006 00:25:22 +0000 (20:25 -0400)]
Added a few functions to stuff values into bitfields in an instruction.
--HG--
extra : convert_revision :
507d7e13fd6276acf36b75eba31dff5e8080113f
Gabe Black [Fri, 27 Oct 2006 00:24:01 +0000 (20:24 -0400)]
Changed the number of register windows to be more realistic.
--HG--
extra : convert_revision :
ae557307f377b19bae82226dafa8b4b2654cae52
Gabe Black [Fri, 27 Oct 2006 00:23:00 +0000 (20:23 -0400)]
Got rid of some debug output
--HG--
extra : convert_revision :
6e98cf839dc92bde5f06f9b9bf11ca6ac661c907
Gabe Black [Fri, 27 Oct 2006 00:22:23 +0000 (20:22 -0400)]
Change the default function from setMiscRegWithEffect to setMiscReg
--HG--
extra : convert_revision :
bedf422d51a52b009390b1e94f5330f752be2b87
Lisa Hsu [Thu, 26 Oct 2006 20:04:27 +0000 (16:04 -0400)]
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/clean
--HG--
extra : convert_revision :
cb3f718bdcbd52540747a2696fb37bb4fcfe27a3
Lisa Hsu [Thu, 26 Oct 2006 20:04:09 +0000 (16:04 -0400)]
se.py:
make the same os.getcwd fix ali made in fs.py, make connectMemPorts occur after caches are created.
configs/example/se.py:
make the same os.getcwd fix ali made in fs.py, make connectMemPorts occur after caches are created.
--HG--
extra : convert_revision :
9760ae073d97cd62d3e44f10199d31cce79d4a1d
Ali Saidi [Thu, 26 Oct 2006 19:49:19 +0000 (15:49 -0400)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision :
473901bcd44bd2c563a3293d7326cd5aed8b630f
Ali Saidi [Wed, 25 Oct 2006 22:34:21 +0000 (18:34 -0400)]
Fix simple timing port keep a list of all packets, have only one event, and scan all packets on a functional access.
--HG--
extra : convert_revision :
c735a6408443b5cc90d1c1841c7aeb61e02ec6ae
Gabe Black [Wed, 25 Oct 2006 21:58:44 +0000 (17:58 -0400)]
Fixed the priv instruction format.
src/arch/sparc/isa/formats/priv.isa:
Fix the priv format so that it uses isa_parser operands rather than accessing the registers directly in checkCode. Also, the expressions needed to be negated.
src/arch/sparc/isa/operands.isa:
Added an Hpstate operand, and adjusted the numbering.
--HG--
extra : convert_revision :
4a70862df061aa9e1b9eab125c4c2fc839ac3b5a
Gabe Black [Wed, 25 Oct 2006 21:54:14 +0000 (17:54 -0400)]
Implemented the saved and restored instructions, fixed up register window instructions so that the cwp is modified at the correct time (when handling the fault), and fixed the "done" instruction.
--HG--
extra : convert_revision :
3c9144422f087af1d375782cce1c9b77ca7936c9
Gabe Black [Wed, 25 Oct 2006 21:50:39 +0000 (17:50 -0400)]
Fixed the bitfield FCN to include the right bits.
--HG--
extra : convert_revision :
040beb4dd982784773c3c3ad04cc48c2dc98b58c
Gabe Black [Wed, 25 Oct 2006 21:49:41 +0000 (17:49 -0400)]
Implemented the SPARC fill and spill handlers.
src/arch/sparc/faults.cc:
src/arch/sparc/faults.hh:
Added a function to do normal SPARC trap processing, and implemented the spill and fill faults for SE
src/arch/sparc/process.cc:
src/arch/sparc/process.hh:
Added fill and spill handlers which are stuffed into the processes address space. The location of these handlers are stored in fillStart and spillStart.
--HG--
extra : convert_revision :
59adb96570cce86f373fbc2c3e4c05abe1742d3b
Ron Dreslinski [Wed, 25 Oct 2006 18:14:37 +0000 (14:14 -0400)]
Fix fixPacket functionality to calculate sizes properly
src/mem/packet.cc:
Copy size is calculated by END-BEGIN not BEGIN-END
--HG--
extra : convert_revision :
0e2725c5551f8f70ff05cb285e0822afc0bb3f87
Gabe Black [Tue, 24 Oct 2006 19:50:41 +0000 (15:50 -0400)]
Replace the Alpha No op with a SPARC one.
--HG--
extra : convert_revision :
bed03e63dc80bf24f21bad08e6553d7aab92c7b3
Ali Saidi [Tue, 24 Oct 2006 17:10:31 +0000 (13:10 -0400)]
Fix fs.py. Lisa did you test this? Is there some wierd python version thing?
--HG--
extra : convert_revision :
6df5f90d5b66e7af27d4f524744b9dc3c703a588
Ali Saidi [Tue, 24 Oct 2006 16:59:19 +0000 (12:59 -0400)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision :
4db140e6e8408b3ed39da327515b8e88a2701e6b
Ali Saidi [Tue, 24 Oct 2006 16:59:07 +0000 (12:59 -0400)]
Add more traceflags for ethernet
--HG--
extra : convert_revision :
a5025f501d72626d1bcb4dcc24ee353ceb160ce7
Steve Reinhardt [Tue, 24 Oct 2006 15:50:20 +0000 (11:50 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
--HG--
extra : convert_revision :
a077304e608753f50f4a12216901d156469eebe4
Lisa Hsu [Mon, 23 Oct 2006 23:32:57 +0000 (19:32 -0400)]
warmup of 1B cpu cycles.
configs/example/fs.py:
configs/example/se.py:
warm up of 1B CPU cycles
--HG--
extra : convert_revision :
0f3263f466fde4cd86e0663930e83617a6b3faad
Lisa Hsu [Mon, 23 Oct 2006 22:46:05 +0000 (18:46 -0400)]
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/m5/newmem
--HG--
extra : convert_revision :
bb58679e101570d50c040519fb08ffbabfee7416
Lisa Hsu [Mon, 23 Oct 2006 22:45:30 +0000 (18:45 -0400)]
get rid of the "resume" step at the end of changeToTiming/Atomic because this will cause an assertion when you do the CPU switch. instead, push the responsibility of the resume upwards towards the user - documented in se.py and fs.py so it should be ok.
--HG--
extra : convert_revision :
7530cf140844e18cc26df80057f8760f29ec952b
Lisa Hsu [Mon, 23 Oct 2006 22:43:56 +0000 (18:43 -0400)]
make this parallel to the other cpu types so that resume works correctly.
--HG--
extra : convert_revision :
3c165af27ea0e6c7f2a17819c1717d8900f54cc1
Lisa Hsu [Mon, 23 Oct 2006 22:42:46 +0000 (18:42 -0400)]
make a lot of the same changes as to fs.py for checkpointing.
1) rearrange the options to be in a nice logical order
2) add an option for what i call "standard switch", which is from simple->timing->detailed
3) make checkpointing code such that checkpoints taken from the command line override checkpoint instructions compiled into binaries.
4) add an option for maximum number of checkpoints - simulation will stop at max or maxtick, whichever is first
--HG--
extra : convert_revision :
8d905e1b297ae664d60f8c8ba48b2aac25437fc6
Lisa Hsu [Mon, 23 Oct 2006 22:07:51 +0000 (18:07 -0400)]
changes regarding fs.py
1) rearrange the options to be in a nice logical order
2) add an option for what i call "standard switch", which is from simple->timing->detailed
3) change the client/server naming system to testsys/drivesys
4) make checkpointing code such that checkpoints taken from the command line override checkpoint instructions compiled into binaries.
5) add an option for maximum number of checkpoints - simulation will stop at max or maxtick, whichever is first
doesn't fully work because of a caching issue, but the python side of things i think should work - the counterpart of se.py does work.
i think i should factor out a lot of the common code in both, but i'll do that after this checkin, just to get this in the tree.
configs/example/fs.py:
1) rearrange the options to be in a nice logical order
2) add an option for what i call "standard switch", which is from simple->timing->detailed
3) change the client/server naming system to testsys/drivesys
4) make checkpointing code such that checkpoints taken from the command line override checkpoint instructions compiled into binaries.
5) add an option for maximum number of checkpoints - simulation will stop at max or maxtick, whichever is first
--HG--
extra : convert_revision :
078e22800ff83f6e950bf5cc6fb16a98320e7c51
Gabe Black [Mon, 23 Oct 2006 15:17:59 +0000 (11:17 -0400)]
Minor compile fix. Not sure why this is broken.
--HG--
extra : convert_revision :
6f181b15f37114ca0a3965cabcb2036bd2f97916
Gabe Black [Mon, 23 Oct 2006 15:17:15 +0000 (11:17 -0400)]
Move around more SPARC memory code, and make block memory operations work with the timing cpu
--HG--
extra : convert_revision :
37358504c4d05d78d08c19ba3d0c99d38c4babf5
Gabe Black [Mon, 23 Oct 2006 13:44:58 +0000 (09:44 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem
--HG--
extra : convert_revision :
cb15101d24ef2969e1819d6bdeeb2dd1f23f02d1
Gabe Black [Mon, 23 Oct 2006 11:57:16 +0000 (07:57 -0400)]
Add reference outputs for SPARC on the atomic timing cpu model
--HG--
extra : convert_revision :
b64ff7c05504da6112631baaae8f0d927469e16f
Gabe Black [Mon, 23 Oct 2006 11:55:52 +0000 (07:55 -0400)]
Broke Load/Store instructions into microcode, and partially refactored memory operations in the SPARC ISA description.
--HG--
rename : src/arch/sparc/isa/formats.isa => src/arch/sparc/isa/formats/formats.isa
rename : src/arch/sparc/isa/formats/mem.isa => src/arch/sparc/isa/formats/mem/basicmem.isa
rename : src/arch/sparc/isa/formats/blockmem.isa => src/arch/sparc/isa/formats/mem/blockmem.isa
rename : src/arch/sparc/isa/formats/mem.isa => src/arch/sparc/isa/formats/mem/mem.isa
extra : convert_revision :
dbbb00f997a102871b084b209b9fa08c5e1853ee
Gabe Black [Mon, 23 Oct 2006 06:39:02 +0000 (02:39 -0400)]
Don't let interupts interupt microcode at undesired points.
--HG--
extra : convert_revision :
a8ddc6b213b1a1b0d9c5cd194b88ac0c6bfb2a21
Gabe Black [Mon, 23 Oct 2006 06:37:54 +0000 (02:37 -0400)]
Files in base shouldn't depend on things in sim. Changed "sim/host.hh" to <inttypes.hh>
--HG--
extra : convert_revision :
c1e46c012a26cdb0603416f8e8a99e0ecb1c09bc
Gabe Black [Mon, 23 Oct 2006 06:36:46 +0000 (02:36 -0400)]
Start making memory ops work with InitiateAcc and CompleteAcc, and some minor cleanups
--HG--
extra : convert_revision :
178a8c5d0506c75ad7a7e8d691c8863235ed7e95
Gabe Black [Mon, 23 Oct 2006 06:32:58 +0000 (02:32 -0400)]
Change the default constructors to take ExtMachInsts rather than regular MachInsts
--HG--
extra : convert_revision :
8fa34f82e0cbf5ce81775d572b182826c578581f
Steve Reinhardt [Mon, 23 Oct 2006 04:07:38 +0000 (21:07 -0700)]
Clean up cache DPRINTFs
--HG--
extra : convert_revision :
f836e77efd40e25259d7794dd148696586b79a09
Steve Reinhardt [Mon, 23 Oct 2006 03:38:34 +0000 (20:38 -0700)]
s/pktuest/request/ (all in comments)
--HG--
extra : convert_revision :
7ce779242a15245a20322c0b6c40d02c8ddd15ad
Steve Reinhardt [Sun, 22 Oct 2006 23:22:45 +0000 (16:22 -0700)]
Add DPRINTF for non-timed quiesce.
--HG--
extra : convert_revision :
5487f4fc07dbea6e5a651c104ea1d2fe864fb057
Steve Reinhardt [Sun, 22 Oct 2006 16:52:58 +0000 (12:52 -0400)]
Add mutex test to Benchmarks.py.
--HG--
extra : convert_revision :
9b4f1ce9a181ac5a01e5b6a68067079969dfe9ce
Steve Reinhardt [Sun, 22 Oct 2006 16:51:49 +0000 (12:51 -0400)]
Another missing case in a switch (like Nate's earlier fix).
--HG--
extra : convert_revision :
b2f195c29861a09e9dd99aefcf4a173be2f8c97c
Steve Reinhardt [Sun, 22 Oct 2006 16:51:00 +0000 (12:51 -0400)]
Have tracediff print warning if no traceflags are set.
Elaborate on description a bit.
--HG--
extra : convert_revision :
2649961b53d6fb2774ddfb60219415ae4251db2d
Steve Reinhardt [Sun, 22 Oct 2006 06:35:00 +0000 (23:35 -0700)]
Small bug fixes for timing LL/SC. Better now but
not necessarily 100% there yet.
src/mem/cache/cache_impl.hh:
Generate response packet on failed store conditional.
src/mem/packet.hh:
Clear packet flags when reinitializing.
(SATISFIED in particular is one we don't want to leave set.)
--HG--
extra : convert_revision :
29207c8a09afcbce43f41c480ad0c1b21d47454f
Steve Reinhardt [Sun, 22 Oct 2006 06:32:14 +0000 (23:32 -0700)]
Add Quiesce trace flag to track CPU quiesce/wakeup events.
--HG--
extra : convert_revision :
23be99d0fe6e2184523efe5d9e0a1ac7bf19d087
Steve Reinhardt [Sun, 22 Oct 2006 00:19:33 +0000 (17:19 -0700)]
Just give up if a store conditional misses completely
in the cache (don't treat as normal write miss).
--HG--
extra : convert_revision :
c030eb6ba25318cae422e4da31e3b802049c8c74
Steve Reinhardt [Sat, 21 Oct 2006 20:54:48 +0000 (13:54 -0700)]
Fix formatting that got screwed up when tabs were removed.
--HG--
extra : convert_revision :
98596542a5774fe010e25632836ce92b66779f53
Steve Reinhardt [Sat, 21 Oct 2006 20:43:14 +0000 (13:43 -0700)]
Refactor coherence state table initialization.
--HG--
extra : convert_revision :
eb36dd2cc1463e5076f4758a59cf68cc6b2bafc5
Steve Reinhardt [Sat, 21 Oct 2006 18:41:53 +0000 (11:41 -0700)]
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-llsc
--HG--
extra : convert_revision :
157d07cc56e8ea68741d1b8536a9856488cb4a69
Steve Reinhardt [Sat, 21 Oct 2006 18:38:23 +0000 (11:38 -0700)]
Get rid of unused handleTargets() function.
--HG--
extra : convert_revision :
90032c3831d10e98c6453cd6144f9c00b9f97219
Steve Reinhardt [Sat, 21 Oct 2006 09:28:05 +0000 (05:28 -0400)]
Tweak a few things for better page fault debugging.
src/sim/faults.cc:
Fix fault message.
src/kern/tru64/tru64.hh:
Add DPRINTF to see where new thread stacks are allocated.
src/arch/alpha/faults.cc:
Add print statement so we know what the faulting address is in SE mode.
--HG--
extra : convert_revision :
6eb2b513c339496a0d013b7e914953a0a066c12d
Steve Reinhardt [Sat, 21 Oct 2006 09:24:27 +0000 (02:24 -0700)]
Updated to work with new command line argument ordering.
Note that command line syntax has totally changed as a result.
See comments for more details.
--HG--
extra : convert_revision :
bdb6e27abd2da83c7468dfe2a95e8bf54757ac6c
Nathan Binkert [Sat, 21 Oct 2006 07:32:09 +0000 (00:32 -0700)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into iceaxe.:/Volumes/work/research/m5/incoming
--HG--
extra : convert_revision :
c9153e5dca1d1f46a34770c645761d7b0419e8ce
Nathan Binkert [Sat, 21 Oct 2006 07:31:46 +0000 (00:31 -0700)]
Missing case
--HG--
extra : convert_revision :
128896dd1a654fe9a02e2c07ef6ce6799b62f21f
Ron Dreslinski [Sat, 21 Oct 2006 01:13:10 +0000 (21:13 -0400)]
Add some default options, point it to the /dist version of the splash benchmarks
--HG--
extra : convert_revision :
cd3b4f395b360d646b8b60464768eaad0fd110a4
Ron Dreslinski [Sat, 21 Oct 2006 00:04:45 +0000 (20:04 -0400)]
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
--HG--
extra : convert_revision :
4678ce5fb0dc29a28d9cd21e687f9cee967d21fa
Ron Dreslinski [Fri, 20 Oct 2006 23:53:52 +0000 (19:53 -0400)]
Clean up splash2 so it works in v2.0
configs/splash2/run.py:
Update the splash2 file
--HG--
extra : convert_revision :
b57ef1ab4b8fd1eaf281358db623b7581b96546b
Gabe Black [Fri, 20 Oct 2006 20:39:47 +0000 (16:39 -0400)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem
--HG--
extra : convert_revision :
2711fec2bf72801999b060e65f0bf744c18734fb
Nathan Binkert [Fri, 20 Oct 2006 18:37:59 +0000 (11:37 -0700)]
Construct a correct value of PYTHONHOME from the interpreter
running SCons, make it into a sticky option that can be
overridden at build time, and set it up before the interpreter
is started. Also, fix the code that turns sticky options into
config/*.hh so that it works with types other than bool.
--HG--
extra : convert_revision :
602398b35d4da4e813f78865678ed348fdea7270
Ron Dreslinski [Fri, 20 Oct 2006 17:36:26 +0000 (13:36 -0400)]
Give physical memory some latency to stress the system
--HG--
extra : convert_revision :
3ca32ff9140770d0774cac5e82807a0574db09dd
Ron Dreslinski [Fri, 20 Oct 2006 17:32:24 +0000 (13:32 -0400)]
Add a config file in the example with the memtester and some parser options.
--HG--
extra : convert_revision :
e70ccc3de4f7a3ae20ff9ec672853ee1555ed41b
Ron Dreslinski [Fri, 20 Oct 2006 17:05:39 +0000 (13:05 -0400)]
Get rid of a variable put back by merge.
--HG--
extra : convert_revision :
5ddb6ae5d5412f062c07c16a27b79483430b5f22
Ron Dreslinski [Fri, 20 Oct 2006 17:04:59 +0000 (13:04 -0400)]
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
src/mem/tport.cc:
Merge PacketPtr changes
--HG--
extra : convert_revision :
0329c5803a3df67af3dda89bd9d4753fd1a286d1
Ron Dreslinski [Fri, 20 Oct 2006 17:01:21 +0000 (13:01 -0400)]
Use fixPacket function everywhere.
Fix fixPacket assert function.
Stop timing port from forwarding the request if a response was found in its queue on a read.
src/cpu/memtest/memtest.cc:
src/cpu/memtest/memtest.hh:
src/python/m5/objects/MemTest.py:
Add parameter to configure what percentage of mem accesses are functional
src/mem/cache/base_cache.cc:
src/mem/cache/cache_impl.hh:
Use fix Packet function
src/mem/packet.cc:
Fix an assert that was checking the wrong thing
src/mem/tport.cc:
Properly detect if we need to do the access to the functional device
--HG--
extra : convert_revision :
447cc1a9a65ddd2a41e937fb09dc0e7c74e9c75e
Ali Saidi [Fri, 20 Oct 2006 17:00:15 +0000 (13:00 -0400)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision :
c0f9bde20585b3811ff906728b003072b69696b5
Ali Saidi [Fri, 20 Oct 2006 17:00:05 +0000 (13:00 -0400)]
still working on getting past initialization
--HG--
extra : convert_revision :
7a5fccb9a19d363e479ef24012a7b8598272eaa9
Nathan Binkert [Fri, 20 Oct 2006 07:10:12 +0000 (00:10 -0700)]
Use PacketPtr everywhere
--HG--
extra : convert_revision :
d9eb83ab77ffd2d725961f295b1733137e187711
Nathan Binkert [Fri, 20 Oct 2006 06:38:45 +0000 (23:38 -0700)]
refactor code for the packet, get rid of packet_impl.hh
and call it packet_access.hh and fix the #includes so
things compile right.
--HG--
extra : convert_revision :
d3626c9715b9f7e51bb3ab8d97e971fad4e0b724
Nathan Binkert [Fri, 20 Oct 2006 06:35:59 +0000 (23:35 -0700)]
initialize end, clean up loop
--HG--
extra : convert_revision :
e1c107f0c0fd5d535acd2d6c43571a5df57c9ed3
Nathan Binkert [Fri, 20 Oct 2006 06:34:59 +0000 (23:34 -0700)]
Fix compile of m5.fast
--HG--
extra : convert_revision :
a8a37c318e55e48e697e4aaba339328f000b3f60
Steve Reinhardt [Fri, 20 Oct 2006 05:59:38 +0000 (22:59 -0700)]
Delete unused file src/mem/cache.hh
--HG--
extra : convert_revision :
11bd043bb72eef0239fa60155e1f5a5e02de7cbc
Steve Reinhardt [Fri, 20 Oct 2006 04:42:30 +0000 (21:42 -0700)]
m5term: assume localhost if host name not provided.
util/term/term.c:
Reindent.
util/term/term.c:
Assume localhost if only port number is given on command line.
--HG--
extra : convert_revision :
768e61a56339a0795ca258cca788e9a2c20cbaae
Ron Dreslinski [Fri, 20 Oct 2006 01:26:46 +0000 (21:26 -0400)]
Fix corner case on assertion.
I need to move over to using the fixPacket function so I don't have to make the same changes everywhere.
Still a functional access bug someplace I need to track down in timing mode.
src/mem/cache/base_cache.cc:
src/mem/cache/cache_impl.hh:
Fix corner case on assertion
tests/configs/memtest.py:
Updated memtester with uncacheable addresses and functional accesses
--HG--
extra : convert_revision :
e6fa851621700ff9227b83cc5cac20af4fc8444f
Ron Dreslinski [Fri, 20 Oct 2006 01:07:53 +0000 (21:07 -0400)]
Fix memtester to use functional access, fix cache to work functionally now that we could test it.
src/cpu/memtest/memtest.cc:
Fix memtest to do functional accesses
src/mem/cache/cache_impl.hh:
Fix cache to handle functional accesses properly based on memtester changes
Still need to fix functional accesses in timing mode now that the memtester can test it.
--HG--
extra : convert_revision :
a6dbca4dc23763ca13560fbf5d41a23ddf021113
Ron Dreslinski [Fri, 20 Oct 2006 00:18:17 +0000 (20:18 -0400)]
Small changes:
?? doesn't compile in warn statements
Should have been false, where I had a true.
src/cpu/o3/lsq_impl.hh:
Apparently you can't have ?? in a warn statement (Something about trigraphs)
src/mem/cache/cache_impl.hh:
Forgot to signal atomic mode in snoopProbe
--HG--
extra : convert_revision :
c75cb76e193e852284564993440c8ea39e6de426
Ron Dreslinski [Fri, 20 Oct 2006 00:02:57 +0000 (20:02 -0400)]
Fixes to get single level uni-coherence to work.
Now to try L2 caches in FS.
src/mem/cache/base_cache.hh:
Fix uni-coherence for atomic accesses in coherence protocol access to port
src/mem/cache/cache_impl.hh:
Properly handle uni-coherence
src/mem/cache/coherence/simple_coherence.hh:
Properly forward invalidates (not done for MSI+ protocols (assumed top level for now)
src/mem/cache/coherence/uni_coherence.cc:
src/mem/cache/coherence/uni_coherence.hh:
Properly forward invalidates in atomic/timing uni-coherence
--HG--
extra : convert_revision :
f0f11315e8e7f32c19d92287f6f9c27b079c96f7
Ron Dreslinski [Thu, 19 Oct 2006 23:00:43 +0000 (19:00 -0400)]
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
--HG--
extra : convert_revision :
c6611b32537918f5bf183788227ddf69a9a9a069
Ron Dreslinski [Thu, 19 Oct 2006 23:00:27 +0000 (19:00 -0400)]
Always get the functional access from the highest level of cache first.
src/mem/cache/cache_impl.hh:
Get the read data from the highest level of cache on a functional access
--HG--
extra : convert_revision :
7437ac46fb40f3ea3b42197a1aa8aec62af60181
Ron Dreslinski [Thu, 19 Oct 2006 22:29:42 +0000 (18:29 -0400)]
Also mark the packet as successful.
--HG--
extra : convert_revision :
2c38c209d2f5cb0ee2f8e55fce6ee4400529d547
Gabe Black [Thu, 19 Oct 2006 18:57:06 +0000 (14:57 -0400)]
Cleaned up the function a bit to help route out bugs.
--HG--
extra : convert_revision :
db9a526bddc8634cea63b42b882f580806066db5
Ron Dreslinski [Thu, 19 Oct 2006 18:55:54 +0000 (14:55 -0400)]
Properly update the state in the cache block on functional access.
Mark as satisfied for functional snoops.
--HG--
extra : convert_revision :
f75309c3436044a64caff097e2a585363cd004c3
Steve Reinhardt [Thu, 19 Oct 2006 17:33:08 +0000 (13:33 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
--HG--
extra : convert_revision :
8a70922250092c013fa4db6d83254b438ee6c4be
Steve Reinhardt [Thu, 19 Oct 2006 17:32:08 +0000 (10:32 -0700)]
Add "All" compund flag to enable all defined trace flags.
--HG--
extra : convert_revision :
dcc699d8341f762dee659290cd35206e326e1179
Steve Reinhardt [Thu, 19 Oct 2006 17:21:23 +0000 (10:21 -0700)]
Add new event priority for trace enable events so
that tracing gets turned on as the very first thing
in the selected cycle (tick).
--HG--
extra : convert_revision :
c08f749ca42782af1b48e5aa5f0860bf7076bd3c
Steve Reinhardt [Thu, 19 Oct 2006 07:33:33 +0000 (00:33 -0700)]
First cut at LL/SC support in caches (atomic mode only).
configs/example/fs.py:
Add MOESI protocol to caches (uni coherence not quite working w/FS yet).
--HG--
extra : convert_revision :
7bef7d9c5b24bf7241cc810df692408837b06b86
Gabe Black [Thu, 19 Oct 2006 00:53:59 +0000 (20:53 -0400)]
Zeroed out the actual LSB in addition to moving it's original value the MSB.
--HG--
extra : convert_revision :
d29efe01781d72ee6e61818e7b93972262c0616b