[gem5-dev] [M] Change in gem5/gem5[develop]: mem-cache: De-virtualize forEachBlk() in tags
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/70998?usp=email )
Change subject: mem-cache: De-virtualize forEachBlk() in tags
..
mem-cache: De-virtualize forEachBlk() in tags
Avoid code duplication by using the anyBlk function
with a lambda that always returns false, which forces
all blocks to be visited.
Change-Id: I25527602535c719f46699677a7f70f3e31157f26
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70998
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/mem/cache/tags/base.cc
M src/mem/cache/tags/base.hh
M src/mem/cache/tags/base_set_assoc.hh
M src/mem/cache/tags/compressed_tags.cc
M src/mem/cache/tags/compressed_tags.hh
M src/mem/cache/tags/fa_lru.hh
M src/mem/cache/tags/sector_tags.cc
M src/mem/cache/tags/sector_tags.hh
8 files changed, 10 insertions(+), 49 deletions(-)
Approvals:
kokoro: Regressions pass
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 560b041..8216f3d 100644
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -215,6 +215,15 @@
return str;
}
+void
+BaseTags::forEachBlk(std::function visitor)
+{
+anyBlk([visitor](CacheBlk ) {
+visitor(blk);
+return false;
+});
+}
+
BaseTags::BaseTagStats::BaseTagStats(BaseTags &_tags)
: statistics::Group(&_tags),
tags(_tags),
diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index e270277..c491881 100644
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -336,7 +336,7 @@
*
* @param visitor Visitor to call on each block.
*/
-virtual void forEachBlk(std::function visitor) = 0;
+void forEachBlk(std::function visitor);
/**
* Find if any of the blocks satisfies a condition
diff --git a/src/mem/cache/tags/base_set_assoc.hh
b/src/mem/cache/tags/base_set_assoc.hh
index 22695d2..8ffb718 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -233,12 +233,6 @@
return indexingPolicy->regenerateAddr(blk->getTag(), blk);
}
-void forEachBlk(std::function visitor) override {
-for (CacheBlk& blk : blks) {
-visitor(blk);
-}
-}
-
bool anyBlk(std::function visitor) override {
for (CacheBlk& blk : blks) {
if (visitor(blk)) {
diff --git a/src/mem/cache/tags/compressed_tags.cc
b/src/mem/cache/tags/compressed_tags.cc
index 32d7401..c84718f 100644
--- a/src/mem/cache/tags/compressed_tags.cc
+++ b/src/mem/cache/tags/compressed_tags.cc
@@ -163,14 +163,6 @@
return victim;
}
-void
-CompressedTags::forEachBlk(std::function visitor)
-{
-for (CompressionBlk& blk : blks) {
-visitor(blk);
-}
-}
-
bool
CompressedTags::anyBlk(std::function visitor)
{
diff --git a/src/mem/cache/tags/compressed_tags.hh
b/src/mem/cache/tags/compressed_tags.hh
index b54efb0..6e5b62d 100644
--- a/src/mem/cache/tags/compressed_tags.hh
+++ b/src/mem/cache/tags/compressed_tags.hh
@@ -109,16 +109,6 @@
std::vector& evict_blks) override;
/**
- * Visit each sub-block in the tags and apply a visitor.
- *
- * The visitor should be a std::function that takes a cache block.
- * reference as its parameter.
- *
- * @param visitor Visitor to call on each block.
- */
-void forEachBlk(std::function visitor) override;
-
-/**
* Find if any of the sub-blocks satisfies a condition.
*
* The visitor should be a std::function that takes a cache block
diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index deffd72..cd07817 100644
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -253,12 +253,6 @@
return blk->getTag();
}
-void forEachBlk(std::function visitor) override {
-for (int i = 0; i < numBlocks; i++) {
-visitor(blks[i]);
-}
-}
-
bool anyBlk(std::function visitor) override {
for (int i = 0; i < numBlocks; i++) {
if (visitor(blks[i])) {
diff --git a/src/mem/cache/tags/sector_tags.cc
b/src/mem/cache/tags/sector_tags.cc
index cb121eb..6a9ffd0 100644
--- a/src/mem/cache/tags/sector_tags.cc
+++ b/src/mem/cache/tags/sector_tags.cc
@@ -359,14 +359,6 @@
}
}
-void
-SectorTags::forEachBlk(std::function visitor)
-{
-for (SectorSubBlk& blk : blks) {
-visitor(blk);
-}
-}
-
bool
SectorTags::anyBlk(std::function visitor)
{
diff --git a/src/mem/cache/tags/sector_tags.hh
b/src/mem/cache/tags/sector_tags.hh
index bad1321..035b085 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -194,16 +194,6 @@
Addr regenerateBlkAddr(const CacheBlk* blk) const override;
[gem5-dev] [M] Change in gem5/gem5[develop]: mem-cache: De-virtualize forEachBlk() in tags
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/70998?usp=email )
Change subject: mem-cache: De-virtualize forEachBlk() in tags
..
mem-cache: De-virtualize forEachBlk() in tags
Avoid code duplication by using the anyBlk function
with a lambda that always returns false, which forces
all blocks to be visited.
Change-Id: I25527602535c719f46699677a7f70f3e31157f26
Signed-off-by: Daniel R. Carvalho
---
M src/mem/cache/tags/base.cc
M src/mem/cache/tags/base.hh
M src/mem/cache/tags/base_set_assoc.hh
M src/mem/cache/tags/compressed_tags.cc
M src/mem/cache/tags/compressed_tags.hh
M src/mem/cache/tags/fa_lru.hh
M src/mem/cache/tags/sector_tags.cc
M src/mem/cache/tags/sector_tags.hh
8 files changed, 10 insertions(+), 49 deletions(-)
diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 560b041..8216f3d 100644
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -215,6 +215,15 @@
return str;
}
+void
+BaseTags::forEachBlk(std::function visitor)
+{
+anyBlk([visitor](CacheBlk ) {
+visitor(blk);
+return false;
+});
+}
+
BaseTags::BaseTagStats::BaseTagStats(BaseTags &_tags)
: statistics::Group(&_tags),
tags(_tags),
diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index e270277..c491881 100644
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -336,7 +336,7 @@
*
* @param visitor Visitor to call on each block.
*/
-virtual void forEachBlk(std::function visitor) = 0;
+void forEachBlk(std::function visitor);
/**
* Find if any of the blocks satisfies a condition
diff --git a/src/mem/cache/tags/base_set_assoc.hh
b/src/mem/cache/tags/base_set_assoc.hh
index 22695d2..8ffb718 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -233,12 +233,6 @@
return indexingPolicy->regenerateAddr(blk->getTag(), blk);
}
-void forEachBlk(std::function visitor) override {
-for (CacheBlk& blk : blks) {
-visitor(blk);
-}
-}
-
bool anyBlk(std::function visitor) override {
for (CacheBlk& blk : blks) {
if (visitor(blk)) {
diff --git a/src/mem/cache/tags/compressed_tags.cc
b/src/mem/cache/tags/compressed_tags.cc
index 32d7401..c84718f 100644
--- a/src/mem/cache/tags/compressed_tags.cc
+++ b/src/mem/cache/tags/compressed_tags.cc
@@ -163,14 +163,6 @@
return victim;
}
-void
-CompressedTags::forEachBlk(std::function visitor)
-{
-for (CompressionBlk& blk : blks) {
-visitor(blk);
-}
-}
-
bool
CompressedTags::anyBlk(std::function visitor)
{
diff --git a/src/mem/cache/tags/compressed_tags.hh
b/src/mem/cache/tags/compressed_tags.hh
index b54efb0..6e5b62d 100644
--- a/src/mem/cache/tags/compressed_tags.hh
+++ b/src/mem/cache/tags/compressed_tags.hh
@@ -109,16 +109,6 @@
std::vector& evict_blks) override;
/**
- * Visit each sub-block in the tags and apply a visitor.
- *
- * The visitor should be a std::function that takes a cache block.
- * reference as its parameter.
- *
- * @param visitor Visitor to call on each block.
- */
-void forEachBlk(std::function visitor) override;
-
-/**
* Find if any of the sub-blocks satisfies a condition.
*
* The visitor should be a std::function that takes a cache block
diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index deffd72..cd07817 100644
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -253,12 +253,6 @@
return blk->getTag();
}
-void forEachBlk(std::function visitor) override {
-for (int i = 0; i < numBlocks; i++) {
-visitor(blks[i]);
-}
-}
-
bool anyBlk(std::function visitor) override {
for (int i = 0; i < numBlocks; i++) {
if (visitor(blks[i])) {
diff --git a/src/mem/cache/tags/sector_tags.cc
b/src/mem/cache/tags/sector_tags.cc
index cb121eb..6a9ffd0 100644
--- a/src/mem/cache/tags/sector_tags.cc
+++ b/src/mem/cache/tags/sector_tags.cc
@@ -359,14 +359,6 @@
}
}
-void
-SectorTags::forEachBlk(std::function visitor)
-{
-for (SectorSubBlk& blk : blks) {
-visitor(blk);
-}
-}
-
bool
SectorTags::anyBlk(std::function visitor)
{
diff --git a/src/mem/cache/tags/sector_tags.hh
b/src/mem/cache/tags/sector_tags.hh
index bad1321..035b085 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -194,16 +194,6 @@
Addr regenerateBlkAddr(const CacheBlk* blk) const override;
/**
- * Visit each sub-block in the tags and apply a visitor.
- *
- * The visitor should be a std::function that takes a cache block.
- * reference as its parameter.
- *
- * @param visitor Visitor to call on each block.
-
[gem5-dev] [S] Change in gem5/gem5[develop]: arch: Remove a couple of deprecated namespaces
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67375?usp=email )
Change subject: arch: Remove a couple of deprecated namespaces
..
arch: Remove a couple of deprecated namespaces
These namespaces have gone through the deprecation period
and can now be removed: X86Macroops, SMBios, RomLabels,
DeliveryMode, ConditionTests.
Change-Id: I6ff5e98319d92e27743a9fbeeab054497a2392e0
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67375
Tested-by: kokoro
Maintainer: Jason Lowe-Power
Reviewed-by: Jason Lowe-Power
---
M src/arch/x86/bios/smbios.hh
M src/arch/x86/fs_workload.hh
M src/arch/x86/insts/microop.hh
M src/arch/x86/intmessage.hh
M src/arch/x86/isa/macroop.isa
M src/arch/x86/isa/rom.isa
6 files changed, 19 insertions(+), 8 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/x86/bios/smbios.hh b/src/arch/x86/bios/smbios.hh
index dc38676..88d3344 100644
--- a/src/arch/x86/bios/smbios.hh
+++ b/src/arch/x86/bios/smbios.hh
@@ -61,7 +61,6 @@
namespace X86ISA
{
-GEM5_DEPRECATED_NAMESPACE(SMBios, smbios);
namespace smbios
{
diff --git a/src/arch/x86/fs_workload.hh b/src/arch/x86/fs_workload.hh
index 5c1187c..9d14f91 100644
--- a/src/arch/x86/fs_workload.hh
+++ b/src/arch/x86/fs_workload.hh
@@ -55,7 +55,6 @@
namespace X86ISA
{
-GEM5_DEPRECATED_NAMESPACE(SMBios, smbios);
namespace smbios
{
diff --git a/src/arch/x86/insts/microop.hh b/src/arch/x86/insts/microop.hh
index 9cbdec8..384e15e 100644
--- a/src/arch/x86/insts/microop.hh
+++ b/src/arch/x86/insts/microop.hh
@@ -48,7 +48,6 @@
namespace X86ISA
{
-GEM5_DEPRECATED_NAMESPACE(ConditionTests, condition_tests);
namespace condition_tests
{
diff --git a/src/arch/x86/intmessage.hh b/src/arch/x86/intmessage.hh
index f7692e2..71e4765 100644
--- a/src/arch/x86/intmessage.hh
+++ b/src/arch/x86/intmessage.hh
@@ -52,7 +52,6 @@
Bitfield<21> trigger;
EndBitUnion(TriggerIntMessage)
-GEM5_DEPRECATED_NAMESPACE(DeliveryMode, delivery_mode);
namespace delivery_mode
{
enum IntDeliveryMode
diff --git a/src/arch/x86/isa/macroop.isa b/src/arch/x86/isa/macroop.isa
index 691e8d0..d1b9e22 100644
--- a/src/arch/x86/isa/macroop.isa
+++ b/src/arch/x86/isa/macroop.isa
@@ -76,7 +76,6 @@
// Basic instruction class declaration template.
def template MacroDeclare {{
-GEM5_DEPRECATED_NAMESPACE(X86Macroop, x86_macroop);
namespace x86_macroop
{
/**
diff --git a/src/arch/x86/isa/rom.isa b/src/arch/x86/isa/rom.isa
index 9aef3ba..bf2f9ff 100644
--- a/src/arch/x86/isa/rom.isa
+++ b/src/arch/x86/isa/rom.isa
@@ -42,9 +42,7 @@
class X86MicrocodeRom(Rom):
def getDeclaration(self):
-declareLabels = \
-"GEM5_DEPRECATED_NAMESPACE(RomLabels, rom_labels);\n"
-declareLabels += "namespace rom_labels\n{\n"
+declareLabels = "namespace rom_labels\n{\n"
for (label, microop) in self.labels.items():
declareLabels += "const static uint64_t label_%s = %d;\n" \
% (label, microop.micropc)
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67375?usp=email
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: I6ff5e98319d92e27743a9fbeeab054497a2392e0
Gerrit-Change-Number: 67375
Gerrit-PatchSet: 4
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: sim,arch: Remove the GuestABI namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67374?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: sim,arch: Remove the GuestABI namespace
..
sim,arch: Remove the GuestABI namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I476815491314f4222da43da75c91654b4f3d1228
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67374
Maintainer: Jason Lowe-Power
Reviewed-by: Richard Cooper
Tested-by: kokoro
---
M src/arch/arm/aapcs32.hh
M src/arch/arm/aapcs64.hh
M src/arch/arm/freebsd/se_workload.hh
M src/arch/arm/linux/se_workload.hh
M src/arch/arm/reg_abi.hh
M src/arch/arm/semihosting.cc
M src/arch/arm/semihosting.hh
M src/arch/mips/se_workload.hh
M src/arch/power/se_workload.hh
M src/arch/riscv/se_workload.hh
M src/arch/sparc/pseudo_inst_abi.hh
M src/arch/sparc/se_workload.hh
M src/arch/x86/linux/linux.hh
M src/arch/x86/linux/se_workload.hh
M src/arch/x86/pseudo_inst_abi.hh
M src/sim/guest_abi.test.cc
M src/sim/guest_abi/definition.hh
M src/sim/guest_abi/dispatch.hh
M src/sim/guest_abi/layout.hh
M src/sim/guest_abi/varargs.hh
M src/sim/proxy_ptr.hh
M src/sim/proxy_ptr.test.cc
M src/sim/syscall_abi.hh
23 files changed, 17 insertions(+), 24 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Richard Cooper: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/aapcs32.hh b/src/arch/arm/aapcs32.hh
index 383b8eb..1d727e2 100644
--- a/src/arch/arm/aapcs32.hh
+++ b/src/arch/arm/aapcs32.hh
@@ -70,7 +70,6 @@
};
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
@@ -446,7 +445,6 @@
};
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/aapcs64.hh b/src/arch/arm/aapcs64.hh
index 2f53822..62926d3 100644
--- a/src/arch/arm/aapcs64.hh
+++ b/src/arch/arm/aapcs64.hh
@@ -67,7 +67,6 @@
};
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/freebsd/se_workload.hh
b/src/arch/arm/freebsd/se_workload.hh
index b944dbd..47e41f2 100644
--- a/src/arch/arm/freebsd/se_workload.hh
+++ b/src/arch/arm/freebsd/se_workload.hh
@@ -70,7 +70,6 @@
} // namespace ArmISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/linux/se_workload.hh
b/src/arch/arm/linux/se_workload.hh
index 0939af1..29bd30a 100644
--- a/src/arch/arm/linux/se_workload.hh
+++ b/src/arch/arm/linux/se_workload.hh
@@ -62,7 +62,6 @@
} // namespace ArmISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/reg_abi.hh b/src/arch/arm/reg_abi.hh
index 1d5272c..e892166 100644
--- a/src/arch/arm/reg_abi.hh
+++ b/src/arch/arm/reg_abi.hh
@@ -51,7 +51,6 @@
} // namespace ArmISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/semihosting.cc b/src/arch/arm/semihosting.cc
index 8efe841..4ce52e8 100644
--- a/src/arch/arm/semihosting.cc
+++ b/src/arch/arm/semihosting.cc
@@ -714,7 +714,6 @@
};
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/semihosting.hh b/src/arch/arm/semihosting.hh
index fe7819c..557eb76 100644
--- a/src/arch/arm/semihosting.hh
+++ b/src/arch/arm/semihosting.hh
@@ -599,7 +599,6 @@
std::ostream << (
std::ostream , const ArmSemihosting::InPlaceArg );
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/mips/se_workload.hh b/src/arch/mips/se_workload.hh
index dc6f1dd..18c0bda 100644
--- a/src/arch/mips/se_workload.hh
+++ b/src/arch/mips/se_workload.hh
@@ -68,7 +68,6 @@
} // namespace MipsISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/power/se_workload.hh b/src/arch/power/se_workload.hh
index d041c45..3c2bb93 100644
--- a/src/arch/power/se_workload.hh
+++ b/src/arch/power/se_workload.hh
@@ -68,7 +68,6 @@
} // namespace PowerISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/riscv/se_workload.hh b/src/arch/riscv/se_workload.hh
index 6f7c2ed..9ae3be4 100644
--- a/src/arch/riscv/se_workload.hh
+++ b/src/arch/riscv/se_workload.hh
@@ -66,7 +66,6 @@
} // namespace RiscvISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/sparc/pseudo_inst_abi.hh
b/src/arch/sparc/pseudo_inst_abi.hh
index 993e11b..989f0e7 100644
--- a/src/arch/sparc/pseudo_inst_abi.hh
+++ b/src/arch/sparc/pseudo_inst_abi.hh
@@ -40,7 +40,6 @@
using State = int;
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git
[gem5-dev] [S] Change in gem5/gem5[develop]: sim: Remove a couple of deprecated namespaces
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67373?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: sim: Remove a couple of deprecated namespaces
..
sim: Remove a couple of deprecated namespaces
These namespaces have gone through the deprecation period
and can now be removed: Int, Float, SimClock, PseudoInst
Change-Id: Iec8e0fff021d8d7696e466e2ad52f2d51305d811
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67373
Tested-by: kokoro
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
---
M src/arch/x86/bios/intelmp.hh
M src/arch/x86/fs_workload.hh
M src/sim/core.cc
M src/sim/core.hh
M src/sim/pseudo_inst.cc
M src/sim/pseudo_inst.hh
6 files changed, 17 insertions(+), 10 deletions(-)
Approvals:
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/x86/bios/intelmp.hh b/src/arch/x86/bios/intelmp.hh
index 19f2f7a..207b4ab 100644
--- a/src/arch/x86/bios/intelmp.hh
+++ b/src/arch/x86/bios/intelmp.hh
@@ -84,7 +84,6 @@
namespace X86ISA
{
-GEM5_DEPRECATED_NAMESPACE(IntelMP, intelmp);
namespace intelmp
{
diff --git a/src/arch/x86/fs_workload.hh b/src/arch/x86/fs_workload.hh
index b40b69b..5c1187c 100644
--- a/src/arch/x86/fs_workload.hh
+++ b/src/arch/x86/fs_workload.hh
@@ -63,7 +63,6 @@
} // namespace smbios
-GEM5_DEPRECATED_NAMESPACE(IntelMP, intelmp);
namespace intelmp
{
diff --git a/src/sim/core.cc b/src/sim/core.cc
index c388652..d836b55 100644
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -41,13 +41,11 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(SimClock, sim_clock);
namespace sim_clock
{
/// The simulated frequency of curTick(). (In ticks per second)
Tick Frequency;
-GEM5_DEPRECATED_NAMESPACE(Float, as_float);
namespace as_float
{
double s;
@@ -62,7 +60,6 @@
double GHz;
} // namespace as_float
-GEM5_DEPRECATED_NAMESPACE(Int, as_int);
namespace as_int
{
Tick s;
diff --git a/src/sim/core.hh b/src/sim/core.hh
index bd432c2..bac4e40 100644
--- a/src/sim/core.hh
+++ b/src/sim/core.hh
@@ -46,12 +46,10 @@
/// These are variables that are set based on the simulator frequency
///@{
-GEM5_DEPRECATED_NAMESPACE(SimClock, sim_clock);
namespace sim_clock
{
extern Tick Frequency; ///< The number of ticks that equal one second
-GEM5_DEPRECATED_NAMESPACE(Float, as_float);
namespace as_float
{
@@ -81,7 +79,6 @@
*
* @{
*/
-GEM5_DEPRECATED_NAMESPACE(Int, as_int);
namespace as_int
{
extern Tick s; ///< second
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 28b5619..55e44c7 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -76,7 +76,6 @@
using namespace statistics;
-GEM5_DEPRECATED_NAMESPACE(PseudoInst, pseudo_inst);
namespace pseudo_inst
{
diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh
index 4794a41..ba15370 100644
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -55,7 +55,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(PseudoInst, pseudo_inst);
namespace pseudo_inst
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67373?usp=email
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: Iec8e0fff021d8d7696e466e2ad52f2d51305d811
Gerrit-Change-Number: 67373
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: sim: Remove the Enums namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67372?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: sim: Remove the Enums namespace
..
sim: Remove the Enums namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: If4daad57a421b076ae6661812c2255c7f06f30b9
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67372
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M build_tools/enum_cc.py
1 file changed, 18 insertions(+), 2 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Richard Cooper: Looks good to me, approved
kokoro: Regressions pass
diff --git a/build_tools/enum_cc.py b/build_tools/enum_cc.py
index cd192c5..5d82b40 100644
--- a/build_tools/enum_cc.py
+++ b/build_tools/enum_cc.py
@@ -97,8 +97,7 @@
)
else:
code(
-"""GEM5_DEPRECATED_NAMESPACE(Enums, enums);
-namespace enums
+"""namespace enums
{"""
)
code.indent(1)
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67372?usp=email
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: If4daad57a421b076ae6661812c2255c7f06f30b9
Gerrit-Change-Number: 67372
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: dev: Remove a couple of deprecated namespaces
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67370?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: dev: Remove a couple of deprecated namespaces
..
dev: Remove a couple of deprecated namespaces
These namespaces have gone through the deprecation period
and can now be removed: Sinic, SCMI, Ps2, Regs, Keyboard,
Mouse, TxdOp, iGbReg, CopyEngineReg.
Change-Id: Icfaf458bffca2658650318508c0bb376719cf911
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67370
Tested-by: kokoro
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
---
M src/dev/arm/css/scmi_platform.hh
M src/dev/arm/css/scmi_protocols.hh
M src/dev/net/i8254xGBe_defs.hh
M src/dev/net/sinic.cc
M src/dev/net/sinic.hh
M src/dev/net/sinicreg.hh
M src/dev/pci/copy_engine_defs.hh
M src/dev/ps2/types.cc
M src/dev/ps2/types.hh
9 files changed, 18 insertions(+), 13 deletions(-)
Approvals:
Richard Cooper: Looks good to me, approved
kokoro: Regressions pass
Jason Lowe-Power: Looks good to me, approved
diff --git a/src/dev/arm/css/scmi_platform.hh
b/src/dev/arm/css/scmi_platform.hh
index 581408d..92bec89 100644
--- a/src/dev/arm/css/scmi_platform.hh
+++ b/src/dev/arm/css/scmi_platform.hh
@@ -49,7 +49,6 @@
class Doorbell;
-GEM5_DEPRECATED_NAMESPACE(SCMI, scmi);
namespace scmi
{
diff --git a/src/dev/arm/css/scmi_protocols.hh
b/src/dev/arm/css/scmi_protocols.hh
index 03d6ea4..85e157b 100644
--- a/src/dev/arm/css/scmi_protocols.hh
+++ b/src/dev/arm/css/scmi_protocols.hh
@@ -46,7 +46,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(SCMI, scmi);
namespace scmi
{
diff --git a/src/dev/net/i8254xGBe_defs.hh b/src/dev/net/i8254xGBe_defs.hh
index 015ca7d..ef013a2 100644
--- a/src/dev/net/i8254xGBe_defs.hh
+++ b/src/dev/net/i8254xGBe_defs.hh
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(iGbReg, igbreg);
namespace igbreg
{
@@ -239,7 +238,6 @@
uint64_t d2;
};
-GEM5_DEPRECATED_NAMESPACE(TxdOp, txd_op);
namespace txd_op
{
diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc
index c1afb28..69a42ed 100644
--- a/src/dev/net/sinic.cc
+++ b/src/dev/net/sinic.cc
@@ -48,7 +48,6 @@
using namespace networking;
-GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
namespace sinic
{
diff --git a/src/dev/net/sinic.hh b/src/dev/net/sinic.hh
index 2b0f9fa..adad53b 100644
--- a/src/dev/net/sinic.hh
+++ b/src/dev/net/sinic.hh
@@ -45,7 +45,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
namespace sinic
{
diff --git a/src/dev/net/sinicreg.hh b/src/dev/net/sinicreg.hh
index 120b9a1..47588df 100644
--- a/src/dev/net/sinicreg.hh
+++ b/src/dev/net/sinicreg.hh
@@ -59,11 +59,9 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
namespace sinic
{
-GEM5_DEPRECATED_NAMESPACE(Regs, registers);
namespace registers
{
diff --git a/src/dev/pci/copy_engine_defs.hh
b/src/dev/pci/copy_engine_defs.hh
index 9e687e3..107edee 100644
--- a/src/dev/pci/copy_engine_defs.hh
+++ b/src/dev/pci/copy_engine_defs.hh
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(CopyEngineReg, copy_engine_reg);
namespace copy_engine_reg
{
diff --git a/src/dev/ps2/types.cc b/src/dev/ps2/types.cc
index 99e740e..00e442e 100644
--- a/src/dev/ps2/types.cc
+++ b/src/dev/ps2/types.cc
@@ -45,7 +45,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
namespace ps2
{
diff --git a/src/dev/ps2/types.hh b/src/dev/ps2/types.hh
index 4ad7b05..3286c97 100644
--- a/src/dev/ps2/types.hh
+++ b/src/dev/ps2/types.hh
@@ -53,7 +53,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
namespace ps2
{
@@ -70,7 +69,6 @@
Reset = 0xFF,
};
-GEM5_DEPRECATED_NAMESPACE(Keyboard, keyboard);
namespace keyboard
{
@@ -93,7 +91,6 @@
} // namespace keyboard
-GEM5_DEPRECATED_NAMESPACE(Mouse, mouse);
namespace mouse
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67370?usp=email
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: Icfaf458bffca2658650318508c0bb376719cf911
Gerrit-Change-Number: 67370
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [L] Change in gem5/gem5[develop]: base: Remove the Loader namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67362?usp=email )
Change subject: base: Remove the Loader namespace
..
base: Remove the Loader namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I87b763fccfcdf720909dfbda9c3fc8f6dea36a61
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67362
Tested-by: kokoro
---
M src/arch/mips/process.hh
M src/arch/power/process.hh
M src/arch/riscv/process.hh
M src/base/loader/dtb_file.cc
M src/base/loader/dtb_file.hh
M src/base/loader/elf_object.cc
M src/base/loader/elf_object.hh
M src/base/loader/image_file.hh
M src/base/loader/image_file_data.cc
M src/base/loader/image_file_data.hh
M src/base/loader/memory_image.cc
M src/base/loader/memory_image.hh
M src/base/loader/object_file.cc
M src/base/loader/object_file.hh
M src/base/loader/raw_image.hh
M src/base/loader/symtab.cc
M src/base/loader/symtab.hh
M src/base/loader/symtab.test.cc
M src/cpu/profile.hh
M src/cpu/static_inst.hh
M src/sim/process.hh
21 files changed, 160 insertions(+), 165 deletions(-)
Approvals:
Daniel Carvalho: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/mips/process.hh b/src/arch/mips/process.hh
index 181dd25..8b84ec1 100644
--- a/src/arch/mips/process.hh
+++ b/src/arch/mips/process.hh
@@ -34,7 +34,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
class ObjectFile;
diff --git a/src/arch/power/process.hh b/src/arch/power/process.hh
index c8d8a79..9576c35 100644
--- a/src/arch/power/process.hh
+++ b/src/arch/power/process.hh
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
class ObjectFile;
diff --git a/src/arch/riscv/process.hh b/src/arch/riscv/process.hh
index ca0a050..64b9593 100644
--- a/src/arch/riscv/process.hh
+++ b/src/arch/riscv/process.hh
@@ -40,7 +40,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
class ObjectFile;
diff --git a/src/base/loader/dtb_file.cc b/src/base/loader/dtb_file.cc
index 13e0264..f083b3e 100644
--- a/src/base/loader/dtb_file.cc
+++ b/src/base/loader/dtb_file.cc
@@ -40,7 +40,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/dtb_file.hh b/src/base/loader/dtb_file.hh
index c11b195..bed7cfc 100644
--- a/src/base/loader/dtb_file.hh
+++ b/src/base/loader/dtb_file.hh
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index dc2abb8..4b1467a 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -61,7 +61,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/elf_object.hh b/src/base/loader/elf_object.hh
index 6159b35..f084492 100644
--- a/src/base/loader/elf_object.hh
+++ b/src/base/loader/elf_object.hh
@@ -51,7 +51,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/image_file.hh b/src/base/loader/image_file.hh
index 194c956..f1d3955 100644
--- a/src/base/loader/image_file.hh
+++ b/src/base/loader/image_file.hh
@@ -39,7 +39,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/image_file_data.cc
b/src/base/loader/image_file_data.cc
index 57fb47f..525d577 100644
--- a/src/base/loader/image_file_data.cc
+++ b/src/base/loader/image_file_data.cc
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/image_file_data.hh
b/src/base/loader/image_file_data.hh
index d02c499..4d1701d 100644
--- a/src/base/loader/image_file_data.hh
+++ b/src/base/loader/image_file_data.hh
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/memory_image.cc
b/src/base/loader/memory_image.cc
index 5537f28..a3f378c 100644
--- a/src/base/loader/memory_image.cc
+++ b/src/base/loader/memory_image.cc
@@ -32,7 +32,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/memory_image.hh
b/src/base/loader/memory_image.hh
index 2c56f4c..1207e74 100644
--- a/src/base/loader/memory_image.hh
+++ b/src/base/loader/memory_image.hh
@@ -46,7 +46,6 @@
class PortProxy;
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc
index 3aa5915..287f910 100644
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@ -48,7 +48,6 @@
namespace gem5
{
[gem5-dev] [S] Change in gem5/gem5[develop]: fastmodel: Remove the FastModel namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67363?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: fastmodel: Remove the FastModel namespace
..
fastmodel: Remove the FastModel namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ic0a42f7349ccf15f8c1dd276a647e7cb2a56c1cb
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67363
Reviewed-by: Richard Cooper
Tested-by: kokoro
Maintainer: Jason Lowe-Power
---
M src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
M src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
M src/arch/arm/fastmodel/CortexA76/evs.cc
M src/arch/arm/fastmodel/CortexA76/evs.hh
M src/arch/arm/fastmodel/CortexA76/thread_context.cc
M src/arch/arm/fastmodel/CortexA76/thread_context.hh
M src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
M src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
M src/arch/arm/fastmodel/CortexR52/evs.cc
M src/arch/arm/fastmodel/CortexR52/evs.hh
M src/arch/arm/fastmodel/CortexR52/thread_context.cc
M src/arch/arm/fastmodel/CortexR52/thread_context.hh
M src/arch/arm/fastmodel/GIC/gic.cc
M src/arch/arm/fastmodel/GIC/gic.hh
M src/arch/arm/fastmodel/PL330_DMAC/pl330.cc
M src/arch/arm/fastmodel/PL330_DMAC/pl330.hh
M src/arch/arm/fastmodel/amba_from_tlm_bridge.cc
M src/arch/arm/fastmodel/amba_from_tlm_bridge.hh
M src/arch/arm/fastmodel/amba_ports.hh
M src/arch/arm/fastmodel/amba_to_tlm_bridge.cc
M src/arch/arm/fastmodel/amba_to_tlm_bridge.hh
M src/arch/arm/fastmodel/common/signal_receiver.hh
M src/arch/arm/fastmodel/common/signal_sender.hh
23 files changed, 17 insertions(+), 23 deletions(-)
Approvals:
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
index 9280a04..ea1f477 100644
--- a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
+++ b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
b/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
index 39f916e..61bf501 100644
--- a/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
+++ b/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
@@ -42,7 +42,6 @@
class BaseCPU;
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/evs.cc
b/src/arch/arm/fastmodel/CortexA76/evs.cc
index c9ce3cc..b299ad1 100644
--- a/src/arch/arm/fastmodel/CortexA76/evs.cc
+++ b/src/arch/arm/fastmodel/CortexA76/evs.cc
@@ -37,7 +37,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/evs.hh
b/src/arch/arm/fastmodel/CortexA76/evs.hh
index 7c4ef60..9f08071 100644
--- a/src/arch/arm/fastmodel/CortexA76/evs.hh
+++ b/src/arch/arm/fastmodel/CortexA76/evs.hh
@@ -52,7 +52,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/thread_context.cc
b/src/arch/arm/fastmodel/CortexA76/thread_context.cc
index 672f3b7..c670485 100644
--- a/src/arch/arm/fastmodel/CortexA76/thread_context.cc
+++ b/src/arch/arm/fastmodel/CortexA76/thread_context.cc
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/thread_context.hh
b/src/arch/arm/fastmodel/CortexA76/thread_context.hh
index d7b8ed5..6e3d854 100644
--- a/src/arch/arm/fastmodel/CortexA76/thread_context.hh
+++ b/src/arch/arm/fastmodel/CortexA76/thread_context.hh
@@ -33,7 +33,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
index 9dfe7a5..a22492e 100644
--- a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
+++ b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
b/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
index 76c7d33..186383d 100644
--- a/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
+++ b/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
@@ -42,7 +42,6 @@
class BaseCPU;
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexR52/evs.cc
b/src/arch/arm/fastmodel/CortexR52/evs.cc
index 0ad3f18..47fbc36 100644
---
[gem5-dev] [S] Change in gem5/gem5[develop]: misc: Remove the m5 namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67367?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: misc: Remove the m5 namespace
..
misc: Remove the m5 namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Iffc6d903da1d619c0914379d0ceabc88453b3ac7
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67367
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/base/coroutine.hh
M src/base/stl_helpers.hh
2 files changed, 17 insertions(+), 2 deletions(-)
Approvals:
kokoro: Regressions pass
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
diff --git a/src/base/coroutine.hh b/src/base/coroutine.hh
index 63b26aa..000a0bf 100644
--- a/src/base/coroutine.hh
+++ b/src/base/coroutine.hh
@@ -44,7 +44,6 @@
#include "base/compiler.hh"
#include "base/fiber.hh"
-GEM5_DEPRECATED_NAMESPACE(m5, gem5);
namespace gem5
{
diff --git a/src/base/stl_helpers.hh b/src/base/stl_helpers.hh
index d16446d..d12f266 100644
--- a/src/base/stl_helpers.hh
+++ b/src/base/stl_helpers.hh
@@ -36,7 +36,6 @@
#include "base/compiler.hh"
-GEM5_DEPRECATED_NAMESPACE(m5, gem5);
namespace gem5
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67367?usp=email
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: Iffc6d903da1d619c0914379d0ceabc88453b3ac7
Gerrit-Change-Number: 67367
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: sim: Remove the ProbePoints namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67371?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: sim: Remove the ProbePoints namespace
..
sim: Remove the ProbePoints namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Iddf30ea24a579cf5a94d6217c1d015a0c68d68d0
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67371
Reviewed-by: Richard Cooper
Tested-by: kokoro
Maintainer: Jason Lowe-Power
---
M src/sim/probe/mem.hh
M src/sim/probe/pmu.hh
M src/sim/probe/probe.hh
3 files changed, 17 insertions(+), 3 deletions(-)
Approvals:
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/probe/mem.hh b/src/sim/probe/mem.hh
index df3280c..0496de9 100644
--- a/src/sim/probe/mem.hh
+++ b/src/sim/probe/mem.hh
@@ -46,7 +46,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(ProbePoints, probing);
namespace probing
{
diff --git a/src/sim/probe/pmu.hh b/src/sim/probe/pmu.hh
index acf4750..b589ce7 100644
--- a/src/sim/probe/pmu.hh
+++ b/src/sim/probe/pmu.hh
@@ -45,7 +45,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(ProbePoints, probing);
namespace probing
{
diff --git a/src/sim/probe/probe.hh b/src/sim/probe/probe.hh
index dede7ad..3dd428e 100644
--- a/src/sim/probe/probe.hh
+++ b/src/sim/probe/probe.hh
@@ -86,7 +86,6 @@
* common instrumentation interface for devices such as PMUs that have
* different implementations in different ISAs.
*/
-GEM5_DEPRECATED_NAMESPACE(ProbePoints, probing);
namespace probing
{
/* Note: This is only here for documentation purposes, new probe
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67371?usp=email
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: Iddf30ea24a579cf5a94d6217c1d015a0c68d68d0
Gerrit-Change-Number: 67371
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: misc: Remove the Net namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67366?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: misc: Remove the Net namespace
..
misc: Remove the Net namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ia2e1ef1619f51a0d7c0da9c7b4a160cd88ed8a65
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67366
Tested-by: kokoro
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
---
M src/base/inet.cc
M src/base/inet.hh
2 files changed, 17 insertions(+), 2 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Richard Cooper: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/inet.cc b/src/base/inet.cc
index ab4bfe4..fc7505e 100644
--- a/src/base/inet.cc
+++ b/src/base/inet.cc
@@ -54,7 +54,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Net, networking);
namespace networking
{
diff --git a/src/base/inet.hh b/src/base/inet.hh
index 3897f63..2cc3c6a 100644
--- a/src/base/inet.hh
+++ b/src/base/inet.hh
@@ -68,7 +68,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Net, networking);
namespace networking
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67366?usp=email
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: Ia2e1ef1619f51a0d7c0da9c7b4a160cd88ed8a65
Gerrit-Change-Number: 67366
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: misc: Remove the Linux namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67364?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: misc: Remove the Linux namespace
..
misc: Remove the Linux namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I73d7792ab8897d00b143d82d0fb70987ca410438
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67364
Maintainer: Jason Lowe-Power
Tested-by: kokoro
Reviewed-by: Richard Cooper
---
M src/arch/generic/linux/threadinfo.hh
M src/arch/mips/linux/hwrpb.hh
M src/arch/mips/linux/thread_info.hh
M src/kern/linux/events.cc
M src/kern/linux/events.hh
M src/kern/linux/helpers.hh
M src/kern/linux/printk.cc
M src/kern/linux/printk.hh
8 files changed, 17 insertions(+), 8 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
Richard Cooper: Looks good to me, approved
diff --git a/src/arch/generic/linux/threadinfo.hh
b/src/arch/generic/linux/threadinfo.hh
index 7702f0e..70511c4 100644
--- a/src/arch/generic/linux/threadinfo.hh
+++ b/src/arch/generic/linux/threadinfo.hh
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/arch/mips/linux/hwrpb.hh b/src/arch/mips/linux/hwrpb.hh
index b5dcb18..3c5e439 100644
--- a/src/arch/mips/linux/hwrpb.hh
+++ b/src/arch/mips/linux/hwrpb.hh
@@ -30,7 +30,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
struct pcb_struct
diff --git a/src/arch/mips/linux/thread_info.hh
b/src/arch/mips/linux/thread_info.hh
index df376f0..986c896 100644
--- a/src/arch/mips/linux/thread_info.hh
+++ b/src/arch/mips/linux/thread_info.hh
@@ -34,7 +34,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
struct thread_info
diff --git a/src/kern/linux/events.cc b/src/kern/linux/events.cc
index 6ec883c..3576759 100644
--- a/src/kern/linux/events.cc
+++ b/src/kern/linux/events.cc
@@ -54,7 +54,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/kern/linux/events.hh b/src/kern/linux/events.hh
index 7549209..966c1ba 100644
--- a/src/kern/linux/events.hh
+++ b/src/kern/linux/events.hh
@@ -57,7 +57,6 @@
class ThreadContext;
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/kern/linux/helpers.hh b/src/kern/linux/helpers.hh
index 1ad5b41..b8d3c49 100644
--- a/src/kern/linux/helpers.hh
+++ b/src/kern/linux/helpers.hh
@@ -47,7 +47,6 @@
class ThreadContext;
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index c356016..ccb1e8a 100644
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/kern/linux/printk.hh b/src/kern/linux/printk.hh
index 7b545bc..1e265a7 100644
--- a/src/kern/linux/printk.hh
+++ b/src/kern/linux/printk.hh
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67364?usp=email
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: I73d7792ab8897d00b143d82d0fb70987ca410438
Gerrit-Change-Number: 67364
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: misc: Remove the FreeBSD namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67365?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: misc: Remove the FreeBSD namespace
..
misc: Remove the FreeBSD namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ic0c838709121278584a295ea19a8283d5765b9c9
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67365
Maintainer: Jason Lowe-Power
Reviewed-by: Richard Cooper
Tested-by: kokoro
---
M src/arch/generic/freebsd/threadinfo.hh
M src/kern/freebsd/events.cc
M src/kern/freebsd/events.hh
3 files changed, 17 insertions(+), 3 deletions(-)
Approvals:
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/generic/freebsd/threadinfo.hh
b/src/arch/generic/freebsd/threadinfo.hh
index f2a..443367f 100644
--- a/src/arch/generic/freebsd/threadinfo.hh
+++ b/src/arch/generic/freebsd/threadinfo.hh
@@ -39,7 +39,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FreeBSD, free_bsd);
namespace free_bsd
{
diff --git a/src/kern/freebsd/events.cc b/src/kern/freebsd/events.cc
index ce2291e..667b10b 100644
--- a/src/kern/freebsd/events.cc
+++ b/src/kern/freebsd/events.cc
@@ -44,7 +44,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FreeBSD, free_bsd);
namespace free_bsd
{
diff --git a/src/kern/freebsd/events.hh b/src/kern/freebsd/events.hh
index c89ad0c..f4e350f 100644
--- a/src/kern/freebsd/events.hh
+++ b/src/kern/freebsd/events.hh
@@ -40,7 +40,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FreeBSD, free_bsd);
namespace free_bsd
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67365?usp=email
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: Ic0c838709121278584a295ea19a8283d5765b9c9
Gerrit-Change-Number: 67365
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: cpu: Remove the DecodeCache namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67368?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: cpu: Remove the DecodeCache namespace
..
cpu: Remove the DecodeCache namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ia1b2ab564f7c0ee85c8d288e38be4d7c013f
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67368
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/cpu/decode_cache.hh
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/decode_cache.hh b/src/cpu/decode_cache.hh
index 4e5631a..cbd3c93 100644
--- a/src/cpu/decode_cache.hh
+++ b/src/cpu/decode_cache.hh
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(DecodeCache, decode_cache);
namespace decode_cache
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67368?usp=email
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: Ia1b2ab564f7c0ee85c8d288e38be4d7c013f
Gerrit-Change-Number: 67368
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: cpu: Remove the Minor namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67369?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: cpu: Remove the Minor namespace
..
cpu: Remove the Minor namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I603134248a05c988627bbd3c59c962b085b3b2ad
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67369
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/cpu/minor/activity.cc
M src/cpu/minor/activity.hh
M src/cpu/minor/buffers.hh
M src/cpu/minor/cpu.hh
M src/cpu/minor/decode.cc
M src/cpu/minor/decode.hh
M src/cpu/minor/dyn_inst.cc
M src/cpu/minor/dyn_inst.hh
M src/cpu/minor/exec_context.hh
M src/cpu/minor/execute.cc
M src/cpu/minor/execute.hh
M src/cpu/minor/fetch1.cc
M src/cpu/minor/fetch1.hh
M src/cpu/minor/fetch2.cc
M src/cpu/minor/fetch2.hh
M src/cpu/minor/func_unit.cc
M src/cpu/minor/func_unit.hh
M src/cpu/minor/lsq.cc
M src/cpu/minor/lsq.hh
M src/cpu/minor/pipe_data.cc
M src/cpu/minor/pipe_data.hh
M src/cpu/minor/pipeline.cc
M src/cpu/minor/pipeline.hh
M src/cpu/minor/scoreboard.cc
M src/cpu/minor/scoreboard.hh
M src/cpu/minor/stats.cc
M src/cpu/minor/stats.hh
M src/cpu/minor/trace.hh
28 files changed, 17 insertions(+), 28 deletions(-)
Approvals:
kokoro: Regressions pass
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
diff --git a/src/cpu/minor/activity.cc b/src/cpu/minor/activity.cc
index f78e927..f2f65b3 100644
--- a/src/cpu/minor/activity.cc
+++ b/src/cpu/minor/activity.cc
@@ -44,7 +44,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/activity.hh b/src/cpu/minor/activity.hh
index b942217..d052e0f 100644
--- a/src/cpu/minor/activity.hh
+++ b/src/cpu/minor/activity.hh
@@ -50,7 +50,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/buffers.hh b/src/cpu/minor/buffers.hh
index 648ec49..e461a5c 100644
--- a/src/cpu/minor/buffers.hh
+++ b/src/cpu/minor/buffers.hh
@@ -59,7 +59,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/cpu.hh b/src/cpu/minor/cpu.hh
index b5b04ae..acf4295 100644
--- a/src/cpu/minor/cpu.hh
+++ b/src/cpu/minor/cpu.hh
@@ -56,7 +56,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc
index 53c02f3..a4516a0 100644
--- a/src/cpu/minor/decode.cc
+++ b/src/cpu/minor/decode.cc
@@ -45,7 +45,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/decode.hh b/src/cpu/minor/decode.hh
index 156b920..913e03f 100644
--- a/src/cpu/minor/decode.hh
+++ b/src/cpu/minor/decode.hh
@@ -56,7 +56,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc
index ac8f948..68415ec 100644
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -50,7 +50,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/dyn_inst.hh b/src/cpu/minor/dyn_inst.hh
index d9a85f9..9c6d6fd 100644
--- a/src/cpu/minor/dyn_inst.hh
+++ b/src/cpu/minor/dyn_inst.hh
@@ -62,7 +62,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh
index f3dc3ba..33641f3 100644
--- a/src/cpu/minor/exec_context.hh
+++ b/src/cpu/minor/exec_context.hh
@@ -59,7 +59,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index 6eccec0..5eaaf58 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -57,7 +57,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/execute.hh b/src/cpu/minor/execute.hh
index 8a8c263..0a1dde1 100644
--- a/src/cpu/minor/execute.hh
+++ b/src/cpu/minor/execute.hh
@@ -59,7 +59,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc
index daf8d56..dd427b7 100644
--- a/src/cpu/minor/fetch1.cc
+++ b/src/cpu/minor/fetch1.cc
@@ -54,7 +54,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/fetch1.hh b/src/cpu/minor/fetch1.hh
index e33eb04..f6a796c 100644
--- a/src/cpu/minor/fetch1.hh
+++ b/src/cpu/minor/fetch1.hh
@@ -58,7 +58,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor,
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Remove the Stats namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67359?usp=email )
Change subject: base: Remove the Stats namespace
..
base: Remove the Stats namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I80f25af68e03fff3df8316cb4d1d2669687d0fe4
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67359
Maintainer: Jason Lowe-Power
Reviewed-by: Jason Lowe-Power
Tested-by: kokoro
---
M src/base/statistics.cc
M src/base/statistics.hh
M src/base/stats/group.cc
M src/base/stats/group.hh
M src/base/stats/group.test.cc
M src/base/stats/hdf5.cc
M src/base/stats/hdf5.hh
M src/base/stats/info.cc
M src/base/stats/info.hh
M src/base/stats/output.hh
M src/base/stats/storage.cc
M src/base/stats/storage.hh
M src/base/stats/text.cc
M src/base/stats/text.hh
M src/base/stats/types.hh
M src/base/stats/units.hh
M src/python/pybind11/stats.cc
M src/sim/power/mathexpr_powermodel.hh
M src/sim/stat_control.cc
M src/sim/stat_control.hh
M src/sim/stat_register.cc
M src/sim/stat_register.hh
22 files changed, 20 insertions(+), 24 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index c380143..2fddf1b 100644
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -53,7 +53,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 24cbf71..8156be5 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -91,7 +91,6 @@
{
/* A namespace for all of the Statistics */
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/group.cc b/src/base/stats/group.cc
index d5626e6..93e7183 100644
--- a/src/base/stats/group.cc
+++ b/src/base/stats/group.cc
@@ -47,7 +47,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/group.hh b/src/base/stats/group.hh
index bd1183e..3c11e61 100644
--- a/src/base/stats/group.hh
+++ b/src/base/stats/group.hh
@@ -74,7 +74,6 @@
#define ADD_STAT(n, ...) n(this, #n, __VA_ARGS__)
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/group.test.cc b/src/base/stats/group.test.cc
index e2e0598..5a7cde4 100644
--- a/src/base/stats/group.test.cc
+++ b/src/base/stats/group.test.cc
@@ -255,10 +255,10 @@
ASSERT_EQ(node2_2.getStatGroups().size(), 0);
}
-class DummyInfo : public Stats::Info
+class DummyInfo : public statistics::Info
{
public:
-using Stats::Info::Info;
+using statistics::Info::Info;
int value = 0;
@@ -266,7 +266,7 @@
void prepare() override {}
void reset() override { value = 0; }
bool zero() const override { return false; }
-void visit(Stats::Output ) override {}
+void visit(statistics::Output ) override {}
};
/** Test adding stats to a group. */
diff --git a/src/base/stats/hdf5.cc b/src/base/stats/hdf5.cc
index 03574b2..be548bf 100644
--- a/src/base/stats/hdf5.cc
+++ b/src/base/stats/hdf5.cc
@@ -59,7 +59,6 @@
}
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/hdf5.hh b/src/base/stats/hdf5.hh
index 7fa..ac21ee8a 100644
--- a/src/base/stats/hdf5.hh
+++ b/src/base/stats/hdf5.hh
@@ -53,7 +53,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/info.cc b/src/base/stats/info.cc
index c40b559..06e7ec9 100644
--- a/src/base/stats/info.cc
+++ b/src/base/stats/info.cc
@@ -52,7 +52,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh
index 9a5e2e7..98859cb 100644
--- a/src/base/stats/info.hh
+++ b/src/base/stats/info.hh
@@ -43,7 +43,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/output.hh b/src/base/stats/output.hh
index 39b0804..23531e8 100644
--- a/src/base/stats/output.hh
+++ b/src/base/stats/output.hh
@@ -49,7 +49,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/storage.cc b/src/base/stats/storage.cc
index 6b32dc5..3b2c091 100644
--- a/src/base/stats/storage.cc
+++ b/src/base/stats/storage.cc
@@ -46,7 +46,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/storage.hh b/src/base/stats/storage.hh
index cf22e10..eb1873b 100644
--- a/src/base/stats/storage.hh
+++ b/src/base/stats/storage.hh
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
[gem5-dev] [M] Change in gem5/gem5[develop]: mem-cache: Remove the Prefetcher namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67353?usp=email )
Change subject: mem-cache: Remove the Prefetcher namespace
..
mem-cache: Remove the Prefetcher namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I31953be7ce8566576de94c9296c601c9906a
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
---
M src/mem/cache/base.hh
M src/mem/cache/prefetch/access_map_pattern_matching.cc
M src/mem/cache/prefetch/access_map_pattern_matching.hh
M src/mem/cache/prefetch/base.cc
M src/mem/cache/prefetch/base.hh
M src/mem/cache/prefetch/bop.cc
M src/mem/cache/prefetch/bop.hh
M src/mem/cache/prefetch/delta_correlating_prediction_tables.cc
M src/mem/cache/prefetch/delta_correlating_prediction_tables.hh
M src/mem/cache/prefetch/indirect_memory.cc
M src/mem/cache/prefetch/indirect_memory.hh
M src/mem/cache/prefetch/irregular_stream_buffer.cc
M src/mem/cache/prefetch/irregular_stream_buffer.hh
M src/mem/cache/prefetch/multi.cc
M src/mem/cache/prefetch/multi.hh
M src/mem/cache/prefetch/pif.cc
M src/mem/cache/prefetch/pif.hh
M src/mem/cache/prefetch/queued.cc
M src/mem/cache/prefetch/queued.hh
M src/mem/cache/prefetch/sbooe.cc
M src/mem/cache/prefetch/sbooe.hh
M src/mem/cache/prefetch/signature_path.cc
M src/mem/cache/prefetch/signature_path.hh
M src/mem/cache/prefetch/signature_path_v2.cc
M src/mem/cache/prefetch/signature_path_v2.hh
M src/mem/cache/prefetch/slim_ampm.cc
M src/mem/cache/prefetch/slim_ampm.hh
M src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc
M src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh
M src/mem/cache/prefetch/stride.cc
M src/mem/cache/prefetch/stride.hh
M src/mem/cache/prefetch/tagged.cc
M src/mem/cache/prefetch/tagged.hh
33 files changed, 17 insertions(+), 33 deletions(-)
Approvals:
kokoro: Regressions pass
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 6fc7628..78571ce 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 6bf5d9b..989f3c6 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 3b0bc28..893d30d 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 @@
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 9ff81fb..e3e4b24 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 e5e43e5..6bae735 100644
--- a/src/mem/cache/prefetch/base.hh
+++ b/src/mem/cache/prefetch/base.hh
@@ -65,7 +65,6 @@
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 a60c1fe..ce2502b 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 7fdba2b..bb1b05d 100644
--- a/src/mem/cache/prefetch/bop.hh
+++ b/src/mem/cache/prefetch/bop.hh
@@ -46,7 +46,6 @@
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 c5e126c..b59394c 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
[gem5-dev] [S] Change in gem5/gem5[develop]: mem: Remove the QoS namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67356?usp=email )
Change subject: mem: Remove the QoS namespace
..
mem: Remove the QoS namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I2fa66e5fc77f19beaac3251602617704dadaec99
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67356
Tested-by: kokoro
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
---
M src/mem/qos/mem_ctrl.cc
M src/mem/qos/mem_ctrl.hh
M src/mem/qos/mem_sink.cc
M src/mem/qos/mem_sink.hh
M src/mem/qos/policy.cc
M src/mem/qos/policy.hh
M src/mem/qos/policy_fixed_prio.cc
M src/mem/qos/policy_fixed_prio.hh
M src/mem/qos/policy_pf.cc
M src/mem/qos/policy_pf.hh
M src/mem/qos/q_policy.cc
M src/mem/qos/q_policy.hh
M src/mem/qos/turnaround_policy.hh
M src/mem/qos/turnaround_policy_ideal.cc
M src/mem/qos/turnaround_policy_ideal.hh
15 files changed, 17 insertions(+), 15 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
Richard Cooper: Looks good to me, approved
diff --git a/src/mem/qos/mem_ctrl.cc b/src/mem/qos/mem_ctrl.cc
index 5bb031c..9bf1328 100644
--- a/src/mem/qos/mem_ctrl.cc
+++ b/src/mem/qos/mem_ctrl.cc
@@ -48,7 +48,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/mem_ctrl.hh b/src/mem/qos/mem_ctrl.hh
index 11e787d..359e285 100644
--- a/src/mem/qos/mem_ctrl.hh
+++ b/src/mem/qos/mem_ctrl.hh
@@ -64,7 +64,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc
index 2dec5d5..3ffe7f4 100644
--- a/src/mem/qos/mem_sink.cc
+++ b/src/mem/qos/mem_sink.cc
@@ -50,7 +50,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/mem_sink.hh b/src/mem/qos/mem_sink.hh
index a2e975a..d2310c6 100644
--- a/src/mem/qos/mem_sink.hh
+++ b/src/mem/qos/mem_sink.hh
@@ -59,7 +59,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy.cc b/src/mem/qos/policy.cc
index 6d41e7d..5ca7eae 100644
--- a/src/mem/qos/policy.cc
+++ b/src/mem/qos/policy.cc
@@ -45,7 +45,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy.hh b/src/mem/qos/policy.hh
index a7e7666..c5bd2be 100644
--- a/src/mem/qos/policy.hh
+++ b/src/mem/qos/policy.hh
@@ -57,7 +57,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy_fixed_prio.cc
b/src/mem/qos/policy_fixed_prio.cc
index 140817e..f64aae9 100644
--- a/src/mem/qos/policy_fixed_prio.cc
+++ b/src/mem/qos/policy_fixed_prio.cc
@@ -51,7 +51,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy_fixed_prio.hh
b/src/mem/qos/policy_fixed_prio.hh
index 77e7a25..18ff6ac 100644
--- a/src/mem/qos/policy_fixed_prio.hh
+++ b/src/mem/qos/policy_fixed_prio.hh
@@ -52,7 +52,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy_pf.cc b/src/mem/qos/policy_pf.cc
index ae15045..adbcdb4 100644
--- a/src/mem/qos/policy_pf.cc
+++ b/src/mem/qos/policy_pf.cc
@@ -48,7 +48,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy_pf.hh b/src/mem/qos/policy_pf.hh
index acc2a4a..4c215e5 100644
--- a/src/mem/qos/policy_pf.hh
+++ b/src/mem/qos/policy_pf.hh
@@ -52,7 +52,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/q_policy.cc b/src/mem/qos/q_policy.cc
index de2e316..a6d13fe 100644
--- a/src/mem/qos/q_policy.cc
+++ b/src/mem/qos/q_policy.cc
@@ -52,7 +52,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/q_policy.hh b/src/mem/qos/q_policy.hh
index 7af52b6..fc9200d 100644
--- a/src/mem/qos/q_policy.hh
+++ b/src/mem/qos/q_policy.hh
@@ -53,7 +53,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/turnaround_policy.hh
b/src/mem/qos/turnaround_policy.hh
index 2d5696f..9bbb446 100644
--- a/src/mem/qos/turnaround_policy.hh
+++ b/src/mem/qos/turnaround_policy.hh
@@ -49,7 +49,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/turnaround_policy_ideal.cc
b/src/mem/qos/turnaround_policy_ideal.cc
index c67e40b..8d3d7d0 100644
--- a/src/mem/qos/turnaround_policy_ideal.cc
+++ b/src/mem/qos/turnaround_policy_ideal.cc
@@ -48,7 +48,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/turnaround_policy_ideal.hh
b/src/mem/qos/turnaround_policy_ideal.hh
index
[gem5-dev] [S] Change in gem5/gem5[develop]: mem-cache: Remove the Encoder namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67355?usp=email )
Change subject: mem-cache: Remove the Encoder namespace
..
mem-cache: Remove the Encoder namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Iabe3b61eb2409a10c582ab1f1c26abc649c1646a
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67355
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/mem/cache/compressors/encoders/base.hh
M src/mem/cache/compressors/encoders/huffman.cc
M src/mem/cache/compressors/encoders/huffman.hh
3 files changed, 17 insertions(+), 3 deletions(-)
Approvals:
kokoro: Regressions pass
Jason Lowe-Power: Looks good to me, approved
Richard Cooper: Looks good to me, approved
diff --git a/src/mem/cache/compressors/encoders/base.hh
b/src/mem/cache/compressors/encoders/base.hh
index c5f2297..ddc8c67 100644
--- a/src/mem/cache/compressors/encoders/base.hh
+++ b/src/mem/cache/compressors/encoders/base.hh
@@ -38,7 +38,6 @@
namespace compression
{
-GEM5_DEPRECATED_NAMESPACE(Encoder, encoder);
namespace encoder
{
diff --git a/src/mem/cache/compressors/encoders/huffman.cc
b/src/mem/cache/compressors/encoders/huffman.cc
index a7f24cf..5be3bce 100644
--- a/src/mem/cache/compressors/encoders/huffman.cc
+++ b/src/mem/cache/compressors/encoders/huffman.cc
@@ -37,7 +37,6 @@
namespace compression
{
-GEM5_DEPRECATED_NAMESPACE(Encoder, encoder);
namespace encoder
{
diff --git a/src/mem/cache/compressors/encoders/huffman.hh
b/src/mem/cache/compressors/encoders/huffman.hh
index 2ea5364..7614854 100644
--- a/src/mem/cache/compressors/encoders/huffman.hh
+++ b/src/mem/cache/compressors/encoders/huffman.hh
@@ -44,7 +44,6 @@
namespace compression
{
-GEM5_DEPRECATED_NAMESPACE(Encoder, encoder);
namespace encoder
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67355?usp=email
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: Iabe3b61eb2409a10c582ab1f1c26abc649c1646a
Gerrit-Change-Number: 67355
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Nikos Nikoleris
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: mem: Remove the ContextSwitchTaskId namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67357?usp=email )
Change subject: mem: Remove the ContextSwitchTaskId namespace
..
mem: Remove the ContextSwitchTaskId namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Iab4bb6ac6e8d603fb508330691796ccdac4b9cb6
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67357
Tested-by: kokoro
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
---
M src/mem/request.hh
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
Richard Cooper: Looks good to me, approved
kokoro: Regressions pass
Jason Lowe-Power: Looks good to me, approved
diff --git a/src/mem/request.hh b/src/mem/request.hh
index 6a0cbc2..be91c71 100644
--- a/src/mem/request.hh
+++ b/src/mem/request.hh
@@ -74,7 +74,6 @@
* doesn't cause a problem with stats and is large enough to realistic
* benchmarks (Linux/Android boot, BBench, etc.)
*/
-GEM5_DEPRECATED_NAMESPACE(ContextSwitchTaskId, context_switch_task_id);
namespace context_switch_task_id
{
enum TaskId
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67357?usp=email
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: Iab4bb6ac6e8d603fb508330691796ccdac4b9cb6
Gerrit-Change-Number: 67357
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Nikos Nikoleris
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Remove the Units namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67361?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: base: Remove the Units namespace
..
base: Remove the Units namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I3d885e656caea0f96dfbdda69713832ff5f79d28
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67361
Reviewed-by: Richard Cooper
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/base/stats/units.hh
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/stats/units.hh b/src/base/stats/units.hh
index fe5b23d..1d7d640 100644
--- a/src/base/stats/units.hh
+++ b/src/base/stats/units.hh
@@ -109,7 +109,6 @@
* - The new unit is significant enough to be not included in Count unit.
* (e.g. Cycle unit, Tick unit)
*/
-GEM5_DEPRECATED_NAMESPACE(Units, units);
namespace units
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67361?usp=email
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: I3d885e656caea0f96dfbdda69713832ff5f79d28
Gerrit-Change-Number: 67361
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Remove the BloomFilter namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67358?usp=email )
Change subject: base: Remove the BloomFilter namespace
..
base: Remove the BloomFilter namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ib919285c6270eb53bd29ab534f3f9b5612417bb2
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67358
Tested-by: kokoro
Maintainer: Jason Lowe-Power
Reviewed-by: Richard Cooper
---
M src/base/filters/base.hh
M src/base/filters/block_bloom_filter.cc
M src/base/filters/block_bloom_filter.hh
M src/base/filters/bulk_bloom_filter.cc
M src/base/filters/bulk_bloom_filter.hh
M src/base/filters/h3_bloom_filter.cc
M src/base/filters/h3_bloom_filter.hh
M src/base/filters/multi_bit_sel_bloom_filter.cc
M src/base/filters/multi_bit_sel_bloom_filter.hh
M src/base/filters/multi_bloom_filter.cc
M src/base/filters/multi_bloom_filter.hh
M src/base/filters/perfect_bloom_filter.cc
M src/base/filters/perfect_bloom_filter.hh
13 files changed, 17 insertions(+), 13 deletions(-)
Approvals:
Richard Cooper: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/filters/base.hh b/src/base/filters/base.hh
index f2b9fce..858e265 100644
--- a/src/base/filters/base.hh
+++ b/src/base/filters/base.hh
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/block_bloom_filter.cc
b/src/base/filters/block_bloom_filter.cc
index e1ae116..7a3c170 100644
--- a/src/base/filters/block_bloom_filter.cc
+++ b/src/base/filters/block_bloom_filter.cc
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/block_bloom_filter.hh
b/src/base/filters/block_bloom_filter.hh
index 0375d30..f704006 100644
--- a/src/base/filters/block_bloom_filter.hh
+++ b/src/base/filters/block_bloom_filter.hh
@@ -39,7 +39,6 @@
struct BloomFilterBlockParams;
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/bulk_bloom_filter.cc
b/src/base/filters/bulk_bloom_filter.cc
index 3a2ac58..cf28bf9 100644
--- a/src/base/filters/bulk_bloom_filter.cc
+++ b/src/base/filters/bulk_bloom_filter.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/bulk_bloom_filter.hh
b/src/base/filters/bulk_bloom_filter.hh
index 985fcb3..6c47476 100644
--- a/src/base/filters/bulk_bloom_filter.hh
+++ b/src/base/filters/bulk_bloom_filter.hh
@@ -37,7 +37,6 @@
struct BloomFilterBulkParams;
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/h3_bloom_filter.cc
b/src/base/filters/h3_bloom_filter.cc
index e1aeba7..9e973d8 100644
--- a/src/base/filters/h3_bloom_filter.cc
+++ b/src/base/filters/h3_bloom_filter.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/h3_bloom_filter.hh
b/src/base/filters/h3_bloom_filter.hh
index a60c212..fc6ba65 100644
--- a/src/base/filters/h3_bloom_filter.hh
+++ b/src/base/filters/h3_bloom_filter.hh
@@ -37,7 +37,6 @@
struct BloomFilterH3Params;
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/multi_bit_sel_bloom_filter.cc
b/src/base/filters/multi_bit_sel_bloom_filter.cc
index f12d1f7..e6f6c145 100644
--- a/src/base/filters/multi_bit_sel_bloom_filter.cc
+++ b/src/base/filters/multi_bit_sel_bloom_filter.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/multi_bit_sel_bloom_filter.hh
b/src/base/filters/multi_bit_sel_bloom_filter.hh
index 8c5b34c..a746b1d 100644
--- a/src/base/filters/multi_bit_sel_bloom_filter.hh
+++ b/src/base/filters/multi_bit_sel_bloom_filter.hh
@@ -37,7 +37,6 @@
struct BloomFilterMultiBitSelParams;
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/multi_bloom_filter.cc
b/src/base/filters/multi_bloom_filter.cc
index 401d844..f6b4892 100644
--- a/src/base/filters/multi_bloom_filter.cc
+++ b/src/base/filters/multi_bloom_filter.cc
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/multi_bloom_filter.hh
b/src/base/filters/multi_bloom_filter.hh
index ec9838a..9445b81 100644
--- a/src/base/filters/multi_bloom_filter.hh
+++ b/src/base/filters/multi_bloom_filter.hh
@@ -39,7 +39,6 @@
struct BloomFilterMultiParams;
[gem5-dev] [S] Change in gem5/gem5[develop]: mem-cache: Remove the Compressor namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67354?usp=email )
Change subject: mem-cache: Remove the Compressor namespace
..
mem-cache: Remove the Compressor namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ibbcc8221ed6042d55f56a94bf499a4c1c564ea82
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67354
Maintainer: Jason Lowe-Power
Tested-by: kokoro
Reviewed-by: Richard Cooper
---
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
27 files changed, 17 insertions(+), 27 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Richard Cooper: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/compressors/base.cc
b/src/mem/cache/compressors/base.cc
index cafd691..df3020d 100644
--- a/src/mem/cache/compressors/base.cc
+++ b/src/mem/cache/compressors/base.cc
@@ -48,7 +48,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base.hh
b/src/mem/cache/compressors/base.hh
index 4945176..110c6a4 100644
--- a/src/mem/cache/compressors/base.hh
+++ b/src/mem/cache/compressors/base.hh
@@ -50,7 +50,6 @@
class CacheBlk;
struct BaseCacheCompressorParams;
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base_delta.cc
b/src/mem/cache/compressors/base_delta.cc
index 9b2e67c..308dabf 100644
--- a/src/mem/cache/compressors/base_delta.cc
+++ b/src/mem/cache/compressors/base_delta.cc
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base_delta.hh
b/src/mem/cache/compressors/base_delta.hh
index 81f2c4b..a0e6668 100644
--- a/src/mem/cache/compressors/base_delta.hh
+++ b/src/mem/cache/compressors/base_delta.hh
@@ -52,7 +52,6 @@
struct Base32Delta16Params;
struct Base16Delta8Params;
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base_delta_impl.hh
b/src/mem/cache/compressors/base_delta_impl.hh
index c4a841d..c43283c 100644
--- a/src/mem/cache/compressors/base_delta_impl.hh
+++ b/src/mem/cache/compressors/base_delta_impl.hh
@@ -40,7 +40,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base_dictionary_compressor.cc
b/src/mem/cache/compressors/base_dictionary_compressor.cc
index 6a1ed92..d289db1 100644
--- a/src/mem/cache/compressors/base_dictionary_compressor.cc
+++ b/src/mem/cache/compressors/base_dictionary_compressor.cc
@@ -37,7 +37,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/cpack.cc
b/src/mem/cache/compressors/cpack.cc
index 64376b9..44f47bb 100644
--- a/src/mem/cache/compressors/cpack.cc
+++ b/src/mem/cache/compressors/cpack.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/cpack.hh
b/src/mem/cache/compressors/cpack.hh
index 51f5ce1..d1005d1 100644
--- a/src/mem/cache/compressors/cpack.hh
+++ b/src/mem/cache/compressors/cpack.hh
@@ -46,7 +46,6 @@
struct CPackParams;
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/dictionary_compressor.hh
b/src/mem/cache/compressors/dictionary_compressor.hh
index c283280..6efdb73 100644
--- a/src/mem/cache/compressors/dictionary_compressor.hh
+++ b/src/mem/cache/compressors/dictionary_compressor.hh
@@ -61,7 +61,6
[gem5-dev] [S] Change in gem5/gem5[develop]: mem-cache: Remove the ReplacementPolicy namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67352?usp=email )
Change subject: mem-cache: Remove the ReplacementPolicy namespace
..
mem-cache: Remove the ReplacementPolicy namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: If4904706b897999e9200b163d47679519f01e4d4
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67352
Maintainer: Jason Lowe-Power
Reviewed-by: Richard Cooper
Tested-by: kokoro
---
M src/mem/cache/prefetch/stride.hh
M src/mem/cache/replacement_policies/base.hh
M src/mem/cache/replacement_policies/bip_rp.cc
M src/mem/cache/replacement_policies/bip_rp.hh
M src/mem/cache/replacement_policies/brrip_rp.cc
M src/mem/cache/replacement_policies/brrip_rp.hh
M src/mem/cache/replacement_policies/dueling_rp.hh
M src/mem/cache/replacement_policies/fifo_rp.cc
M src/mem/cache/replacement_policies/fifo_rp.hh
M src/mem/cache/replacement_policies/lfu_rp.cc
M src/mem/cache/replacement_policies/lfu_rp.hh
M src/mem/cache/replacement_policies/lru_rp.cc
M src/mem/cache/replacement_policies/lru_rp.hh
M src/mem/cache/replacement_policies/mru_rp.cc
M src/mem/cache/replacement_policies/mru_rp.hh
M src/mem/cache/replacement_policies/random_rp.cc
M src/mem/cache/replacement_policies/random_rp.hh
M src/mem/cache/replacement_policies/replaceable_entry.hh
M src/mem/cache/replacement_policies/second_chance_rp.cc
M src/mem/cache/replacement_policies/second_chance_rp.hh
M src/mem/cache/replacement_policies/ship_rp.hh
M src/mem/cache/replacement_policies/tree_plru_rp.cc
M src/mem/cache/replacement_policies/tree_plru_rp.hh
M src/mem/cache/replacement_policies/weighted_lru_rp.cc
M src/mem/cache/replacement_policies/weighted_lru_rp.hh
M src/mem/cache/tags/sector_tags.hh
26 files changed, 19 insertions(+), 26 deletions(-)
Approvals:
kokoro: Regressions pass
Jason Lowe-Power: Looks good to me, approved
Richard Cooper: Looks good to me, approved
diff --git a/src/mem/cache/prefetch/stride.hh
b/src/mem/cache/prefetch/stride.hh
index 2b70765..27fa917 100644
--- a/src/mem/cache/prefetch/stride.hh
+++ b/src/mem/cache/prefetch/stride.hh
@@ -64,7 +64,6 @@
{
class BaseIndexingPolicy;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
class Base;
diff --git a/src/mem/cache/replacement_policies/base.hh
b/src/mem/cache/replacement_policies/base.hh
index fc92ecb..2c23c95 100644
--- a/src/mem/cache/replacement_policies/base.hh
+++ b/src/mem/cache/replacement_policies/base.hh
@@ -45,7 +45,6 @@
*/
typedef std::vector ReplacementCandidates;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/bip_rp.cc
b/src/mem/cache/replacement_policies/bip_rp.cc
index 102037d..812c36b 100644
--- a/src/mem/cache/replacement_policies/bip_rp.cc
+++ b/src/mem/cache/replacement_policies/bip_rp.cc
@@ -37,7 +37,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/bip_rp.hh
b/src/mem/cache/replacement_policies/bip_rp.hh
index 486f459..0b830e0 100644
--- a/src/mem/cache/replacement_policies/bip_rp.hh
+++ b/src/mem/cache/replacement_policies/bip_rp.hh
@@ -49,7 +49,6 @@
struct BIPRPParams;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/brrip_rp.cc
b/src/mem/cache/replacement_policies/brrip_rp.cc
index a28ad33..06dad0d9 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.cc
+++ b/src/mem/cache/replacement_policies/brrip_rp.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/brrip_rp.hh
b/src/mem/cache/replacement_policies/brrip_rp.hh
index f4f815e..5649a64 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.hh
+++ b/src/mem/cache/replacement_policies/brrip_rp.hh
@@ -60,7 +60,6 @@
struct BRRIPRPParams;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/dueling_rp.hh
b/src/mem/cache/replacement_policies/dueling_rp.hh
index a451050..c7400b4 100644
--- a/src/mem/cache/replacement_policies/dueling_rp.hh
+++ b/src/mem/cache/replacement_policies/dueling_rp.hh
@@ -41,7 +41,6 @@
struct DuelingRPParams;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/fifo_rp.cc
b/src/mem/cache/replacement_policies/fifo_rp.cc
index bc0680b..199ba0a 100644
--- a/src/mem/cache/replacement_policies/fifo_rp.cc
+++
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Remove the Debug namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67360?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: base: Remove the Debug namespace
..
base: Remove the Debug namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I4241501f3683c1daa8554693cba7aa2c022db130
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67360
Reviewed-by: Richard Cooper
Tested-by: kokoro
Maintainer: Jason Lowe-Power
---
M build_tools/debugflaghh.py
M src/base/debug.cc
M src/base/debug.hh
3 files changed, 17 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Richard Cooper: Looks good to me, approved
kokoro: Regressions pass
diff --git a/build_tools/debugflaghh.py b/build_tools/debugflaghh.py
index 2e861e2..1a4a379 100644
--- a/build_tools/debugflaghh.py
+++ b/build_tools/debugflaghh.py
@@ -82,7 +82,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Debug, debug);
namespace debug
{
diff --git a/src/base/debug.cc b/src/base/debug.cc
index aa4092a..73b52f3 100644
--- a/src/base/debug.cc
+++ b/src/base/debug.cc
@@ -52,7 +52,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Debug, debug);
namespace debug
{
diff --git a/src/base/debug.hh b/src/base/debug.hh
index f6b03ae..3941e66 100644
--- a/src/base/debug.hh
+++ b/src/base/debug.hh
@@ -53,7 +53,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Debug, debug);
namespace debug
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67360?usp=email
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: I4241501f3683c1daa8554693cba7aa2c022db130
Gerrit-Change-Number: 67360
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Richard Cooper
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: sim,arch: Remove the GuestABI namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67374?usp=email )
Change subject: sim,arch: Remove the GuestABI namespace
..
sim,arch: Remove the GuestABI namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I476815491314f4222da43da75c91654b4f3d1228
Signed-off-by: Daniel R. Carvalho
---
M src/arch/arm/aapcs32.hh
M src/arch/arm/aapcs64.hh
M src/arch/arm/freebsd/se_workload.hh
M src/arch/arm/linux/se_workload.hh
M src/arch/arm/reg_abi.hh
M src/arch/arm/semihosting.cc
M src/arch/arm/semihosting.hh
M src/arch/mips/se_workload.hh
M src/arch/power/se_workload.hh
M src/arch/riscv/se_workload.hh
M src/arch/sparc/pseudo_inst_abi.hh
M src/arch/sparc/se_workload.hh
M src/arch/x86/linux/linux.hh
M src/arch/x86/linux/se_workload.hh
M src/arch/x86/pseudo_inst_abi.hh
M src/sim/guest_abi.test.cc
M src/sim/guest_abi/definition.hh
M src/sim/guest_abi/dispatch.hh
M src/sim/guest_abi/layout.hh
M src/sim/guest_abi/varargs.hh
M src/sim/proxy_ptr.hh
M src/sim/proxy_ptr.test.cc
M src/sim/syscall_abi.hh
23 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/src/arch/arm/aapcs32.hh b/src/arch/arm/aapcs32.hh
index 383b8eb..1d727e2 100644
--- a/src/arch/arm/aapcs32.hh
+++ b/src/arch/arm/aapcs32.hh
@@ -70,7 +70,6 @@
};
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
@@ -446,7 +445,6 @@
};
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/aapcs64.hh b/src/arch/arm/aapcs64.hh
index 2f53822..62926d3 100644
--- a/src/arch/arm/aapcs64.hh
+++ b/src/arch/arm/aapcs64.hh
@@ -67,7 +67,6 @@
};
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/freebsd/se_workload.hh
b/src/arch/arm/freebsd/se_workload.hh
index b944dbd..47e41f2 100644
--- a/src/arch/arm/freebsd/se_workload.hh
+++ b/src/arch/arm/freebsd/se_workload.hh
@@ -70,7 +70,6 @@
} // namespace ArmISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/linux/se_workload.hh
b/src/arch/arm/linux/se_workload.hh
index 0939af1..29bd30a 100644
--- a/src/arch/arm/linux/se_workload.hh
+++ b/src/arch/arm/linux/se_workload.hh
@@ -62,7 +62,6 @@
} // namespace ArmISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/reg_abi.hh b/src/arch/arm/reg_abi.hh
index 1d5272c..e892166 100644
--- a/src/arch/arm/reg_abi.hh
+++ b/src/arch/arm/reg_abi.hh
@@ -51,7 +51,6 @@
} // namespace ArmISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/semihosting.cc b/src/arch/arm/semihosting.cc
index 8efe841..4ce52e8 100644
--- a/src/arch/arm/semihosting.cc
+++ b/src/arch/arm/semihosting.cc
@@ -714,7 +714,6 @@
};
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/arm/semihosting.hh b/src/arch/arm/semihosting.hh
index fe7819c..557eb76 100644
--- a/src/arch/arm/semihosting.hh
+++ b/src/arch/arm/semihosting.hh
@@ -599,7 +599,6 @@
std::ostream << (
std::ostream , const ArmSemihosting::InPlaceArg );
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/mips/se_workload.hh b/src/arch/mips/se_workload.hh
index dc6f1dd..18c0bda 100644
--- a/src/arch/mips/se_workload.hh
+++ b/src/arch/mips/se_workload.hh
@@ -68,7 +68,6 @@
} // namespace MipsISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/power/se_workload.hh b/src/arch/power/se_workload.hh
index d041c45..3c2bb93 100644
--- a/src/arch/power/se_workload.hh
+++ b/src/arch/power/se_workload.hh
@@ -68,7 +68,6 @@
} // namespace PowerISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/riscv/se_workload.hh b/src/arch/riscv/se_workload.hh
index 6f7c2ed..9ae3be4 100644
--- a/src/arch/riscv/se_workload.hh
+++ b/src/arch/riscv/se_workload.hh
@@ -66,7 +66,6 @@
} // namespace RiscvISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/sparc/pseudo_inst_abi.hh
b/src/arch/sparc/pseudo_inst_abi.hh
index 993e11b..989f0e7 100644
--- a/src/arch/sparc/pseudo_inst_abi.hh
+++ b/src/arch/sparc/pseudo_inst_abi.hh
@@ -40,7 +40,6 @@
using State = int;
};
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/sparc/se_workload.hh b/src/arch/sparc/se_workload.hh
index 8cb373a..e0f7467 100644
--- a/src/arch/sparc/se_workload.hh
+++ b/src/arch/sparc/se_workload.hh
@@ -80,7 +80,6 @@
} // namespace SparcISA
-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
namespace guest_abi
{
diff --git a/src/arch/x86/linux/linux.hh b/src/arch/x86/linux/linux.hh
index 0c34d09..b959822 100644
---
[gem5-dev] [S] Change in gem5/gem5[develop]: sim: Remove a couple of deprecated namespaces
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67373?usp=email )
Change subject: sim: Remove a couple of deprecated namespaces
..
sim: Remove a couple of deprecated namespaces
These namespaces have gone through the deprecation period
and can now be removed: Int, Float, SimClock, PseudoInst
Change-Id: Iec8e0fff021d8d7696e466e2ad52f2d51305d811
Signed-off-by: Daniel R. Carvalho
---
M src/arch/x86/bios/intelmp.hh
M src/arch/x86/fs_workload.hh
M src/sim/core.cc
M src/sim/core.hh
M src/sim/pseudo_inst.cc
M src/sim/pseudo_inst.hh
6 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/arch/x86/bios/intelmp.hh b/src/arch/x86/bios/intelmp.hh
index 19f2f7a..207b4ab 100644
--- a/src/arch/x86/bios/intelmp.hh
+++ b/src/arch/x86/bios/intelmp.hh
@@ -84,7 +84,6 @@
namespace X86ISA
{
-GEM5_DEPRECATED_NAMESPACE(IntelMP, intelmp);
namespace intelmp
{
diff --git a/src/arch/x86/fs_workload.hh b/src/arch/x86/fs_workload.hh
index b40b69b..5c1187c 100644
--- a/src/arch/x86/fs_workload.hh
+++ b/src/arch/x86/fs_workload.hh
@@ -63,7 +63,6 @@
} // namespace smbios
-GEM5_DEPRECATED_NAMESPACE(IntelMP, intelmp);
namespace intelmp
{
diff --git a/src/sim/core.cc b/src/sim/core.cc
index c388652..d836b55 100644
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -41,13 +41,11 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(SimClock, sim_clock);
namespace sim_clock
{
/// The simulated frequency of curTick(). (In ticks per second)
Tick Frequency;
-GEM5_DEPRECATED_NAMESPACE(Float, as_float);
namespace as_float
{
double s;
@@ -62,7 +60,6 @@
double GHz;
} // namespace as_float
-GEM5_DEPRECATED_NAMESPACE(Int, as_int);
namespace as_int
{
Tick s;
diff --git a/src/sim/core.hh b/src/sim/core.hh
index bd432c2..bac4e40 100644
--- a/src/sim/core.hh
+++ b/src/sim/core.hh
@@ -46,12 +46,10 @@
/// These are variables that are set based on the simulator frequency
///@{
-GEM5_DEPRECATED_NAMESPACE(SimClock, sim_clock);
namespace sim_clock
{
extern Tick Frequency; ///< The number of ticks that equal one second
-GEM5_DEPRECATED_NAMESPACE(Float, as_float);
namespace as_float
{
@@ -81,7 +79,6 @@
*
* @{
*/
-GEM5_DEPRECATED_NAMESPACE(Int, as_int);
namespace as_int
{
extern Tick s; ///< second
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 28b5619..55e44c7 100644
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -76,7 +76,6 @@
using namespace statistics;
-GEM5_DEPRECATED_NAMESPACE(PseudoInst, pseudo_inst);
namespace pseudo_inst
{
diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh
index 4794a41..ba15370 100644
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -55,7 +55,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(PseudoInst, pseudo_inst);
namespace pseudo_inst
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67373?usp=email
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: Iec8e0fff021d8d7696e466e2ad52f2d51305d811
Gerrit-Change-Number: 67373
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: sim: Remove the Enums namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67372?usp=email )
Change subject: sim: Remove the Enums namespace
..
sim: Remove the Enums namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: If4daad57a421b076ae6661812c2255c7f06f30b9
Signed-off-by: Daniel R. Carvalho
---
M build_tools/enum_cc.py
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/build_tools/enum_cc.py b/build_tools/enum_cc.py
index cd192c5..5d82b40 100644
--- a/build_tools/enum_cc.py
+++ b/build_tools/enum_cc.py
@@ -97,8 +97,7 @@
)
else:
code(
-"""GEM5_DEPRECATED_NAMESPACE(Enums, enums);
-namespace enums
+"""namespace enums
{"""
)
code.indent(1)
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67372?usp=email
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: If4daad57a421b076ae6661812c2255c7f06f30b9
Gerrit-Change-Number: 67372
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: arch: Remove a couple of deprecated namespaces
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67375?usp=email )
Change subject: arch: Remove a couple of deprecated namespaces
..
arch: Remove a couple of deprecated namespaces
These namespaces have gone through the deprecation period
and can now be removed: X86Macroops, SMBios, RomLabels,
DeliveryMode, ConditionTests.
Change-Id: I6ff5e98319d92e27743a9fbeeab054497a2392e0
Signed-off-by: Daniel R. Carvalho
---
M src/arch/x86/bios/smbios.hh
M src/arch/x86/fs_workload.hh
M src/arch/x86/insts/microop.hh
M src/arch/x86/intmessage.hh
M src/arch/x86/isa/macroop.isa
M src/arch/x86/isa/rom.isa
6 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/arch/x86/bios/smbios.hh b/src/arch/x86/bios/smbios.hh
index dc38676..88d3344 100644
--- a/src/arch/x86/bios/smbios.hh
+++ b/src/arch/x86/bios/smbios.hh
@@ -61,7 +61,6 @@
namespace X86ISA
{
-GEM5_DEPRECATED_NAMESPACE(SMBios, smbios);
namespace smbios
{
diff --git a/src/arch/x86/fs_workload.hh b/src/arch/x86/fs_workload.hh
index 5c1187c..9d14f91 100644
--- a/src/arch/x86/fs_workload.hh
+++ b/src/arch/x86/fs_workload.hh
@@ -55,7 +55,6 @@
namespace X86ISA
{
-GEM5_DEPRECATED_NAMESPACE(SMBios, smbios);
namespace smbios
{
diff --git a/src/arch/x86/insts/microop.hh b/src/arch/x86/insts/microop.hh
index 9cbdec8..384e15e 100644
--- a/src/arch/x86/insts/microop.hh
+++ b/src/arch/x86/insts/microop.hh
@@ -48,7 +48,6 @@
namespace X86ISA
{
-GEM5_DEPRECATED_NAMESPACE(ConditionTests, condition_tests);
namespace condition_tests
{
diff --git a/src/arch/x86/intmessage.hh b/src/arch/x86/intmessage.hh
index f7692e2..71e4765 100644
--- a/src/arch/x86/intmessage.hh
+++ b/src/arch/x86/intmessage.hh
@@ -52,7 +52,6 @@
Bitfield<21> trigger;
EndBitUnion(TriggerIntMessage)
-GEM5_DEPRECATED_NAMESPACE(DeliveryMode, delivery_mode);
namespace delivery_mode
{
enum IntDeliveryMode
diff --git a/src/arch/x86/isa/macroop.isa b/src/arch/x86/isa/macroop.isa
index 691e8d0..d1b9e22 100644
--- a/src/arch/x86/isa/macroop.isa
+++ b/src/arch/x86/isa/macroop.isa
@@ -76,7 +76,6 @@
// Basic instruction class declaration template.
def template MacroDeclare {{
-GEM5_DEPRECATED_NAMESPACE(X86Macroop, x86_macroop);
namespace x86_macroop
{
/**
diff --git a/src/arch/x86/isa/rom.isa b/src/arch/x86/isa/rom.isa
index 9aef3ba..31548bd 100644
--- a/src/arch/x86/isa/rom.isa
+++ b/src/arch/x86/isa/rom.isa
@@ -43,7 +43,6 @@
class X86MicrocodeRom(Rom):
def getDeclaration(self):
declareLabels = \
-"GEM5_DEPRECATED_NAMESPACE(RomLabels, rom_labels);\n"
declareLabels += "namespace rom_labels\n{\n"
for (label, microop) in self.labels.items():
declareLabels += "const static uint64_t label_%s = %d;\n" \
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67375?usp=email
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: I6ff5e98319d92e27743a9fbeeab054497a2392e0
Gerrit-Change-Number: 67375
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: sim: Remove the ProbePoints namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67371?usp=email )
Change subject: sim: Remove the ProbePoints namespace
..
sim: Remove the ProbePoints namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Iddf30ea24a579cf5a94d6217c1d015a0c68d68d0
Signed-off-by: Daniel R. Carvalho
---
M src/sim/probe/mem.hh
M src/sim/probe/pmu.hh
M src/sim/probe/probe.hh
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/sim/probe/mem.hh b/src/sim/probe/mem.hh
index df3280c..0496de9 100644
--- a/src/sim/probe/mem.hh
+++ b/src/sim/probe/mem.hh
@@ -46,7 +46,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(ProbePoints, probing);
namespace probing
{
diff --git a/src/sim/probe/pmu.hh b/src/sim/probe/pmu.hh
index acf4750..b589ce7 100644
--- a/src/sim/probe/pmu.hh
+++ b/src/sim/probe/pmu.hh
@@ -45,7 +45,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(ProbePoints, probing);
namespace probing
{
diff --git a/src/sim/probe/probe.hh b/src/sim/probe/probe.hh
index dede7ad..3dd428e 100644
--- a/src/sim/probe/probe.hh
+++ b/src/sim/probe/probe.hh
@@ -86,7 +86,6 @@
* common instrumentation interface for devices such as PMUs that have
* different implementations in different ISAs.
*/
-GEM5_DEPRECATED_NAMESPACE(ProbePoints, probing);
namespace probing
{
/* Note: This is only here for documentation purposes, new probe
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67371?usp=email
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: Iddf30ea24a579cf5a94d6217c1d015a0c68d68d0
Gerrit-Change-Number: 67371
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: fastmodel: Remove the FastModel namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67363?usp=email )
Change subject: fastmodel: Remove the FastModel namespace
..
fastmodel: Remove the FastModel namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ic0a42f7349ccf15f8c1dd276a647e7cb2a56c1cb
Signed-off-by: Daniel R. Carvalho
---
M src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
M src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
M src/arch/arm/fastmodel/CortexA76/evs.cc
M src/arch/arm/fastmodel/CortexA76/evs.hh
M src/arch/arm/fastmodel/CortexA76/thread_context.cc
M src/arch/arm/fastmodel/CortexA76/thread_context.hh
M src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
M src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
M src/arch/arm/fastmodel/CortexR52/evs.cc
M src/arch/arm/fastmodel/CortexR52/evs.hh
M src/arch/arm/fastmodel/CortexR52/thread_context.cc
M src/arch/arm/fastmodel/CortexR52/thread_context.hh
M src/arch/arm/fastmodel/GIC/gic.cc
M src/arch/arm/fastmodel/GIC/gic.hh
M src/arch/arm/fastmodel/PL330_DMAC/pl330.cc
M src/arch/arm/fastmodel/PL330_DMAC/pl330.hh
M src/arch/arm/fastmodel/amba_from_tlm_bridge.cc
M src/arch/arm/fastmodel/amba_from_tlm_bridge.hh
M src/arch/arm/fastmodel/amba_ports.hh
M src/arch/arm/fastmodel/amba_to_tlm_bridge.cc
M src/arch/arm/fastmodel/amba_to_tlm_bridge.hh
M src/arch/arm/fastmodel/common/signal_receiver.hh
M src/arch/arm/fastmodel/common/signal_sender.hh
23 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
index 9280a04..ea1f477 100644
--- a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
+++ b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
b/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
index 39f916e..61bf501 100644
--- a/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
+++ b/src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
@@ -42,7 +42,6 @@
class BaseCPU;
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/evs.cc
b/src/arch/arm/fastmodel/CortexA76/evs.cc
index c9ce3cc..b299ad1 100644
--- a/src/arch/arm/fastmodel/CortexA76/evs.cc
+++ b/src/arch/arm/fastmodel/CortexA76/evs.cc
@@ -37,7 +37,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/evs.hh
b/src/arch/arm/fastmodel/CortexA76/evs.hh
index 7c4ef60..9f08071 100644
--- a/src/arch/arm/fastmodel/CortexA76/evs.hh
+++ b/src/arch/arm/fastmodel/CortexA76/evs.hh
@@ -52,7 +52,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/thread_context.cc
b/src/arch/arm/fastmodel/CortexA76/thread_context.cc
index 672f3b7..c670485 100644
--- a/src/arch/arm/fastmodel/CortexA76/thread_context.cc
+++ b/src/arch/arm/fastmodel/CortexA76/thread_context.cc
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexA76/thread_context.hh
b/src/arch/arm/fastmodel/CortexA76/thread_context.hh
index d7b8ed5..6e3d854 100644
--- a/src/arch/arm/fastmodel/CortexA76/thread_context.hh
+++ b/src/arch/arm/fastmodel/CortexA76/thread_context.hh
@@ -33,7 +33,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
index 9dfe7a5..a22492e 100644
--- a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
+++ b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
b/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
index 76c7d33..186383d 100644
--- a/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
+++ b/src/arch/arm/fastmodel/CortexR52/cortex_r52.hh
@@ -42,7 +42,6 @@
class BaseCPU;
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexR52/evs.cc
b/src/arch/arm/fastmodel/CortexR52/evs.cc
index 0ad3f18..47fbc36 100644
--- a/src/arch/arm/fastmodel/CortexR52/evs.cc
+++ b/src/arch/arm/fastmodel/CortexR52/evs.cc
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
namespace fastmodel
{
diff --git a/src/arch/arm/fastmodel/CortexR52/evs.hh
b/src/arch/arm/fastmodel/CortexR52/evs.hh
index 9cebec3..6516f4c 100644
--- a/src/arch/arm/fastmodel/CortexR52/evs.hh
+++
[gem5-dev] [S] Change in gem5/gem5[develop]: misc: Remove the Linux namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67364?usp=email )
Change subject: misc: Remove the Linux namespace
..
misc: Remove the Linux namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I73d7792ab8897d00b143d82d0fb70987ca410438
Signed-off-by: Daniel R. Carvalho
---
M src/arch/generic/linux/threadinfo.hh
M src/arch/mips/linux/hwrpb.hh
M src/arch/mips/linux/thread_info.hh
M src/kern/linux/events.cc
M src/kern/linux/events.hh
M src/kern/linux/helpers.hh
M src/kern/linux/printk.cc
M src/kern/linux/printk.hh
8 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/arch/generic/linux/threadinfo.hh
b/src/arch/generic/linux/threadinfo.hh
index 7702f0e..70511c4 100644
--- a/src/arch/generic/linux/threadinfo.hh
+++ b/src/arch/generic/linux/threadinfo.hh
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/arch/mips/linux/hwrpb.hh b/src/arch/mips/linux/hwrpb.hh
index b5dcb18..3c5e439 100644
--- a/src/arch/mips/linux/hwrpb.hh
+++ b/src/arch/mips/linux/hwrpb.hh
@@ -30,7 +30,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
struct pcb_struct
diff --git a/src/arch/mips/linux/thread_info.hh
b/src/arch/mips/linux/thread_info.hh
index df376f0..986c896 100644
--- a/src/arch/mips/linux/thread_info.hh
+++ b/src/arch/mips/linux/thread_info.hh
@@ -34,7 +34,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
struct thread_info
diff --git a/src/kern/linux/events.cc b/src/kern/linux/events.cc
index 6ec883c..3576759 100644
--- a/src/kern/linux/events.cc
+++ b/src/kern/linux/events.cc
@@ -54,7 +54,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/kern/linux/events.hh b/src/kern/linux/events.hh
index 7549209..966c1ba 100644
--- a/src/kern/linux/events.hh
+++ b/src/kern/linux/events.hh
@@ -57,7 +57,6 @@
class ThreadContext;
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/kern/linux/helpers.hh b/src/kern/linux/helpers.hh
index 1ad5b41..b8d3c49 100644
--- a/src/kern/linux/helpers.hh
+++ b/src/kern/linux/helpers.hh
@@ -47,7 +47,6 @@
class ThreadContext;
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index c356016..ccb1e8a 100644
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
diff --git a/src/kern/linux/printk.hh b/src/kern/linux/printk.hh
index 7b545bc..1e265a7 100644
--- a/src/kern/linux/printk.hh
+++ b/src/kern/linux/printk.hh
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Linux, linux);
namespace linux
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67364?usp=email
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: I73d7792ab8897d00b143d82d0fb70987ca410438
Gerrit-Change-Number: 67364
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: misc: Remove the Net namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67366?usp=email )
Change subject: misc: Remove the Net namespace
..
misc: Remove the Net namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ia2e1ef1619f51a0d7c0da9c7b4a160cd88ed8a65
Signed-off-by: Daniel R. Carvalho
---
M src/base/inet.cc
M src/base/inet.hh
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/base/inet.cc b/src/base/inet.cc
index ab4bfe4..fc7505e 100644
--- a/src/base/inet.cc
+++ b/src/base/inet.cc
@@ -54,7 +54,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Net, networking);
namespace networking
{
diff --git a/src/base/inet.hh b/src/base/inet.hh
index 3897f63..2cc3c6a 100644
--- a/src/base/inet.hh
+++ b/src/base/inet.hh
@@ -68,7 +68,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Net, networking);
namespace networking
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67366?usp=email
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: Ia2e1ef1619f51a0d7c0da9c7b4a160cd88ed8a65
Gerrit-Change-Number: 67366
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: cpu: Remove the Minor namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67369?usp=email )
Change subject: cpu: Remove the Minor namespace
..
cpu: Remove the Minor namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I603134248a05c988627bbd3c59c962b085b3b2ad
Signed-off-by: Daniel R. Carvalho
---
M src/cpu/minor/activity.cc
M src/cpu/minor/activity.hh
M src/cpu/minor/buffers.hh
M src/cpu/minor/cpu.hh
M src/cpu/minor/decode.cc
M src/cpu/minor/decode.hh
M src/cpu/minor/dyn_inst.cc
M src/cpu/minor/dyn_inst.hh
M src/cpu/minor/exec_context.hh
M src/cpu/minor/execute.cc
M src/cpu/minor/execute.hh
M src/cpu/minor/fetch1.cc
M src/cpu/minor/fetch1.hh
M src/cpu/minor/fetch2.cc
M src/cpu/minor/fetch2.hh
M src/cpu/minor/func_unit.cc
M src/cpu/minor/func_unit.hh
M src/cpu/minor/lsq.cc
M src/cpu/minor/lsq.hh
M src/cpu/minor/pipe_data.cc
M src/cpu/minor/pipe_data.hh
M src/cpu/minor/pipeline.cc
M src/cpu/minor/pipeline.hh
M src/cpu/minor/scoreboard.cc
M src/cpu/minor/scoreboard.hh
M src/cpu/minor/stats.cc
M src/cpu/minor/stats.hh
M src/cpu/minor/trace.hh
28 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/src/cpu/minor/activity.cc b/src/cpu/minor/activity.cc
index f78e927..f2f65b3 100644
--- a/src/cpu/minor/activity.cc
+++ b/src/cpu/minor/activity.cc
@@ -44,7 +44,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/activity.hh b/src/cpu/minor/activity.hh
index b942217..d052e0f 100644
--- a/src/cpu/minor/activity.hh
+++ b/src/cpu/minor/activity.hh
@@ -50,7 +50,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/buffers.hh b/src/cpu/minor/buffers.hh
index 648ec49..e461a5c 100644
--- a/src/cpu/minor/buffers.hh
+++ b/src/cpu/minor/buffers.hh
@@ -59,7 +59,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/cpu.hh b/src/cpu/minor/cpu.hh
index b5b04ae..acf4295 100644
--- a/src/cpu/minor/cpu.hh
+++ b/src/cpu/minor/cpu.hh
@@ -56,7 +56,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc
index 53c02f3..a4516a0 100644
--- a/src/cpu/minor/decode.cc
+++ b/src/cpu/minor/decode.cc
@@ -45,7 +45,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/decode.hh b/src/cpu/minor/decode.hh
index 156b920..913e03f 100644
--- a/src/cpu/minor/decode.hh
+++ b/src/cpu/minor/decode.hh
@@ -56,7 +56,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc
index ac8f948..68415ec 100644
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -50,7 +50,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/dyn_inst.hh b/src/cpu/minor/dyn_inst.hh
index d9a85f9..9c6d6fd 100644
--- a/src/cpu/minor/dyn_inst.hh
+++ b/src/cpu/minor/dyn_inst.hh
@@ -62,7 +62,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh
index f3dc3ba..33641f3 100644
--- a/src/cpu/minor/exec_context.hh
+++ b/src/cpu/minor/exec_context.hh
@@ -59,7 +59,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index 6eccec0..5eaaf58 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -57,7 +57,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/execute.hh b/src/cpu/minor/execute.hh
index 8a8c263..0a1dde1 100644
--- a/src/cpu/minor/execute.hh
+++ b/src/cpu/minor/execute.hh
@@ -59,7 +59,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc
index daf8d56..dd427b7 100644
--- a/src/cpu/minor/fetch1.cc
+++ b/src/cpu/minor/fetch1.cc
@@ -54,7 +54,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/fetch1.hh b/src/cpu/minor/fetch1.hh
index e33eb04..f6a796c 100644
--- a/src/cpu/minor/fetch1.hh
+++ b/src/cpu/minor/fetch1.hh
@@ -58,7 +58,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc
index 0ff0140..b02294b 100644
--- a/src/cpu/minor/fetch2.cc
+++ b/src/cpu/minor/fetch2.cc
@@ -52,7 +52,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
namespace minor
{
diff --git a/src/cpu/minor/fetch2.hh b/src/cpu/minor/fetch2.hh
index 85012bf..26c3a5a 100644
---
[gem5-dev] [S] Change in gem5/gem5[develop]: misc: Remove the FreeBSD namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67365?usp=email )
Change subject: misc: Remove the FreeBSD namespace
..
misc: Remove the FreeBSD namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ic0c838709121278584a295ea19a8283d5765b9c9
Signed-off-by: Daniel R. Carvalho
---
M src/arch/generic/freebsd/threadinfo.hh
M src/kern/freebsd/events.cc
M src/kern/freebsd/events.hh
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/arch/generic/freebsd/threadinfo.hh
b/src/arch/generic/freebsd/threadinfo.hh
index f2a..443367f 100644
--- a/src/arch/generic/freebsd/threadinfo.hh
+++ b/src/arch/generic/freebsd/threadinfo.hh
@@ -39,7 +39,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FreeBSD, free_bsd);
namespace free_bsd
{
diff --git a/src/kern/freebsd/events.cc b/src/kern/freebsd/events.cc
index ce2291e..667b10b 100644
--- a/src/kern/freebsd/events.cc
+++ b/src/kern/freebsd/events.cc
@@ -44,7 +44,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FreeBSD, free_bsd);
namespace free_bsd
{
diff --git a/src/kern/freebsd/events.hh b/src/kern/freebsd/events.hh
index c89ad0c..f4e350f 100644
--- a/src/kern/freebsd/events.hh
+++ b/src/kern/freebsd/events.hh
@@ -40,7 +40,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(FreeBSD, free_bsd);
namespace free_bsd
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67365?usp=email
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: Ic0c838709121278584a295ea19a8283d5765b9c9
Gerrit-Change-Number: 67365
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: dev: Remove a couple of deprecated namespaces
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67370?usp=email )
Change subject: dev: Remove a couple of deprecated namespaces
..
dev: Remove a couple of deprecated namespaces
These namespaces have gone through the deprecation period
and can now be removed: Sinic, SCMI, Ps2, Regs, Keyboard,
Mouse, TxdOp, iGbReg, CopyEngineReg.
Change-Id: Icfaf458bffca2658650318508c0bb376719cf911
Signed-off-by: Daniel R. Carvalho
---
M src/dev/arm/css/scmi_platform.hh
M src/dev/arm/css/scmi_protocols.hh
M src/dev/net/i8254xGBe_defs.hh
M src/dev/net/sinic.cc
M src/dev/net/sinic.hh
M src/dev/net/sinicreg.hh
M src/dev/pci/copy_engine_defs.hh
M src/dev/ps2/types.cc
M src/dev/ps2/types.hh
9 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/dev/arm/css/scmi_platform.hh
b/src/dev/arm/css/scmi_platform.hh
index 581408d..92bec89 100644
--- a/src/dev/arm/css/scmi_platform.hh
+++ b/src/dev/arm/css/scmi_platform.hh
@@ -49,7 +49,6 @@
class Doorbell;
-GEM5_DEPRECATED_NAMESPACE(SCMI, scmi);
namespace scmi
{
diff --git a/src/dev/arm/css/scmi_protocols.hh
b/src/dev/arm/css/scmi_protocols.hh
index 03d6ea4..85e157b 100644
--- a/src/dev/arm/css/scmi_protocols.hh
+++ b/src/dev/arm/css/scmi_protocols.hh
@@ -46,7 +46,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(SCMI, scmi);
namespace scmi
{
diff --git a/src/dev/net/i8254xGBe_defs.hh b/src/dev/net/i8254xGBe_defs.hh
index 015ca7d..ef013a2 100644
--- a/src/dev/net/i8254xGBe_defs.hh
+++ b/src/dev/net/i8254xGBe_defs.hh
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(iGbReg, igbreg);
namespace igbreg
{
@@ -239,7 +238,6 @@
uint64_t d2;
};
-GEM5_DEPRECATED_NAMESPACE(TxdOp, txd_op);
namespace txd_op
{
diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc
index c1afb28..69a42ed 100644
--- a/src/dev/net/sinic.cc
+++ b/src/dev/net/sinic.cc
@@ -48,7 +48,6 @@
using namespace networking;
-GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
namespace sinic
{
diff --git a/src/dev/net/sinic.hh b/src/dev/net/sinic.hh
index 2b0f9fa..adad53b 100644
--- a/src/dev/net/sinic.hh
+++ b/src/dev/net/sinic.hh
@@ -45,7 +45,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
namespace sinic
{
diff --git a/src/dev/net/sinicreg.hh b/src/dev/net/sinicreg.hh
index 120b9a1..47588df 100644
--- a/src/dev/net/sinicreg.hh
+++ b/src/dev/net/sinicreg.hh
@@ -59,11 +59,9 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
namespace sinic
{
-GEM5_DEPRECATED_NAMESPACE(Regs, registers);
namespace registers
{
diff --git a/src/dev/pci/copy_engine_defs.hh
b/src/dev/pci/copy_engine_defs.hh
index 9e687e3..107edee 100644
--- a/src/dev/pci/copy_engine_defs.hh
+++ b/src/dev/pci/copy_engine_defs.hh
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(CopyEngineReg, copy_engine_reg);
namespace copy_engine_reg
{
diff --git a/src/dev/ps2/types.cc b/src/dev/ps2/types.cc
index 99e740e..00e442e 100644
--- a/src/dev/ps2/types.cc
+++ b/src/dev/ps2/types.cc
@@ -45,7 +45,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
namespace ps2
{
diff --git a/src/dev/ps2/types.hh b/src/dev/ps2/types.hh
index 4ad7b05..3286c97 100644
--- a/src/dev/ps2/types.hh
+++ b/src/dev/ps2/types.hh
@@ -53,7 +53,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
namespace ps2
{
@@ -70,7 +69,6 @@
Reset = 0xFF,
};
-GEM5_DEPRECATED_NAMESPACE(Keyboard, keyboard);
namespace keyboard
{
@@ -93,7 +91,6 @@
} // namespace keyboard
-GEM5_DEPRECATED_NAMESPACE(Mouse, mouse);
namespace mouse
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67370?usp=email
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: Icfaf458bffca2658650318508c0bb376719cf911
Gerrit-Change-Number: 67370
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: misc: Remove the m5 namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67367?usp=email )
Change subject: misc: Remove the m5 namespace
..
misc: Remove the m5 namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Iffc6d903da1d619c0914379d0ceabc88453b3ac7
Signed-off-by: Daniel R. Carvalho
---
M src/base/coroutine.hh
M src/base/stl_helpers.hh
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/base/coroutine.hh b/src/base/coroutine.hh
index 63b26aa..000a0bf 100644
--- a/src/base/coroutine.hh
+++ b/src/base/coroutine.hh
@@ -44,7 +44,6 @@
#include "base/compiler.hh"
#include "base/fiber.hh"
-GEM5_DEPRECATED_NAMESPACE(m5, gem5);
namespace gem5
{
diff --git a/src/base/stl_helpers.hh b/src/base/stl_helpers.hh
index d16446d..d12f266 100644
--- a/src/base/stl_helpers.hh
+++ b/src/base/stl_helpers.hh
@@ -36,7 +36,6 @@
#include "base/compiler.hh"
-GEM5_DEPRECATED_NAMESPACE(m5, gem5);
namespace gem5
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67367?usp=email
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: Iffc6d903da1d619c0914379d0ceabc88453b3ac7
Gerrit-Change-Number: 67367
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: cpu: Remove the DecodeCache namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67368?usp=email )
Change subject: cpu: Remove the DecodeCache namespace
..
cpu: Remove the DecodeCache namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ia1b2ab564f7c0ee85c8d288e38be4d7c013f
Signed-off-by: Daniel R. Carvalho
---
M src/cpu/decode_cache.hh
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/cpu/decode_cache.hh b/src/cpu/decode_cache.hh
index 4e5631a..cbd3c93 100644
--- a/src/cpu/decode_cache.hh
+++ b/src/cpu/decode_cache.hh
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(DecodeCache, decode_cache);
namespace decode_cache
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67368?usp=email
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: Ia1b2ab564f7c0ee85c8d288e38be4d7c013f
Gerrit-Change-Number: 67368
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Remove the Loader namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67362?usp=email )
Change subject: base: Remove the Loader namespace
..
base: Remove the Loader namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I87b763fccfcdf720909dfbda9c3fc8f6dea36a61
Signed-off-by: Daniel R. Carvalho
---
M src/arch/mips/process.hh
M src/arch/power/process.hh
M src/arch/riscv/process.hh
M src/base/loader/dtb_file.cc
M src/base/loader/dtb_file.hh
M src/base/loader/elf_object.cc
M src/base/loader/elf_object.hh
M src/base/loader/image_file.hh
M src/base/loader/image_file_data.cc
M src/base/loader/image_file_data.hh
M src/base/loader/memory_image.cc
M src/base/loader/memory_image.hh
M src/base/loader/object_file.cc
M src/base/loader/object_file.hh
M src/base/loader/raw_image.hh
M src/base/loader/symtab.cc
M src/base/loader/symtab.hh
M src/cpu/profile.hh
M src/cpu/static_inst.hh
M src/sim/process.hh
20 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/arch/mips/process.hh b/src/arch/mips/process.hh
index 181dd25..8b84ec1 100644
--- a/src/arch/mips/process.hh
+++ b/src/arch/mips/process.hh
@@ -34,7 +34,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
class ObjectFile;
diff --git a/src/arch/power/process.hh b/src/arch/power/process.hh
index c8d8a79..9576c35 100644
--- a/src/arch/power/process.hh
+++ b/src/arch/power/process.hh
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
class ObjectFile;
diff --git a/src/arch/riscv/process.hh b/src/arch/riscv/process.hh
index ca0a050..64b9593 100644
--- a/src/arch/riscv/process.hh
+++ b/src/arch/riscv/process.hh
@@ -40,7 +40,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
class ObjectFile;
diff --git a/src/base/loader/dtb_file.cc b/src/base/loader/dtb_file.cc
index 13e0264..f083b3e 100644
--- a/src/base/loader/dtb_file.cc
+++ b/src/base/loader/dtb_file.cc
@@ -40,7 +40,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/dtb_file.hh b/src/base/loader/dtb_file.hh
index c11b195..bed7cfc 100644
--- a/src/base/loader/dtb_file.hh
+++ b/src/base/loader/dtb_file.hh
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc
index dc2abb8..4b1467a 100644
--- a/src/base/loader/elf_object.cc
+++ b/src/base/loader/elf_object.cc
@@ -61,7 +61,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/elf_object.hh b/src/base/loader/elf_object.hh
index 6159b35..f084492 100644
--- a/src/base/loader/elf_object.hh
+++ b/src/base/loader/elf_object.hh
@@ -51,7 +51,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/image_file.hh b/src/base/loader/image_file.hh
index 194c956..f1d3955 100644
--- a/src/base/loader/image_file.hh
+++ b/src/base/loader/image_file.hh
@@ -39,7 +39,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/image_file_data.cc
b/src/base/loader/image_file_data.cc
index 57fb47f..525d577 100644
--- a/src/base/loader/image_file_data.cc
+++ b/src/base/loader/image_file_data.cc
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/image_file_data.hh
b/src/base/loader/image_file_data.hh
index d02c499..4d1701d 100644
--- a/src/base/loader/image_file_data.hh
+++ b/src/base/loader/image_file_data.hh
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/memory_image.cc
b/src/base/loader/memory_image.cc
index 5537f28..a3f378c 100644
--- a/src/base/loader/memory_image.cc
+++ b/src/base/loader/memory_image.cc
@@ -32,7 +32,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/memory_image.hh
b/src/base/loader/memory_image.hh
index 2c56f4c..1207e74 100644
--- a/src/base/loader/memory_image.hh
+++ b/src/base/loader/memory_image.hh
@@ -46,7 +46,6 @@
class PortProxy;
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc
index 3aa5915..287f910 100644
--- a/src/base/loader/object_file.cc
+++ b/src/base/loader/object_file.cc
@@ -48,7 +48,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
namespace loader
{
diff --git a/src/base/loader/object_file.hh b/src/base/loader/object_file.hh
index 0415bec..f078116 100644
--- a/src/base/loader/object_file.hh
+++
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Remove the BloomFilter namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67358?usp=email )
Change subject: base: Remove the BloomFilter namespace
..
base: Remove the BloomFilter namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ib919285c6270eb53bd29ab534f3f9b5612417bb2
Signed-off-by: Daniel R. Carvalho
---
M src/base/filters/base.hh
M src/base/filters/block_bloom_filter.cc
M src/base/filters/block_bloom_filter.hh
M src/base/filters/bulk_bloom_filter.cc
M src/base/filters/bulk_bloom_filter.hh
M src/base/filters/h3_bloom_filter.cc
M src/base/filters/h3_bloom_filter.hh
M src/base/filters/multi_bit_sel_bloom_filter.cc
M src/base/filters/multi_bit_sel_bloom_filter.hh
M src/base/filters/multi_bloom_filter.cc
M src/base/filters/multi_bloom_filter.hh
M src/base/filters/perfect_bloom_filter.cc
M src/base/filters/perfect_bloom_filter.hh
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/base/filters/base.hh b/src/base/filters/base.hh
index f2b9fce..858e265 100644
--- a/src/base/filters/base.hh
+++ b/src/base/filters/base.hh
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/block_bloom_filter.cc
b/src/base/filters/block_bloom_filter.cc
index e1ae116..7a3c170 100644
--- a/src/base/filters/block_bloom_filter.cc
+++ b/src/base/filters/block_bloom_filter.cc
@@ -36,7 +36,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/block_bloom_filter.hh
b/src/base/filters/block_bloom_filter.hh
index 0375d30..f704006 100644
--- a/src/base/filters/block_bloom_filter.hh
+++ b/src/base/filters/block_bloom_filter.hh
@@ -39,7 +39,6 @@
struct BloomFilterBlockParams;
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/bulk_bloom_filter.cc
b/src/base/filters/bulk_bloom_filter.cc
index 3a2ac58..cf28bf9 100644
--- a/src/base/filters/bulk_bloom_filter.cc
+++ b/src/base/filters/bulk_bloom_filter.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/bulk_bloom_filter.hh
b/src/base/filters/bulk_bloom_filter.hh
index 985fcb3..6c47476 100644
--- a/src/base/filters/bulk_bloom_filter.hh
+++ b/src/base/filters/bulk_bloom_filter.hh
@@ -37,7 +37,6 @@
struct BloomFilterBulkParams;
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/h3_bloom_filter.cc
b/src/base/filters/h3_bloom_filter.cc
index e1aeba7..9e973d8 100644
--- a/src/base/filters/h3_bloom_filter.cc
+++ b/src/base/filters/h3_bloom_filter.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/h3_bloom_filter.hh
b/src/base/filters/h3_bloom_filter.hh
index a60c212..fc6ba65 100644
--- a/src/base/filters/h3_bloom_filter.hh
+++ b/src/base/filters/h3_bloom_filter.hh
@@ -37,7 +37,6 @@
struct BloomFilterH3Params;
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/multi_bit_sel_bloom_filter.cc
b/src/base/filters/multi_bit_sel_bloom_filter.cc
index f12d1f7..e6f6c145 100644
--- a/src/base/filters/multi_bit_sel_bloom_filter.cc
+++ b/src/base/filters/multi_bit_sel_bloom_filter.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/multi_bit_sel_bloom_filter.hh
b/src/base/filters/multi_bit_sel_bloom_filter.hh
index 8c5b34c..a746b1d 100644
--- a/src/base/filters/multi_bit_sel_bloom_filter.hh
+++ b/src/base/filters/multi_bit_sel_bloom_filter.hh
@@ -37,7 +37,6 @@
struct BloomFilterMultiBitSelParams;
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/multi_bloom_filter.cc
b/src/base/filters/multi_bloom_filter.cc
index 401d844..f6b4892 100644
--- a/src/base/filters/multi_bloom_filter.cc
+++ b/src/base/filters/multi_bloom_filter.cc
@@ -35,7 +35,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/multi_bloom_filter.hh
b/src/base/filters/multi_bloom_filter.hh
index ec9838a..9445b81 100644
--- a/src/base/filters/multi_bloom_filter.hh
+++ b/src/base/filters/multi_bloom_filter.hh
@@ -39,7 +39,6 @@
struct BloomFilterMultiParams;
-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
namespace bloom_filter
{
diff --git a/src/base/filters/perfect_bloom_filter.cc
b/src/base/filters/perfect_bloom_filter.cc
index 7583a1a..f6f9d8b 100644
--- a/src/base/filters/perfect_bloom_filter.cc
+++
[gem5-dev] [S] Change in gem5/gem5[develop]: mem-cache: Remove the Encoder namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67355?usp=email )
Change subject: mem-cache: Remove the Encoder namespace
..
mem-cache: Remove the Encoder namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Iabe3b61eb2409a10c582ab1f1c26abc649c1646a
Signed-off-by: Daniel R. Carvalho
---
M src/mem/cache/compressors/encoders/base.hh
M src/mem/cache/compressors/encoders/huffman.cc
M src/mem/cache/compressors/encoders/huffman.hh
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/mem/cache/compressors/encoders/base.hh
b/src/mem/cache/compressors/encoders/base.hh
index c5f2297..ddc8c67 100644
--- a/src/mem/cache/compressors/encoders/base.hh
+++ b/src/mem/cache/compressors/encoders/base.hh
@@ -38,7 +38,6 @@
namespace compression
{
-GEM5_DEPRECATED_NAMESPACE(Encoder, encoder);
namespace encoder
{
diff --git a/src/mem/cache/compressors/encoders/huffman.cc
b/src/mem/cache/compressors/encoders/huffman.cc
index a7f24cf..5be3bce 100644
--- a/src/mem/cache/compressors/encoders/huffman.cc
+++ b/src/mem/cache/compressors/encoders/huffman.cc
@@ -37,7 +37,6 @@
namespace compression
{
-GEM5_DEPRECATED_NAMESPACE(Encoder, encoder);
namespace encoder
{
diff --git a/src/mem/cache/compressors/encoders/huffman.hh
b/src/mem/cache/compressors/encoders/huffman.hh
index 2ea5364..7614854 100644
--- a/src/mem/cache/compressors/encoders/huffman.hh
+++ b/src/mem/cache/compressors/encoders/huffman.hh
@@ -44,7 +44,6 @@
namespace compression
{
-GEM5_DEPRECATED_NAMESPACE(Encoder, encoder);
namespace encoder
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67355?usp=email
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: Iabe3b61eb2409a10c582ab1f1c26abc649c1646a
Gerrit-Change-Number: 67355
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Remove the Units namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67361?usp=email )
Change subject: base: Remove the Units namespace
..
base: Remove the Units namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I3d885e656caea0f96dfbdda69713832ff5f79d28
Signed-off-by: Daniel R. Carvalho
---
M src/base/stats/units.hh
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/base/stats/units.hh b/src/base/stats/units.hh
index fe5b23d..1d7d640 100644
--- a/src/base/stats/units.hh
+++ b/src/base/stats/units.hh
@@ -109,7 +109,6 @@
* - The new unit is significant enough to be not included in Count unit.
* (e.g. Cycle unit, Tick unit)
*/
-GEM5_DEPRECATED_NAMESPACE(Units, units);
namespace units
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67361?usp=email
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: I3d885e656caea0f96dfbdda69713832ff5f79d28
Gerrit-Change-Number: 67361
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: mem: Remove the ContextSwitchTaskId namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67357?usp=email )
Change subject: mem: Remove the ContextSwitchTaskId namespace
..
mem: Remove the ContextSwitchTaskId namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Iab4bb6ac6e8d603fb508330691796ccdac4b9cb6
Signed-off-by: Daniel R. Carvalho
---
M src/mem/request.hh
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/mem/request.hh b/src/mem/request.hh
index 6a0cbc2..be91c71 100644
--- a/src/mem/request.hh
+++ b/src/mem/request.hh
@@ -74,7 +74,6 @@
* doesn't cause a problem with stats and is large enough to realistic
* benchmarks (Linux/Android boot, BBench, etc.)
*/
-GEM5_DEPRECATED_NAMESPACE(ContextSwitchTaskId, context_switch_task_id);
namespace context_switch_task_id
{
enum TaskId
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67357?usp=email
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: Iab4bb6ac6e8d603fb508330691796ccdac4b9cb6
Gerrit-Change-Number: 67357
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Remove the Debug namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67360?usp=email )
Change subject: base: Remove the Debug namespace
..
base: Remove the Debug namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I4241501f3683c1daa8554693cba7aa2c022db130
Signed-off-by: Daniel R. Carvalho
---
M build_tools/debugflaghh.py
M src/base/debug.cc
M src/base/debug.hh
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/build_tools/debugflaghh.py b/build_tools/debugflaghh.py
index 2e861e2..1a4a379 100644
--- a/build_tools/debugflaghh.py
+++ b/build_tools/debugflaghh.py
@@ -82,7 +82,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Debug, debug);
namespace debug
{
diff --git a/src/base/debug.cc b/src/base/debug.cc
index aa4092a..73b52f3 100644
--- a/src/base/debug.cc
+++ b/src/base/debug.cc
@@ -52,7 +52,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Debug, debug);
namespace debug
{
diff --git a/src/base/debug.hh b/src/base/debug.hh
index f6b03ae..3941e66 100644
--- a/src/base/debug.hh
+++ b/src/base/debug.hh
@@ -53,7 +53,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Debug, debug);
namespace debug
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67360?usp=email
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: I4241501f3683c1daa8554693cba7aa2c022db130
Gerrit-Change-Number: 67360
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: mem-cache: Remove the Prefetcher namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67353?usp=email )
Change subject: mem-cache: Remove the Prefetcher namespace
..
mem-cache: Remove the Prefetcher namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I31953be7ce8566576de94c9296c601c9906a
Signed-off-by: Daniel R. Carvalho
---
M src/mem/cache/base.hh
M src/mem/cache/prefetch/access_map_pattern_matching.cc
M src/mem/cache/prefetch/access_map_pattern_matching.hh
M src/mem/cache/prefetch/base.cc
M src/mem/cache/prefetch/base.hh
M src/mem/cache/prefetch/bop.cc
M src/mem/cache/prefetch/bop.hh
M src/mem/cache/prefetch/delta_correlating_prediction_tables.cc
M src/mem/cache/prefetch/delta_correlating_prediction_tables.hh
M src/mem/cache/prefetch/indirect_memory.cc
M src/mem/cache/prefetch/indirect_memory.hh
M src/mem/cache/prefetch/irregular_stream_buffer.cc
M src/mem/cache/prefetch/irregular_stream_buffer.hh
M src/mem/cache/prefetch/multi.cc
M src/mem/cache/prefetch/multi.hh
M src/mem/cache/prefetch/pif.cc
M src/mem/cache/prefetch/pif.hh
M src/mem/cache/prefetch/queued.cc
M src/mem/cache/prefetch/queued.hh
M src/mem/cache/prefetch/sbooe.cc
M src/mem/cache/prefetch/sbooe.hh
M src/mem/cache/prefetch/signature_path.cc
M src/mem/cache/prefetch/signature_path.hh
M src/mem/cache/prefetch/signature_path_v2.cc
M src/mem/cache/prefetch/signature_path_v2.hh
M src/mem/cache/prefetch/slim_ampm.cc
M src/mem/cache/prefetch/slim_ampm.hh
M src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc
M src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh
M src/mem/cache/prefetch/stride.cc
M src/mem/cache/prefetch/stride.hh
M src/mem/cache/prefetch/tagged.cc
M src/mem/cache/prefetch/tagged.hh
33 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 6fc7628..78571ce 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 6bf5d9b..989f3c6 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 3b0bc28..893d30d 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 @@
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 cb4c1e8..1b03530 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 f2a8207..d195bf8 100644
--- a/src/mem/cache/prefetch/base.hh
+++ b/src/mem/cache/prefetch/base.hh
@@ -65,7 +65,6 @@
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 a60c1fe..ce2502b 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 7fdba2b..bb1b05d 100644
--- a/src/mem/cache/prefetch/bop.hh
+++ b/src/mem/cache/prefetch/bop.hh
@@ -46,7 +46,6 @@
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 c5e126c..b59394c 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 8ad21a6..0218e91 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 @@
struct
[gem5-dev] [S] Change in gem5/gem5[develop]: mem-cache: Remove the Compressor namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67354?usp=email )
Change subject: mem-cache: Remove the Compressor namespace
..
mem-cache: Remove the Compressor namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: Ibbcc8221ed6042d55f56a94bf499a4c1c564ea82
Signed-off-by: Daniel R. Carvalho
---
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
27 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/src/mem/cache/compressors/base.cc
b/src/mem/cache/compressors/base.cc
index cafd691..df3020d 100644
--- a/src/mem/cache/compressors/base.cc
+++ b/src/mem/cache/compressors/base.cc
@@ -48,7 +48,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base.hh
b/src/mem/cache/compressors/base.hh
index 4945176..110c6a4 100644
--- a/src/mem/cache/compressors/base.hh
+++ b/src/mem/cache/compressors/base.hh
@@ -50,7 +50,6 @@
class CacheBlk;
struct BaseCacheCompressorParams;
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base_delta.cc
b/src/mem/cache/compressors/base_delta.cc
index 9b2e67c..308dabf 100644
--- a/src/mem/cache/compressors/base_delta.cc
+++ b/src/mem/cache/compressors/base_delta.cc
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base_delta.hh
b/src/mem/cache/compressors/base_delta.hh
index 81f2c4b..a0e6668 100644
--- a/src/mem/cache/compressors/base_delta.hh
+++ b/src/mem/cache/compressors/base_delta.hh
@@ -52,7 +52,6 @@
struct Base32Delta16Params;
struct Base16Delta8Params;
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base_delta_impl.hh
b/src/mem/cache/compressors/base_delta_impl.hh
index c4a841d..c43283c 100644
--- a/src/mem/cache/compressors/base_delta_impl.hh
+++ b/src/mem/cache/compressors/base_delta_impl.hh
@@ -40,7 +40,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/base_dictionary_compressor.cc
b/src/mem/cache/compressors/base_dictionary_compressor.cc
index 6a1ed92..d289db1 100644
--- a/src/mem/cache/compressors/base_dictionary_compressor.cc
+++ b/src/mem/cache/compressors/base_dictionary_compressor.cc
@@ -37,7 +37,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/cpack.cc
b/src/mem/cache/compressors/cpack.cc
index 64376b9..44f47bb 100644
--- a/src/mem/cache/compressors/cpack.cc
+++ b/src/mem/cache/compressors/cpack.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/cpack.hh
b/src/mem/cache/compressors/cpack.hh
index 51f5ce1..d1005d1 100644
--- a/src/mem/cache/compressors/cpack.hh
+++ b/src/mem/cache/compressors/cpack.hh
@@ -46,7 +46,6 @@
struct CPackParams;
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/dictionary_compressor.hh
b/src/mem/cache/compressors/dictionary_compressor.hh
index c283280..6efdb73 100644
--- a/src/mem/cache/compressors/dictionary_compressor.hh
+++ b/src/mem/cache/compressors/dictionary_compressor.hh
@@ -61,7 +61,6 @@
struct BaseDictionaryCompressorParams;
-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
namespace compression
{
diff --git a/src/mem/cache/compressors/dictionary_compressor_impl.hh
b/src/mem/cache/compressors/dictionary_compressor_impl.hh
index
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Remove the Stats namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67359?usp=email )
Change subject: base: Remove the Stats namespace
..
base: Remove the Stats namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I80f25af68e03fff3df8316cb4d1d2669687d0fe4
Signed-off-by: Daniel R. Carvalho
---
M src/base/statistics.cc
M src/base/statistics.hh
M src/base/stats/group.cc
M src/base/stats/group.hh
M src/base/stats/hdf5.cc
M src/base/stats/hdf5.hh
M src/base/stats/info.cc
M src/base/stats/info.hh
M src/base/stats/output.hh
M src/base/stats/storage.cc
M src/base/stats/storage.hh
M src/base/stats/text.cc
M src/base/stats/text.hh
M src/base/stats/types.hh
M src/base/stats/units.hh
M src/python/pybind11/stats.cc
M src/sim/power/mathexpr_powermodel.hh
M src/sim/stat_control.cc
M src/sim/stat_control.hh
M src/sim/stat_register.cc
M src/sim/stat_register.hh
21 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index c380143..2fddf1b 100644
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -53,7 +53,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 24cbf71..8156be5 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -91,7 +91,6 @@
{
/* A namespace for all of the Statistics */
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/group.cc b/src/base/stats/group.cc
index d5626e6..93e7183 100644
--- a/src/base/stats/group.cc
+++ b/src/base/stats/group.cc
@@ -47,7 +47,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/group.hh b/src/base/stats/group.hh
index bd1183e..3c11e61 100644
--- a/src/base/stats/group.hh
+++ b/src/base/stats/group.hh
@@ -74,7 +74,6 @@
#define ADD_STAT(n, ...) n(this, #n, __VA_ARGS__)
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/hdf5.cc b/src/base/stats/hdf5.cc
index 03574b2..be548bf 100644
--- a/src/base/stats/hdf5.cc
+++ b/src/base/stats/hdf5.cc
@@ -59,7 +59,6 @@
}
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/hdf5.hh b/src/base/stats/hdf5.hh
index 7fa..ac21ee8a 100644
--- a/src/base/stats/hdf5.hh
+++ b/src/base/stats/hdf5.hh
@@ -53,7 +53,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/info.cc b/src/base/stats/info.cc
index c40b559..06e7ec9 100644
--- a/src/base/stats/info.cc
+++ b/src/base/stats/info.cc
@@ -52,7 +52,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh
index 9a5e2e7..98859cb 100644
--- a/src/base/stats/info.hh
+++ b/src/base/stats/info.hh
@@ -43,7 +43,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/output.hh b/src/base/stats/output.hh
index 39b0804..23531e8 100644
--- a/src/base/stats/output.hh
+++ b/src/base/stats/output.hh
@@ -49,7 +49,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/storage.cc b/src/base/stats/storage.cc
index 6b32dc5..3b2c091 100644
--- a/src/base/stats/storage.cc
+++ b/src/base/stats/storage.cc
@@ -46,7 +46,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/storage.hh b/src/base/stats/storage.hh
index cf22e10..eb1873b 100644
--- a/src/base/stats/storage.hh
+++ b/src/base/stats/storage.hh
@@ -42,7 +42,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc
index db5743a..36282a3 100644
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -67,7 +67,6 @@
} // anonymous namespace
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/text.hh b/src/base/stats/text.hh
index 4bbe3ea..7be498d 100644
--- a/src/base/stats/text.hh
+++ b/src/base/stats/text.hh
@@ -53,7 +53,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/types.hh b/src/base/stats/types.hh
index 92d594a..14f89ca 100644
--- a/src/base/stats/types.hh
+++ b/src/base/stats/types.hh
@@ -39,7 +39,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/units.hh b/src/base/stats/units.hh
index 52e2e57..fe5b23d 100644
--- a/src/base/stats/units.hh
+++ b/src/base/stats/units.hh
@@ -75,7 +75,6 @@
[gem5-dev] [S] Change in gem5/gem5[develop]: mem: Remove the QoS namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67356?usp=email )
Change subject: mem: Remove the QoS namespace
..
mem: Remove the QoS namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I2fa66e5fc77f19beaac3251602617704dadaec99
Signed-off-by: Daniel R. Carvalho
---
M src/mem/qos/mem_ctrl.cc
M src/mem/qos/mem_ctrl.hh
M src/mem/qos/mem_sink.cc
M src/mem/qos/mem_sink.hh
M src/mem/qos/policy.cc
M src/mem/qos/policy.hh
M src/mem/qos/policy_fixed_prio.cc
M src/mem/qos/policy_fixed_prio.hh
M src/mem/qos/policy_pf.cc
M src/mem/qos/policy_pf.hh
M src/mem/qos/q_policy.cc
M src/mem/qos/q_policy.hh
M src/mem/qos/turnaround_policy.hh
M src/mem/qos/turnaround_policy_ideal.cc
M src/mem/qos/turnaround_policy_ideal.hh
15 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/mem/qos/mem_ctrl.cc b/src/mem/qos/mem_ctrl.cc
index 5bb031c..9bf1328 100644
--- a/src/mem/qos/mem_ctrl.cc
+++ b/src/mem/qos/mem_ctrl.cc
@@ -48,7 +48,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/mem_ctrl.hh b/src/mem/qos/mem_ctrl.hh
index 11e787d..359e285 100644
--- a/src/mem/qos/mem_ctrl.hh
+++ b/src/mem/qos/mem_ctrl.hh
@@ -64,7 +64,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc
index 2dec5d5..3ffe7f4 100644
--- a/src/mem/qos/mem_sink.cc
+++ b/src/mem/qos/mem_sink.cc
@@ -50,7 +50,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/mem_sink.hh b/src/mem/qos/mem_sink.hh
index a2e975a..d2310c6 100644
--- a/src/mem/qos/mem_sink.hh
+++ b/src/mem/qos/mem_sink.hh
@@ -59,7 +59,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy.cc b/src/mem/qos/policy.cc
index 6d41e7d..5ca7eae 100644
--- a/src/mem/qos/policy.cc
+++ b/src/mem/qos/policy.cc
@@ -45,7 +45,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy.hh b/src/mem/qos/policy.hh
index a7e7666..c5bd2be 100644
--- a/src/mem/qos/policy.hh
+++ b/src/mem/qos/policy.hh
@@ -57,7 +57,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy_fixed_prio.cc
b/src/mem/qos/policy_fixed_prio.cc
index 140817e..f64aae9 100644
--- a/src/mem/qos/policy_fixed_prio.cc
+++ b/src/mem/qos/policy_fixed_prio.cc
@@ -51,7 +51,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy_fixed_prio.hh
b/src/mem/qos/policy_fixed_prio.hh
index 77e7a25..18ff6ac 100644
--- a/src/mem/qos/policy_fixed_prio.hh
+++ b/src/mem/qos/policy_fixed_prio.hh
@@ -52,7 +52,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy_pf.cc b/src/mem/qos/policy_pf.cc
index ae15045..adbcdb4 100644
--- a/src/mem/qos/policy_pf.cc
+++ b/src/mem/qos/policy_pf.cc
@@ -48,7 +48,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/policy_pf.hh b/src/mem/qos/policy_pf.hh
index acc2a4a..4c215e5 100644
--- a/src/mem/qos/policy_pf.hh
+++ b/src/mem/qos/policy_pf.hh
@@ -52,7 +52,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/q_policy.cc b/src/mem/qos/q_policy.cc
index de2e316..a6d13fe 100644
--- a/src/mem/qos/q_policy.cc
+++ b/src/mem/qos/q_policy.cc
@@ -52,7 +52,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/q_policy.hh b/src/mem/qos/q_policy.hh
index 7af52b6..fc9200d 100644
--- a/src/mem/qos/q_policy.hh
+++ b/src/mem/qos/q_policy.hh
@@ -53,7 +53,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/turnaround_policy.hh
b/src/mem/qos/turnaround_policy.hh
index 2d5696f..9bbb446 100644
--- a/src/mem/qos/turnaround_policy.hh
+++ b/src/mem/qos/turnaround_policy.hh
@@ -49,7 +49,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/turnaround_policy_ideal.cc
b/src/mem/qos/turnaround_policy_ideal.cc
index c67e40b..8d3d7d0 100644
--- a/src/mem/qos/turnaround_policy_ideal.cc
+++ b/src/mem/qos/turnaround_policy_ideal.cc
@@ -48,7 +48,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
diff --git a/src/mem/qos/turnaround_policy_ideal.hh
b/src/mem/qos/turnaround_policy_ideal.hh
index 0a75f79..de416c4 100644
--- a/src/mem/qos/turnaround_policy_ideal.hh
+++ b/src/mem/qos/turnaround_policy_ideal.hh
@@ -47,7 +47,6 @@
namespace memory
{
-GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
--
To view, visit
[gem5-dev] [S] Change in gem5/gem5[develop]: mem-cache: Remove the ReplacementPolicy namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67352?usp=email )
Change subject: mem-cache: Remove the ReplacementPolicy namespace
..
mem-cache: Remove the ReplacementPolicy namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: If4904706b897999e9200b163d47679519f01e4d4
Signed-off-by: Daniel R. Carvalho
---
M src/mem/cache/prefetch/stride.hh
M src/mem/cache/replacement_policies/base.hh
M src/mem/cache/replacement_policies/bip_rp.cc
M src/mem/cache/replacement_policies/bip_rp.hh
M src/mem/cache/replacement_policies/brrip_rp.cc
M src/mem/cache/replacement_policies/brrip_rp.hh
M src/mem/cache/replacement_policies/dueling_rp.hh
M src/mem/cache/replacement_policies/fifo_rp.cc
M src/mem/cache/replacement_policies/fifo_rp.hh
M src/mem/cache/replacement_policies/lfu_rp.cc
M src/mem/cache/replacement_policies/lfu_rp.hh
M src/mem/cache/replacement_policies/lru_rp.cc
M src/mem/cache/replacement_policies/lru_rp.hh
M src/mem/cache/replacement_policies/mru_rp.cc
M src/mem/cache/replacement_policies/mru_rp.hh
M src/mem/cache/replacement_policies/random_rp.cc
M src/mem/cache/replacement_policies/random_rp.hh
M src/mem/cache/replacement_policies/replaceable_entry.hh
M src/mem/cache/replacement_policies/second_chance_rp.cc
M src/mem/cache/replacement_policies/second_chance_rp.hh
M src/mem/cache/replacement_policies/ship_rp.hh
M src/mem/cache/replacement_policies/tree_plru_rp.cc
M src/mem/cache/replacement_policies/tree_plru_rp.hh
M src/mem/cache/replacement_policies/weighted_lru_rp.cc
M src/mem/cache/replacement_policies/weighted_lru_rp.hh
M src/mem/cache/tags/sector_tags.hh
26 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/src/mem/cache/prefetch/stride.hh
b/src/mem/cache/prefetch/stride.hh
index 2b70765..27fa917 100644
--- a/src/mem/cache/prefetch/stride.hh
+++ b/src/mem/cache/prefetch/stride.hh
@@ -64,7 +64,6 @@
{
class BaseIndexingPolicy;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
class Base;
diff --git a/src/mem/cache/replacement_policies/base.hh
b/src/mem/cache/replacement_policies/base.hh
index fc92ecb..2c23c95 100644
--- a/src/mem/cache/replacement_policies/base.hh
+++ b/src/mem/cache/replacement_policies/base.hh
@@ -45,7 +45,6 @@
*/
typedef std::vector ReplacementCandidates;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/bip_rp.cc
b/src/mem/cache/replacement_policies/bip_rp.cc
index 102037d..812c36b 100644
--- a/src/mem/cache/replacement_policies/bip_rp.cc
+++ b/src/mem/cache/replacement_policies/bip_rp.cc
@@ -37,7 +37,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/bip_rp.hh
b/src/mem/cache/replacement_policies/bip_rp.hh
index 486f459..0b830e0 100644
--- a/src/mem/cache/replacement_policies/bip_rp.hh
+++ b/src/mem/cache/replacement_policies/bip_rp.hh
@@ -49,7 +49,6 @@
struct BIPRPParams;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/brrip_rp.cc
b/src/mem/cache/replacement_policies/brrip_rp.cc
index a28ad33..06dad0d9 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.cc
+++ b/src/mem/cache/replacement_policies/brrip_rp.cc
@@ -38,7 +38,6 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/brrip_rp.hh
b/src/mem/cache/replacement_policies/brrip_rp.hh
index f4f815e..5649a64 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.hh
+++ b/src/mem/cache/replacement_policies/brrip_rp.hh
@@ -60,7 +60,6 @@
struct BRRIPRPParams;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/dueling_rp.hh
b/src/mem/cache/replacement_policies/dueling_rp.hh
index a451050..c7400b4 100644
--- a/src/mem/cache/replacement_policies/dueling_rp.hh
+++ b/src/mem/cache/replacement_policies/dueling_rp.hh
@@ -41,7 +41,6 @@
struct DuelingRPParams;
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
namespace replacement_policy
{
diff --git a/src/mem/cache/replacement_policies/fifo_rp.cc
b/src/mem/cache/replacement_policies/fifo_rp.cc
index bc0680b..199ba0a 100644
--- a/src/mem/cache/replacement_policies/fifo_rp.cc
+++ b/src/mem/cache/replacement_policies/fifo_rp.cc
@@ -36,9 +36,10 @@
namespace gem5
{
-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+
namespace replacement_policy
{
+
FIFO::FIFO(const Params )
: Base(p)
{
diff --git
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Fix signature of SatCounter::saturate()
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/66791?usp=email )
Change subject: base: Fix signature of SatCounter::saturate()
..
base: Fix signature of SatCounter::saturate()
The variants that use more than 8 bits were broken,
since the size of the difference in those cases
could be larger than 8 bits, and the return value
was only 8-bits long.
Change-Id: I8b75be48f924cc33ebf5e5aeff6d4045fac66bcc
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66791
Maintainer: Matt Sinclair
Reviewed-by: Matt Sinclair
Tested-by: kokoro
---
M src/base/sat_counter.hh
M src/base/sat_counter.test.cc
2 files changed, 35 insertions(+), 2 deletions(-)
Approvals:
Matt Sinclair: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/sat_counter.hh b/src/base/sat_counter.hh
index a607c4c..ecb8df8 100644
--- a/src/base/sat_counter.hh
+++ b/src/base/sat_counter.hh
@@ -318,9 +318,9 @@
*
* @ingroup api_sat_counter
*/
-uint8_t saturate()
+T saturate()
{
-const uint8_t diff = maxVal - counter;
+const T diff = maxVal - counter;
counter = maxVal;
return diff;
}
diff --git a/src/base/sat_counter.test.cc b/src/base/sat_counter.test.cc
index 07a01c7..0a6459c 100644
--- a/src/base/sat_counter.test.cc
+++ b/src/base/sat_counter.test.cc
@@ -149,6 +149,20 @@
ASSERT_TRUE(counter.isSaturated());
}
+TEST(SatCounterTest, Saturate16)
+{
+const unsigned bits = 14;
+const unsigned max_value = (1 << bits) - 1;
+SatCounter16 counter(bits);
+counter++;
+ASSERT_FALSE(counter.isSaturated());
+
+// Make sure the value added is what was missing to saturate
+const unsigned diff = counter.saturate();
+ASSERT_EQ(diff, max_value - 1);
+ASSERT_TRUE(counter.isSaturated());
+}
+
/**
* Test back and forth against an int.
*/
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/66791?usp=email
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: I8b75be48f924cc33ebf5e5aeff6d4045fac66bcc
Gerrit-Change-Number: 66791
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Matt Sinclair
Gerrit-Reviewer: kokoro
Gerrit-MessageType: merged
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] [S] Change in gem5/gem5[develop]: base: Fix signature of SatCounter::saturate()
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/66791?usp=email )
Change subject: base: Fix signature of SatCounter::saturate()
..
base: Fix signature of SatCounter::saturate()
The variants that use more than 8 bits were broken,
since the size of the difference in those cases
could be larger than 8 bits, and the return value
was only 8-bits long.
Change-Id: I8b75be48f924cc33ebf5e5aeff6d4045fac66bcc
Signed-off-by: Daniel R. Carvalho
---
M src/base/sat_counter.hh
M src/base/sat_counter.test.cc
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/base/sat_counter.hh b/src/base/sat_counter.hh
index a607c4c..ecb8df8 100644
--- a/src/base/sat_counter.hh
+++ b/src/base/sat_counter.hh
@@ -318,9 +318,9 @@
*
* @ingroup api_sat_counter
*/
-uint8_t saturate()
+T saturate()
{
-const uint8_t diff = maxVal - counter;
+const T diff = maxVal - counter;
counter = maxVal;
return diff;
}
diff --git a/src/base/sat_counter.test.cc b/src/base/sat_counter.test.cc
index 07a01c7..0a6459c 100644
--- a/src/base/sat_counter.test.cc
+++ b/src/base/sat_counter.test.cc
@@ -149,6 +149,20 @@
ASSERT_TRUE(counter.isSaturated());
}
+TEST(SatCounterTest, Saturate16)
+{
+const unsigned bits = 14;
+const unsigned max_value = (1 << bits) - 1;
+SatCounter16 counter(bits);
+counter++;
+ASSERT_FALSE(counter.isSaturated());
+
+// Make sure the value added is what was missing to saturate
+const unsigned diff = counter.saturate();
+ASSERT_EQ(diff, max_value - 1);
+ASSERT_TRUE(counter.isSaturated());
+}
+
/**
* Test back and forth against an int.
*/
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/66791?usp=email
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: I8b75be48f924cc33ebf5e5aeff6d4045fac66bcc
Gerrit-Change-Number: 66791
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
[gem5-dev] Change in gem5/gem5[develop]: mem-cache,tests: Add unit test for ReplaceableEntry
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44110 )
(
12 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: mem-cache,tests: Add unit test for ReplaceableEntry
..
mem-cache,tests: Add unit test for ReplaceableEntry
Add a unit test for ReplacementPolicy::ReplaceableEntry.
Change-Id: Iaa0c0cfdf1745b7b4d9efbe8ccab8f002a1bcee8
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44110
Reviewed-by: Bobby Bruce
Maintainer: Bobby Bruce
Tested-by: kokoro
---
M src/mem/cache/replacement_policies/SConscript
A src/mem/cache/replacement_policies/replaceable_entry.test.cc
2 files changed, 59 insertions(+), 0 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/replacement_policies/SConscript
b/src/mem/cache/replacement_policies/SConscript
index 19f987b..027093f 100644
--- a/src/mem/cache/replacement_policies/SConscript
+++ b/src/mem/cache/replacement_policies/SConscript
@@ -45,3 +45,5 @@
Source('ship_rp.cc')
Source('tree_plru_rp.cc')
Source('weighted_lru_rp.cc')
+
+GTest('replaceable_entry.test', 'replaceable_entry.test.cc')
diff --git a/src/mem/cache/replacement_policies/replaceable_entry.test.cc
b/src/mem/cache/replacement_policies/replaceable_entry.test.cc
new file mode 100644
index 000..fde5775
--- /dev/null
+++ b/src/mem/cache/replacement_policies/replaceable_entry.test.cc
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2021 Daniel R. Carvalho
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+
+#include "mem/cache/replacement_policies/replaceable_entry.hh"
+
+using namespace gem5;
+
+TEST(ReplaceableEntryTest, SetPosition)
+{
+ReplaceableEntry entry;
+uint32_t set = 10, way = 20;
+entry.setPosition(set, way);
+ASSERT_EQ(entry.getSet(), set);
+ASSERT_EQ(entry.getWay(), way);
+}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44110
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: Iaa0c0cfdf1745b7b4d9efbe8ccab8f002a1bcee8
Gerrit-Change-Number: 44110
Gerrit-PatchSet: 14
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Nikos Nikoleris
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: sim,tests: Add a tag for drain-related files
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44108 )
Change subject: sim,tests: Add a tag for drain-related files
..
sim,tests: Add a tag for drain-related files
This tag can be used to determine which files are needed
when sim/drain.hh is included in a header file. For
example, when declaring a unit test, this tag makes
the SConscript declaration much simpler.
Change-Id: Ie8a44291a0408090ffbb5b078582d3c5c8d1fd55
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44108
Reviewed-by: Bobby Bruce
Maintainer: Bobby Bruce
Tested-by: kokoro
---
M src/sim/SConscript
1 file changed, 23 insertions(+), 3 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/SConscript b/src/sim/SConscript
index c0951f3..bf46ccb 100644
--- a/src/sim/SConscript
+++ b/src/sim/SConscript
@@ -52,10 +52,11 @@
Source('cxx_manager.cc')
Source('cxx_config_ini.cc')
Source('debug.cc')
+Source('drain.cc', add_tags='gem5 drain')
Source('py_interact.cc', add_tags='python')
Source('eventq.cc', add_tags='gem5 events')
Source('futex_map.cc')
-Source('global_event.cc')
+Source('global_event.cc', add_tags='gem5 drain')
Source('globals.cc')
Source('init.cc', add_tags='python')
Source('init_signals.cc')
@@ -66,9 +67,8 @@
Source('redirect_path.cc')
Source('root.cc')
Source('serialize.cc', add_tags='gem5 serialize')
-Source('drain.cc')
Source('se_workload.cc')
-Source('sim_events.cc')
+Source('sim_events.cc', add_tags='gem5 drain')
Source('sim_object.cc')
Source('sub_system.cc')
Source('ticked_object.cc')
@@ -89,6 +89,7 @@
Source('workload.cc')
Source('mem_pool.cc')
+env.TagImplies('gem5 drain', ['gem5 events', 'gem5 trace'])
env.TagImplies('gem5 events', ['gem5 serialize', 'gem5 trace'])
env.TagImplies('gem5 serialize', 'gem5 trace')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44108
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: Ie8a44291a0408090ffbb5b078582d3c5c8d1fd55
Gerrit-Change-Number: 44108
Gerrit-PatchSet: 13
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: sim,tests: Add unit test for Globals
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43593 )
Change subject: sim,tests: Add unit test for Globals
..
sim,tests: Add unit test for Globals
Add a unit test for sim/globals.
Change-Id: Ia47e750df4cbdb91a0ab0498819f4e3451d74830
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43593
Reviewed-by: Bobby Bruce
Maintainer: Bobby Bruce
Tested-by: kokoro
---
M src/sim/SConscript
A src/sim/globals.test.cc
2 files changed, 184 insertions(+), 0 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/SConscript b/src/sim/SConscript
index 8bf5f5d..371eccd 100644
--- a/src/sim/SConscript
+++ b/src/sim/SConscript
@@ -92,6 +92,8 @@
env.TagImplies('gem5 serialize', 'gem5 trace')
GTest('byteswap.test', 'byteswap.test.cc', '../base/types.cc')
+GTest('globals.test', 'globals.test.cc', 'globals.cc',
+with_tag('gem5 serialize'))
GTest('guest_abi.test', 'guest_abi.test.cc')
GTest('port.test', 'port.test.cc', 'port.cc')
GTest('proxy_ptr.test', 'proxy_ptr.test.cc')
diff --git a/src/sim/globals.test.cc b/src/sim/globals.test.cc
new file mode 100644
index 000..8900c19
--- /dev/null
+++ b/src/sim/globals.test.cc
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2022 Daniel R. Carvalho
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+#include
+#include
+
+#include
+
+#include "base/gtest/cur_tick_fake.hh"
+#include "base/gtest/logging.hh"
+#include "base/gtest/serialization_fixture.hh"
+#include "sim/globals.hh"
+
+// The version tags are declared as extern
+namespace gem5
+{
+std::set version_tags;
+} // namespace gem5
+
+using namespace gem5;
+
+// Use the tick handled to manipulate the current tick
+GTestTickHandler tickHandler;
+
+using GlobalsSerializationFixture = SerializationFixture;
+using GlobalsSerializationFixtureDeathTest = GlobalsSerializationFixture;
+
+/** Test serialization. */
+TEST_F(GlobalsSerializationFixture, Serialization)
+{
+Globals globals;
+tickHandler.setCurTick(1234);
+version_tags = { "first-tag", "second-tag", "third-tag", "fourth-tag"
};
+
+// Serialization
+std::ofstream cp(getCptPath());
+Serializable::ScopedCheckpointSection scs(cp, "Section1");
+globals.serialize(cp);
+
+// The checkpoint must be flushed, otherwise the file may not be up-
+// to-date and the assertions below will fail
+cp.close();
+
+// Verify the output
+std::ifstream is(getCptPath());
+assert(is.good());
+std::string str = std::string(std::istreambuf_iterator(is),
+std::istreambuf_iterator());
+ASSERT_THAT(str, ::testing::StrEq("\n[Section1]\ncurTick=1234\n"
+"version_tags=first-tag fourth-tag second-tag third-tag\n"));
+}
+
+/** Test unserialization. */
+TEST_F(GlobalsSerializationFixture, Unserialization)
+{
+version_tags = { "first-tag-un", "second-tag-un", "third-tag-un",
+"fourth-tag-un" };
+simulateSerialization("\n[Section1]\ncurTick=\nversion_tags="
+"first-tag-un second-tag-un third-tag-un fourth-tag-un\n");
+
+Globals globals;
+CheckpointIn cp(getDirName());
+Serializable::ScopedCheckpointSection scs(cp, "Section1");
+
+gtestLogOutput.str("");
+globals.unserialize(cp);
+ASSERT_THAT(gtestLogOutput.str(), ::testing::StrEq(""));
+
[gem5-dev] Change in gem5/gem5[develop]: sim,tests: Add a tag for gem5 events
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44107 )
Change subject: sim,tests: Add a tag for gem5 events
..
sim,tests: Add a tag for gem5 events
This tag can be used to determine which files are needed
when sim/eventq.hh is included in a header file. For
example, when declaring a unit test, this tag makes
the SConscript declaration much simpler.
Change-Id: If68ddf94975dbe9f7121fefb6051a8bbaca19c4b
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44107
Reviewed-by: Bobby Bruce
Maintainer: Bobby Bruce
Tested-by: kokoro
---
M src/base/SConscript
M src/sim/SConscript
2 files changed, 22 insertions(+), 2 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/SConscript b/src/base/SConscript
index c49e2ae..21ebde9 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -40,7 +40,7 @@
Source('cprintf.cc', add_tags='gtest lib')
GTest('cprintf.test', 'cprintf.test.cc')
Executable('cprintftime', 'cprintftime.cc', 'cprintf.cc')
-Source('debug.cc', add_tags='gem5 trace')
+Source('debug.cc', add_tags=['gem5 trace', 'gem5 events'])
GTest('debug.test', 'debug.test.cc', 'debug.cc')
if env['HAVE_FENV']:
Source('fenv.cc')
diff --git a/src/sim/SConscript b/src/sim/SConscript
index 371eccd..c0951f3 100644
--- a/src/sim/SConscript
+++ b/src/sim/SConscript
@@ -53,7 +53,7 @@
Source('cxx_config_ini.cc')
Source('debug.cc')
Source('py_interact.cc', add_tags='python')
-Source('eventq.cc')
+Source('eventq.cc', add_tags='gem5 events')
Source('futex_map.cc')
Source('global_event.cc')
Source('globals.cc')
@@ -89,6 +89,7 @@
Source('workload.cc')
Source('mem_pool.cc')
+env.TagImplies('gem5 events', ['gem5 serialize', 'gem5 trace'])
env.TagImplies('gem5 serialize', 'gem5 trace')
GTest('byteswap.test', 'byteswap.test.cc', '../base/types.cc')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44107
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: If68ddf94975dbe9f7121fefb6051a8bbaca19c4b
Gerrit-Change-Number: 44107
Gerrit-PatchSet: 13
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base: Finish deprecating SatCounter
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/54523 )
Change subject: base: Finish deprecating SatCounter
..
base: Finish deprecating SatCounter
SatCounter has been marked as deprecated for at least 2 versions,
so it can be removed.
Change-Id: Iffb75822cc0d09d8b7d9b86828b26198865ce407
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/54523
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/base/sat_counter.hh
1 file changed, 17 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/sat_counter.hh b/src/base/sat_counter.hh
index 6644b05..a607c4c 100644
--- a/src/base/sat_counter.hh
+++ b/src/base/sat_counter.hh
@@ -340,9 +340,6 @@
typedef GenericSatCounter SatCounter64;
/** @} */
-[[deprecated("Use SatCounter8 (or variants) instead")]]
-typedef SatCounter8 SatCounter;
-
} // namespace gem5
#endif // __BASE_SAT_COUNTER_HH__
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54523
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: Iffb75822cc0d09d8b7d9b86828b26198865ce407
Gerrit-Change-Number: 54523
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base: Finish deprecating SatCounter
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/54523 )
Change subject: base: Finish deprecating SatCounter
..
base: Finish deprecating SatCounter
SatCounter has been marked as deprecated for at least 2 versions,
so it can be removed.
Change-Id: Iffb75822cc0d09d8b7d9b86828b26198865ce407
Signed-off-by: Daniel R. Carvalho
---
M src/base/sat_counter.hh
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/base/sat_counter.hh b/src/base/sat_counter.hh
index 6644b05..a607c4c 100644
--- a/src/base/sat_counter.hh
+++ b/src/base/sat_counter.hh
@@ -340,9 +340,6 @@
typedef GenericSatCounter SatCounter64;
/** @} */
-[[deprecated("Use SatCounter8 (or variants) instead")]]
-typedef SatCounter8 SatCounter;
-
} // namespace gem5
#endif // __BASE_SAT_COUNTER_HH__
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54523
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: Iffb75822cc0d09d8b7d9b86828b26198865ce407
Gerrit-Change-Number: 54523
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: base,tests: Add unit test for SymbolTable
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43250 )
Change subject: base,tests: Add unit test for SymbolTable
..
base,tests: Add unit test for SymbolTable
Add a unit test for base/loader/symtab.*.
Change-Id: I81c14826ab629439897235cbaaf79047e603ff8d
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43250
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M src/base/loader/SConscript
A src/base/loader/symtab.test.cc
2 files changed, 826 insertions(+), 0 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/loader/SConscript b/src/base/loader/SConscript
index d17875f..8b43512 100644
--- a/src/base/loader/SConscript
+++ b/src/base/loader/SConscript
@@ -35,3 +35,5 @@
Source('memory_image.cc')
Source('object_file.cc')
Source('symtab.cc')
+GTest('symtab.test', 'symtab.test.cc', 'symtab.cc',
+with_any_tags('gem5 serialize', 'gem5 trace'))
diff --git a/src/base/loader/symtab.test.cc b/src/base/loader/symtab.test.cc
new file mode 100644
index 000..e9edb11
--- /dev/null
+++ b/src/base/loader/symtab.test.cc
@@ -0,0 +1,824 @@
+/*
+ * Copyright (c) 2021 Daniel R. Carvalho
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include "base/gtest/serialization_fixture.hh"
+#include "base/loader/symtab.hh"
+
+using namespace gem5;
+
+/**
+ * Checks if a symbol's contents matches the expected contents to generate
+ * an error message. On matches an empty string is returned.
+ *
+ * @param symbol The symbol to check for a match.
+ * @param expected The expected symbol value.
+ * @return The error string, if any.
+ */
+std::string
+getSymbolError(const Loader::Symbol& symbol, const Loader::Symbol&
expected)
+{
+std::stringstream ss;
+
+if (symbol.binding != expected.binding) {
+ss << "symbols' bindings do not match: seen `" <<
+(int)symbol.binding << "`, expected `" <<
+(int)expected.binding << "`.\n";
+}
+
+if (symbol.name != expected.name) {
+ss << "symbols' names do not match: seen `" << symbol.name <<
+"`, expected `" << expected.name << "`.\n";
+}
+
+if (symbol.address != expected.address) {
+ss << "symbols' addresses do not match: seen `" <<
+symbol.address << "`, expected `" << expected.address
<< "`.\n";
+}
+
+// No error, symbols match
+return ss.str();
+}
+
+/**
+ * Checks that a symbol's contents matches the expected contents.
+ *
+ * @param m_symbol
+ * @param m_expected
+ * @param symbol The symbol to check for a match.
+ * @param expected The expected symbol value.
+ * @return A GTest's assertion result, with error message on failure.
+ */
+::testing::AssertionResult
+checkSymbol(const char* m_symbol, const char* m_expected,
+const Loader::Symbol& symbol, const Loader::Symbol& expected)
+{
+const std::string error = getSymbolError(symbol, expected);
+if (!error.empty()) {
+return ::testing::AssertionFailure() << "Symbols do not match (" <<
+m_symbol << " != " << m_expected << ")\n" << error;
+}
+return ::testing::AssertionSuccess();
+}
+
+/**
+ * Checks that a symbol table contains only the expected symbols.
+
[gem5-dev] Change in gem5/gem5[develop]: sim,tests: Add unit test for sim/serialize_handlers
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38776 )
Change subject: sim,tests: Add unit test for sim/serialize_handlers
..
sim,tests: Add unit test for sim/serialize_handlers
Add a GTest for the functionality of sim/serialize_handlers.hh.
Change-Id: I1128c7adb12a3c7d091e26db13733ba45e1e61fe
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38776
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M src/sim/SConscript
A src/sim/serialize_handlers.test.cc
2 files changed, 420 insertions(+), 0 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/SConscript b/src/sim/SConscript
index 20f8d6b..91fe15f 100644
--- a/src/sim/SConscript
+++ b/src/sim/SConscript
@@ -91,6 +91,7 @@
GTest('guest_abi.test', 'guest_abi.test.cc')
GTest('port.test', 'port.test.cc', 'port.cc')
GTest('proxy_ptr.test', 'proxy_ptr.test.cc')
+GTest('serialize_handlers.test', 'serialize_handlers.test.cc')
if env['TARGET_ISA'] != 'null':
SimObject('InstTracer.py')
diff --git a/src/sim/serialize_handlers.test.cc
b/src/sim/serialize_handlers.test.cc
new file mode 100644
index 000..a844b7a
--- /dev/null
+++ b/src/sim/serialize_handlers.test.cc
@@ -0,0 +1,419 @@
+/*
+ * Copyright 2021 Daniel R. Carvalho
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+
+#include
+#include
+
+#include "sim/serialize_handlers.hh"
+
+using namespace gem5;
+
+TEST(SerializeTest, ParseParamInt8)
+{
+ParseParam parser;
+int8_t value(0);
+
+// Zero
+EXPECT_TRUE(parser.parse("0", value));
+EXPECT_EQ(0, value);
+
+// Booleans
+EXPECT_FALSE(parser.parse("true", value));
+EXPECT_FALSE(parser.parse("false", value));
+
+// 8-bit values
+EXPECT_FALSE(parser.parse("255", value));
+EXPECT_TRUE(parser.parse("-128", value));
+EXPECT_EQ(-128, value);
+
+// 16-bit values
+EXPECT_FALSE(parser.parse("1000", value));
+EXPECT_FALSE(parser.parse("-1000", value));
+
+// 32-bit values
+EXPECT_FALSE(parser.parse("2147483648", value));
+EXPECT_FALSE(parser.parse("-1073741824", value));
+
+// Doubles (scientific numbers should not be converted to integers
+// correctly)
+EXPECT_FALSE(parser.parse("123456.789", value));
+EXPECT_FALSE(parser.parse("-123456.789", value));
+EXPECT_FALSE(parser.parse("9.87654e+06", value));
+
+// Characters
+EXPECT_TRUE(parser.parse("69", value));
+EXPECT_EQ(69, value);
+EXPECT_TRUE(parser.parse("97", value));
+EXPECT_EQ(97, value);
+
+// Strings
+EXPECT_FALSE(parser.parse("Test", value));
+}
+
+TEST(SerializeTest, ParseParamUint32)
+{
+ParseParam parser;
+uint32_t value(0);
+
+// Zero
+EXPECT_TRUE(parser.parse("0", value));
+EXPECT_EQ(0, value);
+
+// Booleans
+EXPECT_FALSE(parser.parse("true", value));
+EXPECT_FALSE(parser.parse("false", value));
+
+// 8-bit values
+EXPECT_TRUE(parser.parse("255", value));
+EXPECT_EQ(255, value);
+EXPECT_FALSE(parser.parse("-128", value));
+
+// 16-bit values
+EXPECT_TRUE(parser.parse("1000", value));
+EXPECT_EQ(1000, value);
+EXPECT_FALSE(parser.parse("-1000", value));
+
+// 32-bit values
+EXPECT_TRUE(parser.parse("2147483648", value));
+EXPECT_EQ(2147483648, value);
+
[gem5-dev] Change in gem5/gem5[develop]: arch-arm: Fix memory leak of PMU events
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38703 )
Change subject: arch-arm: Fix memory leak of PMU events
..
arch-arm: Fix memory leak of PMU events
Memory of PMU events was never being released.
Change-Id: I3cd958310008799f0873af3a490f847a21b5
Issued-on: https://gem5.atlassian.net/browse/GEM5-857
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38703
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M src/arch/arm/pmu.cc
M src/arch/arm/pmu.hh
2 files changed, 13 insertions(+), 17 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/pmu.cc b/src/arch/arm/pmu.cc
index ad4ea24..57df5f6 100644
--- a/src/arch/arm/pmu.cc
+++ b/src/arch/arm/pmu.cc
@@ -118,7 +118,7 @@
fatal_if(old_event != eventMap.end(), "An event with id %d has "
"been previously defined\n", id);
-swIncrementEvent = new SWIncrementEvent();
+swIncrementEvent = std::make_shared();
eventMap[id] = swIncrementEvent;
registerEvent(id);
}
@@ -130,18 +130,14 @@
DPRINTF(PMUVerbose, "PMU: Adding Probe Driven event with id '0x%x'"
"as probe %s:%s\n",id, obj->name(), probe_name);
-RegularEvent *event = nullptr;
+std::shared_ptr event;
auto event_entry = eventMap.find(id);
if (event_entry == eventMap.end()) {
-
-event = new RegularEvent();
+event = std::make_shared();
eventMap[id] = event;
-
} else {
-event = dynamic_cast(event_entry->second);
-if (!event) {
-fatal("Event with id %d is not probe driven\n", id);
-}
+event =
std::dynamic_pointer_cast(event_entry->second);
+fatal_if(!event, "Event with id %d is not probe driven\n", id);
}
event->addMicroarchitectureProbe(obj, probe_name);
@@ -182,7 +178,7 @@
counters.emplace_back(*this, index);
}
-PMUEvent *event = getEvent(cycleCounterEventId);
+std::shared_ptr event = getEvent(cycleCounterEventId);
panic_if(!event, "core cycle event is not present\n");
cycleCounter.enabled = true;
cycleCounter.attach(event);
@@ -531,7 +527,7 @@
}
void
-PMU::CounterState::attach(PMUEvent* event)
+PMU::CounterState::attach(const std::shared_ptr )
{
if (!resetValue) {
value = 0;
@@ -734,7 +730,7 @@
cycleCounter.unserializeSection(cp, "cycleCounter");
}
-PMU::PMUEvent*
+std::shared_ptr
PMU::getEvent(uint64_t eventId)
{
auto entry = eventMap.find(eventId);
diff --git a/src/arch/arm/pmu.hh b/src/arch/arm/pmu.hh
index b9b2747..46b10d0 100644
--- a/src/arch/arm/pmu.hh
+++ b/src/arch/arm/pmu.hh
@@ -408,7 +408,7 @@
* @param the id of the event to obtain
* @return a pointer to the event with id eventId
*/
-PMUEvent* getEvent(uint64_t eventId);
+std::shared_ptr getEvent(uint64_t eventId);
/** State of a counter within the PMU. **/
struct CounterState : public Serializable
@@ -442,7 +442,7 @@
*
* @param the event to attach the counter to
*/
-void attach(PMUEvent* event);
+void attach(const std::shared_ptr );
/**
* Obtain the counter id
@@ -482,7 +482,7 @@
protected: /* Configuration */
/** PmuEvent currently in use (if any) **/
-PMUEvent *sourceEvent;
+std::shared_ptr sourceEvent;
/** id of the counter instance **/
uint64_t counterId;
@@ -612,7 +612,7 @@
const uint64_t cycleCounterEventId;
/** The event that implements the software increment **/
-SWIncrementEvent *swIncrementEvent;
+std::shared_ptr swIncrementEvent;
protected: /* Configuration and constants */
/** Constant (configuration-dependent) part of the PMCR */
@@ -627,7 +627,7 @@
/**
* List of event types supported by this PMU.
*/
-std::map eventMap;
+std::map> eventMap;
};
} // namespace ArmISA
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38703
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: I3cd958310008799f0873af3a490f847a21b5
Gerrit-Change-Number: 38703
Gerrit-PatchSet: 5
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Andreas Sandberg
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base-stats: Remove info dependency from stats storage
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/27083 )
Change subject: base-stats: Remove info dependency from stats storage
..
base-stats: Remove info dependency from stats storage
Info depends on the storage type, not the other way around.
Change-Id: Ie3deca17b859a217c0c7bd833c017d9436eee4b0
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27083
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/base/statistics.hh
M src/base/stats/SConscript
M src/base/stats/info.hh
M src/base/stats/storage.hh
M src/base/stats/storage.test.cc
M src/base/stats/types.hh
6 files changed, 116 insertions(+), 156 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 1afdd74..24b67be 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -439,7 +439,7 @@
size_t size = self.size();
for (off_type i = 0; i < size; ++i)
-self.data(i)->prepare(info);
+self.data(i)->prepare(info->storageParams);
}
void
@@ -450,7 +450,7 @@
size_t size = self.size();
for (off_type i = 0; i < size; ++i)
-self.data(i)->reset(info);
+self.data(i)->reset(info->storageParams);
}
};
@@ -550,7 +550,7 @@
void
doInit()
{
-new (storage) Storage(this->info());
+new (storage) Storage(this->info()->storageParams);
this->setInit();
}
@@ -623,8 +623,8 @@
bool zero() const { return result() == 0.0; }
-void reset() { data()->reset(this->info()); }
-void prepare() { data()->prepare(this->info()); }
+void reset() { data()->reset(this->info()->storageParams); }
+void prepare() { data()->prepare(this->info()->storageParams); }
};
class ProxyInfo : public ScalarInfo
@@ -957,7 +957,7 @@
storage = reinterpret_cast(ptr);
for (off_type i = 0; i < _size; ++i)
-new ([i]) Storage(this->info());
+new ([i]) Storage(this->info()->storageParams);
this->setInit();
}
@@ -1196,7 +1196,7 @@
storage = reinterpret_cast(ptr);
for (off_type i = 0; i < _size; ++i)
-new ([i]) Storage(info);
+new ([i]) Storage(info->storageParams);
this->setInit();
@@ -1244,7 +1244,7 @@
size_type size = this->size();
for (off_type i = 0; i < size; ++i)
-data(i)->prepare(info);
+data(i)->prepare(info->storageParams);
info->cvec.resize(size);
for (off_type i = 0; i < size; ++i)
@@ -1260,7 +1260,7 @@
Info *info = this->info();
size_type size = this->size();
for (off_type i = 0; i < size; ++i)
-data(i)->reset(info);
+data(i)->reset(info->storageParams);
}
bool
@@ -1316,7 +1316,7 @@
void
doInit()
{
-new (storage) Storage(this->info());
+new (storage) Storage(this->info()->storageParams);
this->setInit();
}
@@ -1352,7 +1352,7 @@
prepare()
{
Info *info = this->info();
-data()->prepare(info, info->data);
+data()->prepare(info->storageParams, info->data);
}
/**
@@ -1361,7 +1361,7 @@
void
reset()
{
-data()->reset(this->info());
+data()->reset(this->info()->storageParams);
}
/**
@@ -1413,7 +1413,7 @@
Info *info = this->info();
for (off_type i = 0; i < _size; ++i)
-new ([i]) Storage(info);
+new ([i]) Storage(info->storageParams);
this->setInit();
}
@@ -1464,7 +1464,7 @@
size_type size = this->size();
info->data.resize(size);
for (off_type i = 0; i < size; ++i)
-data(i)->prepare(info, info->data[i]);
+data(i)->prepare(info->storageParams, info->data[i]);
}
bool
@@ -2461,7 +2461,7 @@
void
doInit()
{
-new (storage) Storage(this->info());
+new (storage) Storage(this->info()->storageParams);
this->setInit();
}
@@ -2497,7 +2497,7 @@
prepare()
{
Info *info = this->info();
-data()->prepare(info, info->data);
+data()->prepare(info->storageParams, info->data);
}
/**
@@ -2506,7 +2506,7 @@
void
reset()
{
-data()->reset(this->info());
+data()->reset(this->info()->storageParams);
}
};
diff --git a/src/base/stats/SConscript b/src/base/stats/SConscript
index 882ac13..841e455 100644
--- a/src/base/stats/SConscript
+++ b/src/base/stats/SConscript
@@ -43,6 +43,6 @@
GTest('group.test', 'group.test.cc', 'group.cc', 'info.cc',
with_tag('gem5 trace'))
GTest('info.test', 'info.test.cc',
[gem5-dev] Change in gem5/gem5[develop]: base-stats,tests: Add unit test for Stats::Group
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43010 )
Change subject: base-stats,tests: Add unit test for Stats::Group
..
base-stats,tests: Add unit test for Stats::Group
Add a unit test for Stats::Group.
Three bugs were found: groups are able to add
themselves/null groups as their sub-groups, and
one can create a cyclic dependency of sub-groups.
The ADD_STAT macro is not being tested.
Change-Id: I52326994b3f75e313024f872d214e8c45943f44d
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43010
Maintainer: Bobby R. Bruce
Reviewed-by: Hoa Nguyen
Tested-by: kokoro
---
M src/base/stats/SConscript
A src/base/stats/group.test.cc
2 files changed, 661 insertions(+), 0 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/stats/SConscript b/src/base/stats/SConscript
index f44ef03..882ac13 100644
--- a/src/base/stats/SConscript
+++ b/src/base/stats/SConscript
@@ -40,6 +40,8 @@
else:
Source('hdf5.cc')
+GTest('group.test', 'group.test.cc', 'group.cc', 'info.cc',
+with_tag('gem5 trace'))
GTest('info.test', 'info.test.cc', 'info.cc', '../debug.cc', '../str.cc')
GTest('storage.test', 'storage.test.cc', '../debug.cc', '../str.cc', 'info.cc',
'storage.cc', '../../sim/cur_tick.cc')
diff --git a/src/base/stats/group.test.cc b/src/base/stats/group.test.cc
new file mode 100644
index 000..92f125a
--- /dev/null
+++ b/src/base/stats/group.test.cc
@@ -0,0 +1,659 @@
+/*
+ * Copyright (c) 2021 Daniel R. Carvalho
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+#include
+
+#include "base/stats/group.hh"
+#include "base/stats/info.hh"
+#include "base/stats/output.hh"
+
+using namespace gem5;
+
+/** Test that the constructor without a parent doesn't do anything. */
+TEST(StatsGroupTest, ConstructNoParent)
+{
+Stats::Group root(nullptr);
+ASSERT_EQ(root.getStatGroups().size(), 0);
+}
+
+/** Test adding a single stat group to a root node. */
+TEST(StatsGroupTest, AddGetSingleStatGroup)
+{
+Stats::Group root(nullptr);
+Stats::Group node1(nullptr);
+root.addStatGroup("Node1", );
+
+const auto root_map = root.getStatGroups();
+ASSERT_EQ(root_map.size(), 1);
+ASSERT_NE(root_map.find("Node1"), root_map.end());
+
+ASSERT_EQ(node1.getStatGroups().size(), 0);
+}
+
+/** Test that group names are unique within a node's stat group. */
+TEST(StatsGroupDeathTest, AddUniqueNameStatGroup)
+{
+Stats::Group root(nullptr);
+Stats::Group node1(nullptr);
+Stats::Group node2(nullptr);
+root.addStatGroup("Node1", );
+ASSERT_ANY_THROW(root.addStatGroup("Node1", ));
+}
+
+/** Test that group names are not unique among two nodes' stat groups. */
+TEST(StatsGroupTest, AddNotUniqueNameAmongGroups)
+{
+Stats::Group root(nullptr);
+Stats::Group node1(nullptr);
+Stats::Group node2(nullptr);
+Stats::Group node1_1(nullptr);
+root.addStatGroup("Node1", );
+node1.addStatGroup("Node1_1", _1);
+ASSERT_NO_THROW(node1.addStatGroup("Node1", ));
+}
+
+/** Test that a group cannot add a non-existent group. */
+TEST(StatsGroupDeathTest, AddNull)
+{
+Stats::Group root(nullptr);
+ASSERT_ANY_THROW(root.addStatGroup("Node1", nullptr));
+}
+
+/** Test that a group cannot add itself. */
[gem5-dev] Change in gem5/gem5[develop]: base-stats: Use std vector in vector stats
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/27085 )
Change subject: base-stats: Use std vector in vector stats
..
base-stats: Use std vector in vector stats
Use std::vector in vector based stats to avoid data management.
Change-Id: I6b341f03e4861a5b8f80fa8741373065b7c755bf
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27085
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/base/statistics.hh
1 file changed, 37 insertions(+), 67 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 24b67be..1885954 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2020 Inria
* Copyright (c) 2019-2020 Arm Limited
* All rights reserved.
*
@@ -928,8 +929,7 @@
protected:
/** The storage of this stat. */
-Storage *storage;
-size_type _size;
+std::vector storage;
protected:
/**
@@ -937,28 +937,22 @@
* @param index The vector index to access.
* @return The storage object at the given index.
*/
-Storage *data(off_type index) { return [index]; }
+Storage *data(off_type index) { return storage[index]; }
/**
* Retrieve a const pointer to the storage.
* @param index The vector index to access.
* @return A const pointer to the storage object at the given index.
*/
-const Storage *data(off_type index) const { return [index]; }
+const Storage *data(off_type index) const { return storage[index]; }
void
doInit(size_type s)
{
-assert(s > 0 && "size must be positive!");
-assert(!storage && "already initialized");
-_size = s;
+fatal_if(s <= 0, "Storage size must be positive");
+fatal_if(check(), "Stat has already been initialized");
-char *ptr = new char[_size * sizeof(Storage)];
-storage = reinterpret_cast(ptr);
-
-for (off_type i = 0; i < _size; ++i)
-new ([i]) Storage(this->info()->storageParams);
-
+storage.resize(s, new Storage(this->info()->storageParams));
this->setInit();
}
@@ -999,7 +993,7 @@
/**
* @return the number of elements in this vector.
*/
-size_type size() const { return _size; }
+size_type size() const { return storage.size(); }
bool
zero() const
@@ -1013,7 +1007,7 @@
bool
check() const
{
-return storage != NULL;
+return size() > 0;
}
public:
@@ -1021,17 +1015,14 @@
const units::Base *unit,
const char *desc)
: DataWrapVec(parent, name, unit, desc),
- storage(nullptr), _size(0)
+ storage()
{}
~VectorBase()
{
-if (!storage)
-return;
-
-for (off_type i = 0; i < _size; ++i)
-data(i)->~Storage();
-delete [] reinterpret_cast(storage);
+for (auto& stor : storage) {
+delete stor;
+}
}
/**
@@ -1152,36 +1143,32 @@
protected:
size_type x;
size_type y;
-size_type _size;
-Storage *storage;
+std::vector storage;
protected:
-Storage *data(off_type index) { return [index]; }
-const Storage *data(off_type index) const { return [index]; }
+Storage *data(off_type index) { return storage[index]; }
+const Storage *data(off_type index) const { return storage[index]; }
public:
Vector2dBase(Group *parent, const char *name,
const units::Base *unit,
const char *desc)
: DataWrapVec2d(parent, name, unit,
desc),
- x(0), y(0), _size(0), storage(nullptr)
+ x(0), y(0), storage()
{}
~Vector2dBase()
{
-if (!storage)
-return;
-
-for (off_type i = 0; i < _size; ++i)
-data(i)->~Storage();
-delete [] reinterpret_cast(storage);
+for (auto& stor : storage) {
+delete stor;
+}
}
Derived &
init(size_type _x, size_type _y)
{
-assert(_x > 0 && _y > 0 && "sizes must be positive!");
-assert(!storage && "already initialized");
+fatal_if((_x <= 0) || (_y <= 0), "Storage sizes must be positive");
+fatal_if(check(), "Stat has already been initialized");
Derived = this->self();
Info *info = this->info();
@@ -1190,14 +1177,8 @@
y = _y;
info->x = _x;
info->y = _y;
-_size = x * y;
-char *ptr = new char[_size * sizeof(Storage)];
-storage = reinterpret_cast(ptr);
-
-for (off_type i = 0; i < _size; ++i)
-new ([i]) Storage(info->storageParams);
-
+storage.resize(x *
[gem5-dev] Change in gem5/gem5[develop]: base-stats: Use smart pointer for info's storageParams
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38178 )
Change subject: base-stats: Use smart pointer for info's storageParams
..
base-stats: Use smart pointer for info's storageParams
Previously the storage params were not being deallocated.
Make sure this happens by managing it with smart pointers.
As a side effect, encapsulate this variable to facilitate
future changes.
Change-Id: I4c2496d08241f155793ed35e3463512d9ea06f83
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38178
Tested-by: kokoro
Reviewed-by: Hoa Nguyen
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/base/statistics.cc
M src/base/statistics.hh
M src/base/stats/info.cc
M src/base/stats/info.hh
4 files changed, 44 insertions(+), 21 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, but someone else must approve; Looks
good to me, approved
Hoa Nguyen: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index c4782f6..39e76b6 100644
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -99,7 +99,7 @@
void
InfoAccess::setParams(const StorageParams *params)
{
-info()->storageParams = params;
+info()->setStorageParams(params);
}
void
diff --git a/src/base/statistics.hh b/src/base/statistics.hh
index 1885954..18f52cb 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -440,7 +440,7 @@
size_t size = self.size();
for (off_type i = 0; i < size; ++i)
-self.data(i)->prepare(info->storageParams);
+self.data(i)->prepare(info->getStorageParams());
}
void
@@ -451,7 +451,7 @@
size_t size = self.size();
for (off_type i = 0; i < size; ++i)
-self.data(i)->reset(info->storageParams);
+self.data(i)->reset(info->getStorageParams());
}
};
@@ -551,7 +551,7 @@
void
doInit()
{
-new (storage) Storage(this->info()->storageParams);
+new (storage) Storage(this->info()->getStorageParams());
this->setInit();
}
@@ -624,8 +624,8 @@
bool zero() const { return result() == 0.0; }
-void reset() { data()->reset(this->info()->storageParams); }
-void prepare() { data()->prepare(this->info()->storageParams); }
+void reset() { data()->reset(this->info()->getStorageParams()); }
+void prepare() { data()->prepare(this->info()->getStorageParams()); }
};
class ProxyInfo : public ScalarInfo
@@ -952,7 +952,7 @@
fatal_if(s <= 0, "Storage size must be positive");
fatal_if(check(), "Stat has already been initialized");
-storage.resize(s, new Storage(this->info()->storageParams));
+storage.resize(s, new Storage(this->info()->getStorageParams()));
this->setInit();
}
@@ -1178,7 +1178,7 @@
info->x = _x;
info->y = _y;
-storage.resize(x * y, new Storage(info->storageParams));
+storage.resize(x * y, new Storage(info->getStorageParams()));
this->setInit();
return self;
@@ -1225,7 +1225,7 @@
size_type size = this->size();
for (off_type i = 0; i < size; ++i)
-data(i)->prepare(info->storageParams);
+data(i)->prepare(info->getStorageParams());
info->cvec.resize(size);
for (off_type i = 0; i < size; ++i)
@@ -1241,7 +1241,7 @@
Info *info = this->info();
size_type size = this->size();
for (off_type i = 0; i < size; ++i)
-data(i)->reset(info->storageParams);
+data(i)->reset(info->getStorageParams());
}
bool
@@ -1297,7 +1297,7 @@
void
doInit()
{
-new (storage) Storage(this->info()->storageParams);
+new (storage) Storage(this->info()->getStorageParams());
this->setInit();
}
@@ -1333,7 +1333,7 @@
prepare()
{
Info *info = this->info();
-data()->prepare(info->storageParams, info->data);
+data()->prepare(info->getStorageParams(), info->data);
}
/**
@@ -1342,7 +1342,7 @@
void
reset()
{
-data()->reset(this->info()->storageParams);
+data()->reset(this->info()->getStorageParams());
}
/**
@@ -1387,7 +1387,7 @@
fatal_if(s <= 0, "Storage size must be positive");
fatal_if(check(), "Stat has already been initialized");
-storage.resize(s, new Storage(this->info()->storageParams));
+storage.resize(s, new Storage(this->info()->getStorageParams()));
this->setInit();
}
@@ -1434,7 +1434,7 @@
size_type size = this->size();
info->data.resize(size);
for (off_type i = 0; i < size; ++i)
-data(i)->prepare(info->storageParams, info->data[i]);
+data(i)->prepare(info->getStorageParams(),
[gem5-dev] Change in gem5/gem5[develop]: mem: Adopt a memory namespace for memories
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47309 )
Change subject: mem: Adopt a memory namespace for memories
..
mem: Adopt a memory namespace for memories
Encapsulate every class inheriting from Abstract or Physical
memories, and the memory controller in a memory namespace.
Change-Id: I228f7e55efc395089e3616ae0a0a6325867bd782
Issued-on: https://gem5.atlassian.net/browse/GEM5-983
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47309
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/arch/arm/semihosting.cc
M src/cpu/kvm/vm.cc
M src/cpu/o3/inst_queue.hh
M src/mem/AbstractMemory.py
M src/mem/CfiMemory.py
M src/mem/DRAMInterface.py
M src/mem/DRAMSim2.py
M src/mem/DRAMsim3.py
M src/mem/MemCtrl.py
M src/mem/MemInterface.py
M src/mem/NVMInterface.py
M src/mem/SimpleMemory.py
M src/mem/abstract_mem.cc
M src/mem/abstract_mem.hh
M src/mem/cfi_mem.cc
M src/mem/cfi_mem.hh
M src/mem/dramsim2.cc
M src/mem/dramsim2.hh
M src/mem/dramsim2_wrapper.cc
M src/mem/dramsim2_wrapper.hh
M src/mem/dramsim3.cc
M src/mem/dramsim3.hh
M src/mem/dramsim3_wrapper.cc
M src/mem/dramsim3_wrapper.hh
M src/mem/mem_ctrl.cc
M src/mem/mem_ctrl.hh
M src/mem/mem_interface.cc
M src/mem/mem_interface.hh
M src/mem/physical.cc
M src/mem/physical.hh
M src/mem/ruby/system/RubySystem.hh
M src/mem/simple_mem.cc
M src/mem/simple_mem.hh
M src/sim/system.cc
M src/sim/system.hh
35 files changed, 115 insertions(+), 24 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/semihosting.cc b/src/arch/arm/semihosting.cc
index 1f06b51..59ea4aa 100644
--- a/src/arch/arm/semihosting.cc
+++ b/src/arch/arm/semihosting.cc
@@ -551,7 +551,7 @@
Addr _base, Addr _limit,
Addr _base, Addr _limit)
{
-const PhysicalMemory = tc->getSystemPtr()->getPhysMem();
+const memory::PhysicalMemory = tc->getSystemPtr()->getPhysMem();
const AddrRangeList memories = phys.getConfAddrRanges();
fatal_if(memories.size() < 1, "No memories reported from System");
warn_if(memories.size() > 1, "Multiple physical memory ranges
available. "
diff --git a/src/cpu/kvm/vm.cc b/src/cpu/kvm/vm.cc
index f1fdeec..cd975ac 100644
--- a/src/cpu/kvm/vm.cc
+++ b/src/cpu/kvm/vm.cc
@@ -50,6 +50,7 @@
#include "cpu/kvm/base.hh"
#include "debug/Kvm.hh"
+#include "mem/physical.hh"
#include "params/KvmVM.hh"
#include "sim/system.hh"
@@ -355,7 +356,7 @@
KvmVM::delayedStartup()
{
assert(system); // set by the system during its construction
-const std::vector (
+const std::vector (
system->getPhysMem().getBackingStore());
DPRINTF(Kvm, "Mapping %i memory region(s)\n", memories.size());
diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index b69344a..b2d9303 100644
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -65,7 +65,11 @@
{
struct O3CPUParams;
+
+namespace memory
+{
class MemInterface;
+} // namespace memory
namespace o3
{
@@ -284,7 +288,7 @@
CPU *cpu;
/** Cache interface. */
-MemInterface *dcacheInterface;
+memory::MemInterface *dcacheInterface;
/** Pointer to IEW stage. */
IEW *iewStage;
diff --git a/src/mem/AbstractMemory.py b/src/mem/AbstractMemory.py
index 3fe94f3..ed2a02c 100644
--- a/src/mem/AbstractMemory.py
+++ b/src/mem/AbstractMemory.py
@@ -43,7 +43,7 @@
type = 'AbstractMemory'
abstract = True
cxx_header = "mem/abstract_mem.hh"
-cxx_class = 'gem5::AbstractMemory'
+cxx_class = 'gem5::memory::AbstractMemory'
# A default memory size of 128 MiB (starting at 0) is used to
# simplify the regressions
diff --git a/src/mem/CfiMemory.py b/src/mem/CfiMemory.py
index 6ac539e..aa6b18a 100644
--- a/src/mem/CfiMemory.py
+++ b/src/mem/CfiMemory.py
@@ -43,7 +43,7 @@
class CfiMemory(AbstractMemory):
type = 'CfiMemory'
cxx_header = "mem/cfi_mem.hh"
-cxx_class = 'gem5::CfiMemory'
+cxx_class = 'gem5::memory::CfiMemory'
port = ResponsePort("Response port")
diff --git a/src/mem/DRAMInterface.py b/src/mem/DRAMInterface.py
index 91e1540..3f938dd 100644
--- a/src/mem/DRAMInterface.py
+++ b/src/mem/DRAMInterface.py
@@ -49,7 +49,7 @@
class DRAMInterface(MemInterface):
type = 'DRAMInterface'
cxx_header = "mem/mem_interface.hh"
-cxx_class = 'gem5::DRAMInterface'
+cxx_class = 'gem5::memory::DRAMInterface'
# scheduler page policy
page_policy = Param.PageManage('open_adaptive', "Page management
policy")
diff --git a/src/mem/DRAMSim2.py b/src/mem/DRAMSim2.py
index d6f92ef..11f9b4e 100644
--- a/src/mem/DRAMSim2.py
+++ b/src/mem/DRAMSim2.py
@@ -40,7 +40,7 @@
class DRAMSim2(AbstractMemory):
type = 'DRAMSim2'
cxx_header =
[gem5-dev] Change in gem5/gem5[develop]: base-stats,tests: Add unit test for Stats::Info
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43009 )
Change subject: base-stats,tests: Add unit test for Stats::Info
..
base-stats,tests: Add unit test for Stats::Info
Add a unit test for stats/info.
One test has been disabled due to not knowing the
expected behavior.
It is important to notice that Stats::Info can have
duplicate names using the new style. Stats::Group is
responsible for not allowing duplicate names in this
case.
Change-Id: I8b169d34c1309b37ba79fa9cf6895547b7e97fc0
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43009
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M src/base/stats/SConscript
M src/base/stats/info.cc
M src/base/stats/info.hh
A src/base/stats/info.test.cc
4 files changed, 328 insertions(+), 2 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/stats/SConscript b/src/base/stats/SConscript
index 1e275fa..f44ef03 100644
--- a/src/base/stats/SConscript
+++ b/src/base/stats/SConscript
@@ -40,6 +40,7 @@
else:
Source('hdf5.cc')
+GTest('info.test', 'info.test.cc', 'info.cc', '../debug.cc', '../str.cc')
GTest('storage.test', 'storage.test.cc', '../debug.cc', '../str.cc', 'info.cc',
'storage.cc', '../../sim/cur_tick.cc')
GTest('units.test', 'units.test.cc')
diff --git a/src/base/stats/info.cc b/src/base/stats/info.cc
index c7dd5c9..edc4290 100644
--- a/src/base/stats/info.cc
+++ b/src/base/stats/info.cc
@@ -42,8 +42,6 @@
#include "base/stats/info.hh"
#include
-#include
-#include
#include "base/cprintf.hh"
#include "base/debug.hh"
diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh
index f8dfce7..36fb42c 100644
--- a/src/base/stats/info.hh
+++ b/src/base/stats/info.hh
@@ -29,6 +29,11 @@
#ifndef __BASE_STATS_INFO_HH__
#define __BASE_STATS_INFO_HH__
+#include
+#include
+#include
+#include
+
#include "base/compiler.hh"
#include "base/flags.hh"
#include "base/stats/types.hh"
diff --git a/src/base/stats/info.test.cc b/src/base/stats/info.test.cc
new file mode 100644
index 000..b56460c
--- /dev/null
+++ b/src/base/stats/info.test.cc
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2021 Daniel R. Carvalho
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+#include
+
+#include "base/stats/info.hh"
+
+using namespace gem5;
+
+class TestInfo : public statistics::Info
+{
+ public:
+using statistics::Info::Info;
+
+int value = 0;
+
+bool check() const override { return true; }
+void prepare() override {}
+void reset() override { value = 0; }
+bool zero() const override { return false; }
+void visit(statistics::Output ) override {}
+};
+
+/** Test that a name is properly assigned under the new style. */
+TEST(StatsInfoTest, NameNewStyle)
+{
+TestInfo info;
+info.setName("InfoNameNewStyle", false);
+ASSERT_EQ(info.name, "InfoNameNewStyle");
+}
+
+/** Test that the first character accepts alpha and underscore. */
+TEST(StatsInfoTest, NameFirstCharacter)
+{
+TestInfo info;
+info.setName("X", false);
+ASSERT_EQ(info.name, "X");
+
+TestInfo info2;
+info2.setName("a", false);
+ASSERT_EQ(info2.name, "a");
+
+TestInfo info3;
+info3.setName("_", false);
+ASSERT_EQ(info3.name, "_");
+
+TestInfo info4;
+
[gem5-dev] Change in gem5/gem5[develop]: mem: Adopt the memory namespace in qos files
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47308 )
Change subject: mem: Adopt the memory namespace in qos files
..
mem: Adopt the memory namespace in qos files
Encapsulate everything qos-related in the gem5::memory
namespace.
Change-Id: Ib906ddd6d76b9d4a56f2eb705efe6cd498829155
Issued-on: https://gem5.atlassian.net/browse/GEM5-983
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47308
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/mem/mem_ctrl.cc
M src/mem/mem_ctrl.hh
M src/mem/qos/QoSMemCtrl.py
M src/mem/qos/QoSMemSinkCtrl.py
M src/mem/qos/QoSMemSinkInterface.py
M src/mem/qos/QoSPolicy.py
M src/mem/qos/QoSTurnaround.py
M src/mem/qos/mem_ctrl.cc
M src/mem/qos/mem_ctrl.hh
M src/mem/qos/mem_sink.cc
M src/mem/qos/mem_sink.hh
M src/mem/qos/policy.cc
M src/mem/qos/policy.hh
M src/mem/qos/policy_fixed_prio.cc
M src/mem/qos/policy_fixed_prio.hh
M src/mem/qos/policy_pf.cc
M src/mem/qos/policy_pf.hh
M src/mem/qos/q_policy.cc
M src/mem/qos/q_policy.hh
M src/mem/qos/turnaround_policy.hh
M src/mem/qos/turnaround_policy_ideal.cc
M src/mem/qos/turnaround_policy_ideal.hh
22 files changed, 71 insertions(+), 11 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/mem_ctrl.cc b/src/mem/mem_ctrl.cc
index 8e3545b..5156b84 100644
--- a/src/mem/mem_ctrl.cc
+++ b/src/mem/mem_ctrl.cc
@@ -53,7 +53,7 @@
{
MemCtrl::MemCtrl(const MemCtrlParams ) :
-qos::MemCtrl(p),
+memory::qos::MemCtrl(p),
port(name() + ".port", *this), isTimingMode(false),
retryRdReq(false), retryWrReq(false),
nextReqEvent([this]{ processNextReqEvent(); }, name()),
@@ -1396,7 +1396,7 @@
MemCtrl::getPort(const std::string _name, PortID idx)
{
if (if_name != "port") {
-return qos::MemCtrl::getPort(if_name, idx);
+return memory::qos::MemCtrl::getPort(if_name, idx);
} else {
return port;
}
diff --git a/src/mem/mem_ctrl.hh b/src/mem/mem_ctrl.hh
index b78796f..a30fcb3 100644
--- a/src/mem/mem_ctrl.hh
+++ b/src/mem/mem_ctrl.hh
@@ -236,7 +236,7 @@
* please cite the paper.
*
*/
-class MemCtrl : public qos::MemCtrl
+class MemCtrl : public memory::qos::MemCtrl
{
private:
diff --git a/src/mem/qos/QoSMemCtrl.py b/src/mem/qos/QoSMemCtrl.py
index b3391fb..842b62b 100644
--- a/src/mem/qos/QoSMemCtrl.py
+++ b/src/mem/qos/QoSMemCtrl.py
@@ -44,7 +44,7 @@
class QoSMemCtrl(ClockedObject):
type = 'QoSMemCtrl'
cxx_header = "mem/qos/mem_ctrl.hh"
-cxx_class = 'gem5::qos::MemCtrl'
+cxx_class = 'gem5::memory::qos::MemCtrl'
abstract = True
system = Param.System(Parent.any, "System that the controller belongs
to.")
diff --git a/src/mem/qos/QoSMemSinkCtrl.py b/src/mem/qos/QoSMemSinkCtrl.py
index 234d8bc..486e74b 100644
--- a/src/mem/qos/QoSMemSinkCtrl.py
+++ b/src/mem/qos/QoSMemSinkCtrl.py
@@ -42,7 +42,7 @@
class QoSMemSinkCtrl(QoSMemCtrl):
type = 'QoSMemSinkCtrl'
cxx_header = "mem/qos/mem_sink.hh"
-cxx_class = 'gem5::qos::MemSinkCtrl'
+cxx_class = 'gem5::memory::qos::MemSinkCtrl'
port = ResponsePort("Response ports")
diff --git a/src/mem/qos/QoSMemSinkInterface.py
b/src/mem/qos/QoSMemSinkInterface.py
index d493dce..2544df8 100644
--- a/src/mem/qos/QoSMemSinkInterface.py
+++ b/src/mem/qos/QoSMemSinkInterface.py
@@ -38,7 +38,7 @@
class QoSMemSinkInterface(AbstractMemory):
type = 'QoSMemSinkInterface'
cxx_header = "mem/qos/mem_sink.hh"
-cxx_class = 'gem5::qos::MemSinkInterface'
+cxx_class = 'gem5::memory::qos::MemSinkInterface'
def controller(self):
"""
diff --git a/src/mem/qos/QoSPolicy.py b/src/mem/qos/QoSPolicy.py
index fba2e86..99a3f2f 100644
--- a/src/mem/qos/QoSPolicy.py
+++ b/src/mem/qos/QoSPolicy.py
@@ -41,12 +41,12 @@
type = 'QoSPolicy'
abstract = True
cxx_header = "mem/qos/policy.hh"
-cxx_class = 'gem5::qos::Policy'
+cxx_class = 'gem5::memory::qos::Policy'
class QoSFixedPriorityPolicy(QoSPolicy):
type = 'QoSFixedPriorityPolicy'
cxx_header = "mem/qos/policy_fixed_prio.hh"
-cxx_class = 'gem5::qos::FixedPriorityPolicy'
+cxx_class = 'gem5::memory::qos::FixedPriorityPolicy'
cxx_exports = [
PyBindMethod('initRequestorName'),
@@ -90,7 +90,7 @@
class QoSPropFairPolicy(QoSPolicy):
type = 'QoSPropFairPolicy'
cxx_header = "mem/qos/policy_pf.hh"
-cxx_class = 'gem5::qos::PropFairPolicy'
+cxx_class = 'gem5::memory::qos::PropFairPolicy'
cxx_exports = [
PyBindMethod('initRequestorName'),
diff --git a/src/mem/qos/QoSTurnaround.py b/src/mem/qos/QoSTurnaround.py
index c74f5e8..7a8d1e3 100644
--- a/src/mem/qos/QoSTurnaround.py
+++ b/src/mem/qos/QoSTurnaround.py
@@ -39,10 +39,10 @@
class QoSTurnaroundPolicy(SimObject):
[gem5-dev] Change in gem5/gem5[develop]: base: Remove DPRINTF_UNCONDITIONAL test
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47819 )
Change subject: base: Remove DPRINTF_UNCONDITIONAL test
..
base: Remove DPRINTF_UNCONDITIONAL test
This macro has been marked as deprecated [1]. To avoid
having warnings popping up on every run of the unit tests,
assume that this macro will no longer be modified, and
remove the respective tests.
[1] https://gem5-review.googlesource.com/c/public/gem5/+/44987
Change-Id: I1800440ab545b0acb83ac9c1cf20c19400242d3f
Signed-off-by: Daniel R. Carvalho
---
M src/base/trace.test.cc
1 file changed, 0 insertions(+), 28 deletions(-)
diff --git a/src/base/trace.test.cc b/src/base/trace.test.cc
index 526e8dd..491a826 100644
--- a/src/base/trace.test.cc
+++ b/src/base/trace.test.cc
@@ -556,34 +556,6 @@
#endif
}
-/** Test DPRINTF_UNCONDITIONAL with tracing on. */
-TEST(TraceTest, MacroDPRINTF_UNCONDITIONAL)
-{
-StringWrap name("Foo");
-
-// Flag enabled
-Trace::enable();
-EXPECT_TRUE(debug::changeFlag("TraceTestDebugFlag", true));
-EXPECT_TRUE(debug::changeFlag("FmtFlag", true));
-DPRINTF_UNCONDITIONAL(TraceTestDebugFlag, "Test message");
-#if TRACING_ON
-ASSERT_EQ(getString(Trace::output()),
-" 0: TraceTestDebugFlag: Foo: Test message");
-#else
-ASSERT_EQ(getString(Trace::output()), "");
-#endif
-
-// Flag disabled
-Trace::disable();
-EXPECT_TRUE(debug::changeFlag("TraceTestDebugFlag", false));
-DPRINTF_UNCONDITIONAL(TraceTestDebugFlag, "Test message");
-#if TRACING_ON
-ASSERT_EQ(getString(Trace::output()), " 0: Foo: Test message");
-#else
-ASSERT_EQ(getString(Trace::output()), "");
-#endif
-}
-
/**
* Test that there is a global name() to fall through when a locally scoped
* name() is not defined.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47819
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: I1800440ab545b0acb83ac9c1cf20c19400242d3f
Gerrit-Change-Number: 47819
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: sim: Align coding style of probes
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38697 )
Change subject: sim: Align coding style of probes
..
sim: Align coding style of probes
Fix coding style of probes for the following aspects:
- Long lines
- Return type of multi-line functions
- Name of local parameters
Also, added missing overrides
Jira: https://gem5.atlassian.net/browse/GEM5-857
Change-Id: Ibd905d1941fc203ca8308f7a3930d58515b19a97
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38697
Tested-by: kokoro
Reviewed-by: Andreas Sandberg
Maintainer: Andreas Sandberg
---
M src/sim/probe/probe.cc
M src/sim/probe/probe.hh
2 files changed, 49 insertions(+), 31 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/probe/probe.cc b/src/sim/probe/probe.cc
index 3101f76..da3ca64 100644
--- a/src/sim/probe/probe.cc
+++ b/src/sim/probe/probe.cc
@@ -11,6 +11,9 @@
* unmodified and in its entirety in all distributions of the software,
* modified or unmodified, in source code or in binary form.
*
+ * Copyright (c) 2020 Inria
+ * All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
@@ -78,35 +81,39 @@
}
bool
-ProbeManager::addListener(std::string pointName, ProbeListener )
+ProbeManager::addListener(std::string point_name, ProbeListener )
{
-DPRINTFR(ProbeVerbose, "Probes: Call to addListener to \"%s\"
on %s.\n", pointName, object->name());
+DPRINTFR(ProbeVerbose, "Probes: Call to addListener to \"%s\"
on %s.\n",
+point_name, object->name());
bool added = false;
for (auto p = points.begin(); p != points.end(); ++p) {
-if ((*p)->getName() == pointName) {
+if ((*p)->getName() == point_name) {
(*p)->addListener();
added = true;
}
}
if (!added) {
-DPRINTFR(ProbeVerbose, "Probes: Call to addListener to \"%s\"
on %s failed, no such point.\n", pointName, object->name());
+DPRINTFR(ProbeVerbose, "Probes: Call to addListener to \"%s\" on "
+"%s failed, no such point.\n", point_name, object->name());
}
return added;
}
bool
-ProbeManager::removeListener(std::string pointName, ProbeListener
)
+ProbeManager::removeListener(std::string point_name, ProbeListener
)
{
-DPRINTFR(ProbeVerbose, "Probes: Call to removeListener from \"%s\"
on %s.\n", pointName, object->name());
+DPRINTFR(ProbeVerbose, "Probes: Call to removeListener from \"%s\" on "
+"%s.\n", point_name, object->name());
bool removed = false;
for (auto p = points.begin(); p != points.end(); ++p) {
-if ((*p)->getName() == pointName) {
+if ((*p)->getName() == point_name) {
(*p)->removeListener();
removed = true;
}
}
if (!removed) {
-DPRINTFR(ProbeVerbose, "Probes: Call to removeListener from \"%s\"
on %s failed, no such point.\n", pointName, object->name());
+DPRINTFR(ProbeVerbose, "Probes: Call to removeListener from
\"%s\" "
+"on %s failed, no such point.\n", point_name, object->name());
}
return removed;
}
@@ -114,11 +121,13 @@
void
ProbeManager::addPoint(ProbePoint )
{
-DPRINTFR(ProbeVerbose, "Probes: Call to addPoint \"%s\" to %s.\n",
point.getName(), object->name());
+DPRINTFR(ProbeVerbose, "Probes: Call to addPoint \"%s\" to %s.\n",
+point.getName(), object->name());
for (auto p = points.begin(); p != points.end(); ++p) {
if ((*p)->getName() == point.getName()) {
-DPRINTFR(ProbeVerbose, "Probes: Call to addPoint \"%s\" to %s
failed, already added.\n", point.getName(), object->name());
+DPRINTFR(ProbeVerbose, "Probes: Call to addPoint \"%s\" to %s "
+"failed, already added.\n", point.getName(),
object->name());
return;
}
}
diff --git a/src/sim/probe/probe.hh b/src/sim/probe/probe.hh
index 89b0a97..dede7ad 100644
--- a/src/sim/probe/probe.hh
+++ b/src/sim/probe/probe.hh
@@ -11,6 +11,9 @@
* unmodified and in its entirety in all distributions of the software,
* modified or unmodified, in source code or in binary form.
*
+ * Copyright (c) 2020 Inria
+ * All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
@@ -39,21 +42,22 @@
* @file This file describes the base components used for the probe system.
* There are currently 3 components:
*
- * ProbePoint:
[gem5-dev] Change in gem5/gem5[develop]: cpu: Add a branch_prediction namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47303 )
Change subject: cpu: Add a branch_prediction namespace
..
cpu: Add a branch_prediction namespace
Encapsulate all branch-prediction-related files
in a branch_prediction namespace. This will allow
these files to be renamed to drop the BP suffix.
Issued-on: https://gem5.atlassian.net/browse/GEM5-982
Change-Id: I640c0caa846a3aade6fae95e9a93e4318ae9fca0
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47303
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
M src/cpu/minor/fetch2.hh
M src/cpu/o3/fetch.hh
M src/cpu/pred/2bit_local.cc
M src/cpu/pred/2bit_local.hh
M src/cpu/pred/BranchPredictor.py
M src/cpu/pred/bi_mode.cc
M src/cpu/pred/bi_mode.hh
M src/cpu/pred/bpred_unit.cc
M src/cpu/pred/bpred_unit.hh
M src/cpu/pred/btb.cc
M src/cpu/pred/btb.hh
M src/cpu/pred/indirect.hh
M src/cpu/pred/loop_predictor.cc
M src/cpu/pred/loop_predictor.hh
M src/cpu/pred/ltage.cc
M src/cpu/pred/ltage.hh
M src/cpu/pred/multiperspective_perceptron.cc
M src/cpu/pred/multiperspective_perceptron.hh
M src/cpu/pred/multiperspective_perceptron_64KB.cc
M src/cpu/pred/multiperspective_perceptron_64KB.hh
M src/cpu/pred/multiperspective_perceptron_8KB.cc
M src/cpu/pred/multiperspective_perceptron_8KB.hh
M src/cpu/pred/multiperspective_perceptron_tage.cc
M src/cpu/pred/multiperspective_perceptron_tage.hh
M src/cpu/pred/multiperspective_perceptron_tage_64KB.cc
M src/cpu/pred/multiperspective_perceptron_tage_64KB.hh
M src/cpu/pred/multiperspective_perceptron_tage_8KB.cc
M src/cpu/pred/multiperspective_perceptron_tage_8KB.hh
M src/cpu/pred/ras.cc
M src/cpu/pred/ras.hh
M src/cpu/pred/simple_indirect.cc
M src/cpu/pred/simple_indirect.hh
M src/cpu/pred/statistical_corrector.cc
M src/cpu/pred/statistical_corrector.hh
M src/cpu/pred/tage.cc
M src/cpu/pred/tage.hh
M src/cpu/pred/tage_base.cc
M src/cpu/pred/tage_base.hh
M src/cpu/pred/tage_sc_l.cc
M src/cpu/pred/tage_sc_l.hh
M src/cpu/pred/tage_sc_l_64KB.cc
M src/cpu/pred/tage_sc_l_64KB.hh
M src/cpu/pred/tage_sc_l_8KB.cc
M src/cpu/pred/tage_sc_l_8KB.hh
M src/cpu/pred/tournament.cc
M src/cpu/pred/tournament.hh
M src/cpu/simple/base.hh
47 files changed, 216 insertions(+), 37 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/minor/fetch2.hh b/src/cpu/minor/fetch2.hh
index 09b7867..41a7a7f 100644
--- a/src/cpu/minor/fetch2.hh
+++ b/src/cpu/minor/fetch2.hh
@@ -93,7 +93,7 @@
bool processMoreThanOneInput;
/** Branch predictor passed from Python configuration */
-BPredUnit
+branch_prediction::BPredUnit
public:
/* Public so that Pipeline can pass it to Fetch1 */
diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index f138718..5bfb01a 100644
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -411,7 +411,7 @@
TimeBuffer::wire toDecode;
/** BPredUnit. */
-BPredUnit *branchPred;
+branch_prediction::BPredUnit *branchPred;
TheISA::PCState pc[MaxThreads];
diff --git a/src/cpu/pred/2bit_local.cc b/src/cpu/pred/2bit_local.cc
index 61ce776..c9aa714 100644
--- a/src/cpu/pred/2bit_local.cc
+++ b/src/cpu/pred/2bit_local.cc
@@ -36,6 +36,9 @@
namespace gem5
{
+namespace branch_prediction
+{
+
LocalBP::LocalBP(const LocalBPParams )
: BPredUnit(params),
localPredictorSize(params.localPredictorSize),
@@ -137,4 +140,5 @@
{
}
+} // namespace branch_prediction
} // namespace gem5
diff --git a/src/cpu/pred/2bit_local.hh b/src/cpu/pred/2bit_local.hh
index 8d2a09b..55f45ca 100644
--- a/src/cpu/pred/2bit_local.hh
+++ b/src/cpu/pred/2bit_local.hh
@@ -51,6 +51,9 @@
namespace gem5
{
+namespace branch_prediction
+{
+
/**
* Implements a local predictor that uses the PC to index into a table of
* counters. Note that any time a pointer to the bp_history is given, it
@@ -125,6 +128,7 @@
const unsigned indexMask;
};
+} // namespace branch_prediction
} // namespace gem5
#endif // __CPU_PRED_2BIT_LOCAL_PRED_HH__
diff --git a/src/cpu/pred/BranchPredictor.py
b/src/cpu/pred/BranchPredictor.py
index aa8e5cf..c6abebb 100644
--- a/src/cpu/pred/BranchPredictor.py
+++ b/src/cpu/pred/BranchPredictor.py
@@ -31,7 +31,7 @@
class IndirectPredictor(SimObject):
type = 'IndirectPredictor'
-cxx_class = 'gem5::IndirectPredictor'
+cxx_class = 'gem5::branch_prediction::IndirectPredictor'
cxx_header = "cpu/pred/indirect.hh"
abstract = True
@@ -39,7 +39,7 @@
class SimpleIndirectPredictor(IndirectPredictor):
type = 'SimpleIndirectPredictor'
-cxx_class = 'gem5::SimpleIndirectPredictor'
+cxx_class = 'gem5::branch_prediction::SimpleIndirectPredictor'
cxx_header = "cpu/pred/simple_indirect.hh"
indirectHashGHR = Param.Bool(True, "Hash branch predictor GHR")
@@
[gem5-dev] Change in gem5/gem5[develop]: arch-arm: Rename debug variables
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47304 )
Change subject: arch-arm: Rename debug variables
..
arch-arm: Rename debug variables
Pave the way for a "debug" namespace.
Change-Id: I1796711cbde527269637b30b0b09cd06c9e25fa1
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47304
Reviewed-by: Giacomo Travaglini
Maintainer: Giacomo Travaglini
Tested-by: kokoro
---
M src/arch/arm/faults.cc
M src/arch/arm/faults.hh
M src/arch/arm/self_debug.cc
3 files changed, 15 insertions(+), 20 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index adb1207..d81651b 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -1103,16 +1103,16 @@
} else if (stage2) {
tc->setMiscReg(MISCREG_HPFAR, (faultAddr >> 8) & ~0xf);
tc->setMiscReg(T::HFarIndex, OVAddr);
-} else if (debug > ArmFault::NODEBUG) {
+} else if (debugType > ArmFault::NODEBUG) {
DBGDS32 Rext = tc->readMiscReg(MISCREG_DBGDSCRext);
tc->setMiscReg(T::FarIndex, faultAddr);
-if (debug == ArmFault::BRKPOINT){
+if (debugType == ArmFault::BRKPOINT){
Rext.moe = 0x1;
-} else if (debug == ArmFault::VECTORCATCH){
+} else if (debugType == ArmFault::VECTORCATCH){
Rext.moe = 0x5;
-} else if (debug > ArmFault::VECTORCATCH) {
+} else if (debugType > ArmFault::VECTORCATCH) {
Rext.moe = 0xa;
-fsr.cm = (debug == ArmFault::WPOINT_CM)? 1 : 0;
+fsr.cm = (debugType == ArmFault::WPOINT_CM)? 1 : 0;
}
tc->setMiscReg(T::FsrIndex, fsr);
diff --git a/src/arch/arm/faults.hh b/src/arch/arm/faults.hh
index da05eb9..6d5411f 100644
--- a/src/arch/arm/faults.hh
+++ b/src/arch/arm/faults.hh
@@ -456,7 +456,7 @@
bool stage2;
bool s1ptw;
ArmFault::TranMethod tranMethod;
-ArmFault::DebugType debug;
+ArmFault::DebugType debugType;
public:
AbortFault(Addr _faultAddr, bool _write, TlbEntry::DomainType _domain,
@@ -465,7 +465,8 @@
ArmFault::DebugType _debug = ArmFault::NODEBUG) :
faultAddr(_faultAddr), OVAddr(0), write(_write),
domain(_domain), source(_source), srcEncoded(0),
-stage2(_stage2), s1ptw(false), tranMethod(_tranMethod),
debug(_debug)
+stage2(_stage2), s1ptw(false), tranMethod(_tranMethod),
+debugType(_debug)
{}
bool getFaultVAddr(Addr ) const override;
diff --git a/src/arch/arm/self_debug.cc b/src/arch/arm/self_debug.cc
index e8d00ed..551abbb 100644
--- a/src/arch/arm/self_debug.cc
+++ b/src/arch/arm/self_debug.cc
@@ -96,8 +96,7 @@
if (p.enable && p.isActive(pc) &&(!to32 || !p.onUse)) {
const DBGBCR ctr = p.getControlReg(tc);
if (p.isEnabled(tc, el, ctr.hmc, ctr.ssc, ctr.pmc)) {
-bool debug = p.test(tc, pc, el, ctr, false);
-if (debug){
+if (p.test(tc, pc, el, ctr, false)) {
if (to32)
p.onUse = true;
return triggerException(tc, pc);
@@ -138,8 +137,7 @@
for (auto : arWatchPoints){
idxtmp ++;
if (p.enable) {
-bool debug = p.test(tc, vaddr, el, write, atomic, size);
-if (debug){
+if (p.test(tc, vaddr, el, write, atomic, size)) {
return triggerWatchpointException(tc, vaddr, write, cm);
}
}
@@ -212,12 +210,8 @@
bool
BrkPoint::testLinkedBk(ThreadContext *tc, Addr vaddr, ExceptionLevel el)
{
-bool debug = false;
const DBGBCR ctr = getControlReg(tc);
-if ((ctr.bt & 0x1) && enable) {
-debug = test(tc, vaddr, el, ctr, true);
-}
-return debug;
+return ((ctr.bt & 0x1) && enable) && test(tc, vaddr, el, ctr, true);
}
bool
@@ -730,12 +724,12 @@
return NoFault;
ExceptionLevel el = (ExceptionLevel) currEL(tc);
-bool debug;
+bool do_debug;
if (fault == nullptr)
-debug = vcExcpt->addressMatching(tc, addr, el);
+do_debug = vcExcpt->addressMatching(tc, addr, el);
else
-debug = vcExcpt->exceptionTrapping(tc, el, fault);
-if (debug) {
+do_debug = vcExcpt->exceptionTrapping(tc, el, fault);
+if (do_debug) {
if (enableTdeTge) {
return std::make_shared(0, 0x22,
EC_PREFETCH_ABORT_TO_HYP);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47304
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch:
[gem5-dev] Change in gem5/gem5[develop]: base: Add error messages to BloomFilter::Perfect
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44112 )
Change subject: base: Add error messages to BloomFilter::Perfect
..
base: Add error messages to BloomFilter::Perfect
Warn the user when they use BloomFilter::Perfect's
parameters incorrectly.
Change-Id: Ib493c5f508e47a5f18e43c023755ef960954f5cc
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44112
Reviewed-by: Giacomo Travaglini
Maintainer: Giacomo Travaglini
Tested-by: kokoro
---
M src/base/filters/BloomFilters.py
M src/base/filters/perfect_bloom_filter.cc
2 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/filters/BloomFilters.py
b/src/base/filters/BloomFilters.py
index 02d2052..7832f47 100644
--- a/src/base/filters/BloomFilters.py
+++ b/src/base/filters/BloomFilters.py
@@ -98,3 +98,8 @@
# The base filter is not needed. Use a dummy value.
size = 1
+
+# This filter does not use saturating counters - as long as the entry
is
+# set, it is present; thus, it only needs one bit.
+num_bits = 1
+threshold = 1
diff --git a/src/base/filters/perfect_bloom_filter.cc
b/src/base/filters/perfect_bloom_filter.cc
index 0424ddc..7583a1a 100644
--- a/src/base/filters/perfect_bloom_filter.cc
+++ b/src/base/filters/perfect_bloom_filter.cc
@@ -28,6 +28,7 @@
#include "base/filters/perfect_bloom_filter.hh"
+#include "base/logging.hh"
#include "params/BloomFilterPerfect.hh"
namespace gem5
@@ -40,6 +41,12 @@
Perfect::Perfect(const BloomFilterPerfectParams )
: Base(p)
{
+fatal_if(p.size != 1, "The perfect Bloom filter cannot be limited to
a "
+"specific size.");
+fatal_if(p.num_bits != 1, "The perfect Bloom filter tracks entries "
+"perfectly using an unlimited amount of 1-bit entries.");
+fatal_if(p.threshold != 1, "The perfect Bloom filter uses 1-bit
entries; "
+"thus, their thresholds must be 1.");
}
Perfect::~Perfect()
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44112
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: Ib493c5f508e47a5f18e43c023755ef960954f5cc
Gerrit-Change-Number: 44112
Gerrit-PatchSet: 9
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: misc: Remove sim/cur_tick dependency from sim/core.hh
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43592 )
Change subject: misc: Remove sim/cur_tick dependency from sim/core.hh
..
misc: Remove sim/cur_tick dependency from sim/core.hh
Remove this unnecessary dependency. Fixed all incorrect
includes of sim/core.hh.
Change-Id: I3ae282dbaeb45fbf4630237a3ab9b1a593ffbe0c
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43592
Reviewed-by: Giacomo Travaglini
Maintainer: Giacomo Travaglini
Tested-by: kokoro
---
M ext/sst/gem5.cc
M src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
M src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
M src/arch/arm/linux/fs_workload.hh
M src/arch/arm/semihosting.hh
M src/arch/arm/tracers/tarmac_parser.cc
M src/arch/riscv/isa.cc
M src/arch/x86/regs/int.hh
M src/base/pollevent.cc
M src/base/pollevent.hh
M src/base/stats/storage.hh
M src/base/trace.hh
M src/base/vnc/vncserver.cc
M src/cpu/inst_pb_trace.cc
M src/cpu/o3/cpu.cc
M src/cpu/pc_event.cc
M src/cpu/testers/traffic_gen/trace_gen.cc
M src/dev/arm/generic_timer.cc
M src/dev/arm/generic_timer.hh
M src/dev/intel_8254_timer.cc
M src/dev/net/dist_etherlink.cc
M src/dev/net/dist_iface.cc
M src/dev/net/dist_iface.hh
M src/dev/net/etherbus.cc
M src/dev/net/etherdump.cc
M src/dev/net/etherlink.cc
M src/dev/net/etherswitch.cc
M src/dev/net/ethertap.cc
M src/dev/net/tcp_iface.cc
M src/dev/pci/device.cc
M src/dev/storage/ide_disk.cc
M src/dev/virtio/fs9p.cc
M src/kern/freebsd/events.cc
M src/mem/cache/base.cc
M src/mem/cache/cache_blk.hh
M src/mem/cache/mshr.cc
M src/mem/cache/mshr.hh
M src/mem/cache/queue.hh
M src/mem/cache/replacement_policies/bip_rp.cc
M src/mem/cache/replacement_policies/fifo_rp.cc
M src/mem/cache/replacement_policies/lru_rp.cc
M src/mem/cache/replacement_policies/mru_rp.cc
M src/mem/cache/replacement_policies/weighted_lru_rp.cc
M src/mem/cache/write_queue_entry.hh
M src/mem/comm_monitor.cc
M src/mem/mem_checker.cc
M src/mem/mem_checker.hh
M src/mem/packet.hh
M src/mem/probes/mem_trace.cc
M src/mem/request.hh
M src/mem/ruby/profiler/StoreTrace.cc
M src/mem/ruby/structures/BankedArray.cc
M src/mem/ruby/structures/BankedArray.hh
M src/python/pybind11/core.cc
M src/sim/core.hh
M src/sim/eventq.cc
M src/sim/eventq.hh
M src/sim/global_event.cc
M src/sim/init.cc
M src/sim/init_signals.cc
M src/sim/power_state.cc
M src/sim/power_state.hh
M src/sim/root.cc
M src/sim/stat_control.hh
M src/systemc/channel/sc_clock.cc
M src/systemc/core/event.cc
M src/systemc/core/sc_main.cc
M src/systemc/core/scheduler.hh
M src/systemc/tlm_bridge/tlm_to_gem5.cc
M src/systemc/utils/tracefile.cc
M src/systemc/utils/vcd.cc
M util/systemc/gem5_within_systemc/sc_module.cc
72 files changed, 52 insertions(+), 54 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/ext/sst/gem5.cc b/ext/sst/gem5.cc
index efe73eb..3049567 100644
--- a/ext/sst/gem5.cc
+++ b/ext/sst/gem5.cc
@@ -52,7 +52,7 @@
#include
// gem5 Headers
-#include
+#include
#include
#include
#include
diff --git a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
index 5f7562e..e9b468d 100644
--- a/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
+++ b/src/arch/arm/fastmodel/CortexA76/cortex_a76.cc
@@ -31,7 +31,6 @@
#include "arch/arm/regs/misc.hh"
#include "base/logging.hh"
#include "dev/arm/base_gic.hh"
-#include "sim/core.hh"
#include "systemc/tlm_bridge/gem5_to_tlm.hh"
namespace gem5
diff --git a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
index 1ab1b29..4f14e7e 100644
--- a/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
+++ b/src/arch/arm/fastmodel/CortexR52/cortex_r52.cc
@@ -30,7 +30,6 @@
#include "arch/arm/fastmodel/iris/cpu.hh"
#include "base/logging.hh"
#include "dev/arm/base_gic.hh"
-#include "sim/core.hh"
#include "systemc/tlm_bridge/gem5_to_tlm.hh"
namespace gem5
diff --git a/src/arch/arm/linux/fs_workload.hh
b/src/arch/arm/linux/fs_workload.hh
index 3531ea9..659de9d 100644
--- a/src/arch/arm/linux/fs_workload.hh
+++ b/src/arch/arm/linux/fs_workload.hh
@@ -52,7 +52,6 @@
#include "base/output.hh"
#include "kern/linux/events.hh"
#include "params/ArmFsLinux.hh"
-#include "sim/core.hh"
namespace gem5
{
diff --git a/src/arch/arm/semihosting.hh b/src/arch/arm/semihosting.hh
index 2c237ca..a21852d 100644
--- a/src/arch/arm/semihosting.hh
+++ b/src/arch/arm/semihosting.hh
@@ -49,6 +49,7 @@
#include "arch/arm/utility.hh"
#include "cpu/thread_context.hh"
#include "mem/port_proxy.hh"
+#include "sim/core.hh"
#include "sim/guest_abi.hh"
#include "sim/sim_object.hh"
diff --git a/src/arch/arm/tracers/tarmac_parser.cc
b/src/arch/arm/tracers/tarmac_parser.cc
index 52b9558..f262c6c 100644
--- a/src/arch/arm/tracers/tarmac_parser.cc
+++
[gem5-dev] Change in gem5/gem5[develop]: base: Avoid dereferencing end() in findNearest
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43591 )
Change subject: base: Avoid dereferencing end() in findNearest
..
base: Avoid dereferencing end() in findNearest
When used with next_addr, findNearest will return the
next (even larger) address than the nearest larger
address. The problem is that when there is no valid
next, the function was dereferencing addrMap.end().
Fix this by marking next address as 0, since 0 is
not larger than any other address.
Places that use this function should be revisited
to make sure they account for this behavior, as
reported in the following Jira issue:
https://gem5.atlassian.net/browse/GEM5-936
Change-Id: I29ed80ff921b205209aeb5db05ffd3019d8595ce
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43591
Tested-by: kokoro
Reviewed-by: Gabe Black
Maintainer: Bobby R. Bruce
---
M src/base/loader/symtab.hh
1 file changed, 10 insertions(+), 3 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh
index 200accc..e48e400 100644
--- a/src/base/loader/symtab.hh
+++ b/src/base/loader/symtab.hh
@@ -348,8 +348,9 @@
}
/**
- * Find the nearest symbol equal to or less than the supplied
- * address (e.g., the label for the enclosing function).
+ * Find the nearest symbol equal to or less than the supplied address
+ * (e.g., the label for the enclosing function). If there is no valid
+ * next address, next_addr is assigned 0.
*
* @param addr The address to look up.
* @param next_addr Address of following symbol (to determine the valid
@@ -363,7 +364,13 @@
if (!upperBound(addr, i))
return end();
-next_addr = i->first;
+// If there is no next address, make it 0 since 0 is not larger
than
+// any other address, so it is clear that next is not valid
+if (i == addrMap.end()) {
+next_addr = 0;
+} else {
+next_addr = i->first;
+}
--i;
return symbols.begin() + i->second;
}
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43591
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: I29ed80ff921b205209aeb5db05ffd3019d8595ce
Gerrit-Change-Number: 43591
Gerrit-PatchSet: 11
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: mem-garnet: Add a garnet namespace
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47306 )
Change subject: mem-garnet: Add a garnet namespace
..
mem-garnet: Add a garnet namespace
Add a namespace encapsulating all garnet files.
GarnetSyntheticTraffic, from
cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh
has not been added to this namespace.
Change-Id: I5304ad3130100ba325e35e20883ee9286f51a75a
Issued-on: https://gem5.atlassian.net/browse/GEM5-987
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47306
Tested-by: kokoro
Reviewed-by: Srikant Bharadwaj
Reviewed-by: Jason Lowe-Power
Maintainer: Srikant Bharadwaj
Maintainer: Jason Lowe-Power
---
M src/mem/ruby/network/garnet/CommonTypes.hh
M src/mem/ruby/network/garnet/Credit.cc
M src/mem/ruby/network/garnet/Credit.hh
M src/mem/ruby/network/garnet/CreditLink.hh
M src/mem/ruby/network/garnet/CrossbarSwitch.cc
M src/mem/ruby/network/garnet/CrossbarSwitch.hh
M src/mem/ruby/network/garnet/GarnetLink.cc
M src/mem/ruby/network/garnet/GarnetLink.hh
M src/mem/ruby/network/garnet/GarnetLink.py
M src/mem/ruby/network/garnet/GarnetNetwork.cc
M src/mem/ruby/network/garnet/GarnetNetwork.hh
M src/mem/ruby/network/garnet/GarnetNetwork.py
M src/mem/ruby/network/garnet/InputUnit.cc
M src/mem/ruby/network/garnet/InputUnit.hh
M src/mem/ruby/network/garnet/NetworkBridge.cc
M src/mem/ruby/network/garnet/NetworkBridge.hh
M src/mem/ruby/network/garnet/NetworkInterface.cc
M src/mem/ruby/network/garnet/NetworkInterface.hh
M src/mem/ruby/network/garnet/NetworkLink.cc
M src/mem/ruby/network/garnet/NetworkLink.hh
M src/mem/ruby/network/garnet/OutVcState.cc
M src/mem/ruby/network/garnet/OutVcState.hh
M src/mem/ruby/network/garnet/OutputUnit.cc
M src/mem/ruby/network/garnet/OutputUnit.hh
M src/mem/ruby/network/garnet/Router.cc
M src/mem/ruby/network/garnet/Router.hh
M src/mem/ruby/network/garnet/RoutingUnit.cc
M src/mem/ruby/network/garnet/RoutingUnit.hh
M src/mem/ruby/network/garnet/SwitchAllocator.cc
M src/mem/ruby/network/garnet/SwitchAllocator.hh
M src/mem/ruby/network/garnet/VirtualChannel.cc
M src/mem/ruby/network/garnet/VirtualChannel.hh
M src/mem/ruby/network/garnet/flit.cc
M src/mem/ruby/network/garnet/flit.hh
M src/mem/ruby/network/garnet/flitBuffer.cc
M src/mem/ruby/network/garnet/flitBuffer.hh
36 files changed, 149 insertions(+), 10 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, but someone else must approve; Looks
good to me, approved
Srikant Bharadwaj: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/ruby/network/garnet/CommonTypes.hh
b/src/mem/ruby/network/garnet/CommonTypes.hh
index c0d8af2..c2b8b65 100644
--- a/src/mem/ruby/network/garnet/CommonTypes.hh
+++ b/src/mem/ruby/network/garnet/CommonTypes.hh
@@ -36,6 +36,9 @@
namespace gem5
{
+namespace garnet
+{
+
// All common enums and typedefs go here
enum flit_type {HEAD_, BODY_, TAIL_, HEAD_TAIL_,
@@ -68,6 +71,7 @@
#define INFINITE_ 1
+} // namespace garnet
} // namespace gem5
#endif //__MEM_RUBY_NETWORK_GARNET_0_COMMONTYPES_HH__
diff --git a/src/mem/ruby/network/garnet/Credit.cc
b/src/mem/ruby/network/garnet/Credit.cc
index 5624005..e88faa0 100644
--- a/src/mem/ruby/network/garnet/Credit.cc
+++ b/src/mem/ruby/network/garnet/Credit.cc
@@ -35,6 +35,9 @@
namespace gem5
{
+namespace garnet
+{
+
// Credit Signal for buffers inside VC
// Carries m_vc (inherits from flit.hh)
// and m_is_free_signal (whether VC is free or not)
@@ -83,4 +86,5 @@
out << "]";
}
+} // namespace garnet
} // namespace gem5
diff --git a/src/mem/ruby/network/garnet/Credit.hh
b/src/mem/ruby/network/garnet/Credit.hh
index 2db47d0..98469e1 100644
--- a/src/mem/ruby/network/garnet/Credit.hh
+++ b/src/mem/ruby/network/garnet/Credit.hh
@@ -41,6 +41,9 @@
namespace gem5
{
+namespace garnet
+{
+
// Credit Signal for buffers inside VC
// Carries m_vc (inherits from flit.hh)
// and m_is_free_signal (whether VC is free or not)
@@ -64,6 +67,7 @@
bool m_is_free_signal;
};
+} // namespace garnet
} // namespace gem5
#endif // __MEM_RUBY_NETWORK_GARNET_0_CREDIT_HH__
diff --git a/src/mem/ruby/network/garnet/CreditLink.hh
b/src/mem/ruby/network/garnet/CreditLink.hh
index 96842dc..c85dc4e 100644
--- a/src/mem/ruby/network/garnet/CreditLink.hh
+++ b/src/mem/ruby/network/garnet/CreditLink.hh
@@ -37,6 +37,9 @@
namespace gem5
{
+namespace garnet
+{
+
class CreditLink : public NetworkLink
{
public:
@@ -44,6 +47,7 @@
CreditLink(const Params ) : NetworkLink(p) {}
};
+} // namespace garnet
} // namespace gem5
#endif // __MEM_RUBY_NETWORK_GARNET_0_CREDITLINK_HH__
diff --git a/src/mem/ruby/network/garnet/CrossbarSwitch.cc
b/src/mem/ruby/network/garnet/CrossbarSwitch.cc
index 2e6c29d..d94f728 100644
--- a/src/mem/ruby/network/garnet/CrossbarSwitch.cc
+++
[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Add Signature-Based Hit Predictor replacement policy
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38118 )
Change subject: mem-cache: Add Signature-Based Hit Predictor replacement
policy
..
mem-cache: Add Signature-Based Hit Predictor replacement policy
Add the SHiP Replacement Policy, as described in "SHiP: Signature-
based Hit Predictor for High Performance Caching", by Wu et al.
Instruction Sequence signatures have not been implemented.
Change-Id: I44f00d26eab4c96c9c5bc29740862a87356d30d1
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38118
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/mem/cache/replacement_policies/ReplacementPolicies.py
M src/mem/cache/replacement_policies/SConscript
A src/mem/cache/replacement_policies/ship_rp.cc
A src/mem/cache/replacement_policies/ship_rp.hh
4 files changed, 386 insertions(+), 0 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/replacement_policies/ReplacementPolicies.py
b/src/mem/cache/replacement_policies/ReplacementPolicies.py
index 11de0b2..7003abe 100644
--- a/src/mem/cache/replacement_policies/ReplacementPolicies.py
+++ b/src/mem/cache/replacement_policies/ReplacementPolicies.py
@@ -114,6 +114,31 @@
btp = 100
num_bits = 1
+class SHiPRP(BRRIPRP):
+type = 'SHiPRP'
+abstract = True
+cxx_class = 'replacement_policy::SHiP'
+cxx_header = "mem/cache/replacement_policies/ship_rp.hh"
+
+shct_size = Param.Unsigned(16384, "Number of SHCT entries")
+# By default any value greater than 0 is enough to change insertion
policy
+insertion_threshold = Param.Percent(1,
+"Percentage at which an entry changes insertion policy")
+# Always make hits mark entries as last to be evicted
+hit_priority = True
+# Let the predictor decide when to change insertion policy
+btp = 0
+
+class SHiPMemRP(SHiPRP):
+type = 'SHiPMemRP'
+cxx_class = 'replacement_policy::SHiPMem'
+cxx_header = "mem/cache/replacement_policies/ship_rp.hh"
+
+class SHiPPCRP(SHiPRP):
+type = 'SHiPPCRP'
+cxx_class = 'replacement_policy::SHiPPC'
+cxx_header = "mem/cache/replacement_policies/ship_rp.hh"
+
class TreePLRURP(BaseReplacementPolicy):
type = 'TreePLRURP'
cxx_class = 'replacement_policy::TreePLRU'
diff --git a/src/mem/cache/replacement_policies/SConscript
b/src/mem/cache/replacement_policies/SConscript
index 29152a0..6370052 100644
--- a/src/mem/cache/replacement_policies/SConscript
+++ b/src/mem/cache/replacement_policies/SConscript
@@ -39,5 +39,6 @@
Source('mru_rp.cc')
Source('random_rp.cc')
Source('second_chance_rp.cc')
+Source('ship_rp.cc')
Source('tree_plru_rp.cc')
Source('weighted_lru_rp.cc')
diff --git a/src/mem/cache/replacement_policies/ship_rp.cc
b/src/mem/cache/replacement_policies/ship_rp.cc
new file mode 100644
index 000..7e16306
--- /dev/null
+++ b/src/mem/cache/replacement_policies/ship_rp.cc
@@ -0,0 +1,171 @@
+/**
+ * Copyright (c) 2019, 2020 Inria
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "mem/cache/replacement_policies/ship_rp.hh"
+
+#include "base/logging.hh"
+#include "params/SHiPMemRP.hh"
+#include "params/SHiPPCRP.hh"
+#include "params/SHiPRP.hh"
+
+namespace replacement_policy
+{
+
+SHiP::SHiPReplData::SHiPReplData(int
[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Make WeightedLRU inherit from LRU
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47399 )
Change subject: mem-cache: Make WeightedLRU inherit from LRU
..
mem-cache: Make WeightedLRU inherit from LRU
WeightedLRU adds occupancy information to LRU, so remove the
duplicated code.
Change-Id: Ifec19ea59fb411a5ed7a891e8957b1ab93cdbf05
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47399
Tested-by: kokoro
Reviewed-by: Nikos Nikoleris
---
M src/mem/cache/replacement_policies/ReplacementPolicies.py
M src/mem/cache/replacement_policies/weighted_lru_rp.cc
M src/mem/cache/replacement_policies/weighted_lru_rp.hh
3 files changed, 12 insertions(+), 68 deletions(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved
Daniel Carvalho: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/replacement_policies/ReplacementPolicies.py
b/src/mem/cache/replacement_policies/ReplacementPolicies.py
index 34c8a1e..11de0b2 100644
--- a/src/mem/cache/replacement_policies/ReplacementPolicies.py
+++ b/src/mem/cache/replacement_policies/ReplacementPolicies.py
@@ -120,7 +120,7 @@
cxx_header = "mem/cache/replacement_policies/tree_plru_rp.hh"
num_leaves = Param.Int(Parent.assoc, "Number of leaves in each tree")
-class WeightedLRURP(BaseReplacementPolicy):
+class WeightedLRURP(LRURP):
type = "WeightedLRURP"
cxx_class = "replacement_policy::WeightedLRU"
cxx_header = "mem/cache/replacement_policies/weighted_lru_rp.hh"
diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
index 3900014..334a128 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
@@ -43,24 +43,15 @@
{
WeightedLRU::WeightedLRU(const Params )
- : Base(p)
+ : LRU(p)
{
}
void
-WeightedLRU::touch(const std::shared_ptr&
- replacement_data) const
+WeightedLRU::touch(const std::shared_ptr&
replacement_data,
+int occupancy) const
{
-std::static_pointer_cast(replacement_data)->
- last_touch_tick =
curTick();
-}
-
-void
-WeightedLRU::touch(const std::shared_ptr&
-replacement_data, int occupancy) const
-{
-std::static_pointer_cast(replacement_data)->
- last_touch_tick =
curTick();
+LRU::touch(replacement_data);
std::static_pointer_cast(replacement_data)->
last_occ_ptr = occupancy;
}
@@ -90,8 +81,8 @@
} else if (candidate_replacement_data->last_occ_ptr ==
victim_replacement_data->last_occ_ptr) {
// Evict the block with a smaller tick.
-Tick time = candidate_replacement_data->last_touch_tick;
-if (time < victim_replacement_data->last_touch_tick) {
+Tick time = candidate_replacement_data->lastTouchTick;
+if (time < victim_replacement_data->lastTouchTick) {
victim = candidate;
}
}
@@ -105,22 +96,4 @@
return std::shared_ptr(new WeightedLRUReplData);
}
-void
-WeightedLRU::reset(const std::shared_ptr&
-replacement_data) const
-{
-// Set last touch timestamp
-std::static_pointer_cast(
-replacement_data)->last_touch_tick = curTick();
-}
-
-void
-WeightedLRU::invalidate(
-const std::shared_ptr& replacement_data)
-{
-// Reset last touch timestamp
-std::static_pointer_cast(
-replacement_data)->last_touch_tick = Tick(0);
-}
-
} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.hh
b/src/mem/cache/replacement_policies/weighted_lru_rp.hh
index 82b31d9..2279683 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.hh
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.hh
@@ -37,7 +37,7 @@
#include
#include "base/types.hh"
-#include "mem/cache/replacement_policies/base.hh"
+#include "mem/cache/replacement_policies/lru_rp.hh"
struct WeightedLRURPParams;
@@ -45,59 +45,30 @@
namespace replacement_policy
{
-class WeightedLRU : public Base
+class WeightedLRU : public LRU
{
protected:
/** Weighted LRU implementation of replacement data. */
-struct WeightedLRUReplData : ReplacementData
+struct WeightedLRUReplData : LRUReplData
{
/** pointer for last occupancy */
int last_occ_ptr;
-/** Tick on which the entry was last touched. */
-Tick last_touch_tick;
-
/**
* Default constructor. Invalidate data.
*/
-WeightedLRUReplData() : ReplacementData(),
-last_occ_ptr(0), last_touch_tick(0) {}
+
[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Allow sending packet information to replacement policy
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38117 )
Change subject: mem-cache: Allow sending packet information to replacement
policy
..
mem-cache: Allow sending packet information to replacement policy
Some replacement policies can use information such as address or
PC to improve their re-reference prediction.
Change-Id: I412eee09efa2f3511ca1ece76fc2732509df4745
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38117
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/mem/cache/replacement_policies/base.hh
M src/mem/cache/replacement_policies/dueling_rp.cc
M src/mem/cache/replacement_policies/dueling_rp.hh
M src/mem/cache/tags/base_set_assoc.hh
M src/mem/cache/tags/sector_tags.cc
5 files changed, 50 insertions(+), 7 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/replacement_policies/base.hh
b/src/mem/cache/replacement_policies/base.hh
index 0393629..0851287 100644
--- a/src/mem/cache/replacement_policies/base.hh
+++ b/src/mem/cache/replacement_policies/base.hh
@@ -33,6 +33,7 @@
#include "base/compiler.hh"
#include "mem/cache/replacement_policies/replaceable_entry.hh"
+#include "mem/packet.hh"
#include "params/BaseReplacementPolicy.hh"
#include "sim/sim_object.hh"
@@ -67,17 +68,29 @@
* Update replacement data.
*
* @param replacement_data Replacement data to be touched.
+ * @param pkt Packet that generated this access.
*/
virtual void touch(const std::shared_ptr&
-replacement_data) const =
0;
+replacement_data, const PacketPtr pkt)
+{
+touch(replacement_data);
+}
+virtual void touch(const std::shared_ptr&
+replacement_data) const = 0;
/**
* Reset replacement data. Used when it's holder is inserted/validated.
*
* @param replacement_data Replacement data to be reset.
+ * @param pkt Packet that generated this access.
*/
virtual void reset(const std::shared_ptr&
-replacement_data) const =
0;
+replacement_data, const PacketPtr pkt)
+{
+reset(replacement_data);
+}
+virtual void reset(const std::shared_ptr&
+replacement_data) const = 0;
/**
* Find replacement victim among candidates.
diff --git a/src/mem/cache/replacement_policies/dueling_rp.cc
b/src/mem/cache/replacement_policies/dueling_rp.cc
index e691141..3565017 100644
--- a/src/mem/cache/replacement_policies/dueling_rp.cc
+++ b/src/mem/cache/replacement_policies/dueling_rp.cc
@@ -54,6 +54,16 @@
}
void
+Dueling::touch(const std::shared_ptr& replacement_data,
+const PacketPtr pkt)
+{
+std::shared_ptr casted_replacement_data =
+std::static_pointer_cast(replacement_data);
+replPolicyA->touch(casted_replacement_data->replDataA, pkt);
+replPolicyB->touch(casted_replacement_data->replDataB, pkt);
+}
+
+void
Dueling::touch(const std::shared_ptr& replacement_data)
const
{
std::shared_ptr casted_replacement_data =
@@ -63,6 +73,22 @@
}
void
+Dueling::reset(const std::shared_ptr& replacement_data,
+const PacketPtr pkt)
+{
+std::shared_ptr casted_replacement_data =
+std::static_pointer_cast(replacement_data);
+replPolicyA->reset(casted_replacement_data->replDataA, pkt);
+replPolicyB->reset(casted_replacement_data->replDataB, pkt);
+
+// A miss in a set is a sample to the duel. A call to this function
+// implies in the replacement of an entry, which was either caused by
+// a miss, an external invalidation, or the initialization of the table
+// entry (when warming up)
+
duelingMonitor.sample(static_cast(casted_replacement_data.get()));
+}
+
+void
Dueling::reset(const std::shared_ptr& replacement_data)
const
{
std::shared_ptr casted_replacement_data =
diff --git a/src/mem/cache/replacement_policies/dueling_rp.hh
b/src/mem/cache/replacement_policies/dueling_rp.hh
index 0c96ca7..314042e 100644
--- a/src/mem/cache/replacement_policies/dueling_rp.hh
+++ b/src/mem/cache/replacement_policies/dueling_rp.hh
@@ -97,8 +97,12 @@
void invalidate(const std::shared_ptr&
replacement_data)
override;
+void touch(const std::shared_ptr& replacement_data,
+const PacketPtr pkt) override;
void touch(const std::shared_ptr& replacement_data)
const
override;
+void reset(const std::shared_ptr& replacement_data,
+const PacketPtr pkt) override;
void reset(const std::shared_ptr& replacement_data)
const
[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Use PacketPtr in tags's accessBlock
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38116 )
Change subject: mem-cache: Use PacketPtr in tags's accessBlock
..
mem-cache: Use PacketPtr in tags's accessBlock
Pass the packet to the tags, so that the replacement policies
more execution information.
Change-Id: I201884a6d60e3299fc3c9befebbb2e8b64a007f0
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38116
Tested-by: kokoro
Reviewed-by: Nikos Nikoleris
Reviewed-by: Jason Lowe-Power
Maintainer: Nikos Nikoleris
---
M src/mem/cache/base.cc
M src/mem/cache/tags/base.hh
M src/mem/cache/tags/base_set_assoc.hh
M src/mem/cache/tags/fa_lru.cc
M src/mem/cache/tags/fa_lru.hh
M src/mem/cache/tags/sector_tags.cc
M src/mem/cache/tags/sector_tags.hh
7 files changed, 18 insertions(+), 21 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Nikos Nikoleris: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index 48731cf..04e127d 100644
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -1141,7 +1141,7 @@
// Access block in the tags
Cycles tag_latency(0);
-blk = tags->accessBlock(pkt->getAddr(), pkt->isSecure(), tag_latency);
+blk = tags->accessBlock(pkt, tag_latency);
DPRINTF(Cache, "%s for %s %s\n", __func__, pkt->print(),
blk ? "hit " + blk->print() : "miss");
diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index cc5dd99..77d6f9d 100644
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -285,12 +285,11 @@
* should only be used as such. Returns the tag lookup latency as a
side
* effect.
*
- * @param addr The address to find.
- * @param is_secure True if the target memory space is secure.
+ * @param pkt The packet holding the address to find.
* @param lat The latency of the tag lookup.
* @return Pointer to the cache block if found.
*/
-virtual CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles )
= 0;
+virtual CacheBlk* accessBlock(const PacketPtr pkt, Cycles ) = 0;
/**
* Generate the tag from the given address.
diff --git a/src/mem/cache/tags/base_set_assoc.hh
b/src/mem/cache/tags/base_set_assoc.hh
index 30592f1..dc749dd 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -117,14 +117,13 @@
* should only be used as such. Returns the tag lookup latency as a
side
* effect.
*
- * @param addr The address to find.
- * @param is_secure True if the target memory space is secure.
+ * @param pkt The packet holding the address to find.
* @param lat The latency of the tag lookup.
* @return Pointer to the cache block if found.
*/
-CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles ) override
+CacheBlk* accessBlock(const PacketPtr pkt, Cycles ) override
{
-CacheBlk *blk = findBlock(addr, is_secure);
+CacheBlk *blk = findBlock(pkt->getAddr(), pkt->isSecure());
// Access all tags in parallel, hence one in each way. The data
side
// either accesses all blocks in parallel, or one block
sequentially on
diff --git a/src/mem/cache/tags/fa_lru.cc b/src/mem/cache/tags/fa_lru.cc
index 53d1246..5fea07e 100644
--- a/src/mem/cache/tags/fa_lru.cc
+++ b/src/mem/cache/tags/fa_lru.cc
@@ -128,17 +128,18 @@
}
CacheBlk*
-FALRU::accessBlock(Addr addr, bool is_secure, Cycles )
+FALRU::accessBlock(const PacketPtr pkt, Cycles )
{
-return accessBlock(addr, is_secure, lat, 0);
+return accessBlock(pkt, lat, 0);
}
CacheBlk*
-FALRU::accessBlock(Addr addr, bool is_secure, Cycles ,
+FALRU::accessBlock(const PacketPtr pkt, Cycles ,
CachesMask *in_caches_mask)
{
CachesMask mask = 0;
-FALRUBlk* blk = static_cast(findBlock(addr, is_secure));
+FALRUBlk* blk =
+static_cast(findBlock(pkt->getAddr(), pkt->isSecure()));
// If a cache hit
if (blk && blk->isValid()) {
diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index 9e45a26..b96a1a0 100644
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -173,19 +173,18 @@
* cache access and should only be used as such.
* Returns tag lookup latency and the inCachesMask flags as a side
effect.
*
- * @param addr The address to look for.
- * @param is_secure True if the target memory space is secure.
+ * @param pkt The packet holding the address to find.
* @param lat The latency of the tag lookup.
* @param in_cache_mask Mask indicating the caches in which the blk
fits.
* @return Pointer to the cache block.
*/
-CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles ,
+CacheBlk* accessBlock(const
[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Make WeightedLRU inherit from LRU
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47399 )
Change subject: mem-cache: Make WeightedLRU inherit from LRU
..
mem-cache: Make WeightedLRU inherit from LRU
WeightedLRU adds occupancy information to LRU, so remove the
duplicated code.
Change-Id: Ifec19ea59fb411a5ed7a891e8957b1ab93cdbf05
Signed-off-by: Daniel R. Carvalho
---
M src/mem/cache/replacement_policies/ReplacementPolicies.py
M src/mem/cache/replacement_policies/weighted_lru_rp.cc
M src/mem/cache/replacement_policies/weighted_lru_rp.hh
3 files changed, 12 insertions(+), 68 deletions(-)
diff --git a/src/mem/cache/replacement_policies/ReplacementPolicies.py
b/src/mem/cache/replacement_policies/ReplacementPolicies.py
index 34c8a1e..11de0b2 100644
--- a/src/mem/cache/replacement_policies/ReplacementPolicies.py
+++ b/src/mem/cache/replacement_policies/ReplacementPolicies.py
@@ -120,7 +120,7 @@
cxx_header = "mem/cache/replacement_policies/tree_plru_rp.hh"
num_leaves = Param.Int(Parent.assoc, "Number of leaves in each tree")
-class WeightedLRURP(BaseReplacementPolicy):
+class WeightedLRURP(LRURP):
type = "WeightedLRURP"
cxx_class = "replacement_policy::WeightedLRU"
cxx_header = "mem/cache/replacement_policies/weighted_lru_rp.hh"
diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
index 3900014..334a128 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
@@ -43,24 +43,15 @@
{
WeightedLRU::WeightedLRU(const Params )
- : Base(p)
+ : LRU(p)
{
}
void
-WeightedLRU::touch(const std::shared_ptr&
- replacement_data) const
+WeightedLRU::touch(const std::shared_ptr&
replacement_data,
+int occupancy) const
{
-std::static_pointer_cast(replacement_data)->
- last_touch_tick =
curTick();
-}
-
-void
-WeightedLRU::touch(const std::shared_ptr&
-replacement_data, int occupancy) const
-{
-std::static_pointer_cast(replacement_data)->
- last_touch_tick =
curTick();
+LRU::touch(replacement_data);
std::static_pointer_cast(replacement_data)->
last_occ_ptr = occupancy;
}
@@ -90,8 +81,8 @@
} else if (candidate_replacement_data->last_occ_ptr ==
victim_replacement_data->last_occ_ptr) {
// Evict the block with a smaller tick.
-Tick time = candidate_replacement_data->last_touch_tick;
-if (time < victim_replacement_data->last_touch_tick) {
+Tick time = candidate_replacement_data->lastTouchTick;
+if (time < victim_replacement_data->lastTouchTick) {
victim = candidate;
}
}
@@ -105,22 +96,4 @@
return std::shared_ptr(new WeightedLRUReplData);
}
-void
-WeightedLRU::reset(const std::shared_ptr&
-replacement_data) const
-{
-// Set last touch timestamp
-std::static_pointer_cast(
-replacement_data)->last_touch_tick = curTick();
-}
-
-void
-WeightedLRU::invalidate(
-const std::shared_ptr& replacement_data)
-{
-// Reset last touch timestamp
-std::static_pointer_cast(
-replacement_data)->last_touch_tick = Tick(0);
-}
-
} // namespace replacement_policy
diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.hh
b/src/mem/cache/replacement_policies/weighted_lru_rp.hh
index 82b31d9..2279683 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.hh
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.hh
@@ -37,7 +37,7 @@
#include
#include "base/types.hh"
-#include "mem/cache/replacement_policies/base.hh"
+#include "mem/cache/replacement_policies/lru_rp.hh"
struct WeightedLRURPParams;
@@ -45,59 +45,30 @@
namespace replacement_policy
{
-class WeightedLRU : public Base
+class WeightedLRU : public LRU
{
protected:
/** Weighted LRU implementation of replacement data. */
-struct WeightedLRUReplData : ReplacementData
+struct WeightedLRUReplData : LRUReplData
{
/** pointer for last occupancy */
int last_occ_ptr;
-/** Tick on which the entry was last touched. */
-Tick last_touch_tick;
-
/**
* Default constructor. Invalidate data.
*/
-WeightedLRUReplData() : ReplacementData(),
-last_occ_ptr(0), last_touch_tick(0) {}
+WeightedLRUReplData() : LRUReplData(), last_occ_ptr(0) {}
};
public:
typedef WeightedLRURPParams Params;
WeightedLRU(const Params );
~WeightedLRU() = default;
-/**
- * Invalidate replacement data to set it
[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Add the DRRIP replacement policy
Daniel Carvalho has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/37898 ) Change subject: mem-cache: Add the DRRIP replacement policy .. mem-cache: Add the DRRIP replacement policy Instantiate the Dynamic Re-Reference Interval Prediction, as defined in "High Performance Cache Replacement Using Re-Reference Interval Prediction (RRIP)", by Jaleel et al. Change-Id: Id1d354c01e63ae49739263647ff25e5665f60d8c Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37898 Tested-by: kokoro Reviewed-by: Bobby R. Bruce Maintainer: Bobby R. Bruce --- M src/mem/cache/replacement_policies/ReplacementPolicies.py 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/src/mem/cache/replacement_policies/ReplacementPolicies.py b/src/mem/cache/replacement_policies/ReplacementPolicies.py index 74709f2..34c8a1e 100644 --- a/src/mem/cache/replacement_policies/ReplacementPolicies.py +++ b/src/mem/cache/replacement_policies/ReplacementPolicies.py @@ -100,6 +100,16 @@ class RRIPRP(BRRIPRP): btp = 100 +class DRRIPRP(DuelingRP): +# The constituency_size and the team_size must be manually provided, where: +# constituency_size = num_cache_entries / +# (num_dueling_sets * num_entries_per_set) +# The paper assumes that: +# num_dueling_sets = 32 +# team_size = num_entries_per_set +replacement_policy_a = BRRIPRP() +replacement_policy_b = RRIPRP() + class NRURP(BRRIPRP): btp = 100 num_bits = 1 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37898 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: Id1d354c01e63ae49739263647ff25e5665f60d8c Gerrit-Change-Number: 37898 Gerrit-PatchSet: 8 Gerrit-Owner: Daniel Carvalho Gerrit-Reviewer: Bobby R. Bruce Gerrit-Reviewer: Daniel Carvalho Gerrit-Reviewer: Nikos Nikoleris Gerrit-Reviewer: kokoro 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
[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Change invalidate signature to not const
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38115 )
Change subject: mem-cache: Change invalidate signature to not const
..
mem-cache: Change invalidate signature to not const
Allow the replacement policy to be modified when an entry is
invalidated.
Change-Id: I7f5086795dbb93a6fab2b4994c757d509d782d79
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38115
Tested-by: kokoro
Reviewed-by: Nikos Nikoleris
Maintainer: Nikos Nikoleris
---
M src/mem/cache/replacement_policies/base.hh
M src/mem/cache/replacement_policies/brrip_rp.cc
M src/mem/cache/replacement_policies/brrip_rp.hh
M src/mem/cache/replacement_policies/dueling_rp.cc
M src/mem/cache/replacement_policies/dueling_rp.hh
M src/mem/cache/replacement_policies/fifo_rp.cc
M src/mem/cache/replacement_policies/fifo_rp.hh
M src/mem/cache/replacement_policies/lfu_rp.cc
M src/mem/cache/replacement_policies/lfu_rp.hh
M src/mem/cache/replacement_policies/lru_rp.cc
M src/mem/cache/replacement_policies/lru_rp.hh
M src/mem/cache/replacement_policies/mru_rp.cc
M src/mem/cache/replacement_policies/mru_rp.hh
M src/mem/cache/replacement_policies/random_rp.cc
M src/mem/cache/replacement_policies/random_rp.hh
M src/mem/cache/replacement_policies/second_chance_rp.cc
M src/mem/cache/replacement_policies/second_chance_rp.hh
M src/mem/cache/replacement_policies/tree_plru_rp.cc
M src/mem/cache/replacement_policies/tree_plru_rp.hh
M src/mem/cache/replacement_policies/weighted_lru_rp.cc
M src/mem/cache/replacement_policies/weighted_lru_rp.hh
21 files changed, 17 insertions(+), 24 deletions(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/replacement_policies/base.hh
b/src/mem/cache/replacement_policies/base.hh
index 1d6b221..0393629 100644
--- a/src/mem/cache/replacement_policies/base.hh
+++ b/src/mem/cache/replacement_policies/base.hh
@@ -61,7 +61,7 @@
* @param replacement_data Replacement data to be invalidated.
*/
virtual void invalidate(const std::shared_ptr&
-replacement_data) const =
0;
+replacement_data) = 0;
/**
* Update replacement data.
diff --git a/src/mem/cache/replacement_policies/brrip_rp.cc
b/src/mem/cache/replacement_policies/brrip_rp.cc
index 2e62510..d735a5a 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.cc
+++ b/src/mem/cache/replacement_policies/brrip_rp.cc
@@ -48,7 +48,6 @@
void
BRRIP::invalidate(const std::shared_ptr& replacement_data)
-const
{
std::shared_ptr casted_replacement_data =
std::static_pointer_cast(replacement_data);
diff --git a/src/mem/cache/replacement_policies/brrip_rp.hh
b/src/mem/cache/replacement_policies/brrip_rp.hh
index e3371bf..7a32adb 100644
--- a/src/mem/cache/replacement_policies/brrip_rp.hh
+++ b/src/mem/cache/replacement_policies/brrip_rp.hh
@@ -121,7 +121,7 @@
* @param replacement_data Replacement data to be invalidated.
*/
void invalidate(const std::shared_ptr&
replacement_data)
- const
override;
+
override;
/**
* Touch an entry to update its replacement data.
diff --git a/src/mem/cache/replacement_policies/dueling_rp.cc
b/src/mem/cache/replacement_policies/dueling_rp.cc
index fc717a3..e691141 100644
--- a/src/mem/cache/replacement_policies/dueling_rp.cc
+++ b/src/mem/cache/replacement_policies/dueling_rp.cc
@@ -45,8 +45,7 @@
}
void
-Dueling::invalidate(
-const std::shared_ptr& replacement_data) const
+Dueling::invalidate(const std::shared_ptr&
replacement_data)
{
std::shared_ptr casted_replacement_data =
std::static_pointer_cast(replacement_data);
diff --git a/src/mem/cache/replacement_policies/dueling_rp.hh
b/src/mem/cache/replacement_policies/dueling_rp.hh
index 23b4378..0c96ca7 100644
--- a/src/mem/cache/replacement_policies/dueling_rp.hh
+++ b/src/mem/cache/replacement_policies/dueling_rp.hh
@@ -96,7 +96,7 @@
~Dueling() = default;
void invalidate(const std::shared_ptr&
replacement_data)
- const
override;
+
override;
void touch(const std::shared_ptr& replacement_data)
const
override;
void reset(const std::shared_ptr& replacement_data)
const
diff --git a/src/mem/cache/replacement_policies/fifo_rp.cc
b/src/mem/cache/replacement_policies/fifo_rp.cc
index 0bb42d0..69cad9b 100644
--- a/src/mem/cache/replacement_policies/fifo_rp.cc
+++ b/src/mem/cache/replacement_policies/fifo_rp.cc
@@ -45,7 +45,6 @@
void
[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Creation of dueling classes
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/37895 )
Change subject: mem-cache: Creation of dueling classes
..
mem-cache: Creation of dueling classes
Table policies (i.e., replacement, compression, etc) behave
differently depending on the workload, and it is often desired
to be able to selectively switch between them. In this case
the relevant metadata for all the policies must be added to
all of the entries being analyzed.
In order to avoid having to monitor all table entries, a few
of these entries are selected to be sampled and estimate
overall behavior. These sampled entries belong each to a
single policy. Then, based on the predominance of these
samples, the winning policy is applied to the other sets
(followers).
As of now, in order to avoid having to iterate over a vector,
there is a limited number of dueling instances, but it may be
easily extended, if needed.
Based on Set Dueling, proposed in "Adaptive Insertion Policies
for High Performance Caching".
Change-Id: I692a3e5e0ad98581d68167ad7e6b45ab2f4c7b10
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37895
Tested-by: kokoro
Maintainer: Bobby R. Bruce
Reviewed-by: Bobby R. Bruce
---
M src/mem/cache/tags/SConscript
A src/mem/cache/tags/dueling.cc
A src/mem/cache/tags/dueling.hh
A src/mem/cache/tags/dueling.test.cc
4 files changed, 603 insertions(+), 0 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/tags/SConscript b/src/mem/cache/tags/SConscript
index 7c19d14..9c6f35d 100644
--- a/src/mem/cache/tags/SConscript
+++ b/src/mem/cache/tags/SConscript
@@ -33,7 +33,10 @@
Source('base.cc')
Source('base_set_assoc.cc')
Source('compressed_tags.cc')
+Source('dueling.cc')
Source('fa_lru.cc')
Source('sector_blk.cc')
Source('sector_tags.cc')
Source('super_blk.cc')
+
+GTest('dueling.test', 'dueling.test.cc', 'dueling.cc')
diff --git a/src/mem/cache/tags/dueling.cc b/src/mem/cache/tags/dueling.cc
new file mode 100644
index 000..7a36e30
--- /dev/null
+++ b/src/mem/cache/tags/dueling.cc
@@ -0,0 +1,136 @@
+/**
+ * Copyright (c) 2019, 2020 Inria
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "mem/cache/tags/dueling.hh"
+
+#include "base/bitfield.hh"
+#include "base/logging.hh"
+
+unsigned DuelingMonitor::numInstances = 0;
+
+Dueler::Dueler()
+ : _isSample(false), _team(0)
+{
+}
+
+void
+Dueler::setSample(uint64_t id, bool team)
+{
+panic_if(popCount(id) != 1, "The id must have a single bit set.");
+panic_if(_isSample & id,
+"This dueler is already a sample for id %llu", id);
+_isSample |= id;
+if (team) {
+_team |= id;
+}
+}
+
+bool
+Dueler::isSample(uint64_t id, bool& team) const
+{
+team = _team & id;
+return _isSample & id;
+}
+
+DuelingMonitor::DuelingMonitor(std::size_t constituency_size,
+std::size_t team_size, unsigned num_bits, double low_threshold,
+double high_threshold)
+ : id(1 << numInstances), constituencySize(constituency_size),
+teamSize(team_size), lowThreshold(low_threshold),
+highThreshold(high_threshold), selector(num_bits), regionCounter(0),
+winner(true)
+{
+fatal_if(constituencySize < (NUM_DUELERS * teamSize),
+"There must be at least team size entries per team in a
constituency");
+
[gem5-dev] Change in gem5/gem5[develop]: mem-cache: Implement a dueling Replacement Policy
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/37897 )
Change subject: mem-cache: Implement a dueling Replacement Policy
..
mem-cache: Implement a dueling Replacement Policy
Implement a template dueling replacement policy which monitors
two replacement policies to decide and select the one that
provides the least amount of misses.
Change-Id: I6a6e96a9388cce8f8c8cd7b9c1dbe9f0554ccc64
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37897
Tested-by: kokoro
---
M src/mem/cache/replacement_policies/ReplacementPolicies.py
M src/mem/cache/replacement_policies/SConscript
A src/mem/cache/replacement_policies/dueling_rp.cc
A src/mem/cache/replacement_policies/dueling_rp.hh
4 files changed, 290 insertions(+), 0 deletions(-)
Approvals:
Daniel Carvalho: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/cache/replacement_policies/ReplacementPolicies.py
b/src/mem/cache/replacement_policies/ReplacementPolicies.py
index 8b308b4..74709f2 100644
--- a/src/mem/cache/replacement_policies/ReplacementPolicies.py
+++ b/src/mem/cache/replacement_policies/ReplacementPolicies.py
@@ -34,6 +34,20 @@
cxx_class = 'replacement_policy::Base'
cxx_header = "mem/cache/replacement_policies/base.hh"
+class DuelingRP(BaseReplacementPolicy):
+type = 'DuelingRP'
+cxx_class = 'replacement_policy::Dueling'
+cxx_header = "mem/cache/replacement_policies/dueling_rp.hh"
+
+constituency_size = Param.Unsigned(
+"The size of a region containing one sample")
+team_size = Param.Unsigned(
+"Number of entries in a sampling set that belong to a team")
+replacement_policy_a = Param.BaseReplacementPolicy(
+"Sub-replacement policy A")
+replacement_policy_b = Param.BaseReplacementPolicy(
+"Sub-replacement policy B")
+
class FIFORP(BaseReplacementPolicy):
type = 'FIFORP'
cxx_class = 'replacement_policy::FIFO'
diff --git a/src/mem/cache/replacement_policies/SConscript
b/src/mem/cache/replacement_policies/SConscript
index 2537d22..29152a0 100644
--- a/src/mem/cache/replacement_policies/SConscript
+++ b/src/mem/cache/replacement_policies/SConscript
@@ -32,6 +32,7 @@
Source('bip_rp.cc')
Source('brrip_rp.cc')
+Source('dueling_rp.cc')
Source('fifo_rp.cc')
Source('lfu_rp.cc')
Source('lru_rp.cc')
diff --git a/src/mem/cache/replacement_policies/dueling_rp.cc
b/src/mem/cache/replacement_policies/dueling_rp.cc
new file mode 100644
index 000..fc717a3
--- /dev/null
+++ b/src/mem/cache/replacement_policies/dueling_rp.cc
@@ -0,0 +1,164 @@
+/**
+ * Copyright (c) 2019, 2020 Inria
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "mem/cache/replacement_policies/dueling_rp.hh"
+
+#include "base/logging.hh"
+#include "params/DuelingRP.hh"
+
+namespace replacement_policy
+{
+
+Dueling::Dueling(const Params )
+ : Base(p), replPolicyA(p.replacement_policy_a),
+replPolicyB(p.replacement_policy_b),
+duelingMonitor(p.constituency_size, p.team_size),
+duelingStats(this)
+{
+fatal_if((replPolicyA == nullptr) || (replPolicyB == nullptr),
+"All replacement policies must be instantiated");
+}
+
+void
+Dueling::invalidate(
+const std::shared_ptr& replacement_data) const
+{
+std::shared_ptr casted_replacement_data =
+
[gem5-dev] Change in gem5/gem5[develop]: python,scons,mem-ruby: Tag origin of generated files
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47301 )
Change subject: python,scons,mem-ruby: Tag origin of generated files
..
python,scons,mem-ruby: Tag origin of generated files
This will make it easier to backtrack and modify
such files when needed.
Change-Id: If09b6f848e607fb21a0acf2114ce0b9b0aa4751f
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47301
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/SConscript
M src/mem/slicc/symbols/StateMachine.py
M src/mem/slicc/symbols/SymbolTable.py
M src/mem/slicc/symbols/Type.py
M src/python/m5/util/code_formatter.py
5 files changed, 32 insertions(+), 42 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/SConscript b/src/SConscript
index 08cfeee..804160b 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1149,10 +1149,6 @@
# file header
code('''
-/*
- * DO NOT EDIT THIS FILE! Automatically generated by SCons.
- */
-
#include "base/debug.hh"
namespace Debug {
@@ -1206,10 +1202,6 @@
# file header boilerplate
code('''\
-/*
- * DO NOT EDIT THIS FILE! Automatically generated by SCons.
- */
-
#ifndef __DEBUG_${name}_HH__
#define __DEBUG_${name}_HH__
diff --git a/src/mem/slicc/symbols/StateMachine.py
b/src/mem/slicc/symbols/StateMachine.py
index 0c4651d..42b5553 100644
--- a/src/mem/slicc/symbols/StateMachine.py
+++ b/src/mem/slicc/symbols/StateMachine.py
@@ -272,11 +272,7 @@
c_ident = "%s_Controller" % self.ident
code('''
-/** \\file $c_ident.hh
- *
- * Auto generated C++ code started by $__file__:$__line__
- * Created by slicc definition of Module "${{self.short}}"
- */
+// Created by slicc definition of Module "${{self.short}}"
#ifndef __${ident}_CONTROLLER_HH__
#define __${ident}_CONTROLLER_HH__
@@ -492,11 +488,7 @@
'''
code('''
-/** \\file $c_ident.cc
- *
- * Auto generated C++ code started by $__file__:$__line__
- * Created by slicc definition of Module "${{self.short}}"
- */
+// Created by slicc definition of Module "${{self.short}}"
#include
#include
@@ -1220,7 +1212,6 @@
outputRequest_types = False
code('''
-// Auto generated C++ code started by $__file__:$__line__
// ${ident}: ${{self.short}}
#include
@@ -1343,7 +1334,6 @@
ident = self.ident
code('''
-// Auto generated C++ code started by $__file__:$__line__
// ${ident}: ${{self.short}}
#include
diff --git a/src/mem/slicc/symbols/SymbolTable.py
b/src/mem/slicc/symbols/SymbolTable.py
index e4fc0a3..fb01b01 100644
--- a/src/mem/slicc/symbols/SymbolTable.py
+++ b/src/mem/slicc/symbols/SymbolTable.py
@@ -126,7 +126,6 @@
makeDir(path)
code = self.codeFormatter()
-code('/** Auto generated C++ code started by $__file__:$__line__
*/')
for include_path in includes:
code('#include "${{include_path}}"')
diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py
index a1ca200..c6013f8 100644
--- a/src/mem/slicc/symbols/Type.py
+++ b/src/mem/slicc/symbols/Type.py
@@ -204,12 +204,6 @@
def printTypeHH(self, path):
code = self.symtab.codeFormatter()
code('''
-/** \\file ${{self.c_ident}}.hh
- *
- *
- * Auto generated C++ code started by $__file__:$__line__
- */
-
#ifndef __${{self.c_ident}}_HH__
#define __${{self.c_ident}}_HH__
@@ -404,11 +398,6 @@
code = self.symtab.codeFormatter()
code('''
-/** \\file ${{self.c_ident}}.cc
- *
- * Auto generated C++ code started by $__file__:$__line__
- */
-
#include
#include
@@ -449,11 +438,6 @@
def printEnumHH(self, path):
code = self.symtab.codeFormatter()
code('''
-/** \\file ${{self.c_ident}}.hh
- *
- * Auto generated C++ code started by $__file__:$__line__
- */
-
#ifndef __${{self.c_ident}}_HH__
#define __${{self.c_ident}}_HH__
@@ -555,11 +539,6 @@
def printEnumCC(self, path):
code = self.symtab.codeFormatter()
code('''
-/** \\file ${{self.c_ident}}.hh
- *
- * Auto generated C++ code started by $__file__:$__line__
- */
-
#include
#include
#include
diff --git a/src/python/m5/util/code_formatter.py
b/src/python/m5/util/code_formatter.py
index 0ca8c98..374e8cc 100644
--- a/src/python/m5/util/code_formatter.py
+++ b/src/python/m5/util/code_formatter.py
@@ -154,6 +154,36 @@
def write(self, *args):
f = open(os.path.join(*args), "w")
+name, extension = os.path.splitext(f.name)
+
+# Add a comment to inform which file generated the generated file
+# to make it easier to backtrack and modify generated code
+frame = inspect.currentframe().f_back
+if re.match('\.(cc|hh|c|h)', extension) is not None:
+f.write(f'''/**
+ * DO
[gem5-dev] Change in gem5/gem5[develop]: dev,sim: Fix compiler not finding specialized byte_swap
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/46322 )
Change subject: dev,sim: Fix compiler not finding specialized byte_swap
..
dev,sim: Fix compiler not finding specialized byte_swap
The specialized version of byte_swap cannot be found by
the compiler. As a temporary workaround to get the major
patch going, move the specialization to the base header
file.
Change-Id: I7d2bfc1c29b70042860ae06cdc043c0490cd8916
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46322
Tested-by: kokoro
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
---
M src/dev/virtio/base.hh
M src/sim/byteswap.hh
2 files changed, 21 insertions(+), 8 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/virtio/base.hh b/src/dev/virtio/base.hh
index 350e510..6eeb4a4 100644
--- a/src/dev/virtio/base.hh
+++ b/src/dev/virtio/base.hh
@@ -68,17 +68,18 @@
* of byte swapping.
*/
-
-static inline vring_used_elem
-swap_byte(vring_used_elem v)
+template
+inline std::enable_if_t::value, T>
+swap_byte(T v)
{
v.id = swap_byte(v.id);
v.len = swap_byte(v.len);
return v;
}
-static inline vring_desc
-swap_byte(vring_desc v)
+template
+inline std::enable_if_t::value, T>
+swap_byte(T v)
{
v.addr = swap_byte(v.addr);
v.len = swap_byte(v.len);
diff --git a/src/sim/byteswap.hh b/src/sim/byteswap.hh
index 30e63d1..82282ec 100644
--- a/src/sim/byteswap.hh
+++ b/src/sim/byteswap.hh
@@ -33,9 +33,6 @@
#ifndef __SIM_BYTE_SWAP_HH__
#define __SIM_BYTE_SWAP_HH__
-#include "base/types.hh"
-#include "enums/ByteOrder.hh"
-
// This lets us figure out what the byte order of the host system is
#if defined(__linux__)
#include
@@ -55,6 +52,12 @@
#include
+#include "base/types.hh"
+#include "enums/ByteOrder.hh"
+
+struct vring_used_elem;
+struct vring_desc;
+
// These functions actually perform the swapping for parameters of various
bit
// lengths.
inline uint64_t
@@ -135,6 +138,15 @@
return x;
}
+// Make the function visible in case we need to declare a version of it for
+// other types
+template
+std::enable_if_t::value, T>
+swap_byte(T v);
+template
+std::enable_if_t::value, T>
+swap_byte(T v);
+
template
inline std::array
swap_byte(std::array a)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/46322
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: I7d2bfc1c29b70042860ae06cdc043c0490cd8916
Gerrit-Change-Number: 46322
Gerrit-PatchSet: 5
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Bobby R. Bruce
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Gabe Black
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Matt Sinclair
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: mem: Conclude deprecation of MemObject
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47299 )
Change subject: mem: Conclude deprecation of MemObject
..
mem: Conclude deprecation of MemObject
This has been marked as deprecated a few versions ago,
so it is safe to conclude its deprecation process.
Change-Id: I20d37700c97264080a7b19cf0cf9ccf8a5b65c32
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47299
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/dev/arm/css/scmi_platform.hh
D src/mem/MemObject.py
M src/mem/SConscript
D src/mem/mem_object.hh
4 files changed, 0 insertions(+), 98 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/arm/css/scmi_platform.hh
b/src/dev/arm/css/scmi_platform.hh
index 5cd52bc..e56f024 100644
--- a/src/dev/arm/css/scmi_platform.hh
+++ b/src/dev/arm/css/scmi_platform.hh
@@ -41,7 +41,6 @@
#include "dev/arm/css/scmi_protocols.hh"
#include "dev/arm/css/scp.hh"
#include "dev/dma_device.hh"
-#include "mem/mem_object.hh"
#include "params/ScmiPlatform.hh"
class Doorbell;
diff --git a/src/mem/MemObject.py b/src/mem/MemObject.py
deleted file mode 100644
index 76b519a..000
--- a/src/mem/MemObject.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2006-2007 The Regents of The University of Michigan
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from m5.objects.ClockedObject import ClockedObject
-
-class MemObject(ClockedObject):
-type = 'MemObject'
-abstract = True
-cxx_header = "mem/mem_object.hh"
diff --git a/src/mem/SConscript b/src/mem/SConscript
index edf2985..5d3c5e6 100644
--- a/src/mem/SConscript
+++ b/src/mem/SConscript
@@ -53,7 +53,6 @@
SimObject('ExternalMaster.py')
SimObject('ExternalSlave.py')
SimObject('CfiMemory.py')
-SimObject('MemObject.py')
SimObject('SimpleMemory.py')
SimObject('XBar.py')
SimObject('HMCController.py')
diff --git a/src/mem/mem_object.hh b/src/mem/mem_object.hh
deleted file mode 100644
index 916eb26..000
--- a/src/mem/mem_object.hh
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2012 ARM Limited
- * All rights reserved
- *
- * The license below extends only to copyright in the software and shall
- * not be construed as granting a license to any other intellectual
- * property including but not limited to intellectual property relating
- * to a hardware implementation of the functionality of the software
- * licensed hereunder. You may use the software subject to the license
- * terms below provided that you ensure that this notice is replicated
- * unmodified and in its entirety in all distributions of the software,
- * modified or unmodified, in source code or in binary form.
- *
- * Copyright (c) 2002-2005 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright
[gem5-dev] Change in gem5/gem5[develop]: mem: Move QoS' MemSinkInterface into gem5::qos
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47300 )
Change subject: mem: Move QoS' MemSinkInterface into gem5::qos
..
mem: Move QoS' MemSinkInterface into gem5::qos
This class has been mistakenly added outside the
qos namespace.
Change-Id: I12c5dc7558a689c771761754e59d78a8010e422f
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47300
Reviewed-by: Jason Lowe-Power
Maintainer: Jason Lowe-Power
Tested-by: kokoro
---
M src/mem/qos/QoSMemSinkInterface.py
M src/mem/qos/mem_sink.cc
M src/mem/qos/mem_sink.hh
3 files changed, 12 insertions(+), 11 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/qos/QoSMemSinkInterface.py
b/src/mem/qos/QoSMemSinkInterface.py
index 37ddf78..9b3b89e 100644
--- a/src/mem/qos/QoSMemSinkInterface.py
+++ b/src/mem/qos/QoSMemSinkInterface.py
@@ -38,6 +38,7 @@
class QoSMemSinkInterface(AbstractMemory):
type = 'QoSMemSinkInterface'
cxx_header = "mem/qos/mem_sink.hh"
+cxx_class = 'qos::MemSinkInterface'
def controller(self):
"""
diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc
index 98a5e3f..f9be06c 100644
--- a/src/mem/qos/mem_sink.cc
+++ b/src/mem/qos/mem_sink.cc
@@ -386,9 +386,9 @@
return mem.recvTimingReq(pkt);
}
-} // namespace qos
-
-QoSMemSinkInterface::QoSMemSinkInterface(const QoSMemSinkInterfaceParams
&_p)
+MemSinkInterface::MemSinkInterface(const QoSMemSinkInterfaceParams &_p)
: AbstractMemory(_p)
{
}
+
+} // namespace qos
diff --git a/src/mem/qos/mem_sink.hh b/src/mem/qos/mem_sink.hh
index 3c229ec..247db22 100644
--- a/src/mem/qos/mem_sink.hh
+++ b/src/mem/qos/mem_sink.hh
@@ -52,12 +52,13 @@
#include "sim/eventq.hh"
struct QoSMemSinkInterfaceParams;
-class QoSMemSinkInterface;
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
+class MemSinkInterface;
+
/**
* QoS Memory Sink
*
@@ -177,7 +178,7 @@
/**
* Create pointer to interface of actual media
*/
-QoSMemSinkInterface* const interface;
+MemSinkInterface* const interface;
/** Read request pending */
bool retryRdReq;
@@ -262,19 +263,18 @@
MemSinkCtrlStats stats;
};
-} // namespace qos
-
-class QoSMemSinkInterface : public AbstractMemory
+class MemSinkInterface : public AbstractMemory
{
public:
/** Setting a pointer to the interface */
-void setMemCtrl(qos::MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
+void setMemCtrl(MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
/** Pointer to the controller */
-qos::MemSinkCtrl* ctrl;
+MemSinkCtrl* ctrl;
-QoSMemSinkInterface(const QoSMemSinkInterfaceParams &_p);
+MemSinkInterface(const QoSMemSinkInterfaceParams &_p);
};
+} // namespace qos
#endif /* __MEM_QOS_MEM_SINK_HH__ */
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47300
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: I12c5dc7558a689c771761754e59d78a8010e422f
Gerrit-Change-Number: 47300
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Jason Lowe-Power
Gerrit-Reviewer: Nikos Nikoleris
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: mem: Adopt the memory namespace in qos files
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47308 )
Change subject: mem: Adopt the memory namespace in qos files
..
mem: Adopt the memory namespace in qos files
Encapsulate everything qos-related in the gem5::memory
namespace.
Change-Id: Ib906ddd6d76b9d4a56f2eb705efe6cd498829155
Issued-on: https://gem5.atlassian.net/browse/GEM5-983
Signed-off-by: Daniel R. Carvalho
---
M src/mem/mem_ctrl.cc
M src/mem/mem_ctrl.hh
M src/mem/qos/QoSMemCtrl.py
M src/mem/qos/QoSMemSinkCtrl.py
M src/mem/qos/QoSMemSinkInterface.py
M src/mem/qos/QoSPolicy.py
M src/mem/qos/QoSTurnaround.py
M src/mem/qos/mem_ctrl.cc
M src/mem/qos/mem_ctrl.hh
M src/mem/qos/mem_sink.cc
M src/mem/qos/mem_sink.hh
M src/mem/qos/policy.cc
M src/mem/qos/policy.hh
M src/mem/qos/policy_fixed_prio.cc
M src/mem/qos/policy_fixed_prio.hh
M src/mem/qos/policy_pf.cc
M src/mem/qos/policy_pf.hh
M src/mem/qos/q_policy.cc
M src/mem/qos/q_policy.hh
M src/mem/qos/turnaround_policy.hh
M src/mem/qos/turnaround_policy_ideal.cc
M src/mem/qos/turnaround_policy_ideal.hh
22 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/src/mem/mem_ctrl.cc b/src/mem/mem_ctrl.cc
index 132cd3f..0e1c0a6 100644
--- a/src/mem/mem_ctrl.cc
+++ b/src/mem/mem_ctrl.cc
@@ -53,7 +53,7 @@
{
MemCtrl::MemCtrl(const MemCtrlParams ) :
-qos::MemCtrl(p),
+memory::qos::MemCtrl(p),
port(name() + ".port", *this), isTimingMode(false),
retryRdReq(false), retryWrReq(false),
nextReqEvent([this]{ processNextReqEvent(); }, name()),
@@ -1395,7 +1395,7 @@
MemCtrl::getPort(const std::string _name, PortID idx)
{
if (if_name != "port") {
-return qos::MemCtrl::getPort(if_name, idx);
+return memory::qos::MemCtrl::getPort(if_name, idx);
} else {
return port;
}
diff --git a/src/mem/mem_ctrl.hh b/src/mem/mem_ctrl.hh
index b78796f..a30fcb3 100644
--- a/src/mem/mem_ctrl.hh
+++ b/src/mem/mem_ctrl.hh
@@ -236,7 +236,7 @@
* please cite the paper.
*
*/
-class MemCtrl : public qos::MemCtrl
+class MemCtrl : public memory::qos::MemCtrl
{
private:
diff --git a/src/mem/qos/QoSMemCtrl.py b/src/mem/qos/QoSMemCtrl.py
index b3391fb..842b62b 100644
--- a/src/mem/qos/QoSMemCtrl.py
+++ b/src/mem/qos/QoSMemCtrl.py
@@ -44,7 +44,7 @@
class QoSMemCtrl(ClockedObject):
type = 'QoSMemCtrl'
cxx_header = "mem/qos/mem_ctrl.hh"
-cxx_class = 'gem5::qos::MemCtrl'
+cxx_class = 'gem5::memory::qos::MemCtrl'
abstract = True
system = Param.System(Parent.any, "System that the controller belongs
to.")
diff --git a/src/mem/qos/QoSMemSinkCtrl.py b/src/mem/qos/QoSMemSinkCtrl.py
index 234d8bc..486e74b 100644
--- a/src/mem/qos/QoSMemSinkCtrl.py
+++ b/src/mem/qos/QoSMemSinkCtrl.py
@@ -42,7 +42,7 @@
class QoSMemSinkCtrl(QoSMemCtrl):
type = 'QoSMemSinkCtrl'
cxx_header = "mem/qos/mem_sink.hh"
-cxx_class = 'gem5::qos::MemSinkCtrl'
+cxx_class = 'gem5::memory::qos::MemSinkCtrl'
port = ResponsePort("Response ports")
diff --git a/src/mem/qos/QoSMemSinkInterface.py
b/src/mem/qos/QoSMemSinkInterface.py
index d493dce..2544df8 100644
--- a/src/mem/qos/QoSMemSinkInterface.py
+++ b/src/mem/qos/QoSMemSinkInterface.py
@@ -38,7 +38,7 @@
class QoSMemSinkInterface(AbstractMemory):
type = 'QoSMemSinkInterface'
cxx_header = "mem/qos/mem_sink.hh"
-cxx_class = 'gem5::qos::MemSinkInterface'
+cxx_class = 'gem5::memory::qos::MemSinkInterface'
def controller(self):
"""
diff --git a/src/mem/qos/QoSPolicy.py b/src/mem/qos/QoSPolicy.py
index fba2e86..99a3f2f 100644
--- a/src/mem/qos/QoSPolicy.py
+++ b/src/mem/qos/QoSPolicy.py
@@ -41,12 +41,12 @@
type = 'QoSPolicy'
abstract = True
cxx_header = "mem/qos/policy.hh"
-cxx_class = 'gem5::qos::Policy'
+cxx_class = 'gem5::memory::qos::Policy'
class QoSFixedPriorityPolicy(QoSPolicy):
type = 'QoSFixedPriorityPolicy'
cxx_header = "mem/qos/policy_fixed_prio.hh"
-cxx_class = 'gem5::qos::FixedPriorityPolicy'
+cxx_class = 'gem5::memory::qos::FixedPriorityPolicy'
cxx_exports = [
PyBindMethod('initRequestorName'),
@@ -90,7 +90,7 @@
class QoSPropFairPolicy(QoSPolicy):
type = 'QoSPropFairPolicy'
cxx_header = "mem/qos/policy_pf.hh"
-cxx_class = 'gem5::qos::PropFairPolicy'
+cxx_class = 'gem5::memory::qos::PropFairPolicy'
cxx_exports = [
PyBindMethod('initRequestorName'),
diff --git a/src/mem/qos/QoSTurnaround.py b/src/mem/qos/QoSTurnaround.py
index c74f5e8..7a8d1e3 100644
--- a/src/mem/qos/QoSTurnaround.py
+++ b/src/mem/qos/QoSTurnaround.py
@@ -39,10 +39,10 @@
class QoSTurnaroundPolicy(SimObject):
type = 'QoSTurnaroundPolicy'
cxx_header = "mem/qos/turnaround_policy.hh"
-cxx_class = 'gem5::qos::TurnaroundPolicy'
+cxx_class = 'gem5::memory::qos::TurnaroundPolicy'
abstract = True
class QoSTurnaroundPolicyIdeal(QoSTurnaroundPolicy):
[gem5-dev] Change in gem5/gem5[develop]: mem: Adopt a memory namespace for memories
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47309 )
Change subject: mem: Adopt a memory namespace for memories
..
mem: Adopt a memory namespace for memories
Encapsulate every class inheriting from Abstract or Physical
memories, and the memory controller in a memory namespace.
Change-Id: I228f7e55efc395089e3616ae0a0a6325867bd782
Issued-on: https://gem5.atlassian.net/browse/GEM5-983
Signed-off-by: Daniel R. Carvalho
---
M src/arch/arm/semihosting.cc
M src/cpu/kvm/vm.cc
M src/cpu/o3/inst_queue.hh
M src/mem/AbstractMemory.py
M src/mem/CfiMemory.py
M src/mem/DRAMInterface.py
M src/mem/DRAMSim2.py
M src/mem/DRAMsim3.py
M src/mem/MemCtrl.py
M src/mem/MemInterface.py
M src/mem/NVMInterface.py
M src/mem/SimpleMemory.py
M src/mem/abstract_mem.cc
M src/mem/abstract_mem.hh
M src/mem/cfi_mem.cc
M src/mem/cfi_mem.hh
M src/mem/dramsim2.cc
M src/mem/dramsim2.hh
M src/mem/dramsim2_wrapper.cc
M src/mem/dramsim2_wrapper.hh
M src/mem/dramsim3.cc
M src/mem/dramsim3.hh
M src/mem/dramsim3_wrapper.cc
M src/mem/dramsim3_wrapper.hh
M src/mem/mem_ctrl.cc
M src/mem/mem_ctrl.hh
M src/mem/mem_interface.cc
M src/mem/mem_interface.hh
M src/mem/physical.cc
M src/mem/physical.hh
M src/mem/ruby/system/RubySystem.hh
M src/mem/simple_mem.cc
M src/mem/simple_mem.hh
M src/sim/system.cc
M src/sim/system.hh
35 files changed, 115 insertions(+), 24 deletions(-)
diff --git a/src/arch/arm/semihosting.cc b/src/arch/arm/semihosting.cc
index 1f06b51..59ea4aa 100644
--- a/src/arch/arm/semihosting.cc
+++ b/src/arch/arm/semihosting.cc
@@ -551,7 +551,7 @@
Addr _base, Addr _limit,
Addr _base, Addr _limit)
{
-const PhysicalMemory = tc->getSystemPtr()->getPhysMem();
+const memory::PhysicalMemory = tc->getSystemPtr()->getPhysMem();
const AddrRangeList memories = phys.getConfAddrRanges();
fatal_if(memories.size() < 1, "No memories reported from System");
warn_if(memories.size() > 1, "Multiple physical memory ranges
available. "
diff --git a/src/cpu/kvm/vm.cc b/src/cpu/kvm/vm.cc
index f1fdeec..cd975ac 100644
--- a/src/cpu/kvm/vm.cc
+++ b/src/cpu/kvm/vm.cc
@@ -50,6 +50,7 @@
#include "cpu/kvm/base.hh"
#include "debug/Kvm.hh"
+#include "mem/physical.hh"
#include "params/KvmVM.hh"
#include "sim/system.hh"
@@ -355,7 +356,7 @@
KvmVM::delayedStartup()
{
assert(system); // set by the system during its construction
-const std::vector (
+const std::vector (
system->getPhysMem().getBackingStore());
DPRINTF(Kvm, "Mapping %i memory region(s)\n", memories.size());
diff --git a/src/cpu/o3/inst_queue.hh b/src/cpu/o3/inst_queue.hh
index b69344a..b2d9303 100644
--- a/src/cpu/o3/inst_queue.hh
+++ b/src/cpu/o3/inst_queue.hh
@@ -65,7 +65,11 @@
{
struct O3CPUParams;
+
+namespace memory
+{
class MemInterface;
+} // namespace memory
namespace o3
{
@@ -284,7 +288,7 @@
CPU *cpu;
/** Cache interface. */
-MemInterface *dcacheInterface;
+memory::MemInterface *dcacheInterface;
/** Pointer to IEW stage. */
IEW *iewStage;
diff --git a/src/mem/AbstractMemory.py b/src/mem/AbstractMemory.py
index 3fe94f3..ed2a02c 100644
--- a/src/mem/AbstractMemory.py
+++ b/src/mem/AbstractMemory.py
@@ -43,7 +43,7 @@
type = 'AbstractMemory'
abstract = True
cxx_header = "mem/abstract_mem.hh"
-cxx_class = 'gem5::AbstractMemory'
+cxx_class = 'gem5::memory::AbstractMemory'
# A default memory size of 128 MiB (starting at 0) is used to
# simplify the regressions
diff --git a/src/mem/CfiMemory.py b/src/mem/CfiMemory.py
index 6ac539e..aa6b18a 100644
--- a/src/mem/CfiMemory.py
+++ b/src/mem/CfiMemory.py
@@ -43,7 +43,7 @@
class CfiMemory(AbstractMemory):
type = 'CfiMemory'
cxx_header = "mem/cfi_mem.hh"
-cxx_class = 'gem5::CfiMemory'
+cxx_class = 'gem5::memory::CfiMemory'
port = ResponsePort("Response port")
diff --git a/src/mem/DRAMInterface.py b/src/mem/DRAMInterface.py
index 91e1540..3f938dd 100644
--- a/src/mem/DRAMInterface.py
+++ b/src/mem/DRAMInterface.py
@@ -49,7 +49,7 @@
class DRAMInterface(MemInterface):
type = 'DRAMInterface'
cxx_header = "mem/mem_interface.hh"
-cxx_class = 'gem5::DRAMInterface'
+cxx_class = 'gem5::memory::DRAMInterface'
# scheduler page policy
page_policy = Param.PageManage('open_adaptive', "Page management
policy")
diff --git a/src/mem/DRAMSim2.py b/src/mem/DRAMSim2.py
index d6f92ef..11f9b4e 100644
--- a/src/mem/DRAMSim2.py
+++ b/src/mem/DRAMSim2.py
@@ -40,7 +40,7 @@
class DRAMSim2(AbstractMemory):
type = 'DRAMSim2'
cxx_header = "mem/dramsim2.hh"
-cxx_class = 'gem5::DRAMSim2'
+cxx_class = 'gem5::memory::DRAMSim2'
# A single port for now
port = ResponsePort("This port sends responses and receives requests")
diff --git a/src/mem/DRAMsim3.py b/src/mem/DRAMsim3.py
index
[gem5-dev] Change in gem5/gem5[develop]: mem-garnet: Add a garnet namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47306 )
Change subject: mem-garnet: Add a garnet namespace
..
mem-garnet: Add a garnet namespace
Add a namespace encapsulating all garnet files.
GarnetSyntheticTraffic, from
cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh
has not been added to this namespace.
Change-Id: I5304ad3130100ba325e35e20883ee9286f51a75a
Issued-on: https://gem5.atlassian.net/browse/GEM5-987
Signed-off-by: Daniel R. Carvalho
---
M src/mem/ruby/network/garnet/CommonTypes.hh
M src/mem/ruby/network/garnet/Credit.cc
M src/mem/ruby/network/garnet/Credit.hh
M src/mem/ruby/network/garnet/CreditLink.hh
M src/mem/ruby/network/garnet/CrossbarSwitch.cc
M src/mem/ruby/network/garnet/CrossbarSwitch.hh
M src/mem/ruby/network/garnet/GarnetLink.cc
M src/mem/ruby/network/garnet/GarnetLink.hh
M src/mem/ruby/network/garnet/GarnetLink.py
M src/mem/ruby/network/garnet/GarnetNetwork.cc
M src/mem/ruby/network/garnet/GarnetNetwork.hh
M src/mem/ruby/network/garnet/GarnetNetwork.py
M src/mem/ruby/network/garnet/InputUnit.cc
M src/mem/ruby/network/garnet/InputUnit.hh
M src/mem/ruby/network/garnet/NetworkBridge.cc
M src/mem/ruby/network/garnet/NetworkBridge.hh
M src/mem/ruby/network/garnet/NetworkInterface.cc
M src/mem/ruby/network/garnet/NetworkInterface.hh
M src/mem/ruby/network/garnet/NetworkLink.cc
M src/mem/ruby/network/garnet/NetworkLink.hh
M src/mem/ruby/network/garnet/OutVcState.cc
M src/mem/ruby/network/garnet/OutVcState.hh
M src/mem/ruby/network/garnet/OutputUnit.cc
M src/mem/ruby/network/garnet/OutputUnit.hh
M src/mem/ruby/network/garnet/Router.cc
M src/mem/ruby/network/garnet/Router.hh
M src/mem/ruby/network/garnet/RoutingUnit.cc
M src/mem/ruby/network/garnet/RoutingUnit.hh
M src/mem/ruby/network/garnet/SwitchAllocator.cc
M src/mem/ruby/network/garnet/SwitchAllocator.hh
M src/mem/ruby/network/garnet/VirtualChannel.cc
M src/mem/ruby/network/garnet/VirtualChannel.hh
M src/mem/ruby/network/garnet/flit.cc
M src/mem/ruby/network/garnet/flit.hh
M src/mem/ruby/network/garnet/flitBuffer.cc
M src/mem/ruby/network/garnet/flitBuffer.hh
36 files changed, 149 insertions(+), 10 deletions(-)
diff --git a/src/mem/ruby/network/garnet/CommonTypes.hh
b/src/mem/ruby/network/garnet/CommonTypes.hh
index c0d8af2..c2b8b65 100644
--- a/src/mem/ruby/network/garnet/CommonTypes.hh
+++ b/src/mem/ruby/network/garnet/CommonTypes.hh
@@ -36,6 +36,9 @@
namespace gem5
{
+namespace garnet
+{
+
// All common enums and typedefs go here
enum flit_type {HEAD_, BODY_, TAIL_, HEAD_TAIL_,
@@ -68,6 +71,7 @@
#define INFINITE_ 1
+} // namespace garnet
} // namespace gem5
#endif //__MEM_RUBY_NETWORK_GARNET_0_COMMONTYPES_HH__
diff --git a/src/mem/ruby/network/garnet/Credit.cc
b/src/mem/ruby/network/garnet/Credit.cc
index 5624005..e88faa0 100644
--- a/src/mem/ruby/network/garnet/Credit.cc
+++ b/src/mem/ruby/network/garnet/Credit.cc
@@ -35,6 +35,9 @@
namespace gem5
{
+namespace garnet
+{
+
// Credit Signal for buffers inside VC
// Carries m_vc (inherits from flit.hh)
// and m_is_free_signal (whether VC is free or not)
@@ -83,4 +86,5 @@
out << "]";
}
+} // namespace garnet
} // namespace gem5
diff --git a/src/mem/ruby/network/garnet/Credit.hh
b/src/mem/ruby/network/garnet/Credit.hh
index 2db47d0..98469e1 100644
--- a/src/mem/ruby/network/garnet/Credit.hh
+++ b/src/mem/ruby/network/garnet/Credit.hh
@@ -41,6 +41,9 @@
namespace gem5
{
+namespace garnet
+{
+
// Credit Signal for buffers inside VC
// Carries m_vc (inherits from flit.hh)
// and m_is_free_signal (whether VC is free or not)
@@ -64,6 +67,7 @@
bool m_is_free_signal;
};
+} // namespace garnet
} // namespace gem5
#endif // __MEM_RUBY_NETWORK_GARNET_0_CREDIT_HH__
diff --git a/src/mem/ruby/network/garnet/CreditLink.hh
b/src/mem/ruby/network/garnet/CreditLink.hh
index 96842dc..c85dc4e 100644
--- a/src/mem/ruby/network/garnet/CreditLink.hh
+++ b/src/mem/ruby/network/garnet/CreditLink.hh
@@ -37,6 +37,9 @@
namespace gem5
{
+namespace garnet
+{
+
class CreditLink : public NetworkLink
{
public:
@@ -44,6 +47,7 @@
CreditLink(const Params ) : NetworkLink(p) {}
};
+} // namespace garnet
} // namespace gem5
#endif // __MEM_RUBY_NETWORK_GARNET_0_CREDITLINK_HH__
diff --git a/src/mem/ruby/network/garnet/CrossbarSwitch.cc
b/src/mem/ruby/network/garnet/CrossbarSwitch.cc
index 2e6c29d..d94f728 100644
--- a/src/mem/ruby/network/garnet/CrossbarSwitch.cc
+++ b/src/mem/ruby/network/garnet/CrossbarSwitch.cc
@@ -38,6 +38,9 @@
namespace gem5
{
+namespace garnet
+{
+
CrossbarSwitch::CrossbarSwitch(Router *router)
: Consumer(router), m_router(router), m_num_vcs(m_router->get_num_vcs()),
m_crossbar_activity(0), switchBuffers(0)
@@ -103,4 +106,5 @@
m_crossbar_activity = 0;
}
+} // namespace garnet
} // namespace gem5
diff --git a/src/mem/ruby/network/garnet/CrossbarSwitch.hh
[gem5-dev] Change in gem5/gem5[develop]: cpu: Add a branch_prediction namespace
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47303 )
Change subject: cpu: Add a branch_prediction namespace
..
cpu: Add a branch_prediction namespace
Encapsulate all branch-prediction-related files
in a branch_prediction namespace. This will allow
these files to be renamed to drop the BP suffix.
Issued-on: https://gem5.atlassian.net/browse/GEM5-982
Change-Id: I640c0caa846a3aade6fae95e9a93e4318ae9fca0
Signed-off-by: Daniel R. Carvalho
---
M src/cpu/minor/fetch2.hh
M src/cpu/o3/fetch.hh
M src/cpu/pred/2bit_local.cc
M src/cpu/pred/2bit_local.hh
M src/cpu/pred/BranchPredictor.py
M src/cpu/pred/bi_mode.cc
M src/cpu/pred/bi_mode.hh
M src/cpu/pred/bpred_unit.cc
M src/cpu/pred/bpred_unit.hh
M src/cpu/pred/btb.cc
M src/cpu/pred/btb.hh
M src/cpu/pred/indirect.hh
M src/cpu/pred/loop_predictor.cc
M src/cpu/pred/loop_predictor.hh
M src/cpu/pred/ltage.cc
M src/cpu/pred/ltage.hh
M src/cpu/pred/multiperspective_perceptron.cc
M src/cpu/pred/multiperspective_perceptron.hh
M src/cpu/pred/multiperspective_perceptron_64KB.cc
M src/cpu/pred/multiperspective_perceptron_64KB.hh
M src/cpu/pred/multiperspective_perceptron_8KB.cc
M src/cpu/pred/multiperspective_perceptron_8KB.hh
M src/cpu/pred/multiperspective_perceptron_tage.cc
M src/cpu/pred/multiperspective_perceptron_tage.hh
M src/cpu/pred/multiperspective_perceptron_tage_64KB.cc
M src/cpu/pred/multiperspective_perceptron_tage_64KB.hh
M src/cpu/pred/multiperspective_perceptron_tage_8KB.cc
M src/cpu/pred/multiperspective_perceptron_tage_8KB.hh
M src/cpu/pred/ras.cc
M src/cpu/pred/ras.hh
M src/cpu/pred/simple_indirect.cc
M src/cpu/pred/simple_indirect.hh
M src/cpu/pred/statistical_corrector.cc
M src/cpu/pred/statistical_corrector.hh
M src/cpu/pred/tage.cc
M src/cpu/pred/tage.hh
M src/cpu/pred/tage_base.cc
M src/cpu/pred/tage_base.hh
M src/cpu/pred/tage_sc_l.cc
M src/cpu/pred/tage_sc_l.hh
M src/cpu/pred/tage_sc_l_64KB.cc
M src/cpu/pred/tage_sc_l_64KB.hh
M src/cpu/pred/tage_sc_l_8KB.cc
M src/cpu/pred/tage_sc_l_8KB.hh
M src/cpu/pred/tournament.cc
M src/cpu/pred/tournament.hh
M src/cpu/simple/base.hh
47 files changed, 216 insertions(+), 37 deletions(-)
diff --git a/src/cpu/minor/fetch2.hh b/src/cpu/minor/fetch2.hh
index 09b7867..41a7a7f 100644
--- a/src/cpu/minor/fetch2.hh
+++ b/src/cpu/minor/fetch2.hh
@@ -93,7 +93,7 @@
bool processMoreThanOneInput;
/** Branch predictor passed from Python configuration */
-BPredUnit
+branch_prediction::BPredUnit
public:
/* Public so that Pipeline can pass it to Fetch1 */
diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index b543709..c0ba0d0 100644
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -410,7 +410,7 @@
TimeBuffer::wire toDecode;
/** BPredUnit. */
-BPredUnit *branchPred;
+branch_prediction::BPredUnit *branchPred;
TheISA::PCState pc[MaxThreads];
diff --git a/src/cpu/pred/2bit_local.cc b/src/cpu/pred/2bit_local.cc
index 61ce776..c9aa714 100644
--- a/src/cpu/pred/2bit_local.cc
+++ b/src/cpu/pred/2bit_local.cc
@@ -36,6 +36,9 @@
namespace gem5
{
+namespace branch_prediction
+{
+
LocalBP::LocalBP(const LocalBPParams )
: BPredUnit(params),
localPredictorSize(params.localPredictorSize),
@@ -137,4 +140,5 @@
{
}
+} // namespace branch_prediction
} // namespace gem5
diff --git a/src/cpu/pred/2bit_local.hh b/src/cpu/pred/2bit_local.hh
index 8d2a09b..55f45ca 100644
--- a/src/cpu/pred/2bit_local.hh
+++ b/src/cpu/pred/2bit_local.hh
@@ -51,6 +51,9 @@
namespace gem5
{
+namespace branch_prediction
+{
+
/**
* Implements a local predictor that uses the PC to index into a table of
* counters. Note that any time a pointer to the bp_history is given, it
@@ -125,6 +128,7 @@
const unsigned indexMask;
};
+} // namespace branch_prediction
} // namespace gem5
#endif // __CPU_PRED_2BIT_LOCAL_PRED_HH__
diff --git a/src/cpu/pred/BranchPredictor.py
b/src/cpu/pred/BranchPredictor.py
index aa8e5cf..c6abebb 100644
--- a/src/cpu/pred/BranchPredictor.py
+++ b/src/cpu/pred/BranchPredictor.py
@@ -31,7 +31,7 @@
class IndirectPredictor(SimObject):
type = 'IndirectPredictor'
-cxx_class = 'gem5::IndirectPredictor'
+cxx_class = 'gem5::branch_prediction::IndirectPredictor'
cxx_header = "cpu/pred/indirect.hh"
abstract = True
@@ -39,7 +39,7 @@
class SimpleIndirectPredictor(IndirectPredictor):
type = 'SimpleIndirectPredictor'
-cxx_class = 'gem5::SimpleIndirectPredictor'
+cxx_class = 'gem5::branch_prediction::SimpleIndirectPredictor'
cxx_header = "cpu/pred/simple_indirect.hh"
indirectHashGHR = Param.Bool(True, "Hash branch predictor GHR")
@@ -54,7 +54,7 @@
class BranchPredictor(SimObject):
type = 'BranchPredictor'
-cxx_class = 'gem5::BPredUnit'
+cxx_class = 'gem5::branch_prediction::BPredUnit'
cxx_header = "cpu/pred/bpred_unit.hh"
abstract = True
@@ -69,7 +69,7 @@
[gem5-dev] Change in gem5/gem5[develop]: mem: Conclude deprecation of MemObject
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47299 )
Change subject: mem: Conclude deprecation of MemObject
..
mem: Conclude deprecation of MemObject
This has been marked as deprecated a few versions ago,
so it is safe to conclude its deprecation process.
Change-Id: I20d37700c97264080a7b19cf0cf9ccf8a5b65c32
Signed-off-by: Daniel R. Carvalho
---
M src/dev/arm/css/scmi_platform.hh
D src/mem/MemObject.py
M src/mem/SConscript
D src/mem/mem_object.hh
4 files changed, 0 insertions(+), 98 deletions(-)
diff --git a/src/dev/arm/css/scmi_platform.hh
b/src/dev/arm/css/scmi_platform.hh
index 5cd52bc..e56f024 100644
--- a/src/dev/arm/css/scmi_platform.hh
+++ b/src/dev/arm/css/scmi_platform.hh
@@ -41,7 +41,6 @@
#include "dev/arm/css/scmi_protocols.hh"
#include "dev/arm/css/scp.hh"
#include "dev/dma_device.hh"
-#include "mem/mem_object.hh"
#include "params/ScmiPlatform.hh"
class Doorbell;
diff --git a/src/mem/MemObject.py b/src/mem/MemObject.py
deleted file mode 100644
index 76b519a..000
--- a/src/mem/MemObject.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2006-2007 The Regents of The University of Michigan
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from m5.objects.ClockedObject import ClockedObject
-
-class MemObject(ClockedObject):
-type = 'MemObject'
-abstract = True
-cxx_header = "mem/mem_object.hh"
diff --git a/src/mem/SConscript b/src/mem/SConscript
index edf2985..5d3c5e6 100644
--- a/src/mem/SConscript
+++ b/src/mem/SConscript
@@ -53,7 +53,6 @@
SimObject('ExternalMaster.py')
SimObject('ExternalSlave.py')
SimObject('CfiMemory.py')
-SimObject('MemObject.py')
SimObject('SimpleMemory.py')
SimObject('XBar.py')
SimObject('HMCController.py')
diff --git a/src/mem/mem_object.hh b/src/mem/mem_object.hh
deleted file mode 100644
index 916eb26..000
--- a/src/mem/mem_object.hh
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2012 ARM Limited
- * All rights reserved
- *
- * The license below extends only to copyright in the software and shall
- * not be construed as granting a license to any other intellectual
- * property including but not limited to intellectual property relating
- * to a hardware implementation of the functionality of the software
- * licensed hereunder. You may use the software subject to the license
- * terms below provided that you ensure that this notice is replicated
- * unmodified and in its entirety in all distributions of the software,
- * modified or unmodified, in source code or in binary form.
- *
- * Copyright (c) 2002-2005 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND
[gem5-dev] Change in gem5/gem5[develop]: python,scons,mem-ruby: Tag origin of generated files
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47301 )
Change subject: python,scons,mem-ruby: Tag origin of generated files
..
python,scons,mem-ruby: Tag origin of generated files
This will make it easier to backtrack and modify
such files when needed.
Change-Id: If09b6f848e607fb21a0acf2114ce0b9b0aa4751f
Signed-off-by: Daniel R. Carvalho
---
M src/SConscript
M src/mem/slicc/symbols/StateMachine.py
M src/mem/slicc/symbols/SymbolTable.py
M src/mem/slicc/symbols/Type.py
M src/python/m5/util/code_formatter.py
5 files changed, 32 insertions(+), 42 deletions(-)
diff --git a/src/SConscript b/src/SConscript
index 08cfeee..804160b 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1149,10 +1149,6 @@
# file header
code('''
-/*
- * DO NOT EDIT THIS FILE! Automatically generated by SCons.
- */
-
#include "base/debug.hh"
namespace Debug {
@@ -1206,10 +1202,6 @@
# file header boilerplate
code('''\
-/*
- * DO NOT EDIT THIS FILE! Automatically generated by SCons.
- */
-
#ifndef __DEBUG_${name}_HH__
#define __DEBUG_${name}_HH__
diff --git a/src/mem/slicc/symbols/StateMachine.py
b/src/mem/slicc/symbols/StateMachine.py
index 0c4651d..42b5553 100644
--- a/src/mem/slicc/symbols/StateMachine.py
+++ b/src/mem/slicc/symbols/StateMachine.py
@@ -272,11 +272,7 @@
c_ident = "%s_Controller" % self.ident
code('''
-/** \\file $c_ident.hh
- *
- * Auto generated C++ code started by $__file__:$__line__
- * Created by slicc definition of Module "${{self.short}}"
- */
+// Created by slicc definition of Module "${{self.short}}"
#ifndef __${ident}_CONTROLLER_HH__
#define __${ident}_CONTROLLER_HH__
@@ -492,11 +488,7 @@
'''
code('''
-/** \\file $c_ident.cc
- *
- * Auto generated C++ code started by $__file__:$__line__
- * Created by slicc definition of Module "${{self.short}}"
- */
+// Created by slicc definition of Module "${{self.short}}"
#include
#include
@@ -1220,7 +1212,6 @@
outputRequest_types = False
code('''
-// Auto generated C++ code started by $__file__:$__line__
// ${ident}: ${{self.short}}
#include
@@ -1343,7 +1334,6 @@
ident = self.ident
code('''
-// Auto generated C++ code started by $__file__:$__line__
// ${ident}: ${{self.short}}
#include
diff --git a/src/mem/slicc/symbols/SymbolTable.py
b/src/mem/slicc/symbols/SymbolTable.py
index e4fc0a3..fb01b01 100644
--- a/src/mem/slicc/symbols/SymbolTable.py
+++ b/src/mem/slicc/symbols/SymbolTable.py
@@ -126,7 +126,6 @@
makeDir(path)
code = self.codeFormatter()
-code('/** Auto generated C++ code started by $__file__:$__line__
*/')
for include_path in includes:
code('#include "${{include_path}}"')
diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py
index a1ca200..c6013f8 100644
--- a/src/mem/slicc/symbols/Type.py
+++ b/src/mem/slicc/symbols/Type.py
@@ -204,12 +204,6 @@
def printTypeHH(self, path):
code = self.symtab.codeFormatter()
code('''
-/** \\file ${{self.c_ident}}.hh
- *
- *
- * Auto generated C++ code started by $__file__:$__line__
- */
-
#ifndef __${{self.c_ident}}_HH__
#define __${{self.c_ident}}_HH__
@@ -404,11 +398,6 @@
code = self.symtab.codeFormatter()
code('''
-/** \\file ${{self.c_ident}}.cc
- *
- * Auto generated C++ code started by $__file__:$__line__
- */
-
#include
#include
@@ -449,11 +438,6 @@
def printEnumHH(self, path):
code = self.symtab.codeFormatter()
code('''
-/** \\file ${{self.c_ident}}.hh
- *
- * Auto generated C++ code started by $__file__:$__line__
- */
-
#ifndef __${{self.c_ident}}_HH__
#define __${{self.c_ident}}_HH__
@@ -555,11 +539,6 @@
def printEnumCC(self, path):
code = self.symtab.codeFormatter()
code('''
-/** \\file ${{self.c_ident}}.hh
- *
- * Auto generated C++ code started by $__file__:$__line__
- */
-
#include
#include
#include
diff --git a/src/python/m5/util/code_formatter.py
b/src/python/m5/util/code_formatter.py
index 0ca8c98..8d726d2 100644
--- a/src/python/m5/util/code_formatter.py
+++ b/src/python/m5/util/code_formatter.py
@@ -154,6 +154,36 @@
def write(self, *args):
f = open(os.path.join(*args), "w")
+name, extension = os.path.splitext(f.name)
+
+# Add a comment to inform which file generated the generated file
+# to make it easier to backtrack and modify generated code
+frame = inspect.currentframe().f_back
+if re.match('\.(cc|hh|c|h)', extension) is not None:
+f.write('''/**
+ * DO NOT EDIT THIS FILE!
+ * File automatically generated by
+ * %s:%s
+ */
+
+''' % (frame.f_code.co_filename, frame.f_lineno))
+elif re.match('\.py', extension) is not None:
+f.write('''#
+# DO NOT EDIT THIS FILE!
+# File automatically
[gem5-dev] Change in gem5/gem5[develop]: mem: Move QoS' MemSinkInterface into gem5::qos
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47300 )
Change subject: mem: Move QoS' MemSinkInterface into gem5::qos
..
mem: Move QoS' MemSinkInterface into gem5::qos
This class has been mistakenly added outside the
qos namespace.
Change-Id: I12c5dc7558a689c771761754e59d78a8010e422f
Signed-off-by: Daniel R. Carvalho
---
M src/mem/qos/QoSMemSinkInterface.py
M src/mem/qos/mem_sink.cc
M src/mem/qos/mem_sink.hh
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/mem/qos/QoSMemSinkInterface.py
b/src/mem/qos/QoSMemSinkInterface.py
index 37ddf78..9b3b89e 100644
--- a/src/mem/qos/QoSMemSinkInterface.py
+++ b/src/mem/qos/QoSMemSinkInterface.py
@@ -38,6 +38,7 @@
class QoSMemSinkInterface(AbstractMemory):
type = 'QoSMemSinkInterface'
cxx_header = "mem/qos/mem_sink.hh"
+cxx_class = 'qos::MemSinkInterface'
def controller(self):
"""
diff --git a/src/mem/qos/mem_sink.cc b/src/mem/qos/mem_sink.cc
index 98a5e3f..f9be06c 100644
--- a/src/mem/qos/mem_sink.cc
+++ b/src/mem/qos/mem_sink.cc
@@ -386,9 +386,9 @@
return mem.recvTimingReq(pkt);
}
-} // namespace qos
-
-QoSMemSinkInterface::QoSMemSinkInterface(const QoSMemSinkInterfaceParams
&_p)
+MemSinkInterface::MemSinkInterface(const QoSMemSinkInterfaceParams &_p)
: AbstractMemory(_p)
{
}
+
+} // namespace qos
diff --git a/src/mem/qos/mem_sink.hh b/src/mem/qos/mem_sink.hh
index 3c229ec..247db22 100644
--- a/src/mem/qos/mem_sink.hh
+++ b/src/mem/qos/mem_sink.hh
@@ -52,12 +52,13 @@
#include "sim/eventq.hh"
struct QoSMemSinkInterfaceParams;
-class QoSMemSinkInterface;
GEM5_DEPRECATED_NAMESPACE(QoS, qos);
namespace qos
{
+class MemSinkInterface;
+
/**
* QoS Memory Sink
*
@@ -177,7 +178,7 @@
/**
* Create pointer to interface of actual media
*/
-QoSMemSinkInterface* const interface;
+MemSinkInterface* const interface;
/** Read request pending */
bool retryRdReq;
@@ -262,19 +263,18 @@
MemSinkCtrlStats stats;
};
-} // namespace qos
-
-class QoSMemSinkInterface : public AbstractMemory
+class MemSinkInterface : public AbstractMemory
{
public:
/** Setting a pointer to the interface */
-void setMemCtrl(qos::MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
+void setMemCtrl(MemSinkCtrl* _ctrl) { ctrl = _ctrl; };
/** Pointer to the controller */
-qos::MemSinkCtrl* ctrl;
+MemSinkCtrl* ctrl;
-QoSMemSinkInterface(const QoSMemSinkInterfaceParams &_p);
+MemSinkInterface(const QoSMemSinkInterfaceParams &_p);
};
+} // namespace qos
#endif /* __MEM_QOS_MEM_SINK_HH__ */
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47300
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: I12c5dc7558a689c771761754e59d78a8010e422f
Gerrit-Change-Number: 47300
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
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
[gem5-dev] Change in gem5/gem5[develop]: ext: Adopt the gem5 namespace in ext/
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47302 )
Change subject: ext: Adopt the gem5 namespace in ext/
..
ext: Adopt the gem5 namespace in ext/
Change-Id: I3da8adffdcfe9e47e88cd85b7b66f6f8e1a1757a
Signed-off-by: Daniel R. Carvalho
---
M ext/sst/ExtMaster.cc
M ext/sst/ExtMaster.hh
M ext/sst/ExtSlave.cc
M ext/sst/ExtSlave.hh
M ext/sst/gem5.cc
M ext/sst/gem5.hh
6 files changed, 92 insertions(+), 71 deletions(-)
diff --git a/ext/sst/ExtMaster.cc b/ext/sst/ExtMaster.cc
index 3afd6b4..e727537 100644
--- a/ext/sst/ExtMaster.cc
+++ b/ext/sst/ExtMaster.cc
@@ -56,10 +56,10 @@
using namespace SST::gem5;
using namespace SST::MemHierarchy;
-ExtMaster::ExtMaster(gem5Component *g, Output , ::ExternalMaster& p,
+ExtMaster::ExtMaster(gem5Component *g, Output , ::gem5::ExternalMaster&
p,
std::string ) :
-Port(n, p), out(o), port(p), simPhase(CONSTRUCTION),
-gem5(g), name(n)
+::gem5::ExternalMaster::Port(n, p), out(o), port(p),
+simPhase(CONSTRUCTION), gem5(g), name(n)
{
Params _p; // will be ignored
nic =
dynamic_cast(gem5->loadModuleWithComponent("memHierarchy.memNIC",
g, _p));
@@ -130,12 +130,12 @@
}
Command cmdI = ev->getCmd(); // command in - SST
-MemCmd::Command cmdO;// command out - gem5
+::gem5::MemCmd::Command cmdO;// command out - gem5
bool data = false;
switch (cmdI) {
-case GetS: cmdO = MemCmd::ReadReq;break;
-case GetX: cmdO = MemCmd::WriteReq; data = true; break;
+case GetS: cmdO = ::gem5::MemCmd::ReadReq;
break;
+case GetX: cmdO = ::gem5::MemCmd::WriteReq; data = true;
break;
case GetSEx:
case PutS:
case PutM:
@@ -158,23 +158,24 @@
CommandString[cmdI]);
}
-Request::FlagsType flags = 0;
+::gem5::Request::FlagsType flags = 0;
if (ev->queryFlag(MemEvent::F_LOCKED))
-flags |= Request::LOCKED_RMW;
+flags |= ::gem5::Request::LOCKED_RMW;
if (ev->queryFlag(MemEvent::F_NONCACHEABLE))
-flags |= Request::UNCACHEABLE;
+flags |= ::gem5::Request::UNCACHEABLE;
if (ev->isLoadLink()) {
assert(cmdI == GetS);
-cmdO = MemCmd::LoadLockedReq;
+cmdO = ::gem5::MemCmd::LoadLockedReq;
} else if (ev->isStoreConditional()) {
assert(cmdI == GetX);
-cmdO = MemCmd::StoreCondReq;
+cmdO = ::gem5::MemCmd::StoreCondReq;
}
-auto req = std::make_shared(ev->getAddr(), ev->getSize(),
flags, 0);
+auto req = std::make_shared<::gem5::Request>(
+ev->getAddr(), ev->getSize(), flags, 0);
req->setContext(ev->getGroupId());
-auto pkt = new Packet(req, cmdO);
+auto pkt = new ::gem5::Packet(req, cmdO);
pkt->allocate();
if (data) {
pkt->setData(ev->getPayload().data());
@@ -186,7 +187,7 @@
}
bool
-ExtMaster::recvTimingResp(PacketPtr pkt) {
+ExtMaster::recvTimingResp(::gem5::PacketPtr pkt) {
if (simPhase == INIT) {
out.fatal(CALL_INFO, 1, "not prepared to handle INIT-phase
traffic\n");
}
diff --git a/ext/sst/ExtMaster.hh b/ext/sst/ExtMaster.hh
index 04e98e5..8b4020b 100644
--- a/ext/sst/ExtMaster.hh
+++ b/ext/sst/ExtMaster.hh
@@ -51,10 +51,11 @@
#include
#include
-#include
+#include
+#include
#include
#include
-#include
+#include
namespace SST {
@@ -70,34 +71,35 @@
class gem5Component;
-class ExtMaster : public ExternalMaster::Port {
+class ExtMaster : public ::gem5::ExternalMaster::Port
+{
enum Phase { CONSTRUCTION, INIT, RUN };
Output& out;
-const ExternalMaster& port;
+const ::gem5::ExternalMaster& port;
Phase simPhase;
gem5Component *const gem5;
const std::string name;
-std::list sendQ;
+std::list<::gem5::PacketPtr> sendQ;
bool blocked() { return !sendQ.empty(); }
MemHierarchy::MemNIC * nic;
-struct SenderState : public Packet::SenderState
+struct SenderState : public ::gem5::Packet::SenderState
{
MemEvent *event;
SenderState(MemEvent* e) : event(e) {}
};
-std::set ranges;
+std::set<::gem5::AddrRange> ranges;
public:
-bool recvTimingResp(PacketPtr);
+bool recvTimingResp(::gem5::PacketPtr);
void recvReqRetry();
-ExtMaster(gem5Component*, Output&, ExternalMaster&, std::string&);
+ExtMaster(gem5Component*, Output&, ::gem5::ExternalMaster&,
std::string&);
void init(unsigned phase);
void setup();
void finish();
diff --git a/ext/sst/ExtSlave.cc b/ext/sst/ExtSlave.cc
index 0e2f8b4..b9a5e78 100644
--- a/ext/sst/ExtSlave.cc
+++ b/ext/sst/ExtSlave.cc
@@ -48,13 +48,15 @@
#undef fatal
#endif
+#include
+
using namespace SST;
using namespace SST::gem5;
using namespace SST::MemHierarchy;
ExtSlave::ExtSlave(gem5Component *g5c, Output ,
[gem5-dev] Change in gem5/gem5[develop]: arch-arm: Rename debug variables
Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/47304 )
Change subject: arch-arm: Rename debug variables
..
arch-arm: Rename debug variables
Pave the way for a "debug" namespace.
Change-Id: I1796711cbde527269637b30b0b09cd06c9e25fa1
Signed-off-by: Daniel R. Carvalho
---
M src/arch/arm/faults.cc
M src/arch/arm/faults.hh
M src/arch/arm/self_debug.cc
3 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index adb1207..d81651b 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -1103,16 +1103,16 @@
} else if (stage2) {
tc->setMiscReg(MISCREG_HPFAR, (faultAddr >> 8) & ~0xf);
tc->setMiscReg(T::HFarIndex, OVAddr);
-} else if (debug > ArmFault::NODEBUG) {
+} else if (debugType > ArmFault::NODEBUG) {
DBGDS32 Rext = tc->readMiscReg(MISCREG_DBGDSCRext);
tc->setMiscReg(T::FarIndex, faultAddr);
-if (debug == ArmFault::BRKPOINT){
+if (debugType == ArmFault::BRKPOINT){
Rext.moe = 0x1;
-} else if (debug == ArmFault::VECTORCATCH){
+} else if (debugType == ArmFault::VECTORCATCH){
Rext.moe = 0x5;
-} else if (debug > ArmFault::VECTORCATCH) {
+} else if (debugType > ArmFault::VECTORCATCH) {
Rext.moe = 0xa;
-fsr.cm = (debug == ArmFault::WPOINT_CM)? 1 : 0;
+fsr.cm = (debugType == ArmFault::WPOINT_CM)? 1 : 0;
}
tc->setMiscReg(T::FsrIndex, fsr);
diff --git a/src/arch/arm/faults.hh b/src/arch/arm/faults.hh
index da05eb9..6d5411f 100644
--- a/src/arch/arm/faults.hh
+++ b/src/arch/arm/faults.hh
@@ -456,7 +456,7 @@
bool stage2;
bool s1ptw;
ArmFault::TranMethod tranMethod;
-ArmFault::DebugType debug;
+ArmFault::DebugType debugType;
public:
AbortFault(Addr _faultAddr, bool _write, TlbEntry::DomainType _domain,
@@ -465,7 +465,8 @@
ArmFault::DebugType _debug = ArmFault::NODEBUG) :
faultAddr(_faultAddr), OVAddr(0), write(_write),
domain(_domain), source(_source), srcEncoded(0),
-stage2(_stage2), s1ptw(false), tranMethod(_tranMethod),
debug(_debug)
+stage2(_stage2), s1ptw(false), tranMethod(_tranMethod),
+debugType(_debug)
{}
bool getFaultVAddr(Addr ) const override;
diff --git a/src/arch/arm/self_debug.cc b/src/arch/arm/self_debug.cc
index 21d4000..13ee2f7 100644
--- a/src/arch/arm/self_debug.cc
+++ b/src/arch/arm/self_debug.cc
@@ -96,8 +96,7 @@
if (p.enable && p.isActive(pc) &&(!to32 || !p.onUse)) {
const DBGBCR ctr = p.getControlReg(tc);
if (p.isEnabled(tc, el, ctr.hmc, ctr.ssc, ctr.pmc)) {
-bool debug = p.test(tc, pc, el, ctr, false);
-if (debug){
+if (p.test(tc, pc, el, ctr, false)) {
if (to32)
p.onUse = true;
return triggerException(tc, pc);
@@ -138,8 +137,7 @@
for (auto : arWatchPoints){
idxtmp ++;
if (p.enable) {
-bool debug = p.test(tc, vaddr, el, write, atomic, size);
-if (debug){
+if (p.test(tc, vaddr, el, write, atomic, size)) {
return triggerWatchpointException(tc, vaddr, write, cm);
}
}
@@ -212,12 +210,8 @@
bool
BrkPoint::testLinkedBk(ThreadContext *tc, Addr vaddr, ExceptionLevel el)
{
-bool debug = false;
const DBGBCR ctr = getControlReg(tc);
-if ((ctr.bt & 0x1) && enable) {
-debug = test(tc, vaddr, el, ctr, true);
-}
-return debug;
+return ((ctr.bt & 0x1) && enable) && test(tc, vaddr, el, ctr, true);
}
bool
@@ -730,12 +724,12 @@
return NoFault;
ExceptionLevel el = (ExceptionLevel) currEL(tc);
-bool debug;
+bool do_debug;
if (fault == nullptr)
-debug = vcExcpt->addressMatching(tc, addr, el);
+do_debug = vcExcpt->addressMatching(tc, addr, el);
else
-debug = vcExcpt->exceptionTrapping(tc, el, fault);
-if (debug) {
+do_debug = vcExcpt->exceptionTrapping(tc, el, fault);
+if (do_debug) {
if (enableTdeTge) {
return std::make_shared(0, 0x22,
EC_PREFETCH_ABORT_TO_HYP);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47304
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: I1796711cbde527269637b30b0b09cd06c9e25fa1
Gerrit-Change-Number: 47304
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho
Gerrit-MessageType: newchange
___
gem5-dev mailing list --
[gem5-dev] Change in gem5/gem5[develop]: base-stats: Fix null addStatGroup
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43012 )
Change subject: base-stats: Fix null addStatGroup
..
base-stats: Fix null addStatGroup
A group must be provided to be added to a stat
group.
Change-Id: I9da42fb12c2a8b258f9f45922a6fb6b7fd41a698
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43012
Tested-by: kokoro
Reviewed-by: Giacomo Travaglini
Maintainer: Giacomo Travaglini
---
M src/base/stats/group.cc
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/stats/group.cc b/src/base/stats/group.cc
index 2350dd5..a66c487 100644
--- a/src/base/stats/group.cc
+++ b/src/base/stats/group.cc
@@ -113,6 +113,7 @@
void
Group::addStatGroup(const char *name, Group *block)
{
+panic_if(!block, "Can't add null stat group %s", name);
panic_if(block == this, "Stat group can't be added to itself");
panic_if(statGroups.find(name) != statGroups.end(),
"Stats of the same group share the same name `%s`.\n", name);
11 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43012
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: I9da42fb12c2a8b258f9f45922a6fb6b7fd41a698
Gerrit-Change-Number: 43012
Gerrit-PatchSet: 13
Gerrit-Owner: Daniel Carvalho
Gerrit-Reviewer: Daniel Carvalho
Gerrit-Reviewer: Giacomo Travaglini
Gerrit-Reviewer: Hoa Nguyen
Gerrit-Reviewer: kokoro
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
[gem5-dev] Change in gem5/gem5[develop]: base: Document the SymbolTable
Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/43248 )
Change subject: base: Document the SymbolTable
..
base: Document the SymbolTable
Add Doxygen documentation to SymbolTable's contents.
Some parameters were renamed to make their purpose
easier to understand.
Change-Id: Ia4f18bf60d3d8eab7a775f34f553d420816d62b9
Signed-off-by: Daniel R. Carvalho
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/43248
Tested-by: kokoro
Reviewed-by: Giacomo Travaglini
Maintainer: Giacomo Travaglini
---
M src/base/loader/symtab.hh
1 file changed, 164 insertions(+), 28 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh
index 03fbb8e..3e287c2 100644
--- a/src/base/loader/symtab.hh
+++ b/src/base/loader/symtab.hh
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2021 Daniel R. Carvalho
* Copyright (c) 2002-2005 The Regents of The University of Michigan
* All rights reserved.
*
@@ -64,16 +65,24 @@
typedef std::shared_ptr SymbolTablePtr;
private:
+/** Vector containing all the symbols in the table. */
typedef std::vector SymbolVector;
-// Map addresses to an index into the symbol vector.
+/** Map addresses to an index into the symbol vector. */
typedef std::multimap AddrMap;
-// Map a symbol name to an index into the symbol vector.
+/** Map a symbol name to an index into the symbol vector. */
typedef std::map NameMap;
SymbolVector symbols;
AddrMap addrMap;
NameMap nameMap;
+/**
+ * Get the first address larger than the given address, if any.
+ *
+ * @param addr The address to compare against.
+ * @param iter An iterator to the larger-address entry.
+ * @return True if successful; false if no larger addresses exist.
+ */
bool
upperBound(Addr addr, AddrMap::const_iterator ) const
{
@@ -87,8 +96,21 @@
return true;
}
+/**
+ * A function that applies an operation on a symbol with respect to a
+ * symbol table. The operation can, for example, simply add the symbol
+ * to the table; modify and insert the symbol; do nothing at all; etc.
+ */
typedef std::function SymTabOp;
+
+/**
+ * Create a derived symbol table by applying an operation on the
symbols
+ * of the current table. The current table is not modified.
+ *
+ * @param op The operation to be applied to the new table.
+ * @return The new table.
+ */
SymbolTablePtr
operate(SymTabOp op) const
{
@@ -98,7 +120,20 @@
return symtab;
}
+/**
+ * A function that applies a condition to the symbol provided to decide
+ * whether the symbol is accepted, or if it must be filtered out.
+ */
typedef std::function SymTabFilter;
+
+/**
+ * Applies a filter to the symbols of the table to generate a new
table.
+ * The filter decides whether the symbols will be inserted in the new
+ * table or not.
+ *
+ * @param filter The filter to be applied.
+ * @return A new table, filtered.
+ */
SymbolTablePtr
filter(SymTabFilter filter) const
{
@@ -111,6 +146,13 @@
return operate(apply_filter);
}
+/**
+ * Generate a new table by applying a filter that only accepts the
symbols
+ * whose binding matches the given binding.
+ *
+ * @param The binding that must be matched.
+ * @return A new table, filtered by binding.
+ */
SymbolTablePtr
filterByBinding(Symbol::Binding binding) const
{
@@ -124,27 +166,66 @@
typedef SymbolVector::iterator iterator;
typedef SymbolVector::const_iterator const_iterator;
+/** @return An iterator to the beginning of the symbol vector. */
const_iterator begin() const { return symbols.begin(); }
+
+/** @return An iterator to the end of the symbol vector. */
const_iterator end() const { return symbols.end(); }
+/** Clears the table. */
void clear();
-// Insert either a single symbol or the contents of an entire symbol
table
-// into this one.
+
+/**
+ * Insert a new symbol in the table if it does not already exist. The
+ * symbol must have a defined name.
+ *
+ * @param symbol The symbol to be inserted.
+ * @return True if successful; false if table already contains the
symbol.
+ */
bool insert(const Symbol );
+
+/**
+ * Copies the symbols of another table to this table if there are no
+ * common symbols between the tables.
+ *
+ * @param symbol The symbol to be inserted.
+ * @return True if successful; false if tables contain any common
symbols.
+ */
bool insert(const SymbolTable );
+
+/**
+ * Verifies whether the table is empty.
+ *
+ *
