from:"Daniel Carvalho \(Gerrit\)"

[gem5-dev] [M] Change in gem5/gem5[develop]: mem-cache: De-virtualize forEachBlk() in tags

2023-06-07 Thread Daniel Carvalho (Gerrit) via gem5-dev

BlkAddr(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.
- */
-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

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/70998?usp=email
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings?usp=email


Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I25527602535c719f46699677a7f70f3e31157f26
Gerrit-Change-Number: 70998
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Nikos Nikoleris 
Gerrit-Reviewer: kokoro 
___
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org

[gem5-dev] [M] Change in gem5/gem5[develop]: mem-cache: De-virtualize forEachBlk() in tags

2023-05-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

 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
--- a/src/arch/x86/linux/linux.hh
+++ b/src/arch/x86/linux/linux.hh
@@ -77,7 +77,6 @@
 class SyscallABI {};
 };

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/arch/x86/linux/se_workload.hh  
b/src/arch/x86/linux/se_workload.hh

index f170776..d8d60e7 100644
--- a/src/arch/x86/linux/se_workload.hh
+++ b/src/arch/x86/linux/se_workload.hh
@@ -96,7 +96,6 @@

 } // namespace X86ISA

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/arch/x86/pseudo_inst_abi.hh  
b/src/arch/x86/pseudo_inst_abi.hh

index 05bf66f..e465c7a 100644
--- a/src/arch/x86/pseudo_inst_abi.hh
+++ b/src/arch/x86/pseudo_inst_abi.hh
@@ -46,7 +46,6 @@
 using State = int;
 };

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi.test.cc b/src/sim/guest_abi.test.cc
index 5b59874..64f4122 100644
--- a/src/sim/guest_abi.test.cc
+++ b/src/sim/guest_abi.test.cc
@@ -98,7 +98,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi/definition.hh  
b/src/sim/guest_abi/definition.hh

index 2857b5b..43aafec 100644
--- a/src/sim/guest_abi/definition.hh
+++ b/src/sim/guest_abi/definition.hh
@@ -35,7 +35,6 @@

 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi/dispatch.hh b/src/sim/guest_abi/dispatch.hh
index 7ada2e2..8846354 100644
--- a/src/sim/guest_abi/dispatch.hh
+++ b/src/sim/guest_abi/dispatch.hh
@@ -43,7 +43,6 @@

 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi/layout.hh b/src/sim/guest_abi/layout.hh
index 0268151..4d469b1 100644
--- a/src/sim/guest_abi/layout.hh
+++ b/src/sim/guest_abi/layout.hh
@@ -38,7 +38,6 @@

 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi/varargs.hh b/src/sim/guest_abi/varargs.hh
index 9bb0478..1a34f20 100644
--- a/src/sim/guest_abi/varargs.hh
+++ b/src/sim/guest_abi/varargs.hh
@@ -39,7 +39,6 @@

 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/proxy_ptr.hh b/src/sim/proxy_ptr.hh
index 03ab947..5e766f7 100644
--- a/src/sim/proxy_ptr.hh
+++ b/src/sim/proxy_ptr.hh
@@ -357,7 +357,6 @@
 return other + a;
 }

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/proxy_ptr.test.cc b/src/sim/proxy_ptr.test.cc
index 6f49d16..57fdb97 100644
--- a/src/sim/proxy_ptr.test.cc
+++ b/src/sim/proxy_ptr.test.cc
@@ -474,7 +474,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/syscall_abi.hh b/src/sim/syscall_abi.hh
index b91dc8e..90dbd97 100644
--- a/src/sim/syscall_abi.hh
+++ b/src/sim/syscall_abi.hh
@@ -75,7 +75,6 @@
 }
 };

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67374?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: I476815491314f4222da43da75c91654b4f3d1228
Gerrit-Change-Number: 67374
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]: sim: Remove a couple of deprecated namespaces

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

,
-{Loader::Symbol::Binding::Local, "symbol3", 0x30},
+loader::Symbol symbols[] = {
+{loader::Symbol::Binding::Local, "symbol", 0x10},
+{loader::Symbol::Binding::Global, "symbol2", 0x20},
+{loader::Symbol::Binding::Local, "symbol3", 0x30},
 };
 simulateSerialization("\n[Section1]\ntest.size=3\n"
 "test.addr_0=16\ntest.symbol_0=symbol\ntest.binding_0=1\n"
 "test.addr_1=32\ntest.symbol_1=symbol2\n"
 "test.addr_2=48\ntest.symbol_2=symbol3\ntest.binding_2=1\n");

-Loader::SymbolTable unserialized_symtab;
+loader::SymbolTable unserialized_symtab;
 CheckpointIn cp(getDirName());
 Serializable::ScopedCheckpointSection scs(cp, "Section1");

@@ -800,22 +800,22 @@
 TEST_F(LoaderSymtabSerializationFixture,
 UnserializationMissingBindingChangeDefault)
 {
-Loader::Symbol symbols[] = {
-{Loader::Symbol::Binding::Local, "symbol", 0x10},
-{Loader::Symbol::Binding::Weak, "symbol2", 0x20},
-{Loader::Symbol::Binding::Local, "symbol3", 0x30},
+loader::Symbol symbols[] = {
+{loader::Symbol::Binding::Local, "symbol", 0x10},
+{loader::Symbol::Binding::Weak, "symbol2", 0x20},
+{loader::Symbol::Binding::Local, "symbol3", 0x30},
 };
 simulateSerialization("\n[Section1]\ntest.size=3\n"
     "test.addr_0=16\ntest.symbol_0=symbol\ntest.binding_0=1\n"
 "test.addr_1=32\ntest.symbol_1=symbol2\n"
 "test.addr_2=48\ntest.symbol_2=symbol3\ntest.binding_2=1\n");

-Loader::SymbolTable unserialized_symtab;
+loader::SymbolTable unserialized_symtab;
 CheckpointIn cp(getDirName());
 Serializable::ScopedCheckpointSection scs(cp, "Section1");

 unserialized_symtab.unserialize("test", cp,
-Loader::Symbol::Binding::Weak);
+loader::Symbol::Binding::Weak);

 // Make sure that the symbols in symtab are present in the
 // unserialized table
diff --git a/src/cpu/profile.hh b/src/cpu/profile.hh
index a5e16d6..68283f5 100644
--- a/src/cpu/profile.hh
+++ b/src/cpu/profile.hh
@@ -43,7 +43,6 @@
 class ThreadContext;
 class FunctionProfile;

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {
 class SymbolTable;
diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index 21ce2aa..3ab7834 100644
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -66,7 +66,6 @@
 class ExecContext;
 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {
 class SymbolTable;
diff --git a/src/sim/process.hh b/src/sim/process.hh
index cece212..d6d30ce 100644
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -49,7 +49,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {
 class ObjectFile;

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67362?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: I87b763fccfcdf720909dfbda9c3fc8f6dea36a61
Gerrit-Change-Number: 67362
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]: fastmodel: Remove the FastModel namespace

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

 {

-GEM5_DEPRECATED_NAMESPACE(FastModel, fastmodel);
 namespace fastmodel
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67363?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: Ic0a42f7349ccf15f8c1dd276a647e7cb2a56c1cb
Gerrit-Change-Number: 67363
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] [S] Change in gem5/gem5[develop]: misc: Remove the m5 namespace

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

, 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
--- a/src/cpu/minor/fetch2.hh
+++ b/src/cpu/minor/fetch2.hh
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc
index 428a8b3..f508d58 100644
--- a/src/cpu/minor/func_unit.cc
+++ b/src/cpu/minor/func_unit.cc
@@ -74,7 +74,6 @@
 opClasses(params.opClasses)
 { }

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/func_unit.hh b/src/cpu/minor/func_unit.hh
index 9400f91..13ae019 100644
--- a/src/cpu/minor/func_unit.hh
+++ b/src/cpu/minor/func_unit.hh
@@ -198,7 +198,6 @@
 { }
 };

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc
index f2fa5be..4b31b26 100644
--- a/src/cpu/minor/lsq.cc
+++ b/src/cpu/minor/lsq.cc
@@ -53,7 +53,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/lsq.hh b/src/cpu/minor/lsq.hh
index 4a95bf7..4d7c351 100644
--- a/src/cpu/minor/lsq.hh
+++ b/src/cpu/minor/lsq.hh
@@ -58,7 +58,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/pipe_data.cc b/src/cpu/minor/pipe_data.cc
index d7f113c..3bda659 100644
--- a/src/cpu/minor/pipe_data.cc
+++ b/src/cpu/minor/pipe_data.cc
@@ -40,7 +40,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/pipe_data.hh b/src/cpu/minor/pipe_data.hh
index 97651b4..15de50e 100644
--- a/src/cpu/minor/pipe_data.hh
+++ b/src/cpu/minor/pipe_data.hh
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/pipeline.cc b/src/cpu/minor/pipeline.cc
index e94181f..c914843 100644
--- a/src/cpu/minor/pipeline.cc
+++ b/src/cpu/minor/pipeline.cc
@@ -51,7 +51,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/pipeline.hh b/src/cpu/minor/pipeline.hh
index ce0ae07..b1c85e3 100644
--- a/src/cpu/minor/pipeline.hh
+++ b/src/cpu/minor/pipeline.hh
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/scoreboard.cc b/src/cpu/minor/scoreboard.cc
index 2bb6966..356fdc7 100644
--- a/src/cpu/minor/scoreboard.cc
+++ b/src/cpu/minor/scoreboard.cc
@@ -44,7 +44,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/scoreboard.hh b/src/cpu/minor/scoreboard.hh
index ac11533..bccb9c5 100644
--- a/src/cpu/minor/scoreboard.hh
+++ b/src/cpu/minor/scoreboard.hh
@@ -56,7 +56,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/stats.cc b/src/cpu/minor/stats.cc
index 187687d..64d4c47 100644
--- a/src/cpu/minor/stats.cc
+++ b/src/cpu/minor/stats.cc
@@ -40,7 +40,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/stats.hh b/src/cpu/minor/stats.hh
index 47b9f0f..1ab81f4 100644
--- a/src/cpu/minor/stats.hh
+++ b/src/cpu/minor/stats.hh
@@ -51,7 +51,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/trace.hh b/src/cpu/minor/trace.hh
index 8a98764..9617d05 100644
--- a/src/cpu/minor/trace.hh
+++ b/src/cpu/minor/trace.hh
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67369?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: I603134248a05c988627bbd3c59c962b085b3b2ad
Gerrit-Change-Number: 67369
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]: base: Remove the Stats namespace

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

);
 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 @@
 UNIT_UNSPECIFIED, statistics::units::Unspecified::get(), \
 "Use statistics::units::Unspecified::get()")

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc
index 2c60b47..266f47e 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -83,7 +83,6 @@
 #undef TRY_CAST
 }

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/sim/power/mathexpr_powermodel.hh  
b/src/sim/power/mathexpr_powermodel.hh

index 25338ee..f05214a 100644
--- a/src/sim/power/mathexpr_powermodel.hh
+++ b/src/sim/power/mathexpr_powermodel.hh
@@ -47,7 +47,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {
 class Info;
diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc
index c388539..99c694a 100644
--- a/src/sim/stat_control.cc
+++ b/src/sim/stat_control.cc
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh
index 22d3134..35d3ea8 100644
--- a/src/sim/stat_control.hh
+++ b/src/sim/stat_control.hh
@@ -48,7 +48,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/sim/stat_register.cc b/src/sim/stat_register.cc
index fb3db1e..5e4bf39 100644
--- a/src/sim/stat_register.cc
+++ b/src/sim/stat_register.cc
@@ -42,7 +42,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/sim/stat_register.hh b/src/sim/stat_register.hh
index d2504f3..e84e8eb 100644
--- a/src/sim/stat_register.hh
+++ b/src/sim/stat_register.hh
@@ -47,7 +47,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67359?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: I80f25af68e03fff3df8316cb4d1d2669687d0fe4
Gerrit-Change-Number: 67359
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] [M] Change in gem5/gem5[develop]: mem-cache: Remove the Prefetcher namespace

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

 a/src/mem/cache/prefetch/signature_path_v2.cc  
b/src/mem/cache/prefetch/signature_path_v2.cc

index 230bc76..b50721c 100644
--- a/src/mem/cache/prefetch/signature_path_v2.cc
+++ b/src/mem/cache/prefetch/signature_path_v2.cc
@@ -37,7 +37,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/signature_path_v2.hh  
b/src/mem/cache/prefetch/signature_path_v2.hh

index b7f745c..417b7ec 100644
--- a/src/mem/cache/prefetch/signature_path_v2.hh
+++ b/src/mem/cache/prefetch/signature_path_v2.hh
@@ -50,7 +50,6 @@

 struct SignaturePathPrefetcherV2Params;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/slim_ampm.cc  
b/src/mem/cache/prefetch/slim_ampm.cc

index 85f8966..950994a 100644
--- a/src/mem/cache/prefetch/slim_ampm.cc
+++ b/src/mem/cache/prefetch/slim_ampm.cc
@@ -33,7 +33,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/slim_ampm.hh  
b/src/mem/cache/prefetch/slim_ampm.hh

index 4a07b9b..54f38d4 100644
--- a/src/mem/cache/prefetch/slim_ampm.hh
+++ b/src/mem/cache/prefetch/slim_ampm.hh
@@ -48,7 +48,6 @@

 struct SlimAMPMPrefetcherParams;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc  
b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc

index 3c9b9eb..0e32115 100644
--- a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc
+++ b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc
@@ -35,7 +35,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh  
b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh

index bee746c..cdd2788 100644
--- a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh
+++ b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh
@@ -53,7 +53,6 @@

 struct STeMSPrefetcherParams;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/stride.cc  
b/src/mem/cache/prefetch/stride.cc

index 1d375a6..0a77b28 100644
--- a/src/mem/cache/prefetch/stride.cc
+++ b/src/mem/cache/prefetch/stride.cc
@@ -60,7 +60,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/stride.hh  
b/src/mem/cache/prefetch/stride.hh

index 27fa917..7e55abe 100644
--- a/src/mem/cache/prefetch/stride.hh
+++ b/src/mem/cache/prefetch/stride.hh
@@ -70,7 +70,6 @@
 }
 struct StridePrefetcherParams;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/tagged.cc  
b/src/mem/cache/prefetch/tagged.cc

index d385ac0..0d4d79b 100644
--- a/src/mem/cache/prefetch/tagged.cc
+++ b/src/mem/cache/prefetch/tagged.cc
@@ -38,7 +38,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/tagged.hh  
b/src/mem/cache/prefetch/tagged.hh

index d7f77a8..5c91f65 100644
--- a/src/mem/cache/prefetch/tagged.hh
+++ b/src/mem/cache/prefetch/tagged.hh
@@ -42,7 +42,6 @@

 struct TaggedPrefetcherParams;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67353?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: I31953be7ce8566576de94c9296c601c9906a
Gerrit-Change-Number: 67353
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 QoS namespace

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

 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  
