P4 to Git Change 1182841 by jatang@jatang-opencl-hsa-stg1 on 2015/08/20 15:24:51

EPR #423121 - Retrieve thread trace results for all SEs.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_thread_trace_amd.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gputhreadtrace.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#76 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#48 edit
... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLThreadTrace.cpp#9 edit

rocclr/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp

@@ -958,14 +958,10 @@ CALGSLContext::resumeThreadTrace(uint32 seNum) const
     }
 }
 
-uint32
-CALGSLContext::getThreadTraceQueryRes(gslQueryObject threadTrace) const
+void
+CALGSLContext::getThreadTraceQueryRes(gslQueryObject threadTrace, uint32* info) const
 {
-    CALuint64 tempResult;
-    threadTrace->GetResult(m_cs, &tempResult);
-    // Make sure that we aren't losing any data from the cast
-    assert(tempResult < UINT_MAX);
-    return (uint32)tempResult;
+    threadTrace->GetResultAll(m_cs, info);
 }
 
 void

rocclr/runtime/device/gpu/gslbe/src/rt/GSLContext.h

@@ -107,7 +107,7 @@ public:
     void            destroyThreadTrace(gslQueryObject) const;
     gslShaderTraceBufferObject CreateThreadTraceBuffer(void) const;
     void            DestroyThreadTraceBuffer(gslShaderTraceBufferObject,uint32) const;
-    uint32          getThreadTraceQueryRes(gslQueryObject) const;
+    void            getThreadTraceQueryRes(gslQueryObject, uint32* info) const;
     void            configMemThreadTrace(gslShaderTraceBufferObject,gslMemObject,uint32,uint32) const;
     void            beginThreadTrace(gslQueryObject,gslQueryObject, gslQueryTarget,uint32,CALthreadTraceConfig&) const;
     void            endThreadTrace(gslQueryObject,uint32) const;