P4 to Git Change 1456420 by wchau@wchau_OCL_boltzmann on 2017/09/07 16:56:26
SWDEV-130808 - Back out changelist 1456363 as it cause AMD SDK 2.9.1 Apps test failure when running OpenCL Sanity tests with Brahma build. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#65 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp#5 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#16 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp#7 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#32 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp#4 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h#9 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp#3 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h#3 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#289 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#571 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#354 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.hpp#100 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#57 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#31 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.hpp#12 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#59 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#22 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.hpp#10 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#276 edit
This commit is contained in:
@@ -248,9 +248,7 @@ RUNTIME_ENTRY(cl_int, clGetDeviceInfo,
|
||||
CASE(CL_DEVICE_VENDOR_ID, vendorId_);
|
||||
CASE(CL_DEVICE_MAX_COMPUTE_UNITS, maxComputeUnits_);
|
||||
CASE(CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS, maxWorkItemDimensions_);
|
||||
CASE(CL_DEVICE_MAX_WORK_GROUP_SIZE, preferredWorkGroupSize_);
|
||||
CASE(CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, preferredWorkGroupSize_);
|
||||
CASE(CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, maxWorkGroupSize_);
|
||||
CASE(CL_DEVICE_MAX_WORK_GROUP_SIZE, maxWorkGroupSize_);
|
||||
CASE(CL_DEVICE_MAX_WORK_ITEM_SIZES, maxWorkItemSizes_);
|
||||
CASE(CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR, preferredVectorWidthChar_);
|
||||
CASE(CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT, preferredVectorWidthShort_);
|
||||
|
||||
@@ -1541,12 +1541,6 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_U
|
||||
#ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_BANKS_AMD, cl_uint)
|
||||
#endif
|
||||
#ifdef CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, ::size_t)
|
||||
#endif
|
||||
#ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t)
|
||||
#endif
|
||||
|
||||
#ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint)
|
||||
|
||||
@@ -207,8 +207,6 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /
|
||||
#define CL_DEVICE_GFXIP_MAJOR_AMD 0x404A
|
||||
#define CL_DEVICE_GFXIP_MINOR_AMD 0x404B
|
||||
#define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C
|
||||
#define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030
|
||||
#define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031
|
||||
|
||||
typedef union
|
||||
{
|
||||
|
||||
@@ -1541,12 +1541,6 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_U
|
||||
#ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_BANKS_AMD, cl_uint)
|
||||
#endif
|
||||
#ifdef CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, ::size_t)
|
||||
#endif
|
||||
#ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t)
|
||||
#endif
|
||||
|
||||
#ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint)
|
||||
|
||||
@@ -226,8 +226,6 @@ typedef CL_API_ENTRY cl_program
|
||||
#define CL_DEVICE_GFXIP_MAJOR_AMD 0x404A
|
||||
#define CL_DEVICE_GFXIP_MINOR_AMD 0x404B
|
||||
#define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C
|
||||
#define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030
|
||||
#define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031
|
||||
|
||||
typedef union
|
||||
{
|
||||
|
||||
@@ -1541,12 +1541,6 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_U
|
||||
#ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_BANKS_AMD, cl_uint)
|
||||
#endif
|
||||
#ifdef CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, ::size_t)
|
||||
#endif
|
||||
#ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t)
|
||||
#endif
|
||||
|
||||
#ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint)
|
||||
|
||||
@@ -207,8 +207,6 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /
|
||||
#define CL_DEVICE_GFXIP_MAJOR_AMD 0x404A
|
||||
#define CL_DEVICE_GFXIP_MINOR_AMD 0x404B
|
||||
#define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C
|
||||
#define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030
|
||||
#define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031
|
||||
|
||||
typedef union
|
||||
{
|
||||
|
||||
@@ -1541,12 +1541,6 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_U
|
||||
#ifdef CL_DEVICE_LOCAL_MEM_BANKS_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_LOCAL_MEM_BANKS_AMD, cl_uint)
|
||||
#endif
|
||||
#ifdef CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD, ::size_t)
|
||||
#endif
|
||||
#ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t)
|
||||
#endif
|
||||
|
||||
#ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV
|
||||
__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint)
|
||||
|
||||
@@ -207,8 +207,6 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /
|
||||
#define CL_DEVICE_GFXIP_MAJOR_AMD 0x404A
|
||||
#define CL_DEVICE_GFXIP_MINOR_AMD 0x404B
|
||||
#define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C
|
||||
#define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030
|
||||
#define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031
|
||||
|
||||
typedef union
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user