https://gem5-review.googlesource.com/c/public/gem5/+/67356?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: I2fa66e5fc77f19beaac3251602617704dadaec99
Gerrit-Change-Number: 67356
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-cache: Remove the Encoder namespace

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

;

-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
+++ b/src/base/filters/perfect_bloom_filter.cc
@@ -34,7 +34,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
 namespace bloom_filter
 {

diff --git a/src/base/filters/perfect_bloom_filter.hh  
b/src/base/filters/perfect_bloom_filter.hh

index 65ef015..2bcecb8 100644
--- a/src/base/filters/perfect_bloom_filter.hh
+++ b/src/base/filters/perfect_bloom_filter.hh
@@ -38,7 +38,6 @@

 struct BloomFilterPerfectParams;

-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
 namespace bloom_filter
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67358?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: Ib919285c6270eb53bd29ab534f3f9b5612417bb2
Gerrit-Change-Number: 67358
Gerrit-PatchSet: 2
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]: mem-cache: Remove the Compressor namespace

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

, compression);
 namespace compression
 {

diff --git a/src/mem/cache/compressors/repeated_qwords.cc  
b/src/mem/cache/compressors/repeated_qwords.cc

index 8d5c32d..01e8396 100644
--- a/src/mem/cache/compressors/repeated_qwords.cc
+++ b/src/mem/cache/compressors/repeated_qwords.cc
@@ -41,7 +41,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
 namespace compression
 {

diff --git a/src/mem/cache/compressors/repeated_qwords.hh  
b/src/mem/cache/compressors/repeated_qwords.hh

index 3e900a1..25deb1f 100644
--- a/src/mem/cache/compressors/repeated_qwords.hh
+++ b/src/mem/cache/compressors/repeated_qwords.hh
@@ -46,7 +46,6 @@

 struct RepeatedQwordsCompressorParams;

-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
 namespace compression
 {

diff --git a/src/mem/cache/compressors/zero.cc  
b/src/mem/cache/compressors/zero.cc

index 42a3c7c..3dca1ec 100644
--- a/src/mem/cache/compressors/zero.cc
+++ b/src/mem/cache/compressors/zero.cc
@@ -41,7 +41,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
 namespace compression
 {

diff --git a/src/mem/cache/compressors/zero.hh  
b/src/mem/cache/compressors/zero.hh

index 6e8ce34..5ab994f 100644
--- a/src/mem/cache/compressors/zero.hh
+++ b/src/mem/cache/compressors/zero.hh
@@ -46,7 +46,6 @@

 struct ZeroCompressorParams;

-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
 namespace compression
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67354?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: Ibbcc8221ed6042d55f56a94bf499a4c1c564ea82
Gerrit-Change-Number: 67354
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-cache: Remove the ReplacementPolicy namespace

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

/replacement_policies/ship_rp.hh  
b/src/mem/cache/replacement_policies/ship_rp.hh

index fa27540..edf4ff5 100644
--- a/src/mem/cache/replacement_policies/ship_rp.hh
+++ b/src/mem/cache/replacement_policies/ship_rp.hh
@@ -51,7 +51,6 @@
 struct SHiPMemRPParams;
 struct SHiPPCRPParams;

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {

diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.cc  
b/src/mem/cache/replacement_policies/tree_plru_rp.cc

index 2ee987c..5014785 100644
--- a/src/mem/cache/replacement_policies/tree_plru_rp.cc
+++ b/src/mem/cache/replacement_policies/tree_plru_rp.cc
@@ -43,7 +43,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {

diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.hh  
b/src/mem/cache/replacement_policies/tree_plru_rp.hh

index 3356704..1f7e91c 100644
--- a/src/mem/cache/replacement_policies/tree_plru_rp.hh
+++ b/src/mem/cache/replacement_policies/tree_plru_rp.hh
@@ -80,7 +80,6 @@

 struct TreePLRURPParams;

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {

diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.cc  
b/src/mem/cache/replacement_policies/weighted_lru_rp.cc

index ed6a7f6..ac8fd10 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
@@ -39,7 +39,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 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 bc0e573..117b73b 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.hh
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.hh
@@ -42,7 +42,6 @@

 struct WeightedLRURPParams;

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {

diff --git a/src/mem/cache/tags/sector_tags.hh  
b/src/mem/cache/tags/sector_tags.hh

index c646212..bad1321 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -47,7 +47,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {
 class Base;

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67352?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: If4904706b897999e9200b163d47679519f01e4d4
Gerrit-Change-Number: 67352
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 Debug namespace

2023-01-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

ch/x86/linux/linux.hh
+++ b/src/arch/x86/linux/linux.hh
@@ -77,7 +77,6 @@
 class SyscallABI {};
 };

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/arch/x86/linux/se_workload.hh  
b/src/arch/x86/linux/se_workload.hh

index f170776..d8d60e7 100644
--- a/src/arch/x86/linux/se_workload.hh
+++ b/src/arch/x86/linux/se_workload.hh
@@ -96,7 +96,6 @@

 } // namespace X86ISA

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/arch/x86/pseudo_inst_abi.hh  
b/src/arch/x86/pseudo_inst_abi.hh

index 05bf66f..e465c7a 100644
--- a/src/arch/x86/pseudo_inst_abi.hh
+++ b/src/arch/x86/pseudo_inst_abi.hh
@@ -46,7 +46,6 @@
 using State = int;
 };

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi.test.cc b/src/sim/guest_abi.test.cc
index 5b59874..64f4122 100644
--- a/src/sim/guest_abi.test.cc
+++ b/src/sim/guest_abi.test.cc
@@ -98,7 +98,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi/definition.hh  
b/src/sim/guest_abi/definition.hh

index 2857b5b..43aafec 100644
--- a/src/sim/guest_abi/definition.hh
+++ b/src/sim/guest_abi/definition.hh
@@ -35,7 +35,6 @@

 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi/dispatch.hh b/src/sim/guest_abi/dispatch.hh
index 7ada2e2..8846354 100644
--- a/src/sim/guest_abi/dispatch.hh
+++ b/src/sim/guest_abi/dispatch.hh
@@ -43,7 +43,6 @@

 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi/layout.hh b/src/sim/guest_abi/layout.hh
index 0268151..4d469b1 100644
--- a/src/sim/guest_abi/layout.hh
+++ b/src/sim/guest_abi/layout.hh
@@ -38,7 +38,6 @@

 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/guest_abi/varargs.hh b/src/sim/guest_abi/varargs.hh
index 9bb0478..1a34f20 100644
--- a/src/sim/guest_abi/varargs.hh
+++ b/src/sim/guest_abi/varargs.hh
@@ -39,7 +39,6 @@

 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/proxy_ptr.hh b/src/sim/proxy_ptr.hh
index 03ab947..5e766f7 100644
--- a/src/sim/proxy_ptr.hh
+++ b/src/sim/proxy_ptr.hh
@@ -357,7 +357,6 @@
 return other + a;
 }

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/proxy_ptr.test.cc b/src/sim/proxy_ptr.test.cc
index 6f49d16..57fdb97 100644
--- a/src/sim/proxy_ptr.test.cc
+++ b/src/sim/proxy_ptr.test.cc
@@ -474,7 +474,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {

diff --git a/src/sim/syscall_abi.hh b/src/sim/syscall_abi.hh
index b91dc8e..90dbd97 100644
--- a/src/sim/syscall_abi.hh
+++ b/src/sim/syscall_abi.hh
@@ -75,7 +75,6 @@
 }
 };

-GEM5_DEPRECATED_NAMESPACE(GuestABI, guest_abi);
 namespace guest_abi
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67374?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: I476815491314f4222da43da75c91654b4f3d1228
Gerrit-Change-Number: 67374
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 a couple of deprecated namespaces

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

-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 Linux namespace

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

/fetch2.hh
+++ b/src/cpu/minor/fetch2.hh
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc
index 428a8b3..f508d58 100644
--- a/src/cpu/minor/func_unit.cc
+++ b/src/cpu/minor/func_unit.cc
@@ -74,7 +74,6 @@
 opClasses(params.opClasses)
 { }

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/func_unit.hh b/src/cpu/minor/func_unit.hh
index 9400f91..13ae019 100644
--- a/src/cpu/minor/func_unit.hh
+++ b/src/cpu/minor/func_unit.hh
@@ -198,7 +198,6 @@
 { }
 };

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc
index f2fa5be..4b31b26 100644
--- a/src/cpu/minor/lsq.cc
+++ b/src/cpu/minor/lsq.cc
@@ -53,7 +53,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/lsq.hh b/src/cpu/minor/lsq.hh
index 4a95bf7..4d7c351 100644
--- a/src/cpu/minor/lsq.hh
+++ b/src/cpu/minor/lsq.hh
@@ -58,7 +58,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/pipe_data.cc b/src/cpu/minor/pipe_data.cc
index d7f113c..3bda659 100644
--- a/src/cpu/minor/pipe_data.cc
+++ b/src/cpu/minor/pipe_data.cc
@@ -40,7 +40,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/pipe_data.hh b/src/cpu/minor/pipe_data.hh
index 97651b4..15de50e 100644
--- a/src/cpu/minor/pipe_data.hh
+++ b/src/cpu/minor/pipe_data.hh
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/pipeline.cc b/src/cpu/minor/pipeline.cc
index e94181f..c914843 100644
--- a/src/cpu/minor/pipeline.cc
+++ b/src/cpu/minor/pipeline.cc
@@ -51,7 +51,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/pipeline.hh b/src/cpu/minor/pipeline.hh
index ce0ae07..b1c85e3 100644
--- a/src/cpu/minor/pipeline.hh
+++ b/src/cpu/minor/pipeline.hh
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/scoreboard.cc b/src/cpu/minor/scoreboard.cc
index 2bb6966..356fdc7 100644
--- a/src/cpu/minor/scoreboard.cc
+++ b/src/cpu/minor/scoreboard.cc
@@ -44,7 +44,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/scoreboard.hh b/src/cpu/minor/scoreboard.hh
index ac11533..bccb9c5 100644
--- a/src/cpu/minor/scoreboard.hh
+++ b/src/cpu/minor/scoreboard.hh
@@ -56,7 +56,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/stats.cc b/src/cpu/minor/stats.cc
index 187687d..64d4c47 100644
--- a/src/cpu/minor/stats.cc
+++ b/src/cpu/minor/stats.cc
@@ -40,7 +40,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/stats.hh b/src/cpu/minor/stats.hh
index 47b9f0f..1ab81f4 100644
--- a/src/cpu/minor/stats.hh
+++ b/src/cpu/minor/stats.hh
@@ -51,7 +51,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {

diff --git a/src/cpu/minor/trace.hh b/src/cpu/minor/trace.hh
index 8a98764..9617d05 100644
--- a/src/cpu/minor/trace.hh
+++ b/src/cpu/minor/trace.hh
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Minor, minor);
 namespace minor
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67369?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: I603134248a05c988627bbd3c59c962b085b3b2ad
Gerrit-Change-Number: 67369
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 FreeBSD namespace

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

/object_file.hh
@@ -55,7 +55,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {

diff --git a/src/base/loader/raw_image.hh b/src/base/loader/raw_image.hh
index 7321ea4..29f4340 100644
--- a/src/base/loader/raw_image.hh
+++ b/src/base/loader/raw_image.hh
@@ -35,7 +35,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {

diff --git a/src/base/loader/symtab.cc b/src/base/loader/symtab.cc
index f2f54e9..941ea10 100644
--- a/src/base/loader/symtab.cc
+++ b/src/base/loader/symtab.cc
@@ -37,7 +37,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {

diff --git a/src/base/loader/symtab.hh b/src/base/loader/symtab.hh
index e48e400..2e50523 100644
--- a/src/base/loader/symtab.hh
+++ b/src/base/loader/symtab.hh
@@ -44,7 +44,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {

diff --git a/src/cpu/profile.hh b/src/cpu/profile.hh
index a5e16d6..68283f5 100644
--- a/src/cpu/profile.hh
+++ b/src/cpu/profile.hh
@@ -43,7 +43,6 @@
 class ThreadContext;
 class FunctionProfile;

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {
 class SymbolTable;
diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh
index 21ce2aa..3ab7834 100644
--- a/src/cpu/static_inst.hh
+++ b/src/cpu/static_inst.hh
@@ -66,7 +66,6 @@
 class ExecContext;
 class ThreadContext;

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {
 class SymbolTable;
diff --git a/src/sim/process.hh b/src/sim/process.hh
index cece212..d6d30ce 100644
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -49,7 +49,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Loader, loader);
 namespace loader
 {
 class ObjectFile;

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67362?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: I87b763fccfcdf720909dfbda9c3fc8f6dea36a61
Gerrit-Change-Number: 67362
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 BloomFilter namespace

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

/base/filters/perfect_bloom_filter.cc
@@ -34,7 +34,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
 namespace bloom_filter
 {

diff --git a/src/base/filters/perfect_bloom_filter.hh  
b/src/base/filters/perfect_bloom_filter.hh

index 65ef015..2bcecb8 100644
--- a/src/base/filters/perfect_bloom_filter.hh
+++ b/src/base/filters/perfect_bloom_filter.hh
@@ -38,7 +38,6 @@

 struct BloomFilterPerfectParams;

-GEM5_DEPRECATED_NAMESPACE(BloomFilter, bloom_filter);
 namespace bloom_filter
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67358?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: Ib919285c6270eb53bd29ab534f3f9b5612417bb2
Gerrit-Change-Number: 67358
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 Encoder namespace

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/signature_path_v2.hh  
b/src/mem/cache/prefetch/signature_path_v2.hh

index b7f745c..417b7ec 100644
--- a/src/mem/cache/prefetch/signature_path_v2.hh
+++ b/src/mem/cache/prefetch/signature_path_v2.hh
@@ -50,7 +50,6 @@

 struct SignaturePathPrefetcherV2Params;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/slim_ampm.cc  
b/src/mem/cache/prefetch/slim_ampm.cc

index 85f8966..950994a 100644
--- a/src/mem/cache/prefetch/slim_ampm.cc
+++ b/src/mem/cache/prefetch/slim_ampm.cc
@@ -33,7 +33,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/slim_ampm.hh  
b/src/mem/cache/prefetch/slim_ampm.hh

index 4a07b9b..54f38d4 100644
--- a/src/mem/cache/prefetch/slim_ampm.hh
+++ b/src/mem/cache/prefetch/slim_ampm.hh
@@ -48,7 +48,6 @@

 struct SlimAMPMPrefetcherParams;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc  
b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc

index 3c9b9eb..0e32115 100644
--- a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc
+++ b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.cc
@@ -35,7 +35,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh  
b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh

index bee746c..cdd2788 100644
--- a/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh
+++ b/src/mem/cache/prefetch/spatio_temporal_memory_streaming.hh
@@ -53,7 +53,6 @@

 struct STeMSPrefetcherParams;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/stride.cc  
b/src/mem/cache/prefetch/stride.cc

index 1d375a6..0a77b28 100644
--- a/src/mem/cache/prefetch/stride.cc
+++ b/src/mem/cache/prefetch/stride.cc
@@ -60,7 +60,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/stride.hh  
b/src/mem/cache/prefetch/stride.hh

index 27fa917..7e55abe 100644
--- a/src/mem/cache/prefetch/stride.hh
+++ b/src/mem/cache/prefetch/stride.hh
@@ -70,7 +70,6 @@
 }
 struct StridePrefetcherParams;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/tagged.cc  
b/src/mem/cache/prefetch/tagged.cc

index d385ac0..0d4d79b 100644
--- a/src/mem/cache/prefetch/tagged.cc
+++ b/src/mem/cache/prefetch/tagged.cc
@@ -38,7 +38,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {

diff --git a/src/mem/cache/prefetch/tagged.hh  
b/src/mem/cache/prefetch/tagged.hh

index d7f77a8..5c91f65 100644
--- a/src/mem/cache/prefetch/tagged.hh
+++ b/src/mem/cache/prefetch/tagged.hh
@@ -42,7 +42,6 @@

 struct TaggedPrefetcherParams;

-GEM5_DEPRECATED_NAMESPACE(Prefetcher, prefetch);
 namespace prefetch
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67353?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: I31953be7ce8566576de94c9296c601c9906a
Gerrit-Change-Number: 67353
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 Compressor namespace

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

/repeated_qwords.cc
@@ -41,7 +41,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
 namespace compression
 {

diff --git a/src/mem/cache/compressors/repeated_qwords.hh  
b/src/mem/cache/compressors/repeated_qwords.hh

index 3e900a1..25deb1f 100644
--- a/src/mem/cache/compressors/repeated_qwords.hh
+++ b/src/mem/cache/compressors/repeated_qwords.hh
@@ -46,7 +46,6 @@

 struct RepeatedQwordsCompressorParams;

-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
 namespace compression
 {

diff --git a/src/mem/cache/compressors/zero.cc  
b/src/mem/cache/compressors/zero.cc

index 42a3c7c..3dca1ec 100644
--- a/src/mem/cache/compressors/zero.cc
+++ b/src/mem/cache/compressors/zero.cc
@@ -41,7 +41,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
 namespace compression
 {

diff --git a/src/mem/cache/compressors/zero.hh  
b/src/mem/cache/compressors/zero.hh

index 6e8ce34..5ab994f 100644
--- a/src/mem/cache/compressors/zero.hh
+++ b/src/mem/cache/compressors/zero.hh
@@ -46,7 +46,6 @@

 struct ZeroCompressorParams;

-GEM5_DEPRECATED_NAMESPACE(Compressor, compression);
 namespace compression
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67354?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: Ibbcc8221ed6042d55f56a94bf499a4c1c564ea82
Gerrit-Change-Number: 67354
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 Stats namespace

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

 @@
 UNIT_UNSPECIFIED, statistics::units::Unspecified::get(), \
 "Use statistics::units::Unspecified::get()")

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc
index 2c60b47..266f47e 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -83,7 +83,6 @@
 #undef TRY_CAST
 }

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/sim/power/mathexpr_powermodel.hh  
b/src/sim/power/mathexpr_powermodel.hh

index 25338ee..f05214a 100644
--- a/src/sim/power/mathexpr_powermodel.hh
+++ b/src/sim/power/mathexpr_powermodel.hh
@@ -47,7 +47,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {
 class Info;
diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc
index c388539..99c694a 100644
--- a/src/sim/stat_control.cc
+++ b/src/sim/stat_control.cc
@@ -57,7 +57,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh
index 22d3134..35d3ea8 100644
--- a/src/sim/stat_control.hh
+++ b/src/sim/stat_control.hh
@@ -48,7 +48,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/sim/stat_register.cc b/src/sim/stat_register.cc
index fb3db1e..5e4bf39 100644
--- a/src/sim/stat_register.cc
+++ b/src/sim/stat_register.cc
@@ -42,7 +42,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {

diff --git a/src/sim/stat_register.hh b/src/sim/stat_register.hh
index d2504f3..e84e8eb 100644
--- a/src/sim/stat_register.hh
+++ b/src/sim/stat_register.hh
@@ -47,7 +47,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
 namespace statistics
 {


--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67359?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: I80f25af68e03fff3df8316cb4d1d2669687d0fe4
Gerrit-Change-Number: 67359
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 QoS namespace

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

/public/gem5/+/67356?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: I2fa66e5fc77f19beaac3251602617704dadaec99
Gerrit-Change-Number: 67356
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 ReplacementPolicy namespace

2023-01-14 Thread Daniel Carvalho (Gerrit) via gem5-dev

;

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {

diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.cc  
b/src/mem/cache/replacement_policies/tree_plru_rp.cc

index 2ee987c..5014785 100644
--- a/src/mem/cache/replacement_policies/tree_plru_rp.cc
+++ b/src/mem/cache/replacement_policies/tree_plru_rp.cc
@@ -43,7 +43,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {

diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.hh  
b/src/mem/cache/replacement_policies/tree_plru_rp.hh

index 3356704..1f7e91c 100644
--- a/src/mem/cache/replacement_policies/tree_plru_rp.hh
+++ b/src/mem/cache/replacement_policies/tree_plru_rp.hh
@@ -80,7 +80,6 @@

 struct TreePLRURPParams;

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {

diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.cc  
b/src/mem/cache/replacement_policies/weighted_lru_rp.cc

index ed6a7f6..ac8fd10 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
@@ -39,7 +39,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 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 bc0e573..117b73b 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.hh
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.hh
@@ -42,7 +42,6 @@

 struct WeightedLRURPParams;

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {

diff --git a/src/mem/cache/tags/sector_tags.hh  
b/src/mem/cache/tags/sector_tags.hh

index c646212..bad1321 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -47,7 +47,6 @@
 namespace gem5
 {

-GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
 namespace replacement_policy
 {
 class Base;

--
To view, visit  
https://gem5-review.googlesource.com/c/public/gem5/+/67352?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: If4904706b897999e9200b163d47679519f01e4d4
Gerrit-Change-Number: 67352
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: Fix signature of SatCounter::saturate()

2022-12-18 Thread Daniel Carvalho (Gerrit) via gem5-dev

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()

2022-12-18 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2022-02-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2022-02-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2022-02-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

opedCheckpointSection scs(cp, "Section1");
+
+gtestLogOutput.str("");
+globals.unserialize(cp);
+ASSERT_THAT(gtestLogOutput.str(), ::testing::StrEq(""));
+ASSERT_EQ(globals.unserializedCurTick, );
+}
+
+/**
+ * Test that unserialization fails when there are no version tags in the
+ * checkpoint.
+ */
+TEST_F(GlobalsSerializationFixture, UnserializationCptNoVersionTags)
+{
+version_tags = {};
+simulateSerialization("\n[Section1]\ncurTick=\n");
+
+// Unserialization
+Globals globals;
+CheckpointIn cp(getDirName());
+Serializable::ScopedCheckpointSection scs(cp, "Section1");
+
+gtestLogOutput.str("");
+globals.unserialize(cp);
+ASSERT_THAT(gtestLogOutput.str(),
+::testing::HasSubstr("Checkpoint uses an old versioning scheme."));
+ASSERT_EQ(globals.unserializedCurTick, );
+}
+
+/** Test that a warning is thrown when the cpt misses any of gem5's tags.  
*/

+TEST_F(GlobalsSerializationFixture, UnserializationCptMissingVersionTags)
+{
+version_tags = { "first-tag-un", "second-tag-un", "third-tag-un",
+"fourth-tag-un" };
+simulateSerialization("\n[Section1]\ncurTick=\n"
+"version_tags=second-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::HasSubstr(
+"warn:   first-tag-un\nwarn:   third-tag-un\n"));
+ASSERT_EQ(globals.unserializedCurTick, );
+}
+
+/** Test that a warning is thrown when gem5 misses any of the cpt's tags.  
*/

+TEST_F(GlobalsSerializationFixture, UnserializationGem5MissingVersionTags)
+{
+version_tags = { "first-tag-un", "second-tag-un", "third-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::HasSubstr("warn:   fourth-tag-un\n"));
+ASSERT_EQ(globals.unserializedCurTick, );
+}
+
+/**
+ * Test that unserialization fails when there are is no cur tick in the
+ * checkpoint.
+ */
+TEST_F(GlobalsSerializationFixtureDeathTest, UnserializationCptNoCurTick)
+{
+simulateSerialization("\n[Section1]\n");
+
+Globals globals;
+CheckpointIn cp(getDirName());
+Serializable::ScopedCheckpointSection scs(cp, "Section1");
+ASSERT_ANY_THROW(globals.unserialize(cp));
+}

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43593
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: Ia47e750df4cbdb91a0ab0498819f4e3451d74830
Gerrit-Change-Number: 43593
Gerrit-PatchSet: 15
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby Bruce 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: kokoro 
Gerrit-CC: Giacomo Travaglini 
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 gem5 events

2022-02-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-12-20 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-12-19 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-09-22 Thread Daniel Carvalho (Gerrit) via gem5-dev

ol::Binding::Local, "symbol", 0x10},
+{Loader::Symbol::Binding::Global, "symbol2", 0x20},
+{Loader::Symbol::Binding::Local, "symbol3", 0x30},
+};
+simulateSerialization("\n[Section1]\ntest.size=3\n"
+"test.addr_0=16\ntest.symbol_0=symbol\ntest.binding_0=1\n"
+"test.addr_1=32\ntest.symbol_1=symbol2\n"
+"test.addr_2=48\ntest.symbol_2=symbol3\ntest.binding_2=1\n");
+
+Loader::SymbolTable unserialized_symtab;
+CheckpointIn cp(getDirName());
+Serializable::ScopedCheckpointSection scs(cp, "Section1");
+
+unserialized_symtab.unserialize("test", cp);
+
+// Make sure that the symbols in symtab are present in the
+// unserialized table
+ASSERT_TRUE(checkTable(unserialized_symtab, {symbols[0], symbols[1],
+symbols[2]}));
+}
+
+/**
+ * Test unserialization missing binding with a different default value.
+ * @todo Since there is no way to create a checkpoint without binding  
anymore,

+ * this functionality should be deprecated at some point.
+ */
+TEST_F(LoaderSymtabSerializationFixture,
+UnserializationMissingBindingChangeDefault)
+{
+Loader::Symbol symbols[] = {
+{Loader::Symbol::Binding::Local, "symbol", 0x10},
+{Loader::Symbol::Binding::Weak, "symbol2", 0x20},
+{Loader::Symbol::Binding::Local, "symbol3", 0x30},
+};
+simulateSerialization("\n[Section1]\ntest.size=3\n"
+"test.addr_0=16\ntest.symbol_0=symbol\ntest.binding_0=1\n"
+"test.addr_1=32\ntest.symbol_1=symbol2\n"
+"test.addr_2=48\ntest.symbol_2=symbol3\ntest.binding_2=1\n");
+
+Loader::SymbolTable unserialized_symtab;
+CheckpointIn cp(getDirName());
+Serializable::ScopedCheckpointSection scs(cp, "Section1");
+
+unserialized_symtab.unserialize("test", cp,
+Loader::Symbol::Binding::Weak);
+
+// Make sure that the symbols in symtab are present in the
+// unserialized table
+ASSERT_TRUE(checkTable(unserialized_symtab, {symbols[0], symbols[1],
+symbols[2]}));
+}

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43250
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: I81c14826ab629439897235cbaaf79047e603ff8d
Gerrit-Change-Number: 43250
Gerrit-PatchSet: 16
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Gabe Black 
Gerrit-Reviewer: kokoro 
Gerrit-CC: Andreas Sandberg 
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 sim/serialize_handlers

2021-09-21 Thread Daniel Carvalho (Gerrit) via gem5-dev

parser;
+std::string value("");
+
+// Zero
+EXPECT_TRUE(parser.parse("0", value));
+EXPECT_EQ("0", value);
+
+// Booleans
+EXPECT_TRUE(parser.parse("true", value));
+EXPECT_EQ("true", value);
+EXPECT_TRUE(parser.parse("false", value));
+EXPECT_EQ("false", value);
+
+// 8-bit values
+EXPECT_TRUE(parser.parse("255", value));
+EXPECT_EQ("255", value);
+EXPECT_TRUE(parser.parse("-128", value));
+EXPECT_EQ("-128", value);
+
+// 16-bit values
+EXPECT_TRUE(parser.parse("1000", value));
+EXPECT_EQ("1000", value);
+EXPECT_TRUE(parser.parse("-1000", value));
+EXPECT_EQ("-1000", value);
+
+// 32-bit values
+EXPECT_TRUE(parser.parse("2147483648", value));
+EXPECT_EQ("2147483648", value);
+EXPECT_TRUE(parser.parse("-1073741824", value));
+EXPECT_EQ("-1073741824", value);
+
+// Doubles
+EXPECT_TRUE(parser.parse("123456.789", value));
+EXPECT_EQ("123456.789", value);
+EXPECT_TRUE(parser.parse("-123456.789", value));
+EXPECT_EQ("-123456.789", value);
+EXPECT_TRUE(parser.parse("9.87654e+06", value));
+EXPECT_EQ("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_TRUE(parser.parse("Test", value));
+EXPECT_EQ("Test", value);
+}
+
+TEST(SerializeTest, ShowParamInt8)
+{
+ShowParam parser;
+std::stringstream ss;
+
+parser.show(ss, 0);
+EXPECT_EQ("0", ss.str());
+ss.str("");
+parser.show(ss, 127);
+EXPECT_EQ("127", ss.str());
+ss.str("");
+parser.show(ss, -128);
+EXPECT_EQ("-128", ss.str());
+ss.str("");
+}
+
+TEST(SerializeTest, ShowParamUint32)
+{
+ShowParam parser;
+std::stringstream ss;
+
+parser.show(ss, 0);
+EXPECT_EQ("0", ss.str());
+ss.str("");
+parser.show(ss, 255);
+EXPECT_EQ("255", ss.str());
+ss.str("");
+parser.show(ss, 1000);
+EXPECT_EQ("1000", ss.str());
+ss.str("");
+parser.show(ss, 2147483648);
+EXPECT_EQ("2147483648", ss.str());
+ss.str("");
+parser.show(ss, (double)123456.789);
+EXPECT_EQ("123456", ss.str());
+ss.str("");
+parser.show(ss, 9.87654e+06);
+EXPECT_EQ("9876540", ss.str());
+ss.str("");
+}
+
+/**
+ * Test converting doubles to strings. Floating numbers are expected to
+ * have 6-digit precision.
+ */
+TEST(SerializeTest, ShowParamDouble)
+{
+ShowParam parser;
+std::stringstream ss;
+
+parser.show(ss, 0);
+EXPECT_EQ("0", ss.str());
+ss.str("");
+parser.show(ss, 255);
+EXPECT_EQ("255", ss.str());
+ss.str("");
+parser.show(ss, -1000);
+EXPECT_EQ("-1000", ss.str());
+ss.str("");
+parser.show(ss, 123456.789);
+EXPECT_EQ("123457", ss.str());
+ss.str("");
+parser.show(ss, -123456.789);
+EXPECT_EQ("-123457", ss.str());
+ss.str("");
+parser.show(ss, 1234567.89);
+EXPECT_EQ("1.23457e+06", ss.str());
+    ss.str("");
+parser.show(ss, -1234567.89);
+EXPECT_EQ("-1.23457e+06", ss.str());
+ss.str("");
+parser.show(ss, 9.87654e+06);
+EXPECT_EQ("9.87654e+06", ss.str());
+ss.str("");
+}
+
+TEST(SerializeTest, ShowParamBool)
+{
+ShowParam parser;
+std::stringstream ss;
+
+parser.show(ss, true);
+EXPECT_EQ("true", ss.str());
+ss.str("");
+parser.show(ss, false);
+EXPECT_EQ("false", ss.str());
+ss.str("");
+}
+
+TEST(SerializeTest, ShowParamChar)
+{
+ShowParam parser;
+std::stringstream ss;
+
+parser.show(ss, 'E');
+EXPECT_EQ("69", ss.str()); // int('E')=69
+ss.str("");
+parser.show(ss, 'a');
+EXPECT_EQ("97", ss.str()); // int('a')=97
+ss.str("");
+}
+
+TEST(SerializeTest, ShowParamString)
+{
+ShowParam parser;
+std::stringstream ss;
+
+parser.show(ss, "test");
+EXPECT_EQ("test", ss.str());
+ss.str("");
+parser.show(ss, "tEsT");
+EXPECT_EQ("tEsT", ss.str());
+ss.str("");
+}

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38776
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: I1128c7adb12a3c7d091e26db13733ba45e1e61fe
Gerrit-Change-Number: 38776
Gerrit-PatchSet: 26
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Gabe Black 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: kokoro 
Gerrit-CC: Jason Lowe-Power 
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]: arch-arm: Fix memory leak of PMU events

2021-09-21 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-07-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

s);
 for (int i = 0; i < num_values2; i++) {
 stor2.sample(values2[i].value, values2[i].numSamples);
 }
 statistics::DistData data2;
-stor2.prepare(, data2);
+stor2.prepare(, data2);

 // Perform the merge
 stor.add();
 statistics::DistData merge_data;
-stor.prepare(, merge_data);
+stor.prepare(, merge_data);

 // Setup expected data. Buckets are:
 //   Bkt0=[0,32[, Bkt1=[32,64[, Bkt2=[64,96[, Bkt3=[96,128[
@@ -1036,11 +1001,10 @@
 statistics::DistData data;
 statistics::DistData expected_data;
 statistics::SampleStor::Params params;
-MockInfo info();

 // Simple test with one value being sampled
 stor.sample(values[0].value, values[0].numSamples);
-stor.prepare(, data);
+stor.prepare(, data);
 val = values[0].value * values[0].numSamples;
 expected_data.type = statistics::Deviation;
 expected_data.sum = val;
@@ -1056,7 +1020,7 @@
 expected_data.squares = 0;
 expected_data.samples = 0;
 stor.reset(nullptr);
-stor.prepare(, data);
+stor.prepare(, data);
 ASSERT_EQ(data.type, expected_data.type);
 ASSERT_EQ(data.sum, expected_data.sum);
 ASSERT_EQ(data.squares, expected_data.squares);
@@ -1071,7 +1035,7 @@
 expected_data.squares += values[i].value * val;
 expected_data.samples += values[i].numSamples;
 }
-stor.prepare(, data);
+stor.prepare(, data);
 ASSERT_EQ(data.type, expected_data.type);
 ASSERT_EQ(data.sum, expected_data.sum);
 ASSERT_EQ(data.squares, expected_data.squares);
@@ -1086,12 +1050,11 @@
 statistics::Counter num_samples = 5;
 statistics::DistData data;
 statistics::SampleStor::Params params;
-MockInfo info();

 ASSERT_EQ(stor.size(), 1);
 stor.sample(val, num_samples);
 ASSERT_EQ(stor.size(), 1);
-stor.prepare(, data);
+stor.prepare(, data);
 ASSERT_EQ(stor.size(), 1);
 stor.reset(nullptr);
 ASSERT_EQ(stor.size(), 1);
@@ -1130,11 +1093,10 @@
 statistics::DistData data;
 statistics::DistData expected_data;
 statistics::AvgSampleStor::Params params;
-MockInfo info();

 // Simple test with one value being sampled
 stor.sample(values[0].value, values[0].numSamples);
-stor.prepare(, data);
+stor.prepare(, data);
 val = values[0].value * values[0].numSamples;
 expected_data.type = statistics::Deviation;
 expected_data.sum = val;
@@ -1150,7 +1112,7 @@
 expected_data.sum = 0;
 expected_data.squares = 0;
 stor.reset(nullptr);
-stor.prepare(, data);
+stor.prepare(, data);
 ASSERT_EQ(data.type, expected_data.type);
 ASSERT_EQ(data.sum, expected_data.sum);
 ASSERT_EQ(data.squares, expected_data.squares);
@@ -1166,7 +1128,7 @@
 expected_data.sum += val;
 expected_data.squares += values[i].value * val;
 }
-stor.prepare(, data);
+stor.prepare(, data);
 ASSERT_EQ(data.type, expected_data.type);
 ASSERT_EQ(data.sum, expected_data.sum);
 ASSERT_EQ(data.squares, expected_data.squares);
@@ -1181,12 +1143,11 @@
 statistics::Counter num_samples = 5;
 statistics::DistData data;
 statistics::AvgSampleStor::Params params;
-MockInfo info();

 ASSERT_EQ(stor.size(), 1);
 stor.sample(val, num_samples);
 ASSERT_EQ(stor.size(), 1);
-stor.prepare(, data);
+stor.prepare(, data);
 ASSERT_EQ(stor.size(), 1);
 stor.reset(nullptr);
 ASSERT_EQ(stor.size(), 1);
diff --git a/src/base/stats/types.hh b/src/base/stats/types.hh
index e6d5232..92d594a 100644
--- a/src/base/stats/types.hh
+++ b/src/base/stats/types.hh
@@ -60,6 +60,34 @@
 typedef unsigned int size_type;
 typedef unsigned int off_type;

+enum DistType { Deviation, Dist, Hist };
+
+/** General container for distribution data. */
+struct DistData
+{
+DistType type;
+Counter min;
+Counter max;
+Counter bucket_size;
+
+Counter min_val;
+Counter max_val;
+Counter underflow;
+Counter overflow;
+VCounter cvec;
+Counter sum;
+Counter squares;
+Counter logs;
+Counter samples;
+};
+
+/** Data structure of sparse histogram */
+struct SparseHistData
+{
+MCounter cmap;
+Counter samples;
+};
+
 } // namespace statistics
 } // namespace gem5




16 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/+/27083
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: Ie3deca17b859a217c0c7bd833c017d9436eee4b0
Gerrit-Change-Number: 27083
Gerrit-PatchSet: 19
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Alex Dutu 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Gem5 Cloud Project GCB service account  
<345032938...@cloudbuild.gserviceaccount.com>

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-stats,tests: Add unit test for Stats::Group

2021-07-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

NE(info_found, nullptr);
+ASSERT_EQ(info_found->name, "InfoResolveSubGroupStatFromParent2");
+
+info_found = root.resolveStat(
+"Node1.Node1_1.Node1_1_1.InfoResolveSubGroupStatFromParent3");
+ASSERT_NE(info_found, nullptr);
+ASSERT_EQ(info_found->name, "InfoResolveSubGroupStatFromParent3");
+}
+
+/** Test that resolving a stat from the parent is not possible. */
+TEST(StatsGroupTest, ResolveStatSubGroupOnSubGroup)
+{
+Stats::Group root(nullptr);
+Stats::Group node1(, "Node1");
+
+DummyInfo info;
+info.setName("InfoResolveStatSubGroupOnSubGroup");
+root.addStat();
+
+auto info_found =  
node1.resolveStat("InfoResolveStatSubGroupOnSubGroup");

+ASSERT_EQ(info_found, nullptr);
+}
+
+/** Test that resolving a merged stat is possible. */
+TEST(StatsGroupTest, ResolveStatMerged)
+{
+Stats::Group root(nullptr);
+Stats::Group node1(nullptr);
+
+DummyInfo info;
+info.setName("InfoResolveStatMerged");
+node1.addStat();
+DummyInfo info2;
+info2.setName("InfoResolveStatMerged2");
+node1.addStat();
+
+root.mergeStatGroup();
+
+auto info_found = root.resolveStat("InfoResolveStatMerged");
+ASSERT_NE(info_found, nullptr);
+ASSERT_EQ(info_found->name, "InfoResolveStatMerged");
+
+info_found = root.resolveStat("InfoResolveStatMerged2");
+ASSERT_NE(info_found, nullptr);
+ASSERT_EQ(info_found->name, "InfoResolveStatMerged2");
+}
+
+/** Test that resolving a stat belonging to a merged sub-group is  
possible. */

+TEST(StatsGroupTest, ResolveStatMergedSubGroup)
+{
+Stats::Group root(nullptr);
+Stats::Group node1(nullptr);
+Stats::Group node2(nullptr);
+
+DummyInfo info;
+info.setName("InfoResolveStatMergedSubGroup");
+node2.addStat();
+
+root.addStatGroup("Node1", );
+node1.mergeStatGroup();
+
+auto info_found =  
root.resolveStat("Node1.InfoResolveStatMergedSubGroup");

+ASSERT_NE(info_found, nullptr);
+ASSERT_EQ(info_found->name, "InfoResolveStatMergedSubGroup");
+}

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43010
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: I52326994b3f75e313024f872d214e8c45943f44d
Gerrit-Change-Number: 43010
Gerrit-PatchSet: 16
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Daniel Carvalho 
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-stats: Use std vector in vector stats

2021-07-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

size * sizeof(Storage)];
-storage = reinterpret_cast(ptr);
-
-for (off_type i = 0; i < _size; ++i)
-new ([i]) Storage(info->storageParams);
-
+storage.resize(x * y, new Storage(info->storageParams));
 this->setInit();

 return self;
@@ -1215,7 +1196,7 @@
 size_type
 size() const
 {
-return _size;
+return storage.size();
 }

 bool
@@ -1266,7 +1247,7 @@
 bool
 check() const
 {
-return storage != NULL;
+return size() > 0;
 }
 };

@@ -1385,36 +1366,28 @@
 friend class DataWrapVec;

   protected:
-Storage *storage;
-size_type _size;
+std::vector storage;

   protected:
 Storage *
 data(off_type index)
 {
-return [index];
+return storage[index];
 }

 const Storage *
 data(off_type index) const
 {
-return [index];
+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);
-
-Info *info = this->info();
-for (off_type i = 0; i < _size; ++i)
-new ([i]) Storage(info->storageParams);
-
+storage.resize(s, new Storage(this->info()->storageParams));
 this->setInit();
 }

@@ -1423,17 +1396,14 @@
const units::Base *unit,
const char *desc)
 : DataWrapVec(parent, name, unit,  
desc),

-  storage(NULL)
+  storage()
 {}

 ~VectorDistBase()
 {
-if (!storage)
-return ;
-
-for (off_type i = 0; i < _size; ++i)
-data(i)->~Storage();
-delete [] reinterpret_cast(storage);
+for (auto& stor : storage) {
+delete stor;
+}
 }

 Proxy operator[](off_type index)
@@ -1445,7 +1415,7 @@
 size_type
 size() const
 {
-return _size;
+return storage.size();
 }

 bool
@@ -1470,7 +1440,7 @@
 bool
 check() const
 {
-return storage != NULL;
+return size() > 0;
 }
 };




17 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/+/27085
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: I6b341f03e4861a5b8f80fa8741373065b7c755bf
Gerrit-Change-Number: 27085
Gerrit-PatchSet: 19
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: kokoro 
Gerrit-CC: Adrian Herrera 
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: Use smart pointer for info's storageParams

2021-07-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

 }

@@ -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(), info->data[i]);
 }

 bool
@@ -2431,7 +2431,7 @@
 void
 doInit()
 {
-new (storage) Storage(this->info()->storageParams);
+new (storage) Storage(this->info()->getStorageParams());
 this->setInit();
 }

@@ -2467,7 +2467,7 @@
 prepare()
 {
 Info *info = this->info();
-data()->prepare(info->storageParams, info->data);
+data()->prepare(info->getStorageParams(), info->data);
 }

 /**
@@ -2476,7 +2476,7 @@
 void
 reset()
 {
-data()->reset(this->info()->storageParams);
+data()->reset(this->info()->getStorageParams());
 }
 };

diff --git a/src/base/stats/info.cc b/src/base/stats/info.cc
index edc4290..c40b559 100644
--- a/src/base/stats/info.cc
+++ b/src/base/stats/info.cc
@@ -46,6 +46,7 @@
 #include "base/cprintf.hh"
 #include "base/debug.hh"
 #include "base/logging.hh"
+#include "base/stats/storage.hh"
 #include "base/str.hh"

 namespace gem5
@@ -69,7 +70,7 @@
 }

 Info::Info()
-: flags(none), precision(-1), prereq(0), storageParams(NULL)
+: flags(none), precision(-1), prereq(0), storageParams()
 {
 id = id_count++;
 if (debug_break_id >= 0 and debug_break_id == id)
@@ -80,6 +81,18 @@
 {
 }

+StorageParams const*
+Info::getStorageParams() const
+{
+return storageParams.get();
+}
+
+void
+Info::setStorageParams(const StorageParams *const params)
+{
+return storageParams.reset(params);
+}
+
 bool
 validateStatName(const std::string )
 {
diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh
index 70e2e2c..9a5e2e7 100644
--- a/src/base/stats/info.hh
+++ b/src/base/stats/info.hh
@@ -31,6 +31,7 @@

 #include 
 #include 
+#include 
 #include 
 #include 

@@ -100,8 +101,8 @@
 static int id_count;
 int id;

-  public:
-const StorageParams *storageParams;
+  private:
+std::unique_ptr storageParams;

   public:
 Info();
@@ -119,6 +120,15 @@
 void setSeparator(std::string _sep) { separatorString = _sep;}

 /**
+ * Getter for the storage params. These parameters should only be  
modified

+ * using the respective setter.
+ * @sa setStorageParams
+ */
+StorageParams const* getStorageParams() const;
+/** Setter for the storage params. */
+void setStorageParams(const StorageParams *const params);
+
+/**
  * Check that this stat has been set up properly and is ready for
  * use
  * @return true for success



14 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/+/38178
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: I4c2496d08241f155793ed35e3463512d9ea06f83
Gerrit-Change-Number: 38178
Gerrit-PatchSet: 16
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Hoa Nguyen 
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]: mem: Adopt a memory namespace for memories

2021-07-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

nullptr;

-PhysicalMemory physmem;
+memory::PhysicalMemory physmem;

 AddrRangeList ShadowRomRanges;




9 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/+/47309
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: I228f7e55efc395089e3616ae0a0a6325867bd782
Gerrit-Change-Number: 47309
Gerrit-PatchSet: 12
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]: base-stats,tests: Add unit test for Stats::Info

2021-07-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

  TestInfo info;
+ASSERT_ANY_THROW(info.setName(".a", false));
+}
+
+/** Test that a sub-group's name cannot be empty. */
+TEST(StatsInfoDeathTest, NameSubEmpty2)
+{
+TestInfo info;
+ASSERT_ANY_THROW(info.setName("A.", false));
+}
+
+/** Test that a sub-group's name cannot be empty. */
+TEST(StatsInfoDeathTest, NameSubEmpty3)
+{
+TestInfo info;
+ASSERT_ANY_THROW(info.setName("a.b..c", false));
+}
+
+/** Test that the first character does not accept numbers. */
+TEST(StatsInfoDeathTest, NameFirstCharacterNumber)
+{
+TestInfo info;
+ASSERT_ANY_THROW(info.setName("1", false));
+}
+
+/** Test that the first character does not accept numbers (sub-group). */
+TEST(StatsInfoDeathTest, NameFirstCharacterNumberSub)
+{
+TestInfo info;
+ASSERT_ANY_THROW(info.setName("A.1", false));
+}
+
+/** Test that the first character does not accept special characters. */
+TEST(StatsInfoDeathTest, NameFirstCharacterSpecial)
+{
+TestInfo info;
+ASSERT_ANY_THROW(info.setName("!", false));
+}
+
+/**
+ * Test that the first character does not accept special characters
+ * (sub-group).
+ */
+TEST(StatsInfoDeathTest, NameFirstCharacterSpecialSub)
+{
+TestInfo info;
+ASSERT_ANY_THROW(info.setName("A.!", false));
+}
+
+/** Test that the non-first characters do not accept special characters. */
+TEST(StatsInfoDeathTest, NameOtherCharacterSpecial)
+{
+TestInfo info;
+ASSERT_ANY_THROW(info.setName("ab!de", false));
+}
+
+/** Test that a name cannot be duplicated under the old style. */
+TEST(StatsInfoDeathTest, NameOldStyleDuplicate)
+{
+TestInfo info;
+std::string name = "InfoNameOldStyleDuplicate";
+info.setName(name, true);
+EXPECT_EQ(info.name, name);
+
+TestInfo info2;
+ASSERT_ANY_THROW(info2.setName(name, true));
+}
+
+/** Test that checking Info without setting the init flag fails. */
+TEST(StatsInfoDeathTest, BaseCheckNoInit)
+{
+TestInfo info;
+ASSERT_ANY_THROW(info.baseCheck());
+}
+
+/** Test that checking Info for display without setting the name fails. */
+TEST(StatsInfoDeathTest, BaseCheckDisplayNoName)
+{
+    TestInfo info;
+info.flags.set(statistics::init | statistics::display);
+ASSERT_ANY_THROW(info.baseCheck());
+}

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43009
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: I8b169d34c1309b37ba79fa9cf6895547b7e97fc0
Gerrit-Change-Number: 43009
Gerrit-PatchSet: 16
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Daniel Carvalho 
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]: mem: Adopt the memory namespace in qos files

