From e9c5f02edf5d62fb8f5c1c8c864e32a26c287e80 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 5 Jan 2018 11:23:11 -0500 Subject: [PATCH] P4 to Git Change 1500415 by gandryey@gera-w8 on 2018/01/05 11:17:48 SWDEV-136522 - Tools need a way to query the PCIE device id via the OpenCL API. - Add CL_DEVICE_PCIE_ID query Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#69 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#20 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#36 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h#13 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h#7 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#580 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#181 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/backend.h#15 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#69 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#79 edit [ROCm/clr commit: a0c9aa69e78b265be39271933c21f87c95859cad] --- projects/clr/opencl/api/opencl/amdocl/cl_device.cpp | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h | 1 + 5 files changed, 5 insertions(+) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp index 92f3a412e6..851c103879 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp @@ -587,6 +587,7 @@ RUNTIME_ENTRY(cl_int, clGetDeviceInfo, } return CL_SUCCESS; } + CASE(CL_DEVICE_PCIE_ID_AMD, pcieDeviceId_); default: break; } diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h b/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h index 45c09ae138..aa5635338a 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h @@ -210,6 +210,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context / #define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030 #define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031 #define CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD 0x4033 +#define CL_DEVICE_PCIE_ID_AMD 0x4034 typedef union { diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h index c41b4e1053..b9a98234cc 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h @@ -229,6 +229,7 @@ typedef CL_API_ENTRY cl_program #define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030 #define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031 #define CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD 0x4033 +#define CL_DEVICE_PCIE_ID_AMD 0x4034 typedef union { diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h index 317fe150a9..52f5ccb688 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h @@ -210,6 +210,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context / #define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030 #define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031 #define CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD 0x4033 +#define CL_DEVICE_PCIE_ID_AMD 0x4034 typedef union { diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h index 1743e51635..d5bdcd7508 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h @@ -210,6 +210,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context / #define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030 #define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031 #define CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD 0x4033 +#define CL_DEVICE_PCIE_ID_AMD 0x4034 typedef union {