From 5e253fe338c2473553cfb57d3ba85e26e90e1a4e Mon Sep 17 00:00:00 2001 From: Aaron Watry Date: Wed, 16 Aug 2017 20:44:41 -0500 Subject: [PATCH] clover/device: Calculate CL_DEVICE_MEM_BASE_ADDR_ALIGN in device The CL CTS queries CL_DEVICE_MEM_BASE_ADDR_ALIGN for a device and then allocates user pointers aligned to that value for its tests. The minimum value is defined as: the size (in bits) of the largest OpenCL built-in data type supported by the device (long16 in FULL profile, long16 or int16 in EMBEDDED profile) for devices that are not of type CL_DEVICE_TYPE_CUSTOM. At the moment, all known devices that support user pointers require CPU page alignment for buffers created from user pointers, so just query that from sysconf. v3: Use std::max instead of MAX2 (Francisco) Add missing unistd include v2: Use system page size instead of a new pipe cap Signed-off-by: Aaron Watry Reviewed-by: Francisco Jerez Reviewed-by (v2): Jan Vesely --- src/gallium/state_trackers/clover/api/device.cpp | 3 ++- src/gallium/state_trackers/clover/core/device.cpp | 6 ++++++ src/gallium/state_trackers/clover/core/device.hpp | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp index b1b7917e4ec..b202102389f 100644 --- a/src/gallium/state_trackers/clover/api/device.cpp +++ b/src/gallium/state_trackers/clover/api/device.cpp @@ -205,7 +205,8 @@ clGetDeviceInfo(cl_device_id d_dev, cl_device_info param, break; case CL_DEVICE_MEM_BASE_ADDR_ALIGN: - buf.as_scalar() = 128 * 8; + buf.as_scalar() = 8 * + std::max(dev.mem_base_addr_align(), (cl_uint) sizeof(cl_long) * 16); break; case CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE: diff --git a/src/gallium/state_trackers/clover/core/device.cpp b/src/gallium/state_trackers/clover/core/device.cpp index f6bbc38a980..fc74bd51a9e 100644 --- a/src/gallium/state_trackers/clover/core/device.cpp +++ b/src/gallium/state_trackers/clover/core/device.cpp @@ -20,6 +20,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // +#include #include "core/device.hpp" #include "core/platform.hpp" #include "pipe/p_screen.h" @@ -194,6 +195,11 @@ device::has_unified_memory() const { return pipe->get_param(pipe, PIPE_CAP_UMA); } +cl_uint +device::mem_base_addr_align() const { + return sysconf(_SC_PAGESIZE); +} + std::vector device::max_block_size() const { auto v = get_compute_param(pipe, ir_format(), diff --git a/src/gallium/state_trackers/clover/core/device.hpp b/src/gallium/state_trackers/clover/core/device.hpp index efc217aedb0..4e11519421a 100644 --- a/src/gallium/state_trackers/clover/core/device.hpp +++ b/src/gallium/state_trackers/clover/core/device.hpp @@ -68,6 +68,7 @@ namespace clover { bool image_support() const; bool has_doubles() const; bool has_unified_memory() const; + cl_uint mem_base_addr_align() const; std::vector max_block_size() const; cl_uint subgroup_size() const; -- 2.30.2