derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: Replace M5_NODISCARD with GEM5_NO_DISCARD.

Browse Source 
Change-Id: I1ddaf03afe865092d1664e395b51b1f573c19c85
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45232
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
This commit is contained in:
Gabe Black
2021-05-08 20:24:36 -07:00
parent fb3befcc6d
commit e1fea279e2
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu-compute/compute_unit.hh
View File

@@ -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<Addr, std::pair<int, int>> pageDataStruct;
pageDataStruct pageAccesses;

2
src/mem/cache/base.hh vendored
View File

@@ -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.

2
src/mem/cache/cache.hh vendored
View File

@@ -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.

2
src/mem/cache/noncoherent_cache.hh vendored
View File

@@ -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);