diff --git a/src/arch/amdgpu/vega/gpu_mem_helpers.hh b/src/arch/amdgpu/vega/gpu_mem_helpers.hh index 6682b42d52..3f4084c4fb 100644 --- a/src/arch/amdgpu/vega/gpu_mem_helpers.hh +++ b/src/arch/amdgpu/vega/gpu_mem_helpers.hh @@ -84,15 +84,15 @@ initMemReqHelper(GPUDynInstPtr gpuDynInst, MemCmd mem_req_type, // a given lane's atomic can't cross cache lines assert(!misaligned_acc); - req = std::make_shared(0, vaddr, sizeof(T), 0, - gpuDynInst->computeUnit()->masterId(), 0, + req = std::make_shared(vaddr, sizeof(T), 0, + gpuDynInst->computeUnit()->requestorId(), 0, gpuDynInst->wfDynId, gpuDynInst->makeAtomicOpFunctor( &(reinterpret_cast(gpuDynInst->a_data))[lane], &(reinterpret_cast(gpuDynInst->x_data))[lane])); } else { - req = std::make_shared(0, vaddr, req_size, 0, - gpuDynInst->computeUnit()->masterId(), 0, + req = std::make_shared(vaddr, req_size, 0, + gpuDynInst->computeUnit()->requestorId(), 0, gpuDynInst->wfDynId); } @@ -155,8 +155,8 @@ initMemReqScalarHelper(GPUDynInstPtr gpuDynInst, MemCmd mem_req_type) */ bool misaligned_acc = split_addr > vaddr; - RequestPtr req = std::make_shared(0, vaddr, req_size, 0, - gpuDynInst->computeUnit()->masterId(), 0, + RequestPtr req = std::make_shared(vaddr, req_size, 0, + gpuDynInst->computeUnit()->requestorId(), 0, gpuDynInst->wfDynId); if (misaligned_acc) { diff --git a/src/arch/amdgpu/vega/insts/op_encodings.hh b/src/arch/amdgpu/vega/insts/op_encodings.hh index 289a0ba488..6952c1fdb3 100644 --- a/src/arch/amdgpu/vega/insts/op_encodings.hh +++ b/src/arch/amdgpu/vega/insts/op_encodings.hh @@ -554,9 +554,10 @@ namespace VegaISA // create request and set flags gpuDynInst->resetEntireStatusVector(); gpuDynInst->setStatusVector(0, 1); - auto req = std::make_shared(0, 0, 0, 0, - gpuDynInst->computeUnit()->masterId(), - 0, gpuDynInst->wfDynId); + RequestPtr req = std::make_shared(0, 0, 0, + gpuDynInst->computeUnit()-> + requestorId(), 0, + gpuDynInst->wfDynId); gpuDynInst->setRequestFlags(req); gpuDynInst->computeUnit()-> injectGlobalMemFence(gpuDynInst, false, req);