P4 to Git Change 1558704 by gandryey@gera-w8 on 2018/05/23 17:20:01
SWDEV-79445 - OCL generic changes and code clean-up - ABI clean-up. Stage 1: Separate kernel arguments and OCL objects. OCL objects will be passed in the new arrays of mem objects, samplers and device queue objects. The kernel arguments will contain GPU virtual addresses. http://ocltc.amd.com/reviews/r/14881/ Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#48 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_svm.cpp#25 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#302 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpublit.cpp#129 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#323 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#128 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.hpp#51 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#417 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palblit.cpp#23 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#50 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palmemory.hpp#7 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#97 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.cpp#22 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocblit.hpp#9 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#28 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.hpp#12 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#51 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#86 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.cpp#26 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.hpp#20 edit
This commit is contained in:
@@ -859,10 +859,6 @@ void CalcRowSlicePitches(cl_ulong* pitch, const cl_int* copySize, size_t rowPitc
|
||||
}
|
||||
}
|
||||
|
||||
static inline void setArgument(amd::Kernel* kernel, size_t index, size_t size, const void* value) {
|
||||
kernel->parameters().set(index, size, value);
|
||||
}
|
||||
|
||||
bool KernelBlitManager::copyBufferToImageKernel(device::Memory& srcMemory,
|
||||
device::Memory& dstMemory,
|
||||
const amd::Coord3D& srcOrigin,
|
||||
@@ -2106,21 +2102,10 @@ Memory* KernelBlitManager::createView(const Memory& parent, cl_image_format form
|
||||
}
|
||||
|
||||
address KernelBlitManager::captureArguments(const amd::Kernel* kernel) const {
|
||||
const size_t stackSize = kernel->signature().paramsSize();
|
||||
const size_t svmInfoSize = kernel->signature().numParameters() * sizeof(bool);
|
||||
address args = reinterpret_cast<address>(
|
||||
amd::AlignedMemory::allocate(stackSize + svmInfoSize, PARAMETERS_MIN_ALIGNMENT));
|
||||
if (args == nullptr) {
|
||||
LogWarning("Failed to allocate memory for arguments");
|
||||
return nullptr;
|
||||
}
|
||||
memcpy(args, kernel->parameters().values(), kernel->signature().paramsSize());
|
||||
memset(args + stackSize, 0, svmInfoSize);
|
||||
return args;
|
||||
return kernel->parameters().values();
|
||||
}
|
||||
|
||||
void KernelBlitManager::releaseArguments(address args) const {
|
||||
amd::AlignedMemory::deallocate(args);
|
||||
}
|
||||
|
||||
} // namespace pal
|
||||
|
||||
Reference in New Issue
Block a user