P4 to Git Change 1567935 by gandryey@gera-w8 on 2018/06/13 16:49:10

SWDEV-79445 - OCL generic changes and code clean-up
	- Remove array of hidden parameters. Hidden parameters will be placed together with OCL kernel arguments.

	http://ocltc.amd.com/reviews/r/15178/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#222 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#308 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#326 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#55 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rockernel.cpp#37 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.cpp#33 edit


[ROCm/clr commit: b7b121fa27]

projects/clr/rocclr/runtime/platform/kernel.cpp

@@ -244,11 +244,11 @@ void KernelParameters::release(address mem, const amd::Device& device) const {
 
 KernelSignature::KernelSignature(const std::vector<KernelParameterDescriptor>& params,
   const std::string& attrib,
-    const std::vector<KernelParameterDescriptor>& hiddenParams,
-    uint32_t version)
+  uint32_t numParameters,
+  uint32_t version)
   : params_(params)
-  , hiddenParams_(hiddenParams)
   , attributes_(attrib)
+  , numParameters_(numParameters)
   , paramsSize_(0)
   , numMemories_(0)
   , numSamplers_(0)
@@ -298,15 +298,5 @@ KernelSignature::KernelSignature(const std::vector<KernelParameterDescriptor>& p
     // 16 bytes is the current HW alignment for the arguments
     paramsSize_ = alignUp(paramsSize_, 16);
   }
-
-  if (hiddenParams.size() > 0) {
-    uint32_t lastArg = hiddenParams.size() - 1;
-    // Check if it's LC path and the hidden arguments are placed at the end
-    if (hiddenParams[lastArg].offset_ >= paramsSize_) {
-      paramsSize_ = hiddenParams[lastArg].offset_ + hiddenParams[lastArg].size_;
-      // 16 bytes is the current HW alignment for the arguments
-      paramsSize_ = alignUp(paramsSize_, 16);
-    }
-  }
 }
 }  // namespace amd