P4 to Git Change 1200252 by jatang@jatang-opencl-hsa-stg1 on 2015/10/15 11:56:48

SWDEV-56468 - Back out changelist 1200206

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#303 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#121 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#387 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuwavelimiter.cpp#10 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuwavelimiter.hpp#7 edit


[ROCm/clr commit: 4b286ad468]

projects/clr/rocclr/runtime/device/gpu/gpukernel.cpp

@@ -826,7 +826,7 @@ Kernel::create(
 
     // Wave limiter needs to be initialized after kernel metadata is parsed
     // Since it depends on it.
-    waveLimiter_.enable(dev().settings().ciPlus_);
+    waveLimiter_.enable();
 
     if (result) {
         buildError_ = CL_SUCCESS;
@@ -844,7 +844,7 @@ Kernel::Kernel(
     const Program&      prog,
     const InitData*     initData)
     : NullKernel(name, gpuDev, prog)
-    , waveLimiter_(this, dev().getAttribs().numberOfCUsperShaderArray * dev().hwInfo()->simdPerCU_)
+    , waveLimiter_(this)
 {
     hwPrivateSize_ = 0;
     if (NULL != initData) {
@@ -3371,7 +3371,6 @@ HSAILKernel::HSAILKernel(std::string name,
     , codeSize_(0)
     , hwMetaData_(NULL)
     , extraArgumentsNum_(extraArgsNum)
-    , waveLimiter_(this, dev().getAttribs().numberOfCUsperShaderArray * dev().hwInfo()->simdPerCU_)
 {
     hsa_ = true;
 }
@@ -3518,16 +3517,6 @@ HSAILKernel::init(amd::hsa::loader::Symbol *sym, bool finalize)
     }
     index_ = md.kernel_index;
 
-    size_t sizeOfWavesPerSimdHint;
-    error = aclQueryInfo(dev().hsaCompiler(), prog().binaryElf(),
-        RT_WAVES_PER_SIMD_HINT, openClKernelName.c_str(),
-        &workGroupInfo_.wavesPerSimdHint_, &sizeOfWavesPerSimdHint);
-    if (error != ACL_SUCCESS) {
-        return false;
-    }
-
-    waveLimiter_.enable(dev().settings().ciPlus_);
-
     return true;
 }