2021-07-09 Thread Daniel Carvalho (Gerrit) via gem5-dev

c/mem/qos/q_policy.hh
@@ -50,6 +50,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 GEM5_DEPRECATED_NAMESPACE(QoS, qos);
 namespace qos
 {
@@ -190,6 +193,7 @@
 };

 } // namespace qos
+} // namespace memory
 } // namespace gem5

 #endif /* __MEM_QOS_Q_POLICY_HH__ */
diff --git a/src/mem/qos/turnaround_policy.hh  
b/src/mem/qos/turnaround_policy.hh

index 324ef8a..2d5696f 100644
--- a/src/mem/qos/turnaround_policy.hh
+++ b/src/mem/qos/turnaround_policy.hh
@@ -46,6 +46,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 GEM5_DEPRECATED_NAMESPACE(QoS, qos);
 namespace qos
 {
@@ -82,6 +85,7 @@
 };

 } // namespace qos
+} // namespace memory
 } // namespace gem5

 #endif /* __MEM_QOS_TURNAROUND_POLICY_HH__ */
diff --git a/src/mem/qos/turnaround_policy_ideal.cc  
b/src/mem/qos/turnaround_policy_ideal.cc

index b6279b9..c67e40b 100644
--- a/src/mem/qos/turnaround_policy_ideal.cc
+++ b/src/mem/qos/turnaround_policy_ideal.cc
@@ -45,6 +45,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 GEM5_DEPRECATED_NAMESPACE(QoS, qos);
 namespace qos
 {
@@ -104,4 +107,5 @@
 }

 } // namespace qos
