From eb9efdaa442ce01728477b09ac4f1154b66ba373 Mon Sep 17 00:00:00 2001 From: Matthew Poremba Date: Thu, 14 Jun 2018 15:12:28 -0700 Subject: [PATCH] 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 Reviewed-by: Matthew Poremba Maintainer: Anthony Gutierrez Tested-by: kokoro --- src/gpu-compute/global_memory_pipeline.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/gpu-compute/global_memory_pipeline.cc b/src/gpu-compute/global_memory_pipeline.cc index 0bbacc44c..c73184a59 100644 --- 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())) { -- 2.30.2