AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
foreman
2018-06-13 17:09:22 -04:00
parent 041c859d7e
commit b7b121fa27
6 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/device/pal/palkernel.cpp
+18 -5
View File
@@ -529,8 +529,11 @@ void HSAILKernel::initArgList(const aclArgData* aclArg) {
}
}
}
createSignature(params, hiddenParams, amd::KernelSignature::ABIVersion_1);
// Save the number of OCL arguments
uint32_t numParams = params.size();
// Append the hidden arguments to the OCL arguments
params.insert(params.end(), hiddenParams.begin(), hiddenParams.end());
createSignature(params, numParams, amd::KernelSignature::ABIVersion_1);
}
void HSAILKernel::initHsailArgs(const aclArgData* aclArg) {
@@ -954,7 +957,8 @@ hsa_kernel_dispatch_packet_t* HSAILKernel::loadArguments(
const amd::KernelSignature& signature = kernel.signature();
// Check if runtime has to setup hidden arguments
for (const auto& it : signature.hiddenParameters()) {
for (uint32_t i = signature.numParameters(); i < signature.numParametersAll(); ++i) {
const auto it = signature.at(i);
size_t offset;
switch (it.info_.oclObject_) {
case amd::KernelParameterDescriptor::HiddenNone:
@@ -1387,10 +1391,19 @@ void LightningKernel::initArgList(const KernelMD& kernelMD) {
// Update read only flag
desc.info_.readOnly_ = (arguments_[i]->access_ == HSAIL_ACCESS_TYPE_RO) ? true : false;
if (arguments_[i]->type_ == HSAIL_ARGTYPE_IMAGE) {
flags_.imageEna_ = true;
if (desc.accessQualifier_ != CL_KERNEL_ARG_ACCESS_READ_ONLY) {
flags_.imageWriteEna_ = true;
}
}
params.push_back(desc);
}
createSignature(params, hiddenParams, amd::KernelSignature::ABIVersion_1);
// Save the number of OCL arguments
uint32_t numParams = params.size();
// Append the hidden arguments to the OCL arguments
params.insert(params.end(), hiddenParams.begin(), hiddenParams.end());
createSignature(params, numParams, amd::KernelSignature::ABIVersion_1);
}
static const KernelMD* FindKernelMetadata(const CodeObjectMD* programMD, const std::string& name) {