gpu-compute: remove recvToken from GM pipe exec

Tokens were previously acquired in GM pipe exec but has been moved to
acqCoalescerToken. This removes the extraneous code which was acquiring
tokens twice, causing them to be depleted and triggering an assertion.

Change-Id: Ic92de8f06cc85828b29c69790bdadde057ef1777
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29916
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Reviewed-by: Matthew Poremba <matthew.poremba@amd.com>
Maintainer: Anthony Gutierrez <anthony.gutierrez@amd.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/gpu-compute/global_memory_pipeline.cc b/src/gpu-compute/global_memory_pipeline.cc
index 0bbacc44c9647fb7f64f9b2774d827c66d1b7ac4..c73184a59b46c8b669eae8d74e56da86320eba6a 100644 (file)
--- a/src/gpu-compute/global_memory_pipeline.cc
+++ b/src/gpu-compute/global_memory_pipeline.cc
@@ -190,12 +190,6 @@ GlobalMemPipeline::exec()
 
         DPRINTF(GPUCoalescer, "initiateAcc for %s seqNum %d\n",
                 mp->disassemble(), mp->seqNum());
-        // Memfences will not return tokens and must be issued so we should
-        // not request one as this will deplete the token count until deadlock
-        if (!mp->isMemSync()) {
-            assert(mp->computeUnit()->getTokenManager()->haveTokens(1));
-            mp->computeUnit()->getTokenManager()->acquireTokens(1);
-        }
         mp->initiateAcc(mp);
 
         if (((mp->isMemSync() && !mp->isEndOfKernel()) || !mp->isMemSync())) {