From 65c15ba18884492888daee4e33f93e017566da02 Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Sat, 14 Jan 2023 09:41:36 -0300 Subject: [PATCH] mem-cache: Remove the Prefetcher namespace This namespace has gone through the deprecation period and can now be removed. Change-Id: I31953be7ce8566576de94c9296eeeec601c9906a Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67353 Reviewed-by: Richard Cooper Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/mem/cache/base.hh | 1 - src/mem/cache/prefetch/access_map_pattern_matching.cc | 1 - src/mem/cache/prefetch/access_map_pattern_matching.hh | 1 - src/mem/cache/prefetch/base.cc | 1 - src/mem/cache/prefetch/base.hh | 1 - src/mem/cache/prefetch/bop.cc | 1 - src/mem/cache/prefetch/bop.hh | 1 - src/mem/cache/prefetch/delta_correlating_prediction_tables.cc | 1 - src/mem/cache/prefetch/delta_correlating_prediction_tables.hh | 1 - src/mem/cache/prefetch/indirect_memory.cc | 1 - src/mem/cache/prefetch/indirect_memory.hh | 1 - src/mem/cache/prefetch/irregular_stream_buffer.cc | 1 - src/mem/cache/prefetch/irregular_stream_buffer.hh | 1 - src/mem/cache/prefetch/multi.cc | 1 - src/mem/cache/prefetch/multi.hh | 1 - src/mem/cache/prefetch/pif.cc | 1 - src/mem/cache/prefetch/pif.hh | 1 - src/mem/cache/prefetch/queued.cc | 1 - src/mem/cache/prefetch/queued.hh | 1 - src/mem/cache/prefetch/sbooe.cc | 1 - src/mem/cache/prefetch/sbooe.hh | 1 - src/mem/cache/prefetch/signature_path.cc | 1 - src/mem/cache/prefetch/signature_path.hh | 1 - src/mem/cache/prefetch/signature_path_v2.cc | 1 - src/mem/cache/prefetch/signature_path_v2.hh | 1 - src/mem/cache/prefetch/slim_ampm.cc | 1 - src/mem/cache/prefetch/slim_ampm.hh | 1 - src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc | 1 - src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh | 1 - src/mem/cache/prefetch/stride.cc | 1 - src/mem/cache/prefetch/stride.hh | 1 - src/mem/cache/prefetch/tagged.cc | 1 - src/mem/cache/prefetch/tagged.hh | 1 - 33 files changed, 33 deletions(-) diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh index 6fc76282e9..78571ceb3c 100644 --- a/src/mem/cache/base.hh +++ b/src/mem/cache/base.hh @@ -79,7 +79,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { class Base; diff --git a/src/mem/cache/prefetch/access_map_pattern_matching.cc b/src/mem/cache/prefetch/access_map_pattern_matching.cc index 6bf5d9bca8..989f3c6be1 100644 --- a/src/mem/cache/prefetch/access_map_pattern_matching.cc +++ b/src/mem/cache/prefetch/access_map_pattern_matching.cc @@ -36,7 +36,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/access_map_pattern_matching.hh b/src/mem/cache/prefetch/access_map_pattern_matching.hh index 3b0bc28f4d..893d30dec2 100644 --- a/src/mem/cache/prefetch/access_map_pattern_matching.hh +++ b/src/mem/cache/prefetch/access_map_pattern_matching.hh @@ -49,7 +49,6 @@ namespace gem5 struct AccessMapPatternMatchingParams; struct AMPMPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/base.cc b/src/mem/cache/prefetch/base.cc index 9ff81fba68..e3e4b24cf2 100644 --- a/src/mem/cache/prefetch/base.cc +++ b/src/mem/cache/prefetch/base.cc @@ -55,7 +55,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/base.hh b/src/mem/cache/prefetch/base.hh index e5e43e534f..6bae73519c 100644 --- a/src/mem/cache/prefetch/base.hh +++ b/src/mem/cache/prefetch/base.hh @@ -65,7 +65,6 @@ namespace gem5 class BaseCache; struct BasePrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/bop.cc b/src/mem/cache/prefetch/bop.cc index a60c1fe95e..ce2502bee6 100644 --- a/src/mem/cache/prefetch/bop.cc +++ b/src/mem/cache/prefetch/bop.cc @@ -34,7 +34,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/bop.hh b/src/mem/cache/prefetch/bop.hh index 7fdba2bbf2..bb1b05dfa9 100644 --- a/src/mem/cache/prefetch/bop.hh +++ b/src/mem/cache/prefetch/bop.hh @@ -46,7 +46,6 @@ namespace gem5 struct BOPPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/delta_correlating_prediction_tables.cc b/src/mem/cache/prefetch/delta_correlating_prediction_tables.cc index c5e126c4c0..b59394ce25 100644 --- a/src/mem/cache/prefetch/delta_correlating_prediction_tables.cc +++ b/src/mem/cache/prefetch/delta_correlating_prediction_tables.cc @@ -36,7 +36,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/delta_correlating_prediction_tables.hh b/src/mem/cache/prefetch/delta_correlating_prediction_tables.hh index 8ad21a6691..0218e9138a 100644 --- a/src/mem/cache/prefetch/delta_correlating_prediction_tables.hh +++ b/src/mem/cache/prefetch/delta_correlating_prediction_tables.hh @@ -39,7 +39,6 @@ namespace gem5 struct DeltaCorrelatingPredictionTablesParams; struct DCPTPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/indirect_memory.cc b/src/mem/cache/prefetch/indirect_memory.cc index 7bb1545f7f..ab84ce25a2 100644 --- a/src/mem/cache/prefetch/indirect_memory.cc +++ b/src/mem/cache/prefetch/indirect_memory.cc @@ -35,7 +35,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/indirect_memory.hh b/src/mem/cache/prefetch/indirect_memory.hh index 85fb50e5a7..da3e894cfa 100644 --- a/src/mem/cache/prefetch/indirect_memory.hh +++ b/src/mem/cache/prefetch/indirect_memory.hh @@ -50,7 +50,6 @@ namespace gem5 struct IndirectMemoryPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/irregular_stream_buffer.cc b/src/mem/cache/prefetch/irregular_stream_buffer.cc index fc0d71faa3..ce30b41aa6 100644 --- a/src/mem/cache/prefetch/irregular_stream_buffer.cc +++ b/src/mem/cache/prefetch/irregular_stream_buffer.cc @@ -35,7 +35,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/irregular_stream_buffer.hh b/src/mem/cache/prefetch/irregular_stream_buffer.hh index 20dadd60a2..39373010bb 100644 --- a/src/mem/cache/prefetch/irregular_stream_buffer.hh +++ b/src/mem/cache/prefetch/irregular_stream_buffer.hh @@ -48,7 +48,6 @@ namespace gem5 struct IrregularStreamBufferPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/multi.cc b/src/mem/cache/prefetch/multi.cc index ddf0e30d59..1f7298f354 100644 --- a/src/mem/cache/prefetch/multi.cc +++ b/src/mem/cache/prefetch/multi.cc @@ -42,7 +42,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/multi.hh b/src/mem/cache/prefetch/multi.hh index ff17918346..7890f090b5 100644 --- a/src/mem/cache/prefetch/multi.hh +++ b/src/mem/cache/prefetch/multi.hh @@ -47,7 +47,6 @@ namespace gem5 struct MultiPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/pif.cc b/src/mem/cache/prefetch/pif.cc index 95b9f4f60f..79e8e6d747 100644 --- a/src/mem/cache/prefetch/pif.cc +++ b/src/mem/cache/prefetch/pif.cc @@ -37,7 +37,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/pif.hh b/src/mem/cache/prefetch/pif.hh index e48d8fbc52..296087e8e0 100644 --- a/src/mem/cache/prefetch/pif.hh +++ b/src/mem/cache/prefetch/pif.hh @@ -49,7 +49,6 @@ namespace gem5 struct PIFPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/queued.cc b/src/mem/cache/prefetch/queued.cc index b85a227f00..1ab34d2e9b 100644 --- a/src/mem/cache/prefetch/queued.cc +++ b/src/mem/cache/prefetch/queued.cc @@ -51,7 +51,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/queued.hh b/src/mem/cache/prefetch/queued.hh index 87d3456def..1d1a3faef4 100644 --- a/src/mem/cache/prefetch/queued.hh +++ b/src/mem/cache/prefetch/queued.hh @@ -53,7 +53,6 @@ namespace gem5 struct QueuedPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/sbooe.cc b/src/mem/cache/prefetch/sbooe.cc index a3f023126d..44a10c232d 100644 --- a/src/mem/cache/prefetch/sbooe.cc +++ b/src/mem/cache/prefetch/sbooe.cc @@ -34,7 +34,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/sbooe.hh b/src/mem/cache/prefetch/sbooe.hh index 9b25816b23..7914b88f45 100644 --- a/src/mem/cache/prefetch/sbooe.hh +++ b/src/mem/cache/prefetch/sbooe.hh @@ -47,7 +47,6 @@ namespace gem5 struct SBOOEPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/signature_path.cc b/src/mem/cache/prefetch/signature_path.cc index 2f9477b703..a36ef809ce 100644 --- a/src/mem/cache/prefetch/signature_path.cc +++ b/src/mem/cache/prefetch/signature_path.cc @@ -38,7 +38,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/signature_path.hh b/src/mem/cache/prefetch/signature_path.hh index 9cffa33d9a..9613fe0886 100644 --- a/src/mem/cache/prefetch/signature_path.hh +++ b/src/mem/cache/prefetch/signature_path.hh @@ -50,7 +50,6 @@ namespace gem5 struct SignaturePathPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/signature_path_v2.cc b/src/mem/cache/prefetch/signature_path_v2.cc index 230bc76256..b50721ca69 100644 --- a/src/mem/cache/prefetch/signature_path_v2.cc +++ b/src/mem/cache/prefetch/signature_path_v2.cc @@ -37,7 +37,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/signature_path_v2.hh b/src/mem/cache/prefetch/signature_path_v2.hh index b7f745cd94..417b7ec540 100644 --- a/src/mem/cache/prefetch/signature_path_v2.hh +++ b/src/mem/cache/prefetch/signature_path_v2.hh @@ -50,7 +50,6 @@ namespace gem5 struct SignaturePathPrefetcherV2Params; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/slim_ampm.cc b/src/mem/cache/prefetch/slim_ampm.cc index 85f89663ca..950994a4bd 100644 --- a/src/mem/cache/prefetch/slim_ampm.cc +++ b/src/mem/cache/prefetch/slim_ampm.cc @@ -33,7 +33,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/slim_ampm.hh b/src/mem/cache/prefetch/slim_ampm.hh index 4a07b9bf45..54f38d4885 100644 --- a/src/mem/cache/prefetch/slim_ampm.hh +++ b/src/mem/cache/prefetch/slim_ampm.hh @@ -48,7 +48,6 @@ namespace gem5 struct SlimAMPMPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc index 3c9b9eb64c..0e3211579c 100644 --- a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc +++ b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc @@ -35,7 +35,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh index bee746c5c7..cdd2788104 100644 --- a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh +++ b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh @@ -53,7 +53,6 @@ namespace gem5 struct STeMSPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/stride.cc b/src/mem/cache/prefetch/stride.cc index 1d375a6228..0a77b28a1c 100644 --- a/src/mem/cache/prefetch/stride.cc +++ b/src/mem/cache/prefetch/stride.cc @@ -60,7 +60,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/stride.hh b/src/mem/cache/prefetch/stride.hh index 27fa917436..7e55abea21 100644 --- a/src/mem/cache/prefetch/stride.hh +++ b/src/mem/cache/prefetch/stride.hh @@ -70,7 +70,6 @@ namespace replacement_policy } struct StridePrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/tagged.cc b/src/mem/cache/prefetch/tagged.cc index d385ac0611..0d4d79b006 100644 --- a/src/mem/cache/prefetch/tagged.cc +++ b/src/mem/cache/prefetch/tagged.cc @@ -38,7 +38,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch { diff --git a/src/mem/cache/prefetch/tagged.hh b/src/mem/cache/prefetch/tagged.hh index d7f77a8841..5c91f654b1 100644 --- a/src/mem/cache/prefetch/tagged.hh +++ b/src/mem/cache/prefetch/tagged.hh @@ -42,7 +42,6 @@ namespace gem5 struct TaggedPrefetcherParams; -GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch); namespace prefetch {