Matthew Poremba has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/66711?usp=email )
Change subject: gpu-compute: Fix ABI init for DispatchId
......................................................................
gpu-compute: Fix ABI init for DispatchId
DispatchId should allocate two SGPRs instead of one. Allocating one was
causing all subsequent SGPR index values to be off by one, leading to
bad addresses for things like flat scratch and private segment. This
field is not used very often so it was not impacting most applications.
Change-Id: I17744e2d099fbc0447f400211ba7f8a42675ea06
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66711
Reviewed-by: Matt Sinclair <mattdsincl...@gmail.com>
Maintainer: Matt Sinclair <mattdsincl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/gpu-compute/wavefront.cc
1 file changed, 28 insertions(+), 2 deletions(-)
Approvals:
Matt Sinclair: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/gpu-compute/wavefront.cc b/src/gpu-compute/wavefront.cc
index 7e4b36f..8a1adfe 100644
--- a/src/gpu-compute/wavefront.cc
+++ b/src/gpu-compute/wavefront.cc
@@ -118,8 +118,10 @@
{
int regInitIdx = 0;
- // iterate over all the init fields and check which
- // bits are enabled
+ // Iterate over all the init fields and check which
+ // bits are enabled. Useful information can be found here:
+ // https://github.com/ROCm-Developer-Tools/ROCm-ComputeABI-Doc/
+ // blob/master/AMDGPU-ABI.md
for (int en_bit = 0; en_bit < NumScalarInitFields; ++en_bit) {
if (task->sgprBitEnabled(en_bit)) {
@@ -263,6 +265,12 @@
computeUnit->cu_id, simdId,
wfSlotId, wfDynId, physSgprIdx,
task->dispatchId());
+
+ // Dispatch ID in gem5 is an int. Set upper 32-bits to
zero.
+ physSgprIdx
+ = computeUnit->registerManager->mapSgpr(this,
regInitIdx);
+ computeUnit->srf[simdId]->write(physSgprIdx, 0);
+ ++regInitIdx;
break;
case FlatScratchInit:
physSgprIdx
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/66711?usp=email
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: I17744e2d099fbc0447f400211ba7f8a42675ea06
Gerrit-Change-Number: 66711
Gerrit-PatchSet: 3
Gerrit-Owner: Matthew Poremba <matthew.pore...@amd.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
