[gem5-dev] Change in gem5/gem5[develop]: misc: Replace M5_NODISCARD with GEM5_NODISCARD.

[Gabe Black (Gerrit) via gem5-dev]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/45232 )

Change subject: misc: Replace M5_NODISCARD with GEM5_NODISCARD.
......................................................................

misc: Replace M5_NODISCARD with GEM5_NODISCARD.

Change-Id: I1ddaf03afe865092d1664e395b51b1f573c19c85
---
M src/gpu-compute/compute_unit.hh
M src/mem/cache/base.hh
M src/mem/cache/cache.hh
M src/mem/cache/noncoherent_cache.hh
4 files changed, 4 insertions(+), 4 deletions(-)



diff --git a/src/gpu-compute/compute_unit.hh  
b/src/gpu-compute/compute_unit.hh
index 186a456..cdefb2b 100644
--- a/src/gpu-compute/compute_unit.hh
+++ b/src/gpu-compute/compute_unit.hh
@@ -476,7 +476,7 @@
     int32_t
     getRefCounter(const uint32_t dispatchId, const uint32_t wgId) const;

-    M5_NODISCARD bool sendToLds(GPUDynInstPtr gpuDynInst);
+    GEM5_NO_DISCARD bool sendToLds(GPUDynInstPtr gpuDynInst);

     typedef std::unordered_map<Addr, std::pair<int, int>> pageDataStruct;
     pageDataStruct pageAccesses;
diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh
index 18d54a5..3285c97 100644
--- a/src/mem/cache/base.hh
+++ b/src/mem/cache/base.hh
@@ -802,7 +802,7 @@
      * @param blk Block to invalidate
      * @return A packet with the writeback, can be nullptr
      */
-    M5_NODISCARD virtual PacketPtr evictBlock(CacheBlk *blk) = 0;
+    GEM5_NO_DISCARD virtual PacketPtr evictBlock(CacheBlk *blk) = 0;

     /**
      * Evict a cache block.
diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh
index d370d8b..556f0be 100644
--- a/src/mem/cache/cache.hh
+++ b/src/mem/cache/cache.hh
@@ -133,7 +133,7 @@
     uint32_t handleSnoop(PacketPtr pkt, CacheBlk *blk,
                          bool is_timing, bool is_deferred, bool  
pending_inval);

-    M5_NODISCARD PacketPtr evictBlock(CacheBlk *blk) override;
+    GEM5_NO_DISCARD PacketPtr evictBlock(CacheBlk *blk) override;

     /**
      * Create a CleanEvict request for the given block.
diff --git a/src/mem/cache/noncoherent_cache.hh  
b/src/mem/cache/noncoherent_cache.hh
index 4fade02..49ee3da 100644
--- a/src/mem/cache/noncoherent_cache.hh
+++ b/src/mem/cache/noncoherent_cache.hh
@@ -116,7 +116,7 @@
                                bool needs_writable,
                                bool is_whole_line_write) const override;

-    M5_NODISCARD PacketPtr evictBlock(CacheBlk *blk) override;
+    GEM5_NO_DISCARD PacketPtr evictBlock(CacheBlk *blk) override;

   public:
     NoncoherentCache(const NoncoherentCacheParams &p);

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45232
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: I1ddaf03afe865092d1664e395b51b1f573c19c85
Gerrit-Change-Number: 45232
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
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