From ff3c30e9cefa1198595c45c8b3af5e6e3f4ea847 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 25 Jan 2017 11:44:06 -0500 Subject: [PATCH] P4 to Git Change 1365943 by lmoriche@lmoriche_opencl_dev on 2017/01/25 11:37:20 SWDEV-102726 - [OCL-LC-ROCm] Open source OpenCL Runtime - Cleanups: Remove CL_HSA_ENABLED/DISABLED_AMD. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#52 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#60 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#13 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#28 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h#6 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/appprofile.cpp#15 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/appprofile.hpp#10 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#208 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#283 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocappprofile.cpp#4 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#36 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#14 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#53 edit --- opencl/api/opencl/amdocl/cl_context.cpp | 5 ----- opencl/api/opencl/amdocl/cl_device.cpp | 5 ----- opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h | 6 ------ opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h | 6 ------ opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h | 6 ------ 5 files changed, 28 deletions(-) diff --git a/opencl/api/opencl/amdocl/cl_context.cpp b/opencl/api/opencl/amdocl/cl_context.cpp index 741fda9ce7..4ee070b1d6 100644 --- a/opencl/api/opencl/amdocl/cl_context.cpp +++ b/opencl/api/opencl/amdocl/cl_context.cpp @@ -186,11 +186,6 @@ RUNTIME_ENTRY_RET(cl_context, clCreateContextFromType, ( return (cl_context) 0; } - if (device_type & CL_HSA_ENABLED_AMD && - device_type & CL_HSA_DISABLED_AMD) { - device_type ^= (CL_HSA_ENABLED_AMD | CL_HSA_DISABLED_AMD); - } - // Get the devices of the given type. cl_uint num_devices; bool offlineDevices = diff --git a/opencl/api/opencl/amdocl/cl_device.cpp b/opencl/api/opencl/amdocl/cl_device.cpp index 661c33b5af..f8cee2e775 100644 --- a/opencl/api/opencl/amdocl/cl_device.cpp +++ b/opencl/api/opencl/amdocl/cl_device.cpp @@ -200,11 +200,6 @@ RUNTIME_ENTRY(cl_int, clGetDeviceIDs, ( return CL_INVALID_VALUE; } - if (device_type & CL_HSA_ENABLED_AMD && - device_type & CL_HSA_DISABLED_AMD) { - device_type ^= (CL_HSA_ENABLED_AMD | CL_HSA_DISABLED_AMD); - } - // Get all available devices if (!amd::Device::getDeviceIDs(device_type, num_entries, devices, num_devices, false)) { diff --git a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h index 4ac6e71bae..6a12cd6ea0 100644 --- a/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h +++ b/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h @@ -247,12 +247,6 @@ typedef union // -/************* -* cl_amd_hsa * -**************/ -#define CL_HSA_ENABLED_AMD (1ull << 62) -#define CL_HSA_DISABLED_AMD (1ull << 63) - /*************************** * cl_amd_command_intercept * ***************************/ 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 8678ded851..f7032f88a2 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 @@ -210,12 +210,6 @@ typedef union #define CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD 1 -/************* -* cl_amd_hsa * -**************/ -#define CL_HSA_ENABLED_AMD (1ull << 62) -#define CL_HSA_DISABLED_AMD (1ull << 63) - // /*************************** * cl_amd_command_intercept * diff --git a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h index 76da26ed8a..cd9f3906d5 100644 --- a/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h +++ b/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h @@ -209,12 +209,6 @@ typedef union #define CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD 1 -/************* -* cl_amd_hsa * -**************/ -#define CL_HSA_ENABLED_AMD (1ull << 62) -#define CL_HSA_DISABLED_AMD (1ull << 63) - // /*************************** * cl_amd_command_intercept *