+} // namespace memory
 } // namespace gem5
diff --git a/src/mem/qos/turnaround_policy_ideal.hh  
b/src/mem/qos/turnaround_policy_ideal.hh

index 29548e6..0a75f79 100644
--- a/src/mem/qos/turnaround_policy_ideal.hh
+++ b/src/mem/qos/turnaround_policy_ideal.hh
@@ -44,6 +44,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 GEM5_DEPRECATED_NAMESPACE(QoS, qos);
 namespace qos
 {
@@ -72,6 +75,7 @@
 };

 } // namespace qos
+} // namespace memory
 } // namespace gem5

 #endif /* __MEM_QOS_TURNAROUND_POLICY_IDEAL_HH_ */



9 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/+/47308
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: Ib906ddd6d76b9d4a56f2eb705efe6cd498829155
Gerrit-Change-Number: 47308
Gerrit-PatchSet: 12
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]: base: Remove DPRINTF_UNCONDITIONAL test

2021-07-08 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-07-08 Thread Daniel Carvalho (Gerrit) via gem5-dev

stener(ProbeListener *l) override
 {
 listeners.erase(std::remove(listeners.begin(), listeners.end(), l),
 listeners.end());
@@ -301,7 +309,8 @@
  * @brief called at the ProbePoint call site, passes arg to each  
listener.

  * @param arg the argument to pass to each listener.
  */
-void notify(const Arg )
+void
+notify(const Arg )
 {
 for (auto l = listeners.begin(); l != listeners.end(); ++l) {
 (*l)->notify(arg);



1 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/+/38697
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: Ibd905d1941fc203ca8308f7a3930d58515b19a97
Gerrit-Change-Number: 38697
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Andreas Sandberg 
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]: cpu: Add a branch_prediction namespace

2021-07-07 Thread Daniel Carvalho (Gerrit) via gem5-dev

 : BPredUnit(params),
   localPredictorSize(params.localPredictorSize),
@@ -351,4 +354,5 @@
 TournamentBP::BPHistory::newCount = 0;
 #endif

+} // namespace branch_prediction
 } // namespace gem5
