From 53604aa483da7b91a1f77e2fd0950efce75eee14 Mon Sep 17 00:00:00 2001
From: Matthew Poremba <matthew.poremba@amd.com>
Date: Tue, 22 Jun 2021 18:33:35 -0500
Subject: [PATCH] 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+kokoro@google.com>
Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com>
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Matt Sinclair <mattdsinclair@gmail.com>
---
 src/arch/amdgpu/vega/gpu_mem_helpers.hh    | 12 ++++++------
 src/arch/amdgpu/vega/insts/op_encodings.hh |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

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<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 @@ initMemReqScalarHelper(GPUDynInstPtr gpuDynInst, MemCmd mem_req_type)
      */
     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 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<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);