Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45406 )
Change subject: mem-cache: Rename Compressor namespace as compression
......................................................................
mem-cache: Rename Compressor namespace as compression
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::Compressor became ::compression.
"compression" was chosen over "compressor" to avoid
generating conflicts with the already existing variables,
as well as because the namespace contains more than solely
compressors (e.g., encoders).
Change-Id: I7054845984784b0dffcc4fb90d66c5096a64194d
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45406
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/mem/cache/base.hh
M src/mem/cache/compressors/Compressors.py
M src/mem/cache/compressors/base.cc
M src/mem/cache/compressors/base.hh
M src/mem/cache/compressors/base_delta.cc
M src/mem/cache/compressors/base_delta.hh
M src/mem/cache/compressors/base_delta_impl.hh
M src/mem/cache/compressors/base_dictionary_compressor.cc
M src/mem/cache/compressors/cpack.cc
M src/mem/cache/compressors/cpack.hh
M src/mem/cache/compressors/dictionary_compressor.hh
M src/mem/cache/compressors/dictionary_compressor_impl.hh
M src/mem/cache/compressors/encoders/base.hh
M src/mem/cache/compressors/encoders/huffman.cc
M src/mem/cache/compressors/encoders/huffman.hh
M src/mem/cache/compressors/fpc.cc
M src/mem/cache/compressors/fpc.hh
M src/mem/cache/compressors/fpcd.cc
M src/mem/cache/compressors/fpcd.hh
M src/mem/cache/compressors/frequent_values.cc
M src/mem/cache/compressors/frequent_values.hh
M src/mem/cache/compressors/multi.cc
M src/mem/cache/compressors/multi.hh
M src/mem/cache/compressors/perfect.cc
M src/mem/cache/compressors/perfect.hh
M src/mem/cache/compressors/repeated_qwords.cc
M src/mem/cache/compressors/repeated_qwords.hh
M src/mem/cache/compressors/zero.cc
M src/mem/cache/compressors/zero.hh
29 files changed, 129 insertions(+), 71 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 00acf93..1af3b91 100644
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -345,7 +345,7 @@
BaseTags *tags;
/** Compression method being used. */
- Compressor::Base* compressor;
+ compression::Base* compressor;
/** Prefetcher */
Prefetcher::Base *prefetcher;
diff --git a/src/mem/cache/compressors/Compressors.py
b/src/mem/cache/compressors/Compressors.py
index a05f1de..eb5b406 100644
--- a/src/mem/cache/compressors/Compressors.py
+++ b/src/mem/cache/compressors/Compressors.py
@@ -34,7 +34,7 @@
class BaseCacheCompressor(SimObject):
type = 'BaseCacheCompressor'
abstract = True
- cxx_class = 'Compressor::Base'
+ cxx_class = 'compression::Base'
cxx_header = "mem/cache/compressors/base.hh"
block_size = Param.Int(Parent.cache_line_size, "Block size in bytes")
@@ -56,7 +56,7 @@
class BaseDictionaryCompressor(BaseCacheCompressor):
type = 'BaseDictionaryCompressor'
abstract = True
- cxx_class = 'Compressor::BaseDictionaryCompressor'
+ cxx_class = 'compression::BaseDictionaryCompressor'
cxx_header = "mem/cache/compressors/dictionary_compressor.hh"
dictionary_size = Param.Int(Parent.cache_line_size,
@@ -64,7 +64,7 @@
class Base64Delta8(BaseDictionaryCompressor):
type = 'Base64Delta8'
- cxx_class = 'Compressor::Base64Delta8'
+ cxx_class = 'compression::Base64Delta8'
cxx_header = "mem/cache/compressors/base_delta.hh"
chunk_size_bits = 64
@@ -77,7 +77,7 @@
class Base64Delta16(BaseDictionaryCompressor):
type = 'Base64Delta16'
- cxx_class = 'Compressor::Base64Delta16'
+ cxx_class = 'compression::Base64Delta16'
cxx_header = "mem/cache/compressors/base_delta.hh"
chunk_size_bits = 64
@@ -90,7 +90,7 @@
class Base64Delta32(BaseDictionaryCompressor):
type = 'Base64Delta32'
- cxx_class = 'Compressor::Base64Delta32'
+ cxx_class = 'compression::Base64Delta32'
cxx_header = "mem/cache/compressors/base_delta.hh"
chunk_size_bits = 64
@@ -103,7 +103,7 @@
class Base32Delta8(BaseDictionaryCompressor):
type = 'Base32Delta8'
- cxx_class = 'Compressor::Base32Delta8'
+ cxx_class = 'compression::Base32Delta8'
cxx_header = "mem/cache/compressors/base_delta.hh"
chunk_size_bits = 32
@@ -116,7 +116,7 @@
class Base32Delta16(BaseDictionaryCompressor):
type = 'Base32Delta16'
- cxx_class = 'Compressor::Base32Delta16'
+ cxx_class = 'compression::Base32Delta16'
cxx_header = "mem/cache/compressors/base_delta.hh"
chunk_size_bits = 32
@@ -129,7 +129,7 @@
class Base16Delta8(BaseDictionaryCompressor):
type = 'Base16Delta8'
- cxx_class = 'Compressor::Base16Delta8'
+ cxx_class = 'compression::Base16Delta8'
cxx_header = "mem/cache/compressors/base_delta.hh"
chunk_size_bits = 16
@@ -142,7 +142,7 @@
class CPack(BaseDictionaryCompressor):
type = 'CPack'
- cxx_class = 'Compressor::CPack'
+ cxx_class = 'compression::CPack'
cxx_header = "mem/cache/compressors/cpack.hh"
comp_chunks_per_cycle = 2
@@ -153,7 +153,7 @@
class FPC(BaseDictionaryCompressor):
type = 'FPC'
- cxx_class = 'Compressor::FPC'
+ cxx_class = 'compression::FPC'
cxx_header = "mem/cache/compressors/fpc.hh"
comp_chunks_per_cycle = 8
@@ -168,7 +168,7 @@
class FPCD(BaseDictionaryCompressor):
type = 'FPCD'
- cxx_class = 'Compressor::FPCD'
+ cxx_class = 'compression::FPCD'
cxx_header = "mem/cache/compressors/fpcd.hh"
# Accounts for checking all patterns, selecting patterns, and shifting
@@ -183,7 +183,7 @@
class FrequentValuesCompressor(BaseCacheCompressor):
type = 'FrequentValuesCompressor'
- cxx_class = 'Compressor::FrequentValues'
+ cxx_class = 'compression::FrequentValues'
cxx_header = "mem/cache/compressors/frequent_values.hh"
chunk_size_bits = 32
@@ -215,7 +215,7 @@
class MultiCompressor(BaseCacheCompressor):
type = 'MultiCompressor'
- cxx_class = 'Compressor::Multi'
+ cxx_class = 'compression::Multi'
cxx_header = "mem/cache/compressors/multi.hh"
# Dummy default compressor list. This might not be an optimal choice,
@@ -239,7 +239,7 @@
class PerfectCompressor(BaseCacheCompressor):
type = 'PerfectCompressor'
- cxx_class = 'Compressor::Perfect'
+ cxx_class = 'compression::Perfect'
cxx_header = "mem/cache/compressors/perfect.hh"
chunk_size_bits = 64
@@ -254,7 +254,7 @@
class RepeatedQwordsCompressor(BaseDictionaryCompressor):
type = 'RepeatedQwordsCompressor'
- cxx_class = 'Compressor::RepeatedQwords'
+ cxx_class = 'compression::RepeatedQwords'
cxx_header = "mem/cache/compressors/repeated_qwords.hh"
chunk_size_bits = 64
@@ -267,7 +267,7 @@
class ZeroCompressor(BaseDictionaryCompressor):
type = 'ZeroCompressor'
- cxx_class = 'Compressor::Zero'
+ cxx_class = 'compression::Zero'
cxx_header = "mem/cache/compressors/zero.hh"
chunk_size_bits = 64
diff --git a/src/mem/cache/compressors/base.cc
b/src/mem/cache/compressors/base.cc
index 1796515..2a7b13d 100644
--- a/src/mem/cache/compressors/base.cc
+++ b/src/mem/cache/compressors/base.cc
@@ -38,13 +38,16 @@
#include <cstdint>
#include <string>
+#include "base/logging.hh"
#include "base/trace.hh"
#include "debug/CacheComp.hh"
#include "mem/cache/base.hh"
#include "mem/cache/tags/super_blk.hh"
#include "params/BaseCacheCompressor.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
// Uncomment this line if debugging compression
//#define DEBUG_COMPRESSION
@@ -265,4 +268,4 @@
avgCompressionSizeBits = compressionSizeBits / compressions;
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/base.hh
b/src/mem/cache/compressors/base.hh
index e1d03cf..4bf0950 100644
--- a/src/mem/cache/compressors/base.hh
+++ b/src/mem/cache/compressors/base.hh
@@ -38,6 +38,7 @@
#include <cstdint>
+#include "base/compiler.hh"
#include "base/statistics.hh"
#include "base/types.hh"
#include "sim/sim_object.hh"
@@ -46,7 +47,9 @@
class CacheBlk;
struct BaseCacheCompressorParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
/**
* Base cache compressor interface. Every cache compressor must implement a
@@ -278,6 +281,6 @@
std::size_t getSize() const;
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_BASE_HH__
diff --git a/src/mem/cache/compressors/base_delta.cc
b/src/mem/cache/compressors/base_delta.cc
index ab5862c..98c9536 100644
--- a/src/mem/cache/compressors/base_delta.cc
+++ b/src/mem/cache/compressors/base_delta.cc
@@ -39,7 +39,9 @@
#include "params/Base64Delta32.hh"
#include "params/Base64Delta8.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
Base64Delta8::Base64Delta8(const Params &p)
: BaseDelta<uint64_t, 8>(p)
@@ -71,4 +73,4 @@
{
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/base_delta.hh
b/src/mem/cache/compressors/base_delta.hh
index ee42c43..e323c55 100644
--- a/src/mem/cache/compressors/base_delta.hh
+++ b/src/mem/cache/compressors/base_delta.hh
@@ -49,7 +49,9 @@
struct Base32Delta16Params;
struct Base16Delta8Params;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
/**
* Base class for all base-delta-immediate compressors. Although not
proposed
@@ -204,6 +206,6 @@
~Base16Delta8() = default;
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_BASE_DELTA_HH__
diff --git a/src/mem/cache/compressors/base_delta_impl.hh
b/src/mem/cache/compressors/base_delta_impl.hh
index 5b94f04..5107aef 100644
--- a/src/mem/cache/compressors/base_delta_impl.hh
+++ b/src/mem/cache/compressors/base_delta_impl.hh
@@ -37,7 +37,9 @@
#include "mem/cache/compressors/base_delta.hh"
#include "mem/cache/compressors/dictionary_compressor_impl.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
template <class BaseType, std::size_t DeltaSizeBits>
BaseDelta<BaseType, DeltaSizeBits>::BaseDelta(const Params &p)
@@ -93,6 +95,6 @@
return comp_data;
}
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_BASE_DELTA_IMPL_HH__
diff --git a/src/mem/cache/compressors/base_dictionary_compressor.cc
b/src/mem/cache/compressors/base_dictionary_compressor.cc
index 1f9d555..56a8c3c 100644
--- a/src/mem/cache/compressors/base_dictionary_compressor.cc
+++ b/src/mem/cache/compressors/base_dictionary_compressor.cc
@@ -34,7 +34,9 @@
#include "mem/cache/compressors/dictionary_compressor.hh"
#include "params/BaseDictionaryCompressor.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
BaseDictionaryCompressor::BaseDictionaryCompressor(const Params &p)
: Base(p), dictionarySize(p.dictionary_size),
@@ -65,4 +67,4 @@
}
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/cpack.cc
b/src/mem/cache/compressors/cpack.cc
index 7d57297..456647b 100644
--- a/src/mem/cache/compressors/cpack.cc
+++ b/src/mem/cache/compressors/cpack.cc
@@ -35,7 +35,9 @@
#include "mem/cache/compressors/dictionary_compressor_impl.hh"
#include "params/CPack.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
CPack::CPack(const Params &p)
: DictionaryCompressor<uint32_t>(p)
@@ -49,4 +51,4 @@
dictionary[numEntries++] = data;
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/cpack.hh
b/src/mem/cache/compressors/cpack.hh
index b485e0d..6382d4d 100644
--- a/src/mem/cache/compressors/cpack.hh
+++ b/src/mem/cache/compressors/cpack.hh
@@ -43,7 +43,9 @@
struct CPackParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
class CPack : public DictionaryCompressor<uint32_t>
{
@@ -170,6 +172,6 @@
}
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_CPACK_HH__
diff --git a/src/mem/cache/compressors/dictionary_compressor.hh
b/src/mem/cache/compressors/dictionary_compressor.hh
index ead3656..1222d2a 100644
--- a/src/mem/cache/compressors/dictionary_compressor.hh
+++ b/src/mem/cache/compressors/dictionary_compressor.hh
@@ -58,7 +58,9 @@
struct BaseDictionaryCompressorParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
class BaseDictionaryCompressor : public Base
{
@@ -786,6 +788,6 @@
}
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_DICTIONARY_COMPRESSOR_HH__
diff --git a/src/mem/cache/compressors/dictionary_compressor_impl.hh
b/src/mem/cache/compressors/dictionary_compressor_impl.hh
index 2a22812..e763389 100644
--- a/src/mem/cache/compressors/dictionary_compressor_impl.hh
+++ b/src/mem/cache/compressors/dictionary_compressor_impl.hh
@@ -40,7 +40,9 @@
#include "mem/cache/compressors/dictionary_compressor.hh"
#include "params/BaseDictionaryCompressor.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
template <class T>
DictionaryCompressor<T>::CompData::CompData()
@@ -232,6 +234,6 @@
return value;
}
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_DICTIONARY_COMPRESSOR_IMPL_HH__
diff --git a/src/mem/cache/compressors/encoders/base.hh
b/src/mem/cache/compressors/encoders/base.hh
index a90dac1..2f58217 100644
--- a/src/mem/cache/compressors/encoders/base.hh
+++ b/src/mem/cache/compressors/encoders/base.hh
@@ -31,7 +31,11 @@
#include <cstdint>
-namespace Compressor {
+#include "base/compiler.hh"
+
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
namespace Encoder {
struct Code
@@ -74,6 +78,6 @@
};
} // namespace Encoder
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_ENCODERS_BASE_HH__
diff --git a/src/mem/cache/compressors/encoders/huffman.cc
b/src/mem/cache/compressors/encoders/huffman.cc
index 8b75456..ec7f44f 100644
--- a/src/mem/cache/compressors/encoders/huffman.cc
+++ b/src/mem/cache/compressors/encoders/huffman.cc
@@ -32,7 +32,9 @@
#include "base/logging.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
namespace Encoder {
Huffman::Huffman(uint64_t max_code_length)
@@ -131,4 +133,4 @@
}
} // namespace Encoder
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/encoders/huffman.hh
b/src/mem/cache/compressors/encoders/huffman.hh
index 946051f..605c82c 100644
--- a/src/mem/cache/compressors/encoders/huffman.hh
+++ b/src/mem/cache/compressors/encoders/huffman.hh
@@ -38,7 +38,9 @@
#include "mem/cache/compressors/encoders/base.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
namespace Encoder {
/**
@@ -175,6 +177,6 @@
};
} // namespace Encoder
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_ENCODERS_HUFFMAN_HH__
diff --git a/src/mem/cache/compressors/fpc.cc
b/src/mem/cache/compressors/fpc.cc
index 0908453..3fb1b36 100644
--- a/src/mem/cache/compressors/fpc.cc
+++ b/src/mem/cache/compressors/fpc.cc
@@ -31,7 +31,9 @@
#include "mem/cache/compressors/dictionary_compressor_impl.hh"
#include "params/FPC.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
FPC::FPCCompData::FPCCompData(int zero_run_size_bits)
: CompData(), zeroRunSizeBits(zero_run_size_bits)
@@ -94,4 +96,4 @@
new FPCCompData(zeroRunSizeBits));
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/fpc.hh
b/src/mem/cache/compressors/fpc.hh
index dc54acd..6f26f29 100644
--- a/src/mem/cache/compressors/fpc.hh
+++ b/src/mem/cache/compressors/fpc.hh
@@ -48,7 +48,9 @@
struct FPCParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
class FPC : public DictionaryCompressor<uint32_t>
{
@@ -300,6 +302,6 @@
}
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_FPC_HH__
diff --git a/src/mem/cache/compressors/fpcd.cc
b/src/mem/cache/compressors/fpcd.cc
index f3d2d33..0cd1a1f 100644
--- a/src/mem/cache/compressors/fpcd.cc
+++ b/src/mem/cache/compressors/fpcd.cc
@@ -35,7 +35,9 @@
#include "mem/cache/compressors/dictionary_compressor_impl.hh"
#include "params/FPCD.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
FPCD::FPCD(const Params &p)
: DictionaryCompressor<uint32_t>(p)
@@ -54,4 +56,4 @@
}
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/fpcd.hh
b/src/mem/cache/compressors/fpcd.hh
index 18c2556..a21619d 100644
--- a/src/mem/cache/compressors/fpcd.hh
+++ b/src/mem/cache/compressors/fpcd.hh
@@ -49,7 +49,9 @@
struct FPCDParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
class FPCD : public DictionaryCompressor<uint32_t>
{
@@ -318,6 +320,6 @@
}
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_FPCD_HH__
diff --git a/src/mem/cache/compressors/frequent_values.cc
b/src/mem/cache/compressors/frequent_values.cc
index 014c938..7e9970d 100644
--- a/src/mem/cache/compressors/frequent_values.cc
+++ b/src/mem/cache/compressors/frequent_values.cc
@@ -39,7 +39,9 @@
#include "mem/cache/prefetch/associative_set_impl.hh"
#include "params/FrequentValuesCompressor.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
FrequentValues::FrequentValues(const Params &p)
: Base(p), useHuffmanEncoding(p.max_code_length != 0),
@@ -295,4 +297,4 @@
parent.probeNotify(data_update);
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/frequent_values.hh
b/src/mem/cache/compressors/frequent_values.hh
index 0624759..8292f14 100644
--- a/src/mem/cache/compressors/frequent_values.hh
+++ b/src/mem/cache/compressors/frequent_values.hh
@@ -45,7 +45,9 @@
struct FrequentValuesCompressorParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
/**
* This compressor samples the cache for a while, trying to define the
@@ -218,6 +220,6 @@
std::vector<CompressedValue> compressedValues;
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_FREQUENT_VALUES_HH__
diff --git a/src/mem/cache/compressors/multi.cc
b/src/mem/cache/compressors/multi.cc
index 1c0766c..98d7c32 100644
--- a/src/mem/cache/compressors/multi.cc
+++ b/src/mem/cache/compressors/multi.cc
@@ -42,7 +42,9 @@
#include "debug/CacheComp.hh"
#include "params/MultiCompressor.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
Multi::MultiCompData::MultiCompData(unsigned index,
std::unique_ptr<Base::CompressionData> comp_data)
@@ -210,4 +212,4 @@
}
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/multi.hh
b/src/mem/cache/compressors/multi.hh
index ec49401..ea71ee3 100644
--- a/src/mem/cache/compressors/multi.hh
+++ b/src/mem/cache/compressors/multi.hh
@@ -43,7 +43,9 @@
struct MultiCompressorParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
class Multi : public Base
{
@@ -136,6 +138,6 @@
uint8_t getIndex() const;
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_MULTI_HH__
diff --git a/src/mem/cache/compressors/perfect.cc
b/src/mem/cache/compressors/perfect.cc
index 56b3fc0..03f070b 100644
--- a/src/mem/cache/compressors/perfect.cc
+++ b/src/mem/cache/compressors/perfect.cc
@@ -38,7 +38,9 @@
#include "debug/CacheComp.hh"
#include "params/PerfectCompressor.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
Perfect::Perfect(const Params &p)
: Base(p), compressedSize(8 * blkSize / p.max_compression_ratio)
@@ -72,4 +74,4 @@
fromChunks(static_cast<const CompData*>(comp_data)->chunks, data);
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/perfect.hh
b/src/mem/cache/compressors/perfect.hh
index 7b89ca5..743d653 100644
--- a/src/mem/cache/compressors/perfect.hh
+++ b/src/mem/cache/compressors/perfect.hh
@@ -43,7 +43,9 @@
struct PerfectCompressorParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
class Perfect : public Base
{
@@ -89,6 +91,6 @@
~CompData() = default;
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_PERFECT_COMPRESSOR_HH__
diff --git a/src/mem/cache/compressors/repeated_qwords.cc
b/src/mem/cache/compressors/repeated_qwords.cc
index 5187dbd..84a7407 100644
--- a/src/mem/cache/compressors/repeated_qwords.cc
+++ b/src/mem/cache/compressors/repeated_qwords.cc
@@ -38,7 +38,9 @@
#include "mem/cache/compressors/dictionary_compressor_impl.hh"
#include "params/RepeatedQwordsCompressor.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
RepeatedQwords::RepeatedQwords(const Params &p)
: DictionaryCompressor<uint64_t>(p)
@@ -77,4 +79,4 @@
return comp_data;
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/repeated_qwords.hh
b/src/mem/cache/compressors/repeated_qwords.hh
index 7d2dd47..b0f33ad 100644
--- a/src/mem/cache/compressors/repeated_qwords.hh
+++ b/src/mem/cache/compressors/repeated_qwords.hh
@@ -43,7 +43,9 @@
struct RepeatedQwordsCompressorParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
class RepeatedQwords : public DictionaryCompressor<uint64_t>
{
@@ -123,6 +125,6 @@
}
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_REPEATED_QWORDS_HH__
diff --git a/src/mem/cache/compressors/zero.cc
b/src/mem/cache/compressors/zero.cc
index 152aea4..8347a90 100644
--- a/src/mem/cache/compressors/zero.cc
+++ b/src/mem/cache/compressors/zero.cc
@@ -38,7 +38,9 @@
#include "mem/cache/compressors/dictionary_compressor_impl.hh"
#include "params/ZeroCompressor.hh"
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
Zero::Zero(const Params &p)
: DictionaryCompressor<uint64_t>(p)
@@ -75,4 +77,4 @@
return comp_data;
}
-} // namespace Compressor
+} // namespace compression
diff --git a/src/mem/cache/compressors/zero.hh
b/src/mem/cache/compressors/zero.hh
index 34141a9..255518c 100644
--- a/src/mem/cache/compressors/zero.hh
+++ b/src/mem/cache/compressors/zero.hh
@@ -43,7 +43,9 @@
struct ZeroCompressorParams;
-namespace Compressor {
+GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
+namespace compression
+{
class Zero : public DictionaryCompressor<uint64_t>
{
@@ -124,6 +126,6 @@
}
};
-} // namespace Compressor
+} // namespace compression
#endif //__MEM_CACHE_COMPRESSORS_ZERO_HH__
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45406
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I7054845984784b0dffcc4fb90d66c5096a64194d
Gerrit-Change-Number: 45406
Gerrit-PatchSet: 10
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Hoa Nguyen <hoangu...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