diff --git a/src/cpu/pred/tournament.hh b/src/cpu/pred/tournament.hh
index 2adeba3..3f2eb25 100644
--- a/src/cpu/pred/tournament.hh
+++ b/src/cpu/pred/tournament.hh
@@ -51,6 +51,9 @@
 namespace gem5
 {

+namespace branch_prediction
+{
+
 /**
  * Implements a tournament branch predictor, hopefully identical to the one
  * used in the 21264.  It has a local predictor, which uses a local history
@@ -242,6 +245,7 @@
 unsigned choiceThreshold;
 };

+} // namespace branch_prediction
 } // namespace gem5

 #endif // __CPU_PRED_TOURNAMENT_PRED_HH__
diff --git a/src/cpu/simple/base.hh b/src/cpu/simple/base.hh
index cee786d..ee75d78 100644
--- a/src/cpu/simple/base.hh
+++ b/src/cpu/simple/base.hh
@@ -71,14 +71,17 @@
 }

 struct BaseSimpleCPUParams;
-class BPredUnit;
+namespace branch_prediction
+{
+class BPredUnit;
+} // namespace branch_prediction
 class SimpleExecContext;

 class BaseSimpleCPU : public BaseCPU
 {
   protected:
 ThreadID curThread;
-BPredUnit *branchPred;
+branch_prediction::BPredUnit *branchPred;

 const RegIndex zeroReg;


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47303
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: I640c0caa846a3aade6fae95e9a93e4318ae9fca0
Gerrit-Change-Number: 47303
Gerrit-PatchSet: 10
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Gabe Black 
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]: arch-arm: Rename debug variables

2021-07-07 Thread Daniel Carvalho (Gerrit) via gem5-dev

 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: 10
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Andreas Sandberg 
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: Add error messages to BloomFilter::Perfect

2021-07-06 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-07-06 Thread Daniel Carvalho (Gerrit) via gem5-dev

+41,6 @@
 #include "base/trace.hh"
 #include "cpu/smt.hh"
 #include "debug/Checkpoint.hh"
-#include "sim/core.hh"

 namespace gem5
 {
diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh
index b996281..3e146e3 100644
--- a/src/sim/eventq.hh
+++ b/src/sim/eventq.hh
@@ -49,7 +49,7 @@
 #include "base/types.hh"
 #include "base/uncontended_mutex.hh"
 #include "debug/Event.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/serialize.hh"

 namespace gem5
diff --git a/src/sim/global_event.cc b/src/sim/global_event.cc
index 700d2c8..4dcc72c 100644
--- a/src/sim/global_event.cc
+++ b/src/sim/global_event.cc
@@ -29,7 +29,7 @@

 #include "sim/global_event.hh"

-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace gem5
 {
diff --git a/src/sim/init.cc b/src/sim/init.cc
index 8b3d46d..f9ab8b2 100644
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -58,7 +58,6 @@
 #include "config/have_protobuf.hh"
 #include "python/pybind11/pybind.hh"
 #include "sim/async.hh"
-#include "sim/core.hh"

 #if HAVE_PROTOBUF
 #include 
diff --git a/src/sim/init_signals.cc b/src/sim/init_signals.cc
index 803d7e2..cac0190 100644
--- a/src/sim/init_signals.cc
+++ b/src/sim/init_signals.cc
@@ -58,7 +58,6 @@
 #include "base/logging.hh"
 #include "sim/async.hh"
 #include "sim/backtrace.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"

 namespace gem5
diff --git a/src/sim/power_state.cc b/src/sim/power_state.cc
index 3e20c69..a8932a7 100644
--- a/src/sim/power_state.cc
+++ b/src/sim/power_state.cc
@@ -42,6 +42,7 @@
 #include "base/logging.hh"
 #include "base/trace.hh"
 #include "debug/PowerDomain.hh"
+#include "sim/cur_tick.hh"
 #include "sim/power_domain.hh"
 #include "sim/serialize.hh"

diff --git a/src/sim/power_state.hh b/src/sim/power_state.hh
index 03f3a60..99c34d2 100644
--- a/src/sim/power_state.hh
+++ b/src/sim/power_state.hh
@@ -50,7 +50,6 @@
 #include "base/statistics.hh"
 #include "enums/PwrState.hh"
 #include "params/PowerState.hh"
-#include "sim/core.hh"
 #include "sim/sim_object.hh"

 namespace gem5
diff --git a/src/sim/root.cc b/src/sim/root.cc
index 7fe1159..ef35ed9 100644
--- a/src/sim/root.cc
+++ b/src/sim/root.cc
@@ -44,6 +44,8 @@
 #include "base/trace.hh"
 #include "config/the_isa.hh"
 #include "debug/TimeSync.hh"
+#include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/eventq.hh"
 #include "sim/full_system.hh"
 #include "sim/root.hh"
diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh
index 20b967c..22d3134 100644
--- a/src/sim/stat_control.hh
+++ b/src/sim/stat_control.hh
@@ -43,7 +43,7 @@

 #include "base/compiler.hh"
 #include "base/types.hh"
-#include "sim/core.hh"
+#include "sim/cur_tick.hh"

 namespace gem5
 {
diff --git a/src/systemc/channel/sc_clock.cc  
b/src/systemc/channel/sc_clock.cc

index bf48b82..03c49d0 100644
--- a/src/systemc/channel/sc_clock.cc
+++ b/src/systemc/channel/sc_clock.cc
@@ -27,7 +27,6 @@

 #include "base/logging.hh"
 #include "base/types.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"
 #include "systemc/core/kernel.hh"
 #include "systemc/core/process_types.hh"
diff --git a/src/systemc/core/event.cc b/src/systemc/core/event.cc
index 928996d..69a3392 100644
--- a/src/systemc/core/event.cc
+++ b/src/systemc/core/event.cc
@@ -31,7 +31,6 @@
 #include 
 #include 

-#include "sim/core.hh"
 #include "systemc/core/module.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/core/messages.hh"
diff --git a/src/systemc/core/sc_main.cc b/src/systemc/core/sc_main.cc
index d95b1b9..ab48f98 100644
--- a/src/systemc/core/sc_main.cc
+++ b/src/systemc/core/sc_main.cc
@@ -26,7 +26,6 @@
  */

 #include "base/types.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"
 #include "systemc/core/kernel.hh"
 #include "systemc/core/sc_main_fiber.hh"
diff --git a/src/systemc/core/scheduler.hh b/src/systemc/core/scheduler.hh
index c73a6f1..6eabb56 100644
--- a/src/systemc/core/scheduler.hh
+++ b/src/systemc/core/scheduler.hh
@@ -37,7 +37,6 @@
 #include 

 #include "base/logging.hh"
-#include "sim/core.hh"
 #include "sim/eventq.hh"
 #include "systemc/core/channel.hh"
 #include "systemc/core/list.hh"
diff --git a/src/systemc/tlm_bridge/tlm_to_gem5.cc  
b/src/systemc/tlm_bridge/tlm_to_gem5.cc

index 3095fd3..2b9ced8 100644
--- a/src/systemc/tlm_bridge/tlm_to_gem5.cc
+++ b/src/systemc/tlm_bridge/tlm_to_gem5.cc
@@ -64,6 +64,7 @@
 #include "params/TlmToGem5Bridge128.hh"
 #include "params/TlmToGem5Bridge256.hh"
 #include "params/TlmToGem5Bridge512.hh"
+#include "sim/core.hh"
 #include "sim/system.hh"
 #include "systemc/ext/core/sc_module_name.hh"
 #include "systemc/ext/core/sc_time.hh"
diff --git a/src/systemc/utils/tracefile.cc b/src/systemc/utils/tracefile.cc
index 2a74459..a6cf952 100644
--- a/src/systemc/utils/tracefile.cc
+++ b/src/systemc/utils/tracefile.cc
@@ -30,7 +30,6 @@
 #include 
 #include 

-#include "sim/core.hh"
 #include "systemc/core/time.hh"
 #include "systemc/ext/core/sc_main.hh"
 #include "systemc/ext/core/sc_time.hh"
diff --git a/src/systemc/utils/vcd.cc b/src/systemc/utils/vcd.cc
index 9cf0bac..ff18792 100644
--- a/src/systemc/utils/vcd.cc
+++ b/src/systemc/utils/vcd.cc
@@ -32,6 +32,7 @@

 #include "base/bitfield.hh"
 #include "base/cprintf.hh"
+#include "sim/core.hh"
 #include "systemc/core/scheduler.hh"
 #include "systemc/ext/core/sc_event.hh"
 #include "systemc/ext/core/sc_main.hh"
diff --git a/util/systemc/gem5_within_systemc/sc_module.cc  
b/util/systemc/gem5_within_systemc/sc_module.cc

index dcd61c7..ae27b51 100644
--- a/util/systemc/gem5_within_systemc/sc_module.cc
+++ b/util/systemc/gem5_within_systemc/sc_module.cc
@@ -61,6 +61,7 @@
 #include "sc_module.hh"
 #include "sim/async.hh"
 #include "sim/core.hh"
+#include "sim/cur_tick.hh"
 #include "sim/eventq.hh"
 #include "sim/sim_exit.hh"
 #include "sim/stat_control.hh"

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43592
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: I3ae282dbaeb45fbf4630237a3ab9b1a593ffbe0c
Gerrit-Change-Number: 43592
Gerrit-PatchSet: 11
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Giacomo Travaglini 
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: Avoid dereferencing end() in findNearest

2021-07-06 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-07-01 Thread Daniel Carvalho (Gerrit) via gem5-dev

uby/network/garnet/SwitchAllocator.hh  
b/src/mem/ruby/network/garnet/SwitchAllocator.hh

index 90089f3..0f2d480 100644
--- a/src/mem/ruby/network/garnet/SwitchAllocator.hh
+++ b/src/mem/ruby/network/garnet/SwitchAllocator.hh
@@ -41,6 +41,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class Router;
 class InputUnit;
 class OutputUnit;
@@ -86,6 +89,7 @@
 std::vector m_vc_winners;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_SWITCHALLOCATOR_HH__
diff --git a/src/mem/ruby/network/garnet/VirtualChannel.cc  
b/src/mem/ruby/network/garnet/VirtualChannel.cc

index b4fc288..bf4502d 100644
--- a/src/mem/ruby/network/garnet/VirtualChannel.cc
+++ b/src/mem/ruby/network/garnet/VirtualChannel.cc
@@ -34,6 +34,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 VirtualChannel::VirtualChannel()
   : inputBuffer(), m_vc_state(IDLE_, Tick(0)), m_output_port(-1),
 m_enqueue_time(INFINITE_), m_output_vc(-1)
@@ -75,4 +78,5 @@
 return inputBuffer.functionalWrite(pkt);
 }

+} // namespace garnet
 } // namespace gem5
