From 01d0171196a109f43ad5544d0514db86efa8e2e0 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 23 Feb 2018 22:16:44 -0500 Subject: [PATCH] P4 to Git Change 1519129 by skudchad@skudchad_test2_win_opencl on 2018/02/23 22:04:04 SWDEV-145570 - Add new info stats for VDI layer which are reported by HIP ReviewBoardURL = http://ocltc.amd.com/reviews/r/14290/diff/ Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#70 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#283 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#296 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#585 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#413 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#74 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#75 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#83 edit --- opencl/api/opencl/amdocl/cl_device.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/opencl/api/opencl/amdocl/cl_device.cpp b/opencl/api/opencl/amdocl/cl_device.cpp index 851c103879..88e5d7f037 100644 --- a/opencl/api/opencl/amdocl/cl_device.cpp +++ b/opencl/api/opencl/amdocl/cl_device.cpp @@ -271,7 +271,7 @@ RUNTIME_ENTRY(cl_int, clGetDeviceInfo, CASE(CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT, nativeVectorWidthFloat_); CASE(CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE, nativeVectorWidthDouble_); CASE(CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF, nativeVectorWidthDouble_); - CASE(CL_DEVICE_MAX_CLOCK_FREQUENCY, maxClockFrequency_); + CASE(CL_DEVICE_MAX_CLOCK_FREQUENCY, maxEngineClockFrequency_); CASE(CL_DEVICE_ADDRESS_BITS, addressBits_); CASE(CL_DEVICE_MAX_READ_IMAGE_ARGS, maxReadImageArgs_); CASE(CL_DEVICE_MAX_WRITE_IMAGE_ARGS, maxWriteImageArgs_); @@ -550,7 +550,10 @@ RUNTIME_ENTRY(cl_int, clGetDeviceInfo, CASE(CL_DEVICE_SIMD_WIDTH_AMD, simdWidth_); CASE(CL_DEVICE_SIMD_INSTRUCTION_WIDTH_AMD, simdInstructionWidth_); CASE(CL_DEVICE_WAVEFRONT_WIDTH_AMD, wavefrontWidth_); - CASE(CL_DEVICE_GLOBAL_MEM_CHANNELS_AMD, globalMemChannels_); + case CL_DEVICE_GLOBAL_MEM_CHANNELS_AMD: { + cl_uint globalMemChannels = as_amd(device)->info().vramBusBitWidth_ / 32; + return amd::clGetInfo(globalMemChannels, param_value_size, param_value, param_value_size_ret); + } CASE(CL_DEVICE_GLOBAL_MEM_CHANNEL_BANKS_AMD, globalMemChannelBanks_); CASE(CL_DEVICE_GLOBAL_MEM_CHANNEL_BANK_WIDTH_AMD, globalMemChannelBankWidth_); CASE(CL_DEVICE_LOCAL_MEM_SIZE_PER_COMPUTE_UNIT_AMD, localMemSizePerCU_);