From 2c2b4ecb2618e29567c280e77bff737b8b762f8f 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 --- opencl/api/opencl/amdocl/cl_context.cpp | 14 ++-- opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp | 71 ++++++++++--------- opencl/api/opencl/amdocl/cl_lqdflash_amd.h | 12 ++-- .../khronos/headers/opencl2.0/CL/cl_ext.h | 66 ++++++++--------- 4 files changed, 82 insertions(+), 81 deletions(-) diff --git a/opencl/api/opencl/amdocl/cl_context.cpp b/opencl/api/opencl/amdocl/cl_context.cpp index 85920dbb5f..741fda9ce7 100644 --- a/opencl/api/opencl/amdocl/cl_context.cpp +++ b/opencl/api/opencl/amdocl/cl_context.cpp @@ -457,7 +457,7 @@ RUNTIME_EXIT /*! \brief returns the address of the extension function named by * funcname for a given platform. The pointer returned should be cast - * to a function pointer type matching the extension function’s definition + * to a function pointer type matching the extension functions definition * defined in the appropriate extension specification and header file. * A return value of NULL indicates that the specified function does not * exist for the implementation or platform is not a valid platform. @@ -514,7 +514,7 @@ clGetExtensionFunctionAddress(const char* func_name) CL_EXTENSION_ENTRYPOINT_CHECK(clCreateProgramWithILKHR); #endif // cl_khr_il_program #if cl_amd_liquid_flash - CL_EXTENSION_ENTRYPOINT_CHECK(clCreateFileObjectAMD); + CL_EXTENSION_ENTRYPOINT_CHECK(clCreateSsgFileObjectAMD); #endif // cl_amd_liquid_flash break; case 'D': @@ -536,8 +536,8 @@ clGetExtensionFunctionAddress(const char* func_name) CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueWriteSignalAMD); CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueMakeBuffersResidentAMD); #if cl_amd_liquid_flash - CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueWriteBufferFromFileAMD); - CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueReadBufferToFileAMD); + CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueReadSsgFileAMD); + CL_EXTENSION_ENTRYPOINT_CHECK(clEnqueueWriteSsgFileAMD); #endif // cl_amd_liquid_flash break; case 'G': @@ -554,7 +554,7 @@ clGetExtensionFunctionAddress(const char* func_name) #endif //_WIN32 CL_EXTENSION_ENTRYPOINT_CHECK(clGetKernelSubGroupInfoKHR); #if cl_amd_liquid_flash - CL_EXTENSION_ENTRYPOINT_CHECK(clGetFileObjectInfoAMD); + CL_EXTENSION_ENTRYPOINT_CHECK(clGetSsgFileObjectInfoAMD); #endif // cl_amd_liquid_flash break; case 'H': @@ -602,8 +602,8 @@ clGetExtensionFunctionAddress(const char* func_name) CL_EXTENSION_ENTRYPOINT_CHECK(clReleaseDeviceEXT); #endif // cl_ext_device_fission #if cl_amd_liquid_flash - CL_EXTENSION_ENTRYPOINT_CHECK(clRetainFileObjectAMD); - CL_EXTENSION_ENTRYPOINT_CHECK(clReleaseFileObjectAMD); + CL_EXTENSION_ENTRYPOINT_CHECK(clRetainSsgFileObjectAMD); + CL_EXTENSION_ENTRYPOINT_CHECK(clReleaseSsgFileObjectAMD); #endif // cl_amd_liquid_flash break; case 'S': diff --git a/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp b/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp index 02e0767d1b..8c6eeda1f1 100644 --- a/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp +++ b/opencl/api/opencl/amdocl/cl_lqdflash_amd.cpp @@ -112,7 +112,7 @@ LiquidFlashFile::transferBlock( * */ -RUNTIME_ENTRY_RET(cl_file_amd, clCreateFileObjectAMD, ( +RUNTIME_ENTRY_RET(cl_file_amd, clCreateSsgFileObjectAMD, ( cl_context context, cl_file_flags_amd flags, const wchar_t* file_name, @@ -136,7 +136,7 @@ RUNTIME_ENTRY_RET(cl_file_amd, clCreateFileObjectAMD, ( } RUNTIME_EXIT -RUNTIME_ENTRY(cl_int, clGetFileObjectInfoAMD, ( +RUNTIME_ENTRY(cl_int, clGetSsgFileObjectInfoAMD, ( cl_file_amd file, cl_file_info_amd param_name, size_t param_value_size, @@ -166,7 +166,7 @@ RUNTIME_ENTRY(cl_int, clGetFileObjectInfoAMD, ( } RUNTIME_EXIT -RUNTIME_ENTRY(cl_int, clRetainFileObjectAMD, ( +RUNTIME_ENTRY(cl_int, clRetainSsgFileObjectAMD, ( cl_file_amd file)) { if (!is_valid(file)) { @@ -177,7 +177,7 @@ RUNTIME_ENTRY(cl_int, clRetainFileObjectAMD, ( } RUNTIME_EXIT -RUNTIME_ENTRY(cl_int, clReleaseFileObjectAMD, ( +RUNTIME_ENTRY(cl_int, clReleaseSsgFileObjectAMD, ( cl_file_amd file)) { if (!is_valid(file)) { @@ -188,7 +188,8 @@ RUNTIME_ENTRY(cl_int, clReleaseFileObjectAMD, ( } RUNTIME_EXIT -cl_int EnqueueTransferBufferFromFileAMD( +static cl_int +EnqueueTransferBufferFromSsgFileAMD( cl_bool isWrite, cl_command_queue command_queue, cl_mem buffer, @@ -252,12 +253,10 @@ cl_int EnqueueTransferBufferFromFileAMD( } amd::TransferBufferFileCommand *command; - command = new amd::TransferBufferFileCommand((isWrite - ? CL_COMMAND_WRITE_BUFFER_FROM_FILE_AMD - : CL_COMMAND_READ_BUFFER_FROM_FILE_AMD), - hostQueue, eventWaitList, - *pBuffer, bufferOffset, bufferSize, - amdFile, file_offset); + command = new amd::TransferBufferFileCommand( + isWrite ? CL_COMMAND_READ_SSG_FILE_AMD : CL_COMMAND_WRITE_SSG_FILE_AMD, + hostQueue, eventWaitList, *pBuffer, bufferOffset, bufferSize, + amdFile, file_offset); if (command == NULL) { return CL_OUT_OF_HOST_MEMORY; @@ -281,7 +280,7 @@ cl_int EnqueueTransferBufferFromFileAMD( return CL_SUCCESS; } -RUNTIME_ENTRY(cl_int, clEnqueueWriteBufferFromFileAMD, ( +RUNTIME_ENTRY(cl_int, clEnqueueReadSsgFileAMD, ( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, @@ -293,21 +292,22 @@ RUNTIME_ENTRY(cl_int, clEnqueueWriteBufferFromFileAMD, ( const cl_event *event_wait_list, cl_event *event)) { - return EnqueueTransferBufferFromFileAMD(CL_TRUE, - command_queue, - buffer, - blocking_write, - buffer_offset, - cb, - file, - file_offset, - num_events_in_wait_list, - event_wait_list, - event); + return EnqueueTransferBufferFromSsgFileAMD( + CL_TRUE, + command_queue, + buffer, + blocking_write, + buffer_offset, + cb, + file, + file_offset, + num_events_in_wait_list, + event_wait_list, + event); } RUNTIME_EXIT -RUNTIME_ENTRY(cl_int, clEnqueueReadBufferToFileAMD, ( +RUNTIME_ENTRY(cl_int, clEnqueueWriteSsgFileAMD, ( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, @@ -319,16 +319,17 @@ RUNTIME_ENTRY(cl_int, clEnqueueReadBufferToFileAMD, ( const cl_event * event_wait_list, cl_event * event)) { - return EnqueueTransferBufferFromFileAMD(CL_FALSE, - command_queue, - buffer, - blocking_write, - buffer_offset, - cb, - file, - file_offset, - num_events_in_wait_list, - event_wait_list, - event); + return EnqueueTransferBufferFromSsgFileAMD( + CL_FALSE, + command_queue, + buffer, + blocking_write, + buffer_offset, + cb, + file, + file_offset, + num_events_in_wait_list, + event_wait_list, + event); } RUNTIME_EXIT diff --git a/opencl/api/opencl/amdocl/cl_lqdflash_amd.h b/opencl/api/opencl/amdocl/cl_lqdflash_amd.h index b9cc9045c0..847214fd36 100644 --- a/opencl/api/opencl/amdocl/cl_lqdflash_amd.h +++ b/opencl/api/opencl/amdocl/cl_lqdflash_amd.h @@ -8,14 +8,14 @@ extern "C" { #endif /*__cplusplus*/ extern CL_API_ENTRY cl_file_amd CL_API_CALL -clCreateFileObjectAMD( +clCreateSsgFileObjectAMD( cl_context context, cl_file_flags_amd flags, const wchar_t * file_name, cl_int * errcode_ret) CL_EXT_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL -clGetFileObjectInfoAMD( +clGetSsgFileObjectInfoAMD( cl_file_amd file, cl_file_info_amd param_name, size_t param_value_size, @@ -23,15 +23,15 @@ clGetFileObjectInfoAMD( size_t * param_value_size_ret) CL_EXT_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL -clRetainFileObjectAMD( +clRetainSsgFileObjectAMD( cl_file_amd file) CL_EXT_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL -clReleaseFileObjectAMD( +clReleaseSsgFileObjectAMD( cl_file_amd file) CL_EXT_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueWriteBufferFromFileAMD( +clEnqueueReadSsgFileAMD( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, @@ -44,7 +44,7 @@ clEnqueueWriteBufferFromFileAMD( cl_event * event) CL_EXT_SUFFIX__VERSION_1_2; extern CL_API_ENTRY cl_int CL_API_CALL -clEnqueueReadBufferToFileAMD( +clEnqueueWriteSsgFileAMD( cl_command_queue command_queue, cl_mem buffer, cl_bool blocking_write, diff --git a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h index b8ec2ac52c..8678ded851 100644 --- a/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h +++ b/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h @@ -460,8 +460,8 @@ typedef CL_API_ENTRY cl_int ***********************/ #define cl_amd_liquid_flash 1 -#define CL_COMMAND_WRITE_BUFFER_FROM_FILE_AMD 0x4083 -#define CL_COMMAND_READ_BUFFER_FROM_FILE_AMD 0x4087 +#define CL_COMMAND_READ_SSG_FILE_AMD 0x4083 +#define CL_COMMAND_WRITE_SSG_FILE_AMD 0x4087 #define CL_INVALID_FILE_OBJECT_AMD 0x4084 @@ -477,47 +477,47 @@ typedef cl_uint cl_file_info_amd; #define CL_FILE_SIZE_AMD 0x4086 typedef CL_API_ENTRY cl_file_amd -(CL_API_CALL * clCreateFileObjectAMD_fn)( cl_context /*context*/, - cl_file_flags_amd /*flags*/, - const wchar_t * /*file_name*/, - cl_int * /*errcode_ret*/) CL_EXT_SUFFIX__VERSION_1_2; +(CL_API_CALL * clCreateSsgFileObjectAMD_fn)(cl_context /*context*/, + cl_file_flags_amd /*flags*/, + const wchar_t * /*file_name*/, + cl_int * /*errcode_ret*/) CL_EXT_SUFFIX__VERSION_1_2; typedef CL_API_ENTRY cl_int -(CL_API_CALL * clGetFileObjectInfoAMD_fn)(cl_file_amd /* file */, - cl_file_info_amd /* param_name */, - size_t /* param_value_size */, - void * /* param_value */, - size_t * /* param_value_size_ret */) CL_EXT_SUFFIX__VERSION_1_2; +(CL_API_CALL * clGetSsgFileObjectInfoAMD_fn)(cl_file_amd /* file */, + cl_file_info_amd /* param_name */, + size_t /* param_value_size */, + void * /* param_value */, + size_t * /* param_value_size_ret */) CL_EXT_SUFFIX__VERSION_1_2; typedef CL_API_ENTRY cl_int -(CL_API_CALL * clRetainFileObjectAMD_fn)( cl_file_amd /*file*/) CL_EXT_SUFFIX__VERSION_1_2; +(CL_API_CALL * clRetainSsgFileObjectAMD_fn)( cl_file_amd /*file*/) CL_EXT_SUFFIX__VERSION_1_2; typedef CL_API_ENTRY cl_int -(CL_API_CALL * clReleaseFileObjectAMD_fn)( cl_file_amd /*file*/) CL_EXT_SUFFIX__VERSION_1_2; +(CL_API_CALL * clReleaseSsgFileObjectAMD_fn)( cl_file_amd /*file*/) CL_EXT_SUFFIX__VERSION_1_2; typedef CL_API_ENTRY cl_int -(CL_API_CALL * clEnqueueWriteBufferFromFileAMD_fn)(cl_command_queue /*command_queue*/, - cl_mem /*buffer*/, - cl_bool /*blocking_write*/, - size_t /*buffer_offset*/, - size_t /*cb*/, - cl_file_amd /*file*/, - size_t /*file_offset*/, - cl_uint /*num_events_in_wait_list*/, - const cl_event * /*event_wait_list*/, - cl_event * /*event*/) CL_EXT_SUFFIX__VERSION_1_2; +(CL_API_CALL * clEnqueueReadSsgFileAMD_fn)(cl_command_queue /*command_queue*/, + cl_mem /*buffer*/, + cl_bool /*blocking_write*/, + size_t /*buffer_offset*/, + size_t /*cb*/, + cl_file_amd /*file*/, + size_t /*file_offset*/, + cl_uint /*num_events_in_wait_list*/, + const cl_event * /*event_wait_list*/, + cl_event * /*event*/) CL_EXT_SUFFIX__VERSION_1_2; typedef CL_API_ENTRY cl_int -(CL_API_CALL * clEnqueueReadBufferToFileAMD_fn)(cl_command_queue /*command_queue*/, - cl_mem /*buffer*/, - cl_bool /*blocking_read*/, - size_t /*buffer_offset*/, - size_t /*cb*/, - cl_file_amd /*file*/, - size_t /*file_offset*/, - cl_uint /*num_events_in_wait_list*/, - const cl_event * /*event_wait_list*/, - cl_event * /*event*/) CL_EXT_SUFFIX__VERSION_1_2; +(CL_API_CALL * clEnqueueWriteSsgFileAMD_fn)(cl_command_queue /*command_queue*/, + cl_mem /*buffer*/, + cl_bool /*blocking_read*/, + size_t /*buffer_offset*/, + size_t /*cb*/, + cl_file_amd /*file*/, + size_t /*file_offset*/, + cl_uint /*num_events_in_wait_list*/, + const cl_event * /*event_wait_list*/, + cl_event * /*event*/) CL_EXT_SUFFIX__VERSION_1_2; #endif /* CL_VERSION_1_2 */