derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mem-cache: Rename Prefetcher namespace as prefetch

Browse Source 
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.

::Prefetcher became ::prefetcher.

"prefetch" was chosen over "prefetcher" to avoid generating
conflicts with the already existing variables. "prefetcher"
is a name that is expected to be more common in user's code
than "prefetch".

Change-Id: I8f07217f278a0229e05545b7847f2620ed208c66
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45410
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
This commit is contained in:
Daniel R. Carvalho
2021-05-08 07:32:23 -03:00
committed by Daniel Carvalho
parent b34d73af27
commit df72e9d548
34 changed files with 152 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mem/cache/base.hh vendored
View File

@@ -76,7 +76,9 @@
#include "sim/sim_exit.hh"
#include "sim/system.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class Base;
}
class MSHR;
@@ -348,7 +350,7 @@ class BaseCache : public ClockedObject
compression::Base* compressor;
/** Prefetcher */
Prefetcher::Base *prefetcher;
prefetch::Base *prefetcher;
/** To probe when a cache hit occurs */
ProbePointArg<PacketPtr> *ppHit;

38
src/mem/cache/prefetch/Prefetcher.py vendored
View File

@@ -59,7 +59,7 @@ class HWPProbeEvent(object):
class BasePrefetcher(ClockedObject):
type = 'BasePrefetcher'
abstract = True
cxx_class = 'Prefetcher::Base'
cxx_class = 'prefetch::Base'
cxx_header = "mem/cache/prefetch/base.hh"
cxx_exports = [
PyBindMethod("addEventProbe"),
@@ -111,7 +111,7 @@ class BasePrefetcher(ClockedObject):
class MultiPrefetcher(BasePrefetcher):
type = 'MultiPrefetcher'
cxx_class = 'Prefetcher::Multi'
cxx_class = 'prefetch::Multi'
cxx_header = 'mem/cache/prefetch/multi.hh'
prefetchers = VectorParam.BasePrefetcher([], "Array of prefetchers")
@@ -119,7 +119,7 @@ class MultiPrefetcher(BasePrefetcher):
class QueuedPrefetcher(BasePrefetcher):
type = "QueuedPrefetcher"
abstract = True
cxx_class = "Prefetcher::Queued"
cxx_class = "prefetch::Queued"
cxx_header = "mem/cache/prefetch/queued.hh"
latency = Param.Int(1, "Latency for generated prefetches")
queue_size = Param.Int(32, "Maximum number of queued prefetches")
@@ -145,12 +145,12 @@ class QueuedPrefetcher(BasePrefetcher):
class StridePrefetcherHashedSetAssociative(SetAssociative):
type = 'StridePrefetcherHashedSetAssociative'
cxx_class = 'Prefetcher::StridePrefetcherHashedSetAssociative'
cxx_class = 'prefetch::StridePrefetcherHashedSetAssociative'
cxx_header = "mem/cache/prefetch/stride.hh"
class StridePrefetcher(QueuedPrefetcher):
type = 'StridePrefetcher'
cxx_class = 'Prefetcher::Stride'
cxx_class = 'prefetch::Stride'
cxx_header = "mem/cache/prefetch/stride.hh"
# Do not consult stride prefetcher on instruction accesses
@@ -178,14 +178,14 @@ class StridePrefetcher(QueuedPrefetcher):
class TaggedPrefetcher(QueuedPrefetcher):
type = 'TaggedPrefetcher'
cxx_class = 'Prefetcher::Tagged'
cxx_class = 'prefetch::Tagged'
cxx_header = "mem/cache/prefetch/tagged.hh"
degree = Param.Int(2, "Number of prefetches to generate")
class IndirectMemoryPrefetcher(QueuedPrefetcher):
type = 'IndirectMemoryPrefetcher'
cxx_class = 'Prefetcher::IndirectMemory'
cxx_class = 'prefetch::IndirectMemory'
cxx_header = "mem/cache/prefetch/indirect_memory.hh"
pt_table_entries = Param.MemorySize("16",
"Number of entries of the Prefetch Table")
@@ -220,7 +220,7 @@ class IndirectMemoryPrefetcher(QueuedPrefetcher):
class SignaturePathPrefetcher(QueuedPrefetcher):
type = 'SignaturePathPrefetcher'
cxx_class = 'Prefetcher::SignaturePath'
cxx_class = 'prefetch::SignaturePath'
cxx_header = "mem/cache/prefetch/signature_path.hh"
signature_shift = Param.UInt8(3,
@@ -260,7 +260,7 @@ class SignaturePathPrefetcher(QueuedPrefetcher):
class SignaturePathPrefetcherV2(SignaturePathPrefetcher):
type = 'SignaturePathPrefetcherV2'
cxx_class = 'Prefetcher::SignaturePathV2'
cxx_class = 'prefetch::SignaturePathV2'
cxx_header = "mem/cache/prefetch/signature_path_v2.hh"
signature_table_entries = "256"
@@ -283,7 +283,7 @@ class SignaturePathPrefetcherV2(SignaturePathPrefetcher):
class AccessMapPatternMatching(ClockedObject):
type = 'AccessMapPatternMatching'
cxx_class = 'Prefetcher::AccessMapPatternMatching'
cxx_class = 'prefetch::AccessMapPatternMatching'
cxx_header = "mem/cache/prefetch/access_map_pattern_matching.hh"
block_size = Param.Unsigned(Parent.block_size,
@@ -322,14 +322,14 @@ class AccessMapPatternMatching(ClockedObject):
class AMPMPrefetcher(QueuedPrefetcher):
type = 'AMPMPrefetcher'
cxx_class = 'Prefetcher::AMPM'
cxx_class = 'prefetch::AMPM'
cxx_header = "mem/cache/prefetch/access_map_pattern_matching.hh"
ampm = Param.AccessMapPatternMatching( AccessMapPatternMatching(),
"Access Map Pattern Matching object")
class DeltaCorrelatingPredictionTables(SimObject):
type = 'DeltaCorrelatingPredictionTables'
cxx_class = 'Prefetcher::DeltaCorrelatingPredictionTables'
cxx_class = 'prefetch::DeltaCorrelatingPredictionTables'
cxx_header = "mem/cache/prefetch/delta_correlating_prediction_tables.hh"
deltas_per_entry = Param.Unsigned(20,
"Number of deltas stored in each table entry")
@@ -349,7 +349,7 @@ class DeltaCorrelatingPredictionTables(SimObject):
class DCPTPrefetcher(QueuedPrefetcher):
type = 'DCPTPrefetcher'
cxx_class = 'Prefetcher::DCPT'
cxx_class = 'prefetch::DCPT'
cxx_header = "mem/cache/prefetch/delta_correlating_prediction_tables.hh"
dcpt = Param.DeltaCorrelatingPredictionTables(
DeltaCorrelatingPredictionTables(),
@@ -357,7 +357,7 @@ class DCPTPrefetcher(QueuedPrefetcher):
class IrregularStreamBufferPrefetcher(QueuedPrefetcher):
type = "IrregularStreamBufferPrefetcher"
cxx_class = "Prefetcher::IrregularStreamBuffer"
cxx_class = "prefetch::IrregularStreamBuffer"
cxx_header = "mem/cache/prefetch/irregular_stream_buffer.hh"
num_counter_bits = Param.Unsigned(2,
@@ -410,7 +410,7 @@ class SlimDeltaCorrelatingPredictionTables(DeltaCorrelatingPredictionTables):
class SlimAMPMPrefetcher(QueuedPrefetcher):
type = 'SlimAMPMPrefetcher'
cxx_class = 'Prefetcher::SlimAMPM'
cxx_class = 'prefetch::SlimAMPM'
cxx_header = "mem/cache/prefetch/slim_ampm.hh"
ampm = Param.AccessMapPatternMatching(SlimAccessMapPatternMatching(),
@@ -421,7 +421,7 @@ class SlimAMPMPrefetcher(QueuedPrefetcher):
class BOPPrefetcher(QueuedPrefetcher):
type = "BOPPrefetcher"
cxx_class = "Prefetcher::BOP"
cxx_class = "prefetch::BOP"
cxx_header = "mem/cache/prefetch/bop.hh"
score_max = Param.Unsigned(31, "Max. score to update the best offset")
round_max = Param.Unsigned(100, "Max. round to update the best offset")
@@ -443,7 +443,7 @@ class BOPPrefetcher(QueuedPrefetcher):
class SBOOEPrefetcher(QueuedPrefetcher):
type = 'SBOOEPrefetcher'
cxx_class = 'Prefetcher::SBOOE'
cxx_class = 'prefetch::SBOOE'
cxx_header = "mem/cache/prefetch/sbooe.hh"
latency_buffer_size = Param.Int(32, "Entries in the latency buffer")
sequential_prefetchers = Param.Int(9, "Number of sequential prefetchers")
@@ -453,7 +453,7 @@ class SBOOEPrefetcher(QueuedPrefetcher):
class STeMSPrefetcher(QueuedPrefetcher):
type = "STeMSPrefetcher"
cxx_class = "Prefetcher::STeMS"
cxx_class = "prefetch::STeMS"
cxx_header = "mem/cache/prefetch/spatio_temporal_memory_streaming.hh"
spatial_region_size = Param.MemorySize("2KiB",
@@ -496,7 +496,7 @@ class HWPProbeEventRetiredInsts(HWPProbeEvent):
class PIFPrefetcher(QueuedPrefetcher):
type = 'PIFPrefetcher'
cxx_class = 'Prefetcher::PIF'
cxx_class = 'prefetch::PIF'
cxx_header = "mem/cache/prefetch/pif.hh"
cxx_exports = [
PyBindMethod("addEventProbeRetiredInsts"),

6
src/mem/cache/prefetch/access_map_pattern_matching.cc vendored
View File

@@ -33,7 +33,9 @@
#include "params/AMPMPrefetcher.hh"
#include "params/AccessMapPatternMatching.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
AccessMapPatternMatching::AccessMapPatternMatching(
const AccessMapPatternMatchingParams &p)
@@ -263,4 +265,4 @@ AMPM::calculatePrefetch(const PrefetchInfo &pfi,
ampm.calculatePrefetch(pfi, addresses);
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/access_map_pattern_matching.hh vendored
View File

@@ -46,7 +46,9 @@
struct AccessMapPatternMatchingParams;
struct AMPMPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class AccessMapPatternMatching : public ClockedObject
{
@@ -200,6 +202,6 @@ class AMPM : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif//__MEM_CACHE_PREFETCH_ACCESS_MAP_PATTERN_MATCHING_HH__

6
src/mem/cache/prefetch/base.cc vendored
View File

@@ -52,7 +52,9 @@
#include "params/BasePrefetcher.hh"
#include "sim/system.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
Base::PrefetchInfo::PrefetchInfo(PacketPtr pkt, Addr addr, bool miss)
: address(addr), pc(pkt->req->hasPC() ? pkt->req->getPC() : 0),
@@ -256,4 +258,4 @@ Base::addTLB(BaseTLB *t)
tlb = t;
}
} // namespace Prefetcher
} // namespace prefetch

7
src/mem/cache/prefetch/base.hh vendored
View File

@@ -49,6 +49,7 @@
#include <cstdint>
#include "arch/generic/tlb.hh"
#include "base/compiler.hh"
#include "base/statistics.hh"
#include "base/types.hh"
#include "mem/packet.hh"
@@ -60,7 +61,9 @@
class BaseCache;
struct BasePrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class Base : public ClockedObject
{
@@ -381,6 +384,6 @@ class Base : public ClockedObject
void addTLB(BaseTLB *tlb);
};
} // namespace Prefetcher
} // namespace prefetch
#endif //__MEM_CACHE_PREFETCH_BASE_HH__

6
src/mem/cache/prefetch/bop.cc vendored
View File

@@ -31,7 +31,9 @@
#include "debug/HWPrefetch.hh"
#include "params/BOPPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
BOP::BOP(const BOPPrefetcherParams &p)
: Queued(p),
@@ -260,4 +262,4 @@ BOP::notifyFill(const PacketPtr& pkt)
}
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/bop.hh vendored
View File

@@ -43,7 +43,9 @@
struct BOPPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class BOP : public Queued
{
@@ -155,6 +157,6 @@ class BOP : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif /* __MEM_CACHE_PREFETCH_BOP_HH__ */

6
src/mem/cache/prefetch/delta_correlating_prediction_tables.cc vendored
View File

@@ -33,7 +33,9 @@
#include "params/DCPTPrefetcher.hh"
#include "params/DeltaCorrelatingPredictionTables.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
DeltaCorrelatingPredictionTables::DeltaCorrelatingPredictionTables(
const DeltaCorrelatingPredictionTablesParams &p) : SimObject(p),
@@ -157,4 +159,4 @@ DCPT::calculatePrefetch(const PrefetchInfo &pfi,
dcpt.calculatePrefetch(pfi, addresses);
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/delta_correlating_prediction_tables.hh vendored
View File

@@ -36,7 +36,9 @@
struct DeltaCorrelatingPredictionTablesParams;
struct DCPTPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
/**
* Delta Correlating Prediction Tables Prefetcher
@@ -129,6 +131,6 @@ class DCPT : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif//__MEM_CACHE_PREFETCH_DELTA_CORRELATING_PREDICTION_TABLES_HH_

6
src/mem/cache/prefetch/indirect_memory.cc vendored
View File

@@ -32,7 +32,9 @@
#include "mem/cache/prefetch/associative_set_impl.hh"
#include "params/IndirectMemoryPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
IndirectMemory::IndirectMemory(const IndirectMemoryPrefetcherParams &p)
: Queued(p),
@@ -254,4 +256,4 @@ IndirectMemory::checkAccessMatchOnActiveEntries(Addr addr)
}
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/indirect_memory.hh vendored
View File

@@ -47,7 +47,9 @@
struct IndirectMemoryPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class IndirectMemory : public Queued
{
@@ -200,6 +202,6 @@ class IndirectMemory : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif//__MEM_CACHE_PREFETCH_INDIRECT_MEMORY_HH__

6
src/mem/cache/prefetch/irregular_stream_buffer.cc vendored
View File

@@ -32,7 +32,9 @@
#include "mem/cache/prefetch/associative_set_impl.hh"
#include "params/IrregularStreamBufferPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
IrregularStreamBuffer::IrregularStreamBuffer(
const IrregularStreamBufferPrefetcherParams &p)
@@ -208,4 +210,4 @@ IrregularStreamBuffer::addStructuralToPhysicalEntry(
mapping.counter++;
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/irregular_stream_buffer.hh vendored
View File

@@ -45,7 +45,9 @@
struct IrregularStreamBufferPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class IrregularStreamBuffer : public Queued
{
@@ -136,6 +138,6 @@ class IrregularStreamBuffer : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif//__MEM_CACHE_PREFETCH_IRREGULAR_STREAM_BUFFER_HH__

6
src/mem/cache/prefetch/multi.cc vendored
View File

@@ -39,7 +39,9 @@
#include "params/MultiPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
Multi::Multi(const MultiPrefetcherParams &p)
: Base(p),
@@ -79,4 +81,4 @@ Multi::getPacket()
return nullptr;
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/multi.hh vendored
View File

@@ -42,7 +42,9 @@
struct MultiPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class Multi : public Base
{
@@ -68,6 +70,6 @@ class Multi : public Base
std::list<Base*> prefetchers;
};
} // namespace Prefetcher
} // namespace prefetch
#endif //__MEM_CACHE_PREFETCH_MULTI_HH__

6
src/mem/cache/prefetch/pif.cc vendored
View File

@@ -34,7 +34,9 @@
#include "mem/cache/prefetch/associative_set_impl.hh"
#include "params/PIFPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
PIF::PIF(const PIFPrefetcherParams &p)
: Queued(p),
@@ -243,4 +245,4 @@ PIF::addEventProbeRetiredInsts(SimObject *obj, const char *name)
listenersPC.push_back(new PrefetchListenerPC(*this, pm, name));
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/pif.hh vendored
View File

@@ -46,7 +46,9 @@
struct PIFPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class PIF : public Queued
{
@@ -188,6 +190,6 @@ class PIF : public Queued
void addEventProbeRetiredInsts(SimObject *obj, const char *name);
};
} // namespace Prefetcher
} // namespace prefetch
#endif // __MEM_CACHE_PREFETCH_PIF_HH__

6
src/mem/cache/prefetch/queued.cc vendored
View File

@@ -47,7 +47,9 @@
#include "mem/request.hh"
#include "params/QueuedPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
void
Queued::DeferredPacket::createPkt(Addr paddr, unsigned blk_size,
@@ -484,4 +486,4 @@ Queued::addToQueue(std::list<DeferredPacket> &queue,
}
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/queued.hh vendored
View File

@@ -49,7 +49,9 @@
struct QueuedPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class Queued : public Base
{
@@ -250,7 +252,7 @@ class Queued : public Base
PacketPtr pkt);
};
} // namespace Prefetcher
} // namespace prefetch
#endif //__MEM_CACHE_PREFETCH_QUEUED_HH__

6
src/mem/cache/prefetch/sbooe.cc vendored
View File

@@ -31,7 +31,9 @@
#include "debug/HWPrefetch.hh"
#include "params/SBOOEPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
SBOOE::SBOOE(const SBOOEPrefetcherParams &p)
: Queued(p),
@@ -132,4 +134,4 @@ SBOOE::calculatePrefetch(const PrefetchInfo &pfi,
}
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/sbooe.hh vendored
View File

@@ -44,7 +44,9 @@
struct SBOOEPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class SBOOE : public Queued
{
@@ -158,6 +160,6 @@ class SBOOE : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif // __MEM_CACHE_PREFETCH_SBOOE_HH__

6
src/mem/cache/prefetch/signature_path.cc vendored
View File

@@ -35,7 +35,9 @@
#include "mem/cache/prefetch/associative_set_impl.hh"
#include "params/SignaturePathPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
SignaturePath::SignaturePath(const SignaturePathPrefetcherParams &p)
: Queued(p),
@@ -316,4 +318,4 @@ SignaturePath::auxiliaryPrefetcher(Addr ppn, stride_t current_block,
}
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/signature_path.hh vendored
View File

@@ -47,7 +47,9 @@
struct SignaturePathPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class SignaturePath : public Queued
{
@@ -286,6 +288,6 @@ class SignaturePath : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif//__MEM_CACHE_PREFETCH_SIGNATURE_PATH_HH__

6
src/mem/cache/prefetch/signature_path_v2.cc vendored
View File

@@ -34,7 +34,9 @@
#include "mem/cache/prefetch/associative_set_impl.hh"
#include "params/SignaturePathPrefetcherV2.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
SignaturePathV2::SignaturePathV2(const SignaturePathPrefetcherV2Params &p)
: SignaturePath(p),
@@ -128,4 +130,4 @@ SignaturePathV2::handlePageCrossingLookahead(signature_t signature,
gh_entry->confidence = path_confidence;
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/signature_path_v2.hh vendored
View File

@@ -47,7 +47,9 @@
struct SignaturePathPrefetcherV2Params;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class SignaturePathV2 : public SignaturePath
{
@@ -94,6 +96,6 @@ class SignaturePathV2 : public SignaturePath
~SignaturePathV2() = default;
};
} // namespace Prefetcher
} // namespace prefetch
#endif//__MEM_CACHE_PREFETCH_SIGNATURE_PATH_V2_HH__

6
src/mem/cache/prefetch/slim_ampm.cc vendored
View File

@@ -30,7 +30,9 @@
#include "params/SlimAMPMPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
SlimAMPM::SlimAMPM(const SlimAMPMPrefetcherParams &p)
: Queued(p), ampm(*p.ampm), dcpt(*p.dcpt)
@@ -47,4 +49,4 @@ SlimAMPM::calculatePrefetch(const PrefetchInfo &pfi,
}
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/slim_ampm.hh vendored
View File

@@ -45,7 +45,9 @@
struct SlimAMPMPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class SlimAMPM : public Queued
{
@@ -61,6 +63,6 @@ class SlimAMPM : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif//__MEM_CACHE_PREFETCH_SLIM_AMPM_HH__

6
src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc vendored
View File

@@ -32,7 +32,9 @@
#include "mem/cache/prefetch/associative_set_impl.hh"
#include "params/STeMSPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
STeMS::STeMS(const STeMSPrefetcherParams &p)
: Queued(p), spatialRegionSize(p.spatial_region_size),
@@ -246,4 +248,4 @@ STeMS::reconstructSequence(
}
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh vendored
View File

@@ -50,7 +50,9 @@
struct STeMSPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class STeMS : public Queued
{
@@ -202,6 +204,6 @@ class STeMS : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif//__MEM_CACHE_PREFETCH_SPATIO_TEMPORAL_MEMORY_STREAMING_HH__

6
src/mem/cache/prefetch/stride.cc vendored
View File

@@ -57,7 +57,9 @@
#include "mem/cache/replacement_policies/base.hh"
#include "params/StridePrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
Stride::StrideEntry::StrideEntry(const SatCounter8& init_confidence)
: TaggedEntry(), confidence(init_confidence)
@@ -201,4 +203,4 @@ StridePrefetcherHashedSetAssociative::extractTag(const Addr addr) const
return addr;
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/stride.hh vendored
View File

@@ -68,7 +68,9 @@ namespace replacement_policy
}
struct StridePrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
/**
* Override the default set associative to apply a specific hash function
@@ -160,6 +162,6 @@ class Stride : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif // __MEM_CACHE_PREFETCH_STRIDE_HH__

6
src/mem/cache/prefetch/tagged.cc vendored
View File

@@ -35,7 +35,9 @@
#include "params/TaggedPrefetcher.hh"
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
Tagged::Tagged(const TaggedPrefetcherParams &p)
: Queued(p), degree(p.degree)
@@ -55,4 +57,4 @@ Tagged::calculatePrefetch(const PrefetchInfo &pfi,
}
}
} // namespace Prefetcher
} // namespace prefetch

6
src/mem/cache/prefetch/tagged.hh vendored
View File

@@ -39,7 +39,9 @@
struct TaggedPrefetcherParams;
namespace Prefetcher {
GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
namespace prefetch
{
class Tagged : public Queued
{
@@ -54,6 +56,6 @@ class Tagged : public Queued
std::vector<AddrPriority> &addresses) override;
};
} // namespace Prefetcher
} // namespace prefetch
#endif // __MEM_CACHE_PREFETCH_TAGGED_HH__