From 2113b21996d086dab32b9fd388efe3df241bfbd2 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Sun, 3 Jun 2018 13:10:26 +0100 Subject: misc: Substitute pointer to Request with aliased RequestPtr Every usage of Request* in the code has been replaced with the RequestPtr alias. This is a preparing patch for when RequestPtr will be the typdefed to a smart pointer to Request rather then a raw pointer to Request. Change-Id: I73cbaf2d96ea9313a590cdc731a25662950cd51a Signed-off-by: Giacomo Travaglini Reviewed-by: Nikos Nikoleris Reviewed-on: https://gem5-review.googlesource.com/10995 Reviewed-by: Anthony Gutierrez Reviewed-by: Daniel Carvalho Maintainer: Anthony Gutierrez --- src/gpu-compute/compute_unit.cc | 4 ++-- src/gpu-compute/fetch_unit.cc | 2 +- src/gpu-compute/gpu_dyn_inst.hh | 2 +- src/gpu-compute/shader.cc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gpu-compute') diff --git a/src/gpu-compute/compute_unit.cc b/src/gpu-compute/compute_unit.cc index aa4f0a322..042347cf2 100644 --- a/src/gpu-compute/compute_unit.cc +++ b/src/gpu-compute/compute_unit.cc @@ -1178,7 +1178,7 @@ ComputeUnit::DTLBPort::recvTimingResp(PacketPtr pkt) if (!stride) break; - Request *prefetch_req = new Request(0, vaddr + stride * pf * + RequestPtr prefetch_req = new Request(0, vaddr + stride * pf * TheISA::PageBytes, sizeof(uint8_t), 0, computeUnit->masterId(), @@ -1801,7 +1801,7 @@ ComputeUnit::sendToLds(GPUDynInstPtr gpuDynInst) { // this is just a request to carry the GPUDynInstPtr // back and forth - Request *newRequest = new Request(); + RequestPtr newRequest = new Request(); newRequest->setPaddr(0x0); // ReadReq is not evaluted by the LDS but the Packet ctor requires this diff --git a/src/gpu-compute/fetch_unit.cc b/src/gpu-compute/fetch_unit.cc index c989d6748..36ef1e1e8 100644 --- a/src/gpu-compute/fetch_unit.cc +++ b/src/gpu-compute/fetch_unit.cc @@ -145,7 +145,7 @@ FetchUnit::initiateFetch(Wavefront *wavefront) } // set up virtual request - Request *req = new Request(0, vaddr, size, Request::INST_FETCH, + RequestPtr req = new Request(0, vaddr, size, Request::INST_FETCH, computeUnit->masterId(), 0, 0, 0); PacketPtr pkt = new Packet(req, MemCmd::ReadReq); diff --git a/src/gpu-compute/gpu_dyn_inst.hh b/src/gpu-compute/gpu_dyn_inst.hh index 8d259cba0..4b1c9fde9 100644 --- a/src/gpu-compute/gpu_dyn_inst.hh +++ b/src/gpu-compute/gpu_dyn_inst.hh @@ -382,7 +382,7 @@ class GPUDynInst : public GPUExecContext } void - setRequestFlags(Request *req, bool setMemOrder=true) + setRequestFlags(RequestPtr req, bool setMemOrder=true) { // currently these are the easy scopes to deduce if (isPrivateSeg()) { diff --git a/src/gpu-compute/shader.cc b/src/gpu-compute/shader.cc index d3453c2f9..8e7ba9ad5 100644 --- a/src/gpu-compute/shader.cc +++ b/src/gpu-compute/shader.cc @@ -338,7 +338,7 @@ Shader::AccessMem(uint64_t address, void *ptr, uint32_t size, int cu_id, for (ChunkGenerator gen(address, size, cuList.at(cu_id)->cacheLineSize()); !gen.done(); gen.next()) { - Request *req = new Request(0, gen.addr(), gen.size(), 0, + RequestPtr req = new Request(0, gen.addr(), gen.size(), 0, cuList[0]->masterId(), 0, 0, 0); doFunctionalAccess(req, cmd, data_buf, suppress_func_errors, cu_id); -- cgit v1.2.3