P4 to Git Change 1184379 by gandryey@gera-dev-w7 on 2015/08/25 13:11:13

ECR #304775 - Remove the passthrough interfaces from CALGSLContext

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpucounters.cpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#293 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#114 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#224 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gputhreadtrace.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gputhreadtrace.hpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gputimestamp.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#374 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#132 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#77 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#49 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/backend.h#9 edit

rocclr/runtime/device/gpu/gputhreadtrace.cpp

@@ -13,7 +13,7 @@ CalThreadTraceReference::~CalThreadTraceReference() {
     amd::ScopedLock lock(gpu_.execution());
 
     if (0 != threadTrace_) {
-        //gpu().destroyThreadTrace(gslThreadTrace());
+        //gpu().cs()->destroyQuery(gslThreadTrace());
     }
 }
 
@@ -24,7 +24,8 @@ ThreadTrace::~ThreadTrace()
         return;
     }
     for(uint i = 0; i < amdThreadTraceMemObjsNum_;++i) {
-        gpu().DestroyThreadTraceBuffer(threadTraceBufferObjs_[i],i);
+        threadTraceBufferObjs_[i]->attachMemObject(gpu().cs(), NULL, 0, 0, 0, i);
+        gpu().cs()->destroyShaderTraceBuffer(threadTraceBufferObjs_[i]);
     }
 
     // Release the thread trace reference object
@@ -52,7 +53,7 @@ ThreadTrace::info(uint infoType, uint* info, uint infoSize) const
             return false;
         }
         else {
-            gpu().getThreadTraceQueryRes(gslThreadTrace(), info);
+            gslThreadTrace()->GetResultAll(gpu().cs(), info);
         }
         break;
     }