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 <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45406
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/mem/cache/base.hh

@@ -345,7 +345,7 @@ class BaseCache : public ClockedObject
     BaseTags *tags;
 
     /** Compression method being used. */
-    Compressor::Base* compressor;
+    compression::Base* compressor;
 
     /** Prefetcher */
     Prefetcher::Base *prefetcher;

src/mem/cache/compressors/Compressors.py

@@ -34,7 +34,7 @@ from m5.objects.ReplacementPolicies import *
 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 BaseCacheCompressor(SimObject):
 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 BaseDictionaryCompressor(BaseCacheCompressor):
 
 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 Base64Delta8(BaseDictionaryCompressor):
 
 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 Base64Delta16(BaseDictionaryCompressor):
 
 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 Base64Delta32(BaseDictionaryCompressor):
 
 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 Base32Delta8(BaseDictionaryCompressor):
 
 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 Base32Delta16(BaseDictionaryCompressor):
 
 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 Base16Delta8(BaseDictionaryCompressor):
 
 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 CPack(BaseDictionaryCompressor):
 
 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 FPC(BaseDictionaryCompressor):
 
 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 FPCD(BaseDictionaryCompressor):
 
 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 FrequentValuesCompressor(BaseCacheCompressor):
 
 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 MultiCompressor(BaseCacheCompressor):
 
 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 PerfectCompressor(BaseCacheCompressor):
 
 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 RepeatedQwordsCompressor(BaseDictionaryCompressor):
 
 class ZeroCompressor(BaseDictionaryCompressor):
     type = 'ZeroCompressor'
-    cxx_class = 'Compressor::Zero'
+    cxx_class = 'compression::Zero'
     cxx_header = "mem/cache/compressors/zero.hh"
 
     chunk_size_bits = 64

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 @@ Base::BaseStats::regStats()
     avgCompressionSizeBits = compressionSizeBits / compressions;
 }
 
-} // namespace Compressor
+} // namespace compression

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 BaseCache;
 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 @@ class Base::CompressionData
     std::size_t getSize() const;
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_BASE_HH__

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 @@ Base16Delta8::Base16Delta8(const Params &p)
 {
 }
 
-} // namespace Compressor
+} // namespace compression

src/mem/cache/compressors/base_delta.hh

@@ -49,7 +49,9 @@ struct Base32Delta8Params;
 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 @@ class Base16Delta8 : public BaseDelta<uint16_t, 8>
     ~Base16Delta8() = default;
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_BASE_DELTA_HH__

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 @@ BaseDelta<BaseType, DeltaSizeBits>::compress(
     return comp_data;
 }
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_BASE_DELTA_IMPL_HH__

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 @@ BaseDictionaryCompressor::DictionaryStats::regStats()
     }
 }
 
-} // namespace Compressor
+} // namespace compression

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 @@ CPack::addToDictionary(DictionaryEntry data)
     dictionary[numEntries++] = data;
 }
 
-} // namespace Compressor
+} // namespace compression

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 @@ class CPack::PatternMMMX : public MaskedPattern<0xFFFFFF00>
     }
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_CPACK_HH__

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 @@ class DictionaryCompressor<T>::SignExtendedPattern
     }
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_DICTIONARY_COMPRESSOR_HH__

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 @@ DictionaryCompressor<T>::fromDictionaryEntry(const DictionaryEntry& entry)
     return value;
 }
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_DICTIONARY_COMPRESSOR_IMPL_HH__

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 @@ class Base
 };
 
 } // namespace Encoder
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_ENCODERS_BASE_HH__

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 @@ Huffman::decode(const uint64_t code) const
 }
 
 } // namespace Encoder
-} // namespace Compressor
+} // namespace compression

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 @@ class Huffman : public Base
 };
 
 } // namespace Encoder
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_ENCODERS_HUFFMAN_HH__

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 @@ FPC::instantiateDictionaryCompData() const
         new FPCCompData(zeroRunSizeBits));
 }
 
-} // namespace Compressor
+} // namespace compression

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 @@ class FPC::Uncompressed : public UncompressedPattern
     }
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_FPC_HH__

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 @@ FPCD::addToDictionary(DictionaryEntry data)
     }
 }
 
-} // namespace Compressor
+} // namespace compression

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 @@ class FPCD::PatternXXXX : public UncompressedPattern
     }
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_FPCD_HH__

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 @@ FrequentValues::FrequentValuesListener::notify(const DataUpdate &data_update)
     parent.probeNotify(data_update);
 }
 
-} // namespace Compressor
+} // namespace compression

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 @@ class FrequentValues::CompData : public CompressionData
     std::vector<CompressedValue> compressedValues;
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_FREQUENT_VALUES_HH__

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 @@ Multi::MultiStats::regStats()
     }
 }
 
-} // namespace Compressor
+} // namespace compression

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 @@ class Multi::MultiCompData : public CompressionData
     uint8_t getIndex() const;
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_MULTI_HH__

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 @@ Perfect::decompress(const CompressionData* comp_data,
     fromChunks(static_cast<const CompData*>(comp_data)->chunks, data);
 }
 
-} // namespace Compressor
+} // namespace compression

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 @@ class Perfect::CompData : public CompressionData
     ~CompData() = default;
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_PERFECT_COMPRESSOR_HH__

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 @@ RepeatedQwords::compress(const std::vector<Chunk>& chunks,
     return comp_data;
 }
 
-} // namespace Compressor
+} // namespace compression

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 @@ class RepeatedQwords::PatternM
     }
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_REPEATED_QWORDS_HH__

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 @@ Zero::compress(const std::vector<Chunk>& chunks, Cycles& comp_lat,
     return comp_data;
 }
 
-} // namespace Compressor
+} // namespace compression

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 @@ class Zero::PatternZ
     }
 };
 
-} // namespace Compressor
+} // namespace compression
 
 #endif //__MEM_CACHE_COMPRESSORS_ZERO_HH__