diff --git a/src/mem/ruby/network/garnet/VirtualChannel.hh  
b/src/mem/ruby/network/garnet/VirtualChannel.hh

index 2bee8ec..fb0ef4a 100644
--- a/src/mem/ruby/network/garnet/VirtualChannel.hh
+++ b/src/mem/ruby/network/garnet/VirtualChannel.hh
@@ -40,6 +40,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class VirtualChannel
 {
   public:
@@ -99,6 +102,7 @@
 int m_output_vc;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_VIRTUALCHANNEL_HH__
diff --git a/src/mem/ruby/network/garnet/flit.cc  
b/src/mem/ruby/network/garnet/flit.cc

index f188ad9..7daff73 100644
--- a/src/mem/ruby/network/garnet/flit.cc
+++ b/src/mem/ruby/network/garnet/flit.cc
@@ -36,6 +36,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 // Constructor for the flit
 flit::flit(int id, int  vc, int vnet, RouteInfo route, int size,
 MsgPtr msg_ptr, int MsgSize, uint32_t bWidth, Tick curTime)
@@ -124,4 +127,5 @@
 return msg->functionalWrite(pkt);
 }

+} // namespace garnet
 } // namespace gem5
diff --git a/src/mem/ruby/network/garnet/flit.hh  
b/src/mem/ruby/network/garnet/flit.hh

index ffad7eb..8bb1a4d 100644
--- a/src/mem/ruby/network/garnet/flit.hh
+++ b/src/mem/ruby/network/garnet/flit.hh
@@ -41,6 +41,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class flit
 {
   public:
@@ -130,6 +133,7 @@
 return out;
 }

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_FLIT_HH__
diff --git a/src/mem/ruby/network/garnet/flitBuffer.cc  
b/src/mem/ruby/network/garnet/flitBuffer.cc

index 96e14f5..468aeb3 100644
--- a/src/mem/ruby/network/garnet/flitBuffer.cc
+++ b/src/mem/ruby/network/garnet/flitBuffer.cc
@@ -34,6 +34,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 flitBuffer::flitBuffer()
 {
 max_size = INFINITE_;
@@ -93,4 +96,5 @@
 return num_functional_writes;
 }

+} // namespace garnet
 } // namespace gem5
diff --git a/src/mem/ruby/network/garnet/flitBuffer.hh  
b/src/mem/ruby/network/garnet/flitBuffer.hh

index dbe92c0..e994c45 100644
--- a/src/mem/ruby/network/garnet/flitBuffer.hh
+++ b/src/mem/ruby/network/garnet/flitBuffer.hh
@@ -41,6 +41,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class flitBuffer
 {
   public:
@@ -89,6 +92,7 @@
 return out;
 }

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_FLITBUFFER_HH__



3 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/+/47306
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: I5304ad3130100ba325e35e20883ee9286f51a75a
Gerrit-Change-Number: 47306
Gerrit-PatchSet: 9
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Srikant Bharadwaj 
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: Add Signature-Based Hit Predictor replacement policy

2021-07-01 Thread Daniel Carvalho (Gerrit) via gem5-dev

 the  
submitted one.

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38118
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: I44f00d26eab4c96c9c5bc29740862a87356d30d1
Gerrit-Change-Number: 38118
Gerrit-PatchSet: 9
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-cache: Make WeightedLRU inherit from LRU

2021-07-01 Thread Daniel Carvalho (Gerrit) via gem5-dev

 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 as the next probable victim.
- * Sets its last touch tick as the starting tick.
- *
- * @param replacement_data Replacement data to be invalidated.
- */
-void invalidate(const std::shared_ptr&  
replacement_data)
- 
override;

-
-/**
- * Touch an entry to update its replacement data.
- * Sets its last touch tick as the current tick.
- *
- * @param replacement_data Replacement data to be touched.
- */
-void touch(const std::shared_ptr&
-replacement_data) const override;
+using Base::touch;
 void touch(const std::shared_ptr& replacement_data,
 int occupancy) const;

 /**
- * Reset replacement data. Used when an entry is inserted.
- * Sets its last touch tick as the current tick.
- *
- * @param replacement_data Replacement data to be reset.
- */
-void reset(const std::shared_ptr& replacement_data)  
const
-  
override;

-
-/**
  * Instantiate a replacement data entry.
  *
  * @return A shared pointer to the new replacement data.

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47399
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: Ifec19ea59fb411a5ed7a891e8957b1ab93cdbf05
Gerrit-Change-Number: 47399
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-cache: Allow sending packet information to replacement policy

2021-07-01 Thread Daniel Carvalho (Gerrit) via gem5-dev

replacement_data,
+const PacketPtr pkt) override;
 void reset(const std::shared_ptr& replacement_data)  
const
   
override;
 ReplaceableEntry* getVictim(const ReplacementCandidates& candidates)  
const
diff --git a/src/mem/cache/tags/base_set_assoc.hh  
b/src/mem/cache/tags/base_set_assoc.hh

index dc749dd..7ca702b 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -143,7 +143,7 @@
 blk->increaseRefCount();

 // Update replacement data of accessed block
-replacementPolicy->touch(blk->replacementData);
+replacementPolicy->touch(blk->replacementData, pkt);
 }

 // The tag lookup latency is the same for a hit or a miss
@@ -195,7 +195,7 @@
 stats.tagsInUse++;

 // Update replacement policy
-replacementPolicy->reset(blk->replacementData);
+replacementPolicy->reset(blk->replacementData, pkt);
 }

 void moveBlock(CacheBlk *src_blk, CacheBlk *dest_blk) override;
diff --git a/src/mem/cache/tags/sector_tags.cc  
b/src/mem/cache/tags/sector_tags.cc

index d90708e..d63773b 100644
--- a/src/mem/cache/tags/sector_tags.cc
+++ b/src/mem/cache/tags/sector_tags.cc
@@ -163,7 +163,7 @@

 // Update replacement data of accessed block, which is shared with
 // the whole sector it belongs to
-replacementPolicy->touch(sector_blk->replacementData);
+replacementPolicy->touch(sector_blk->replacementData, pkt);
 }

 // The tag lookup latency is the same for a hit or a miss
@@ -183,14 +183,14 @@
 // sector was not previously present in the cache.
 if (sector_blk->isValid()) {
 // An existing entry's replacement data is just updated
-replacementPolicy->touch(sector_blk->replacementData);
+replacementPolicy->touch(sector_blk->replacementData, pkt);
 } else {
 // Increment tag counter
 stats.tagsInUse++;
 assert(stats.tagsInUse.value() <= numSectors);

 // A new entry resets the replacement data
-replacementPolicy->reset(sector_blk->replacementData);
+replacementPolicy->reset(sector_blk->replacementData, pkt);
 }

 // Do common block insertion functionality



5 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/+/38117
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: I412eee09efa2f3511ca1ece76fc2732509df4745
Gerrit-Change-Number: 38117
Gerrit-PatchSet: 9
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-cache: Use PacketPtr in tags's accessBlock

2021-07-01 Thread Daniel Carvalho (Gerrit) via gem5-dev

ck(Addr addr, bool is_secure, Cycles ,
+CacheBlk* accessBlock(const PacketPtr pkt, Cycles ,
   CachesMask *in_cache_mask);

 /**
  * Just a wrapper of above function to conform with the base interface.
  */
-CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles ) override;
+CacheBlk* accessBlock(const PacketPtr pkt, Cycles ) override;

 /**
  * Find the block in the cache, do not update the replacement data.
diff --git a/src/mem/cache/tags/sector_tags.cc  
b/src/mem/cache/tags/sector_tags.cc

index eecd026..d90708e 100644
--- a/src/mem/cache/tags/sector_tags.cc
+++ b/src/mem/cache/tags/sector_tags.cc
@@ -136,9 +136,9 @@
 }

 CacheBlk*
-SectorTags::accessBlock(Addr addr, bool is_secure, Cycles )
+SectorTags::accessBlock(const PacketPtr pkt, Cycles )
 {
-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/sector_tags.hh  
b/src/mem/cache/tags/sector_tags.hh

index f19a4a7..2284b77 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -136,12 +136,11 @@
  * access and 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;

 /**
  * Insert the new block into the cache and update replacement data.

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38116
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: I201884a6d60e3299fc3c9befebbb2e8b64a007f0
Gerrit-Change-Number: 38116
Gerrit-PatchSet: 9
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-cache: Make WeightedLRU inherit from LRU

2021-06-30 Thread Daniel Carvalho (Gerrit) via gem5-dev

tedLRURPParams Params;
 WeightedLRU(const Params );
 ~WeightedLRU() = default;

-/**
- * Invalidate replacement data to set it as the next probable victim.
- * Sets its last touch tick as the starting tick.
- *
- * @param replacement_data Replacement data to be invalidated.
- */
-void invalidate(const std::shared_ptr&  
replacement_data)
- 
override;

-
-/**
- * Touch an entry to update its replacement data.
- * Sets its last touch tick as the current tick.
- *
- * @param replacement_data Replacement data to be touched.
- */
-void touch(const std::shared_ptr&
-replacement_data) const override;
+using Base::touch;
 void touch(const std::shared_ptr& replacement_data,
 int occupancy) const;

 /**
- * Reset replacement data. Used when an entry is inserted.
- * Sets its last touch tick as the current tick.
- *
- * @param replacement_data Replacement data to be reset.
- */
-void reset(const std::shared_ptr& replacement_data)  
const
-  
override;

-
-/**
  * Instantiate a replacement data entry.
  *
  * @return A shared pointer to the new replacement data.

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47399
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: Ifec19ea59fb411a5ed7a891e8957b1ab93cdbf05
Gerrit-Change-Number: 47399
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]: mem-cache: Add the DRRIP replacement policy

2021-06-29 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-06-29 Thread Daniel Carvalho (Gerrit) via gem5-dev

pdate its replacement data.
diff --git a/src/mem/cache/replacement_policies/second_chance_rp.cc  
b/src/mem/cache/replacement_policies/second_chance_rp.cc

index c07a600..af872cf 100644
--- a/src/mem/cache/replacement_policies/second_chance_rp.cc
+++ b/src/mem/cache/replacement_policies/second_chance_rp.cc
@@ -54,7 +54,7 @@

 void
 SecondChance::invalidate(
-const std::shared_ptr& replacement_data) const
+const std::shared_ptr& replacement_data)
 {
 FIFO::invalidate(replacement_data);

diff --git a/src/mem/cache/replacement_policies/second_chance_rp.hh  
b/src/mem/cache/replacement_policies/second_chance_rp.hh

index ba8085e..651bb16 100644
--- a/src/mem/cache/replacement_policies/second_chance_rp.hh
+++ b/src/mem/cache/replacement_policies/second_chance_rp.hh
@@ -87,7 +87,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 re-insertion tick and second chance  
bit.
diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.cc  
b/src/mem/cache/replacement_policies/tree_plru_rp.cc

index 834d443..9d4a96d 100644
--- a/src/mem/cache/replacement_policies/tree_plru_rp.cc
+++ b/src/mem/cache/replacement_policies/tree_plru_rp.cc
@@ -107,8 +107,7 @@
 }

 void
-TreePLRU::invalidate(
-const std::shared_ptr& replacement_data) const
+TreePLRU::invalidate(const std::shared_ptr&  
replacement_data)

 {
 // Cast replacement data
 std::shared_ptr treePLRU_replacement_data =
diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.hh  
b/src/mem/cache/replacement_policies/tree_plru_rp.hh

index e1004a2..0e1cf53 100644
--- a/src/mem/cache/replacement_policies/tree_plru_rp.hh
+++ b/src/mem/cache/replacement_policies/tree_plru_rp.hh
@@ -164,7 +164,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/weighted_lru_rp.cc  
b/src/mem/cache/replacement_policies/weighted_lru_rp.cc

index cf9120c..3900014 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.cc
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.cc
@@ -115,8 +115,8 @@
 }

 void
-WeightedLRU::invalidate(const std::shared_ptr&
-replacement_data) const
+WeightedLRU::invalidate(
+const std::shared_ptr& replacement_data)
 {
 // Reset last touch timestamp
 std::static_pointer_cast(
diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.hh  
b/src/mem/cache/replacement_policies/weighted_lru_rp.hh

index 285ce3b..82b31d9 100644
--- a/src/mem/cache/replacement_policies/weighted_lru_rp.hh
+++ b/src/mem/cache/replacement_policies/weighted_lru_rp.hh
@@ -75,7 +75,8 @@
  * @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.
  * Sets its last touch tick as the current tick.



4 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/+/38115
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: I7f5086795dbb93a6fab2b4994c757d509d782d79
Gerrit-Change-Number: 38115
Gerrit-PatchSet: 7
Gerrit-Owner: Daniel Carvalho 
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: Creation of dueling classes

2021-06-29 Thread Daniel Carvalho (Gerrit) via gem5-dev

s) {
+if (entry.isSample(1ULL << monitor_id, team)) {
+if (team) {
+count_samples_true++;
+} else {
+count_samples_false++;
+}
+}
+}
+ASSERT_EQ(count_samples_true, count_samples_false);
+ASSERT_EQ(count_samples_true, expected_num_samples);
+}
+
+/** Test winner selection with multiple different threshold  
configurations. */

