P4 to Git Change 1200206 by jatang@jatang-opencl-hsa-stg1 on 2015/10/15 10:08:51

SWDEV-56468 - Support wave limiter in HSAIL path.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#302 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#120 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#386 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuwavelimiter.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuwavelimiter.hpp#6 edit

rocclr/runtime/device/gpu/gpukernel.hpp

@@ -918,6 +918,17 @@ public:
     //! Returns kernel's extra argument count
     uint extraArgumentsNum() const { return extraArgumentsNum_; }
 
+    //! Get profiling callback object
+    virtual amd::ProfilingCallback* getProfilingCallback(
+        const device::VirtualDevice *vdev){
+        return waveLimiter_.getProfilingCallback(vdev);
+    }
+
+    //! Get waves per shader array to be used for kernel execution.
+    uint getWavesPerSH(const device::VirtualDevice *vdev) const {
+        return waveLimiter_.getWavesPerSH(vdev);
+    }
+
 private:
     //! Disable copy constructor
     HSAILKernel(const HSAILKernel&);
@@ -968,6 +979,8 @@ private:
         uint    value_;
         Flags(): value_(0) {}
     } flags_;
+
+    WaveLimiterManager waveLimiter_; //!< adaptively control number of waves
 };
 
 /*@}*/} // namespace gpu