Was having difficulty with merging the cache, reverted to an early version and will...
authorRon Dreslinski <rdreslin@umich.edu>
Wed, 28 Jun 2006 15:02:14 +0000 (11:02 -0400)
committerRon Dreslinski <rdreslin@umich.edu>
Wed, 28 Jun 2006 15:02:14 +0000 (11:02 -0400)
commited8564a6b9f0702a40995d95cc4da54de3d35462
tree156901f9e5a2e92ddfa44eea664103de5d210aa7
parentecab4b426c949dad797df0bde1c0c120b4b5fb00
Was having difficulty with merging the cache, reverted to an early version and will add back in the patches to make it work soon.

src/mem/cache/prefetch/tagged_prefetcher_impl.hh:
    Trying to merge
src/mem/cache/base_cache.cc:
src/mem/cache/base_cache.hh:
src/mem/cache/cache.cc:
src/mem/cache/cache.hh:
src/mem/cache/cache_blk.hh:
src/mem/cache/cache_builder.cc:
src/mem/cache/cache_impl.hh:
src/mem/cache/coherence/coherence_protocol.cc:
src/mem/cache/coherence/coherence_protocol.hh:
src/mem/cache/coherence/simple_coherence.hh:
src/mem/cache/coherence/uni_coherence.cc:
src/mem/cache/coherence/uni_coherence.hh:
src/mem/cache/miss/blocking_buffer.cc:
src/mem/cache/miss/blocking_buffer.hh:
src/mem/cache/miss/miss_queue.cc:
src/mem/cache/miss/miss_queue.hh:
src/mem/cache/miss/mshr.cc:
src/mem/cache/miss/mshr.hh:
src/mem/cache/miss/mshr_queue.cc:
src/mem/cache/miss/mshr_queue.hh:
src/mem/cache/prefetch/base_prefetcher.cc:
src/mem/cache/prefetch/base_prefetcher.hh:
src/mem/cache/prefetch/ghb_prefetcher.cc:
src/mem/cache/prefetch/ghb_prefetcher.hh:
src/mem/cache/prefetch/stride_prefetcher.cc:
src/mem/cache/prefetch/stride_prefetcher.hh:
src/mem/cache/prefetch/tagged_prefetcher.hh:
src/mem/cache/tags/base_tags.cc:
src/mem/cache/tags/base_tags.hh:
src/mem/cache/tags/fa_lru.cc:
src/mem/cache/tags/fa_lru.hh:
src/mem/cache/tags/iic.cc:
src/mem/cache/tags/iic.hh:
src/mem/cache/tags/lru.cc:
src/mem/cache/tags/lru.hh:
src/mem/cache/tags/repl/gen.cc:
src/mem/cache/tags/repl/gen.hh:
src/mem/cache/tags/repl/repl.cc:
src/mem/cache/tags/repl/repl.hh:
src/mem/cache/tags/split.cc:
src/mem/cache/tags/split.hh:
src/mem/cache/tags/split_blk.hh:
src/mem/cache/tags/split_lifo.cc:
src/mem/cache/tags/split_lifo.hh:
src/mem/cache/tags/split_lru.cc:
src/mem/cache/tags/split_lru.hh:
    Pulling an early version of the cache into the tree due to merging issues.  Will apply patches and push.

--HG--
extra : convert_revision : 3276e5fb9a6272681a1690babf2b586dd0e1f380
47 files changed:
src/mem/cache/base_cache.cc [new file with mode: 0644]
src/mem/cache/base_cache.hh [new file with mode: 0644]
src/mem/cache/cache.cc [new file with mode: 0644]
src/mem/cache/cache.hh [new file with mode: 0644]
src/mem/cache/cache_blk.hh [new file with mode: 0644]
src/mem/cache/cache_builder.cc [new file with mode: 0644]
src/mem/cache/cache_impl.hh [new file with mode: 0644]
src/mem/cache/coherence/coherence_protocol.cc [new file with mode: 0644]
src/mem/cache/coherence/coherence_protocol.hh [new file with mode: 0644]
src/mem/cache/coherence/simple_coherence.hh [new file with mode: 0644]
src/mem/cache/coherence/uni_coherence.cc [new file with mode: 0644]
src/mem/cache/coherence/uni_coherence.hh [new file with mode: 0644]
src/mem/cache/miss/blocking_buffer.cc [new file with mode: 0644]
src/mem/cache/miss/blocking_buffer.hh [new file with mode: 0644]
src/mem/cache/miss/miss_queue.cc [new file with mode: 0644]
src/mem/cache/miss/miss_queue.hh [new file with mode: 0644]
src/mem/cache/miss/mshr.cc [new file with mode: 0644]
src/mem/cache/miss/mshr.hh [new file with mode: 0644]
src/mem/cache/miss/mshr_queue.cc [new file with mode: 0644]
src/mem/cache/miss/mshr_queue.hh [new file with mode: 0644]
src/mem/cache/prefetch/base_prefetcher.cc [new file with mode: 0644]
src/mem/cache/prefetch/base_prefetcher.hh [new file with mode: 0644]
src/mem/cache/prefetch/ghb_prefetcher.cc [new file with mode: 0644]
src/mem/cache/prefetch/ghb_prefetcher.hh [new file with mode: 0644]
src/mem/cache/prefetch/stride_prefetcher.cc [new file with mode: 0644]
src/mem/cache/prefetch/stride_prefetcher.hh [new file with mode: 0644]
src/mem/cache/prefetch/tagged_prefetcher.hh [new file with mode: 0644]
src/mem/cache/prefetch/tagged_prefetcher_impl.hh
src/mem/cache/tags/base_tags.cc [new file with mode: 0644]
src/mem/cache/tags/base_tags.hh [new file with mode: 0644]
src/mem/cache/tags/fa_lru.cc [new file with mode: 0644]
src/mem/cache/tags/fa_lru.hh [new file with mode: 0644]
src/mem/cache/tags/iic.cc [new file with mode: 0644]
src/mem/cache/tags/iic.hh [new file with mode: 0644]
src/mem/cache/tags/lru.cc [new file with mode: 0644]
src/mem/cache/tags/lru.hh [new file with mode: 0644]
src/mem/cache/tags/repl/gen.cc [new file with mode: 0644]
src/mem/cache/tags/repl/gen.hh [new file with mode: 0644]
src/mem/cache/tags/repl/repl.cc [new file with mode: 0644]
src/mem/cache/tags/repl/repl.hh [new file with mode: 0644]
src/mem/cache/tags/split.cc [new file with mode: 0644]
src/mem/cache/tags/split.hh [new file with mode: 0644]
src/mem/cache/tags/split_blk.hh [new file with mode: 0644]
src/mem/cache/tags/split_lifo.cc [new file with mode: 0644]
src/mem/cache/tags/split_lifo.hh [new file with mode: 0644]
src/mem/cache/tags/split_lru.cc [new file with mode: 0644]
src/mem/cache/tags/split_lru.hh [new file with mode: 0644]