+TEST_P(DuelingMonitorTest, WinnerSelection)
+{
+SatCounter32 expected_selector(numBits);
+expected_selector.saturate();
+expected_selector >>= 1;
+
+// Initialize entries, and save a pointer to a sample of each
+// team, and one no sample
+int team_true_index = -1;
+int team_false_index = -1;
+int no_sample_index = -1;
+for (int index = 0; index < entries.size(); index++) {
+bool team;
+if (entries[index].isSample(1ULL << monitor_id, team)) {
+if (team) {
+team_true_index = index;
+} else {
+team_false_index = index;
+}
+} else {
+no_sample_index = index;
+}
+}
+ASSERT_TRUE(team_true_index >= 0);
+ASSERT_TRUE(team_false_index >= 0);
+
+// Duel for team true only. If the monitor starts predicting false
+// the threshold to use is the higher one. Otherwise, we should
+// start expecting true to be the winner, and thus we use the
+// low threshold
+bool current_winner = monitor->getWinner();
+double threshold = current_winner ? lowThreshold : highThreshold;
+for (; expected_selector.calcSaturation() < 1.0;
+expected_selector++) {
+ASSERT_EQ(expected_selector.calcSaturation() >= threshold,
+monitor->getWinner());
+monitor->sample([team_true_index]);
+}
+current_winner = monitor->getWinner();
+ASSERT_TRUE(current_winner);
+
+// Duel for no sample. Should not change winner
+if (no_sample_index >= 0) {
+for (int i = 0; i < 200; i++) {
+monitor->sample([no_sample_index]);
+}
+ASSERT_EQ(current_winner, monitor->getWinner());
+}
+
+// Duel for team false only. Now that we know that team true
+// is winning, the low threshold must be passed in order to
+// make team false win the duel
+threshold = lowThreshold;
+for (; expected_selector.calcSaturation() > 0.0;
+expected_selector--) {
+ASSERT_EQ(expected_selector.calcSaturation() >= threshold,
+monitor->getWinner());
+monitor->sample([team_false_index]);
+}
+current_winner = monitor->getWinner();
+ASSERT_FALSE(current_winner);
+
+// Duel for no sample. Should not change winner
+if (no_sample_index >= 0) {
+for (int i = 0; i < 200; i++) {
+monitor->sample([no_sample_index]);
+}
+ASSERT_EQ(current_winner, monitor->getWinner());
+}
+}
+
+// Test a few possible parameter combinations. There is a limitation on
+// the number of tests due to the maximum number of different ids. Because
+// of that, if a new test is added and it fails for no reason, make sure
+// that this limit has not been surpassed
+INSTANTIATE_TEST_CASE_P(DuelingMonitorTests, DuelingMonitorTest,
+::testing::Values(
+// Combinations of constituencies and teams
+std::make_tuple(32, 2, 1, 1, 0.5, 0.5),
+std::make_tuple(32, 4, 1, 1, 0.5, 0.5),
+std::make_tuple(32, 4, 2, 1, 0.5, 0.5),
+std::make_tuple(32, 8, 1, 1, 0.5, 0.5),
+std::make_tuple(32, 8, 2, 1, 0.5, 0.5),
+std::make_tuple(32, 8, 4, 1, 0.5, 0.5),
+std::make_tuple(32, 16, 1, 1, 0.5, 0.5),
+std::make_tuple(32, 16, 2, 1, 0.5, 0.5),
+std::make_tuple(32, 16, 4, 1, 0.5, 0.5),
+std::make_tuple(32, 16, 8, 1, 0.5, 0.5),
+
+// Tests for the thresholds
+std::make_tuple(16, 4, 1, 3, 0.5, 0.5),
+std::make_tuple(16, 4, 1, 3, 0.1, 0.7),
+std::make_tuple(16, 4, 1, 3, 0.4, 0.6),
+std::make_tuple(16, 4, 1, 3, 0.8, 0.9),
+
+// Test for larger tables
+    std::make_tuple(2048, 32, 4, 4, 0.4, 0.6))
+);



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/+/37895
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: I692a3e5e0ad98581d68167ad7e6b45ab2f4c7b10
Gerrit-Change-Number: 37895
Gerrit-PatchSet: 8
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Bobby R. Bruce 
Gerrit-Reviewer: Cliff Chen 
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: Implement a dueling Replacement Policy

2021-06-29 Thread Daniel Carvalho (Gerrit) via gem5-dev

+1,111 @@
+/**
+ * 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.
+ */
+
+#ifndef __MEM_CACHE_REPLACEMENT_POLICIES_DUELING_RP_HH__
+#define __MEM_CACHE_REPLACEMENT_POLICIES_DUELING_RP_HH__
+
+#include 
+
+#include "base/compiler.hh"
+#include "base/statistics.hh"
+#include "mem/cache/replacement_policies/base.hh"
+#include "mem/cache/tags/dueling.hh"
+
+struct DuelingRPParams;
+
+GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy);
+namespace replacement_policy
+{
+
+/**
+ * This replacement policy duels two replacement policies to find out which
+ * one provides the best results. A policy is said to have the best results
+ * when it has a lower number of misses.
+ */
+class Dueling : public Base
+{
+  protected:
+/**
+ * Dueler-specific implementation of replacement data. Contains all
+ * sub-replacement policies' replacement data.
+ */
+struct DuelerReplData : ReplacementData, Dueler
+{
+std::shared_ptr replDataA;
+std::shared_ptr replDataB;
+
+/** Default constructor. Initialize sub-replacement data. */
+DuelerReplData(const std::shared_ptr& repl_data_a,
+const std::shared_ptr& repl_data_b)
+  : ReplacementData(), Dueler(), replDataA(repl_data_a),
+replDataB(repl_data_b)
+{
+}
+};
+
+/** Sub-replacement policy used in this multiple container. */
+Base* const replPolicyA;
+/** Sub-replacement policy used in this multiple container. */
+Base* const replPolicyB;
+
+/**
+ * A dueling monitor that decides which is the best sub-policy based on
+ * their number of misses.
+ */
+mutable DuelingMonitor duelingMonitor;
+
+mutable struct DuelingStats : public statistics::Group
+{
+DuelingStats(statistics::Group* parent);
+
+/** Number of times A was selected on victimization. */
+statistics::Scalar selectedA;
+
+/** Number of times B was selected on victimization. */
+statistics::Scalar selectedB;
+} duelingStats;
+
+  public:
+PARAMS(DuelingRP);
+Dueling(const Params );
+~Dueling() = default;
+
+void invalidate(const std::shared_ptr&  
replacement_data)
+  const  
override;
+void touch(const std::shared_ptr& replacement_data)  
const
+  
override;
+void reset(const std::shared_ptr& replacement_data)  
const
+  
override;
+ReplaceableEntry* getVictim(const ReplacementCandidates& candidates)  
const
+  
override;

+std::shared_ptr instantiateEntry() override;
+};
+
+} // namespace replacement_policy
+
+#endif // __MEM_CACHE_REPLACEMENT_POLICIES_DUELING_RP_HH__

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37897
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: I6a6e96a9388cce8f8c8cd7b9c1dbe9f0554ccc64
Gerrit-Change-Number: 37897
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]: python,scons,mem-ruby: Tag origin of generated files

2021-06-28 Thread Daniel Carvalho (Gerrit) via gem5-dev

tch('\.(cc|hh|c|h)', extension) is not None:
+f.write(f'''/**
+ * DO NOT EDIT THIS FILE!
+ * File automatically generated by
+ *   {frame.f_code.co_filename}:{frame.f_lineno}
+ */
+
+''')
+elif re.match('\.py', extension) is not None:
+f.write(f'''#
+# DO NOT EDIT THIS FILE!
+# File automatically generated by
+#   {frame.f_code.co_filename}:{frame.f_lineno}
+#
+
+''')
+elif re.match('\.html', extension) is not None:
+f.write(f'''
+
+''')
+
 for data in self._data:
 f.write(data)
 f.close()

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47301
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: If09b6f848e607fb21a0acf2114ce0b9b0aa4751f
Gerrit-Change-Number: 47301
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho 
Gerrit-Reviewer: Andreas Sandberg 
Gerrit-Reviewer: Daniel Carvalho 
Gerrit-Reviewer: Gabe Black 
Gerrit-Reviewer: Jason Lowe-Power 
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]: dev,sim: Fix compiler not finding specialized byte_swap

2021-06-28 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-06-28 Thread Daniel Carvalho (Gerrit) via gem5-dev

 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.
- */
-
-/**
- * @file
- * MemObject declaration.
- */
-
-#ifndef __MEM_MEM_OBJECT_HH__
-#define __MEM_MEM_OBJECT_HH__
-
-#include "params/MemObject.hh"
-#include "sim/clocked_object.hh"
-
-/**
- * The MemObject class extends the ClockedObject for historical reasons.
- */
-class MemObject : public ClockedObject
-{
-  public:
-[[deprecated(
-"MemObject is deprecated. Use ClockedObject or SimObject  
instead")]]

-MemObject(const MemObjectParams ) : ClockedObject(params)
-{}
-};
-
-#endif //__MEM_MEM_OBJECT_HH__

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47299
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: I20d37700c97264080a7b19cf0cf9ccf8a5b65c32
Gerrit-Change-Number: 47299
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: Move QoS' MemSinkInterface into gem5::qos

2021-06-28 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-06-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

 */
diff --git a/src/mem/qos/turnaround_policy.hh  
b/src/mem/qos/turnaround_policy.hh

index 324ef8a..2d5696f 100644
--- a/src/mem/qos/turnaround_policy.hh
+++ b/src/mem/qos/turnaround_policy.hh
@@ -46,6 +46,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 GEM5_DEPRECATED_NAMESPACE(QoS, qos);
 namespace qos
 {
@@ -82,6 +85,7 @@
 };

 } // namespace qos
+} // namespace memory
 } // namespace gem5

 #endif /* __MEM_QOS_TURNAROUND_POLICY_HH__ */
diff --git a/src/mem/qos/turnaround_policy_ideal.cc  
b/src/mem/qos/turnaround_policy_ideal.cc

index b6279b9..c67e40b 100644
--- a/src/mem/qos/turnaround_policy_ideal.cc
+++ b/src/mem/qos/turnaround_policy_ideal.cc
@@ -45,6 +45,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 GEM5_DEPRECATED_NAMESPACE(QoS, qos);
 namespace qos
 {
@@ -104,4 +107,5 @@
 }

 } // namespace qos
+} // namespace memory
 } // namespace gem5
diff --git a/src/mem/qos/turnaround_policy_ideal.hh  
b/src/mem/qos/turnaround_policy_ideal.hh

index 29548e6..0a75f79 100644
--- a/src/mem/qos/turnaround_policy_ideal.hh
+++ b/src/mem/qos/turnaround_policy_ideal.hh
@@ -44,6 +44,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 GEM5_DEPRECATED_NAMESPACE(QoS, qos);
 namespace qos
 {
@@ -72,6 +75,7 @@
 };

 } // namespace qos
+} // namespace memory
 } // namespace gem5

 #endif /* __MEM_QOS_TURNAROUND_POLICY_IDEAL_HH_ */

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47308
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: Ib906ddd6d76b9d4a56f2eb705efe6cd498829155
Gerrit-Change-Number: 47308
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]: mem: Adopt a memory namespace for memories

2021-06-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

--git a/src/mem/physical.cc b/src/mem/physical.cc
index bd7b2de..ae20fb6 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -71,6 +71,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 PhysicalMemory::PhysicalMemory(const std::string& _name,
const std::vector&  
_memories,

bool mmap_using_noreserve,
@@ -471,4 +474,5 @@
   filename);
 }

+} // namespace memory
 } // namespace gem5
diff --git a/src/mem/physical.hh b/src/mem/physical.hh
index 6a39e01..b7ec8eb 100644
--- a/src/mem/physical.hh
+++ b/src/mem/physical.hh
@@ -50,6 +50,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 /**
  * Forward declaration to avoid header dependencies.
  */
@@ -277,6 +280,7 @@

 };

+} // namespace memory
 } // namespace gem5

 #endif //__MEM_PHYSICAL_HH__
diff --git a/src/mem/ruby/system/RubySystem.hh  
b/src/mem/ruby/system/RubySystem.hh

index 36c271a..e16d699 100644
--- a/src/mem/ruby/system/RubySystem.hh
+++ b/src/mem/ruby/system/RubySystem.hh
@@ -49,6 +49,11 @@
 namespace gem5
 {

+namespace memory
+{
+class SimpleMemory;
+} // namespace memory
+
 namespace ruby
 {

@@ -70,7 +75,7 @@
 static bool getWarmupEnabled() { return m_warmup_enabled; }
 static bool getCooldownEnabled() { return m_cooldown_enabled; }

-SimpleMemory *getPhysMem() { return m_phys_mem; }
+memory::SimpleMemory *getPhysMem() { return m_phys_mem; }
 Cycles getStartCycle() { return m_start_cycle; }
 bool getAccessBackingStore() { return m_access_backing_store; }

@@ -137,7 +142,7 @@
 static bool m_warmup_enabled;
 static unsigned m_systems_to_warmup;
 static bool m_cooldown_enabled;
-SimpleMemory *m_phys_mem;
+memory::SimpleMemory *m_phys_mem;
 const bool m_access_backing_store;

 //std::vector m_networks;
diff --git a/src/mem/simple_mem.cc b/src/mem/simple_mem.cc
index ec46702..ced3a38 100644
--- a/src/mem/simple_mem.cc
+++ b/src/mem/simple_mem.cc
@@ -47,6 +47,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 SimpleMemory::SimpleMemory(const SimpleMemoryParams ) :
 AbstractMemory(p),
 port(name() + ".port", *this), latency(p.latency),
@@ -303,4 +306,5 @@
 mem.recvRespRetry();
 }

+} // namespace memory
 } // namespace gem5
