From 98517076ebecac762d49db28ef6109579e423b21 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 5 Oct 2016 17:20:44 -0400 Subject: [PATCH] P4 to Git Change 1322968 by lmoriche@lmoriche_opencl_dev on 2016/10/05 17:07:27 SWDEV-104521 - [SSG] OpenCL API rename Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#51 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp#16 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_lqdflash_amd.h#5 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#27 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#407 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#28 edit ... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#76 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLLiquidFlash.cpp#5 edit ... //depot/stg/opencl/drivers/opencl/tests/ocltst/module/runtime/OCLLiquidFlash.h#4 edit [ROCm/clr commit: 7ed9620393799226e0e69893b94933167da60763] --- projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp | 6 +++--- projects/clr/rocclr/runtime/device/pal/palvirtual.cpp | 6 +++--- projects/clr/rocclr/runtime/platform/command.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp index 2facbbe466..dcace89e26 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpuvirtual.cpp @@ -3566,9 +3566,9 @@ VirtualGPU::submitTransferBufferFromFile(amd::TransferBufferFileCommand& cmd) Memory* mem = dev().getGpuMemory(&cmd.memory()); uint idx = 0; - assert((cmd.type() == CL_COMMAND_WRITE_BUFFER_FROM_FILE_AMD) || - (cmd.type() == CL_COMMAND_READ_BUFFER_FROM_FILE_AMD)); - bool writeBuffer(cmd.type() == CL_COMMAND_WRITE_BUFFER_FROM_FILE_AMD); + assert((cmd.type() == CL_COMMAND_READ_SSG_FILE_AMD) || + (cmd.type() == CL_COMMAND_WRITE_SSG_FILE_AMD)); + bool writeBuffer(cmd.type() == CL_COMMAND_READ_SSG_FILE_AMD); while (copySize > 0) { Memory* staging = dev().getGpuMemory(&cmd.staging(idx)); diff --git a/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp b/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp index 159d22d524..2c8bbc641c 100644 --- a/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palvirtual.cpp @@ -3425,9 +3425,9 @@ VirtualGPU::submitTransferBufferFromFile(amd::TransferBufferFileCommand& cmd) Memory* mem = dev().getGpuMemory(&cmd.memory()); uint idx = 0; - assert((cmd.type() == CL_COMMAND_WRITE_BUFFER_FROM_FILE_AMD) || - (cmd.type() == CL_COMMAND_READ_BUFFER_FROM_FILE_AMD)); - bool writeBuffer(cmd.type() == CL_COMMAND_WRITE_BUFFER_FROM_FILE_AMD); + assert((cmd.type() == CL_COMMAND_READ_SSG_FILE_AMD) || + (cmd.type() == CL_COMMAND_WRITE_SSG_FILE_AMD)); + bool writeBuffer(cmd.type() == CL_COMMAND_READ_SSG_FILE_AMD); while (copySize > 0) { Memory* staging = dev().getGpuMemory(&cmd.staging(idx)); diff --git a/projects/clr/rocclr/runtime/platform/command.cpp b/projects/clr/rocclr/runtime/platform/command.cpp index a525a693af..3bee36f48e 100644 --- a/projects/clr/rocclr/runtime/platform/command.cpp +++ b/projects/clr/rocclr/runtime/platform/command.cpp @@ -594,7 +594,7 @@ TransferBufferFileCommand::submit(device::VirtualDevice& device) CL_MEM_ALLOC_HOST_PTR | CL_MEM_USE_PERSISTENT_MEM_AMD)) { void* srcDstBuffer = mem->cpuMap(device); // Make HD transfer to the host accessible memory - bool writeBuffer(type() == CL_COMMAND_WRITE_BUFFER_FROM_FILE_AMD); + bool writeBuffer(type() == CL_COMMAND_READ_SSG_FILE_AMD); if (!file()->transferBlock(writeBuffer, srcDstBuffer, mem->size(), fileOffset(), origin()[0], size()[0])) { setStatus(CL_INVALID_OPERATION);