clover, gallium: add PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK

This is not necessarily the product of MAX_BLOCK_SIZE[i].

Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>

diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst
index ff63ce83beab003853ebf4622e5198012f396918..2bddf1bbb3b7ea5fe781788d82e609b51e00dbf9 100644 (file)
--- a/src/gallium/docs/source/screen.rst
+++ b/src/gallium/docs/source/screen.rst
@@ -212,6 +212,11 @@ pipe_screen::get_compute_param.
   units.  Value type: ``uint64_t []``.
 * ``PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE``: Maximum block size in thread
   units.  Value type: ``uint64_t []``.
+* ``PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK``: Maximum number of threads that
+  a single block can contain.  Value type: ``uint64_t``.
+  This may be less than the product of the components of MAX_BLOCK_SIZE and is
+  usually limited by the number of threads that can be resident simultaneously
+  on a compute unit.
 * ``PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE``: Maximum size of the GLOBAL
   resource.  Value type: ``uint64_t``.
 * ``PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE``: Maximum size of the LOCAL

diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 1e05cc4caeee8f9eea5e1fff69922c73f8d5492b..ad7f24ef39b5d33817268f38bb7e4be6df030b9e 100644 (file)
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -548,6 +548,7 @@ enum pipe_compute_cap
    PIPE_COMPUTE_CAP_GRID_DIMENSION,
    PIPE_COMPUTE_CAP_MAX_GRID_SIZE,
    PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE,
+   PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK,
    PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE,
    PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE,
    PIPE_COMPUTE_CAP_MAX_PRIVATE_SIZE,

diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp
index 03767519aaf02b69534006b598332d6bd7d103a8..1a9127bb3d5d0bf65b0001b618b4c75a845c1f4a 100644 (file)
--- a/src/gallium/state_trackers/clover/api/device.cpp
+++ b/src/gallium/state_trackers/clover/api/device.cpp
@@ -87,7 +87,8 @@ clGetDeviceInfo(cl_device_id dev, cl_device_info param,
                                      dev->max_block_size());
 
    case CL_DEVICE_MAX_WORK_GROUP_SIZE:
-      return scalar_property<size_t>(buf, size, size_ret, SIZE_MAX);
+      return scalar_property<size_t>(buf, size, size_ret,
+                                     dev->max_threads_per_block());
 
    case CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR:
       return scalar_property<cl_uint>(buf, size, size_ret, 16);

diff --git a/src/gallium/state_trackers/clover/core/device.cpp b/src/gallium/state_trackers/clover/core/device.cpp
index 8390f3f4abba8109602aa9fe6becc3fcdcbbb4fe..59e43af075dab529e02b94eab8576041ca422257 100644 (file)
--- a/src/gallium/state_trackers/clover/core/device.cpp
+++ b/src/gallium/state_trackers/clover/core/device.cpp
@@ -138,6 +138,12 @@ _cl_device_id::max_const_buffers() const {
                                  PIPE_SHADER_CAP_MAX_CONST_BUFFERS);
 }
 
+size_t
+_cl_device_id::max_threads_per_block() const {
+   return get_compute_param<uint64_t>(
+      pipe, PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK)[0];
+}
+
 std::vector<size_t>
 _cl_device_id::max_block_size() const {
    return get_compute_param<uint64_t>(pipe, PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE);

diff --git a/src/gallium/state_trackers/clover/core/device.hpp b/src/gallium/state_trackers/clover/core/device.hpp
index 8f284ba5e42fbbdc223f947c16efe85506c1e4d1..d10635275b1d12917adad89971d8bd422fde0b27 100644 (file)
--- a/src/gallium/state_trackers/clover/core/device.hpp
+++ b/src/gallium/state_trackers/clover/core/device.hpp
@@ -55,6 +55,7 @@ public:
    cl_ulong max_mem_input() const;
    cl_ulong max_const_buffer_size() const;
    cl_uint max_const_buffers() const;
+   size_t max_threads_per_block() const;
 
    std::vector<size_t> max_block_size() const;
    std::string device_name() const;