diff --git a/src/mem/simple_mem.hh b/src/mem/simple_mem.hh
index 153ea10..fc6d684 100644
--- a/src/mem/simple_mem.hh
+++ b/src/mem/simple_mem.hh
@@ -55,6 +55,9 @@
 namespace gem5
 {

+namespace memory
+{
+
 /**
  * The simple memory is a basic single-ported memory controller with
  * a configurable throughput and latency.
@@ -192,6 +195,7 @@
 void recvRespRetry();
 };

+} // namespace memory
 } // namespace gem5

 #endif //__MEM_SIMPLE_MEMORY_HH__
diff --git a/src/sim/system.cc b/src/sim/system.cc
index 4619de9..301ebfb 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -379,7 +379,8 @@
 }

 void
-System::addDeviceMemory(RequestorID requestor_id, AbstractMemory  
*deviceMemory)

+System::addDeviceMemory(RequestorID requestor_id,
+memory::AbstractMemory *deviceMemory)
 {
 deviceMemMap[requestor_id].push_back(deviceMemory);
 }
@@ -394,7 +395,7 @@
 return (getDeviceMemory(pkt) != nullptr);
 }

-AbstractMemory *
+memory::AbstractMemory *
 System::getDeviceMemory(const PacketPtr& pkt) const
 {
 const RequestorID& rid = pkt->requestorId();
diff --git a/src/sim/system.hh b/src/sim/system.hh
index e5215a6..8194138 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -111,7 +111,7 @@
 SystemPort _systemPort;

 // Map of memory address ranges for devices with their own backing  
stores

-std::unordered_map>
+std::unordered_map>
 deviceMemMap;

   public:
@@ -345,7 +345,7 @@
 bool validKvmEnvironment() const;

 /** Get a pointer to access the physical memory of the system */
-PhysicalMemory& getPhysMem() { return physmem; }
+memory::PhysicalMemory& getPhysMem() { return physmem; }

 /** Amount of physical memory that is still free */
 Addr freeMemSize(int poolID = 0) const;
@@ -368,7 +368,7 @@
  * and range match something in the device memory map.
  */
 void addDeviceMemory(RequestorID requestorId,
-  AbstractMemory *deviceMemory);
+memory::AbstractMemory *deviceMemory);

 /**
  * Similar to isMemAddr but for devices. Checks if a physical address
@@ -380,7 +380,7 @@
 /**
  * Return a pointer to the device memory.
  */
-AbstractMemory *getDeviceMemory(const PacketPtr& pkt) const;
+memory::AbstractMemory *getDeviceMemory(const PacketPtr& pkt) const;

 /*
  * Return the list of address ranges backed by a shadowed ROM.
@@ -422,7 +422,7 @@

 KvmVM *const kvmVM = nullptr;

-PhysicalMemory physmem;
+memory::PhysicalMemory physmem;

 AddrRangeList ShadowRomRanges;


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47309
To unsubscribe, or for help writing mail filters, v

[gem5-dev] Change in gem5/gem5[develop]: mem-garnet: Add a garnet namespace

2021-06-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_SWITCHALLOCATOR_HH__
diff --git a/src/mem/ruby/network/garnet/VirtualChannel.cc  
b/src/mem/ruby/network/garnet/VirtualChannel.cc

index b4fc288..bf4502d 100644
--- a/src/mem/ruby/network/garnet/VirtualChannel.cc
+++ b/src/mem/ruby/network/garnet/VirtualChannel.cc
@@ -34,6 +34,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 VirtualChannel::VirtualChannel()
   : inputBuffer(), m_vc_state(IDLE_, Tick(0)), m_output_port(-1),
 m_enqueue_time(INFINITE_), m_output_vc(-1)
@@ -75,4 +78,5 @@
 return inputBuffer.functionalWrite(pkt);
 }

+} // namespace garnet
 } // namespace gem5
diff --git a/src/mem/ruby/network/garnet/VirtualChannel.hh  
b/src/mem/ruby/network/garnet/VirtualChannel.hh

index 2bee8ec..fb0ef4a 100644
--- a/src/mem/ruby/network/garnet/VirtualChannel.hh
+++ b/src/mem/ruby/network/garnet/VirtualChannel.hh
@@ -40,6 +40,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class VirtualChannel
 {
   public:
@@ -99,6 +102,7 @@
 int m_output_vc;
 };

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_VIRTUALCHANNEL_HH__
diff --git a/src/mem/ruby/network/garnet/flit.cc  
b/src/mem/ruby/network/garnet/flit.cc

index f188ad9..7daff73 100644
--- a/src/mem/ruby/network/garnet/flit.cc
+++ b/src/mem/ruby/network/garnet/flit.cc
@@ -36,6 +36,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 // Constructor for the flit
 flit::flit(int id, int  vc, int vnet, RouteInfo route, int size,
 MsgPtr msg_ptr, int MsgSize, uint32_t bWidth, Tick curTime)
@@ -124,4 +127,5 @@
 return msg->functionalWrite(pkt);
 }

+} // namespace garnet
 } // namespace gem5
diff --git a/src/mem/ruby/network/garnet/flit.hh  
b/src/mem/ruby/network/garnet/flit.hh

index ffad7eb..8bb1a4d 100644
--- a/src/mem/ruby/network/garnet/flit.hh
+++ b/src/mem/ruby/network/garnet/flit.hh
@@ -41,6 +41,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class flit
 {
   public:
@@ -130,6 +133,7 @@
 return out;
 }

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_FLIT_HH__
diff --git a/src/mem/ruby/network/garnet/flitBuffer.cc  
b/src/mem/ruby/network/garnet/flitBuffer.cc

index 96e14f5..468aeb3 100644
--- a/src/mem/ruby/network/garnet/flitBuffer.cc
+++ b/src/mem/ruby/network/garnet/flitBuffer.cc
@@ -34,6 +34,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 flitBuffer::flitBuffer()
 {
 max_size = INFINITE_;
@@ -93,4 +96,5 @@
 return num_functional_writes;
 }

+} // namespace garnet
 } // namespace gem5
diff --git a/src/mem/ruby/network/garnet/flitBuffer.hh  
b/src/mem/ruby/network/garnet/flitBuffer.hh

index dbe92c0..e994c45 100644
--- a/src/mem/ruby/network/garnet/flitBuffer.hh
+++ b/src/mem/ruby/network/garnet/flitBuffer.hh
@@ -41,6 +41,9 @@
 namespace gem5
 {

+namespace garnet
+{
+
 class flitBuffer
 {
   public:
@@ -89,6 +92,7 @@
 return out;
 }

+} // namespace garnet
 } // namespace gem5

 #endif // __MEM_RUBY_NETWORK_GARNET_0_FLITBUFFER_HH__

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47306
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: I5304ad3130100ba325e35e20883ee9286f51a75a
Gerrit-Change-Number: 47306
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]: cpu: Add a branch_prediction namespace

2021-06-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

cpu/pred/tournament.hh
index 2adeba3..3f2eb25 100644
--- a/src/cpu/pred/tournament.hh
+++ b/src/cpu/pred/tournament.hh
@@ -51,6 +51,9 @@
 namespace gem5
 {

+namespace branch_prediction
+{
+
 /**
  * Implements a tournament branch predictor, hopefully identical to the one
  * used in the 21264.  It has a local predictor, which uses a local history
@@ -242,6 +245,7 @@
 unsigned choiceThreshold;
 };

+} // namespace branch_prediction
 } // namespace gem5

 #endif // __CPU_PRED_TOURNAMENT_PRED_HH__
diff --git a/src/cpu/simple/base.hh b/src/cpu/simple/base.hh
index 8117138..ff92f65 100644
--- a/src/cpu/simple/base.hh
+++ b/src/cpu/simple/base.hh
@@ -71,14 +71,17 @@
 }

 struct BaseSimpleCPUParams;
-class BPredUnit;
+namespace branch_prediction
+{
+class BPredUnit;
+} // namespace branch_prediction
 class SimpleExecContext;

 class BaseSimpleCPU : public BaseCPU
 {
   protected:
 ThreadID curThread;
-BPredUnit *branchPred;
+branch_prediction::BPredUnit *branchPred;

 const RegIndex zeroReg;


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47303
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: I640c0caa846a3aade6fae95e9a93e4318ae9fca0
Gerrit-Change-Number: 47303
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]: mem: Conclude deprecation of MemObject

2021-06-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

 * 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.
- */
-
-/**
- * @file
- * MemObject declaration.
- */
-
-#ifndef __MEM_MEM_OBJECT_HH__
-#define __MEM_MEM_OBJECT_HH__
-
-#include "params/MemObject.hh"
-#include "sim/clocked_object.hh"
-
-/**
- * The MemObject class extends the ClockedObject for historical reasons.
- */
-class MemObject : public ClockedObject
-{
-  public:
-[[deprecated(
-"MemObject is deprecated. Use ClockedObject or SimObject  
instead")]]

-MemObject(const MemObjectParams ) : ClockedObject(params)
-{}
-};
-
-#endif //__MEM_MEM_OBJECT_HH__

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47299
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: I20d37700c97264080a7b19cf0cf9ccf8a5b65c32
Gerrit-Change-Number: 47299
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]: python,scons,mem-ruby: Tag origin of generated files

2021-06-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

 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('\.html', extension) is not None:
+f.write('''
+
+''' % (frame.f_code.co_filename, frame.f_lineno))
+
 for data in self._data:
 f.write(data)
 f.close()

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47301
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: If09b6f848e607fb21a0acf2114ce0b9b0aa4751f
Gerrit-Change-Number: 47301
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]: mem: Move QoS' MemSinkInterface into gem5::qos

2021-06-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

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/

2021-06-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

+void recvFunctional(::gem5::PacketPtr packet);

 void recvRespRetry();

-Tick
-recvAtomic(PacketPtr packet)
+::gem5::Tick
+recvAtomic(::gem5::PacketPtr packet)
 {
 fatal("recvAtomic unimplemented");
 }
@@ -91,14 +96,14 @@

 std::list* initPackets;
 Link* link;
-std::list respQ;
+std::list<::gem5::PacketPtr> respQ;
 bool blocked() { return !respQ.empty(); }

-typedef std::map PacketMap_t;
+typedef std::map PacketMap_t;
 PacketMap_t PacketMap; // SST Event id -> gem5 Packet*

 public:
-ExtSlave(gem5Component*, Output&, ExternalSlave&, std::string&);
+ExtSlave(gem5Component*, Output&, ::gem5::ExternalSlave&,  
std::string&);

 void init(unsigned phase);

 void
diff --git a/ext/sst/gem5.cc b/ext/sst/gem5.cc
index 3d48e93..efe73eb 100644
--- a/ext/sst/gem5.cc
+++ b/ext/sst/gem5.cc
@@ -108,14 +108,15 @@
 splitCommandArgs(gem5DbgFlags, flags);
 for (auto flag : flags) {
 dbg.output(CALL_INFO, "  Setting Debug Flag [%s]\n", flag);
-setDebugFlag(flag);
+::gem5::setDebugFlag(flag);
 }

-ExternalMaster::registerHandler("sst", this); // these are idempotent
-ExternalSlave ::registerHandler("sst", this);
+// These are idempotent
+::gem5::ExternalMaster::registerHandler("sst", this);
+::gem5::ExternalSlave::registerHandler("sst", this);

-// Initialize m5 special signal handling.
-initSignals();
+// Initialize gem5's special signal handling.
+::gem5::initSignals();

 initPython(args.size(), [0]);

@@ -172,11 +173,12 @@
 m->clock();
 }

-GlobalSimLoopExitEvent *event = simulate(sim_cycles);
+::gem5::GlobalSimLoopExitEvent *event = ::gem5::simulate(sim_cycles);
 ++clocks_processed;
 if (event != simulate_limit_event) {
 info.output("exiting: curTick()=%lu cause=`%s` code=%d\n",
-curTick(), event->getCause().c_str(), event->getCode());
+::gem5::curTick(), event->getCause().c_str(),
+event->getCode());
 primaryComponentOKToEndSim();
 return true;
 }
@@ -248,9 +250,9 @@
 }
 }

-ExternalMaster::Port*
+::gem5::ExternalMaster::Port*
 gem5Component::getExternalPort(const std::string ,
-ExternalMaster , const std::string _data)
+::gem5::ExternalMaster , const std::string _data)
 {
 std::string s(name); // bridges non-& result and &-arg
 auto master = new ExtMaster(this, info, owner, s);
@@ -258,9 +260,9 @@
 return master;
 }

-ExternalSlave::Port*
+::gem5::ExternalSlave::Port*
 gem5Component::getExternalPort(const std::string ,
-ExternalSlave , const std::string _data)
+::gem5::ExternalSlave , const std::string _data)
 {
 std::string s(name); // bridges non-& result and &-arg
 auto slave = new ExtSlave(this, info, owner, s);
diff --git a/ext/sst/gem5.hh b/ext/sst/gem5.hh
index 0f1bed8..4dc0213 100644
--- a/ext/sst/gem5.hh
+++ b/ext/sst/gem5.hh
@@ -45,12 +45,15 @@
 #ifndef EXT_SST_GEM5_HH
 #define EXT_SST_GEM5_HH

+#include 
 #include 
 #include 

 #include 
 #include 

+#include 
+#include 
 #include 

 #include "ExtMaster.hh"
@@ -60,8 +63,9 @@
 namespace gem5 {

 class gem5Component : public SST::Component,
-  public ExternalSlave::Handler,
-  public ExternalMaster::Handler {
+  public ::gem5::ExternalSlave::Handler,
+  public ::gem5::ExternalMaster::Handler
+{
 private:

 Output dbg;
@@ -83,12 +87,12 @@
 virtual void finish();
 bool clockTick(Cycle_t);

-virtual ExternalMaster::Port *getExternalPort(
-const std::string , ExternalMaster ,
+virtual ::gem5::ExternalMaster::Port *getExternalPort(
+const std::string , ::gem5::ExternalMaster ,
 const std::string _data);

-virtual ExternalSlave::Port *getExternalPort(
-const std::string , ExternalSlave ,
+virtual ::gem5::ExternalSlave::Port *getExternalPort(
+const std::string , ::gem5::ExternalSlave ,
 const std::string _data);
 };


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47302
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: I3da8adffdcfe9e47e88cd85b7b66f6f8e1a1757a
Gerrit-Change-Number: 47302
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]: arch-arm: Rename debug variables

2021-06-27 Thread Daniel Carvalho (Gerrit) via gem5-dev

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-Me

[gem5-dev] Change in gem5/gem5[develop]: base-stats: Fix null addStatGroup

2021-06-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

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

2021-06-17 Thread Daniel Carvalho (Gerrit) via gem5-dev

 const
+findNearest(Addr addr, Addr _addr) const
 {
 AddrMap::const_iterator i = addrMap.end();
 if (!upperBound(addr, i))
 return end();

-nextaddr = i->first;
+next_addr = i->first;
 --i;
 return symbols.begin() + i->second;
 }

-/// Overload for findNearestSymbol() for callers who don't care
-/// about nextaddr.
+/**
+ * Overload for findNearestSymbol() for callers who don't care
+ * about nextaddr.
+ */
 const_iterator
 findNearest(Addr addr) const
 {
@@ -247,10 +381,12 @@
 }
 };

-/// Global unified debugging symbol table (for target).  Conceptually
-/// there should be one of these per System object for full system,
-/// and per Process object for non-full-system, but so far one big
-/// global one has worked well enough.
+/**
+ * Global unified debugging symbol table (for target). Conceptually
+ * there should be one of these per System object for full system,
+ * and per Process object for non-full-system, but so far one big
+ * global one has worked well enough.
+ */
 extern SymbolTable debugSymbolTable;

 } // namespace loader



10 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/+/43248
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: Ia4f18bf60d3d8eab7a775f34f553d420816d62b9
Gerrit-Change-Number: 43248
Gerrit-PatchSet: 12
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

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1316 matches

Mail list logo