From c75ff71139d6358678835cca63e35d1135eaf466 Mon Sep 17 00:00:00 2001 From: Mitch Hayenga Date: Thu, 7 Apr 2016 09:30:20 -0500 Subject: mem: Remove threadId from memory request class In general, the ThreadID parameter is unnecessary in the memory system as the ContextID is what is used for the purposes of locks/wakeups. Since we allocate sequential ContextIDs for each thread on MT-enabled CPUs, ThreadID is unnecessary as the CPUs can identify the requesting thread through sideband info (SenderState / LSQ entries) or ContextID offset from the base ContextID for a cpu. This is a re-spin of 20264eb after the revert (bd1c6789) and includes some fixes of that commit. --- src/gpu-compute/dispatcher.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpu-compute/dispatcher.cc') diff --git a/src/gpu-compute/dispatcher.cc b/src/gpu-compute/dispatcher.cc index 55e4be72a..95c0c56a2 100644 --- a/src/gpu-compute/dispatcher.cc +++ b/src/gpu-compute/dispatcher.cc @@ -222,7 +222,7 @@ GpuDispatcher::write(PacketPtr pkt) ndr->addrToNotify = (volatile bool*)curTask.addrToNotify; ndr->numDispLeft = (volatile uint32_t*)curTask.numDispLeft; ndr->dispatchId = nextId; - ndr->curTid = pkt->req->threadId(); + ndr->curCid = pkt->req->contextId(); DPRINTF(GPUDisp, "launching kernel %d\n",nextId); execIds.push(nextId); ++nextId; @@ -272,7 +272,7 @@ GpuDispatcher::exec() while (ndRangeMap[execId].wg_disp_rem) { //update the thread context - shader->updateThreadContext(ndRangeMap[execId].curTid); + shader->updateContext(ndRangeMap[execId].curCid); // attempt to dispatch_workgroup if (!shader->dispatch_workgroups(&ndRangeMap[execId])) { -- cgit v1.2.3