Matthew Poremba has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/47101 )
Change subject: arch-vega: Remove ASID parameter from Requests
......................................................................
arch-vega: Remove ASID parameter from Requests
The ASID parameter was removed from the Request class header while the
Vega patches were under review and these were not updated.
Change-Id: Ie04027bac09a63063501a49ec438b69628972b2d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/47101
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Matt Sinclair <mattdsincl...@gmail.com>
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
Maintainer: Matt Sinclair <mattdsincl...@gmail.com>
---
M src/arch/amdgpu/vega/gpu_mem_helpers.hh
M src/arch/amdgpu/vega/insts/op_encodings.hh
2 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
Matt Sinclair: Looks good to me, but someone else must approve; Looks
good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/amdgpu/vega/gpu_mem_helpers.hh
b/src/arch/amdgpu/vega/gpu_mem_helpers.hh
index 6682b42..3f4084c 100644
--- a/src/arch/amdgpu/vega/gpu_mem_helpers.hh
+++ b/src/arch/amdgpu/vega/gpu_mem_helpers.hh
@@ -84,15 +84,15 @@
// a given lane's atomic can't cross cache lines
assert(!misaligned_acc);
- req = std::make_shared<Request>(0, vaddr, sizeof(T), 0,
- gpuDynInst->computeUnit()->masterId(), 0,
+ req = std::make_shared<Request>(vaddr, sizeof(T), 0,
+ gpuDynInst->computeUnit()->requestorId(), 0,
gpuDynInst->wfDynId,
gpuDynInst->makeAtomicOpFunctor<T>(
&(reinterpret_cast<T*>(gpuDynInst->a_data))[lane],
&(reinterpret_cast<T*>(gpuDynInst->x_data))[lane]));
} else {
- req = std::make_shared<Request>(0, vaddr, req_size, 0,
- gpuDynInst->computeUnit()->masterId(), 0,
+ req = std::make_shared<Request>(vaddr, req_size, 0,
+
gpuDynInst->computeUnit()->requestorId(), 0,
gpuDynInst->wfDynId);
}
@@ -155,8 +155,8 @@
*/
bool misaligned_acc = split_addr > vaddr;
- RequestPtr req = std::make_shared<Request>(0, vaddr, req_size, 0,
- gpuDynInst->computeUnit()->masterId(), 0,
+ RequestPtr req = std::make_shared<Request>(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 289a0ba..6952c1f 100644
--- a/src/arch/amdgpu/vega/insts/op_encodings.hh
+++ b/src/arch/amdgpu/vega/insts/op_encodings.hh
@@ -554,9 +554,10 @@
// create request and set flags
gpuDynInst->resetEntireStatusVector();
gpuDynInst->setStatusVector(0, 1);
- auto req = std::make_shared<Request>(0, 0, 0, 0,
-
gpuDynInst->computeUnit()->masterId(),
- 0, gpuDynInst->wfDynId);
+ RequestPtr req = std::make_shared<Request>(0, 0, 0,
+ gpuDynInst->computeUnit()->
+ requestorId(), 0,
+ gpuDynInst->wfDynId);
gpuDynInst->setRequestFlags(req);
gpuDynInst->computeUnit()->
injectGlobalMemFence(gpuDynInst, false, req);
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/47101
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: Ie04027bac09a63063501a49ec438b69628972b2d
Gerrit-Change-Number: 47101
Gerrit-PatchSet: 3
Gerrit-Owner: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
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
