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/gpucounters.cpp

@@ -5,6 +5,7 @@
 #include "device/gpu/gpudefs.hpp"
 #include "device/gpu/gpucounters.hpp"
 #include "device/gpu/gpuvirtual.hpp"
+#include "query/PerformanceQueryObject.h"
 
 namespace gpu {
 
@@ -14,7 +15,7 @@ CalCounterReference::~CalCounterReference() {
     amd::ScopedLock lock(gpu_.execution());
 
     if (0 != counter_) {
-        gpu().destroyCounter(gslCounter());
+        gpu().cs()->destroyQuery(gslCounter());
     }
 }
 
@@ -52,7 +53,7 @@ PerfCounter::create(
     calRef->growResultArray(index_);
 
     // Initialize the counter
-    gpu().configPerformanceCounter(gslCounter(),
+    gslCounter()->getAsPerformanceQueryObject()->setCounterState(
         info()->blockIndex_, info()->counterIndex_, info()->eventIndex_);
 
     return true;
@@ -75,7 +76,7 @@ PerfCounter::getInfo(uint64_t infoType) const
         return info()->eventIndex_;
     }
     case CL_PERFCOUNTER_DATA: {
-        gpu().getCounter(reinterpret_cast<uint64*>(calRef_->results()), gslCounter());
+        gslCounter()->GetResult(gpu().cs(), reinterpret_cast<uint64*>(calRef_->results()));
         return calRef_->results()[index_];
     }
     default: