From e1fea279e2dad599befa439266ae83052fc1842c Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 8 May 2021 20:24:36 -0700 Subject: [PATCH] misc: Replace M5_NODISCARD with GEM5_NO_DISCARD. Change-Id: I1ddaf03afe865092d1664e395b51b1f573c19c85 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45232 Tested-by: kokoro Maintainer: Gabe Black Reviewed-by: Daniel Carvalho --- src/gpu-compute/compute_unit.hh | 2 +- src/mem/cache/base.hh | 2 +- src/mem/cache/cache.hh | 2 +- src/mem/cache/noncoherent_cache.hh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gpu-compute/compute_unit.hh b/src/gpu-compute/compute_unit.hh index 186a456646..cdefb2be14 100644 --- a/src/gpu-compute/compute_unit.hh +++ b/src/gpu-compute/compute_unit.hh @@ -476,7 +476,7 @@ class ComputeUnit : public ClockedObject 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> pageDataStruct; pageDataStruct pageAccesses; diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh index 18d54a57f4..3285c97c37 100644 --- a/src/mem/cache/base.hh +++ b/src/mem/cache/base.hh @@ -802,7 +802,7 @@ class BaseCache : public ClockedObject * @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 d370d8bda2..556f0bee45 100644 --- a/src/mem/cache/cache.hh +++ b/src/mem/cache/cache.hh @@ -133,7 +133,7 @@ class Cache : public BaseCache 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 4fade02014..49ee3da741 100644 --- a/src/mem/cache/noncoherent_cache.hh +++ b/src/mem/cache/noncoherent_cache.hh @@ -116,7 +116,7 @@ class NoncoherentCache : public BaseCache 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);