[clinfo] 23/30: Some updates from cl_amd_device_attribute_query v3

[Andreas Beckmann]

This is an automated email from the git hooks/post-receive script.

anbe pushed a commit to branch master
in repository clinfo.

commit fb99d6cacf6b75abb64c6b58fd657e125621801c
Author: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
Date:   Fri Apr 3 09:06:06 2015 +0200

    Some updates from cl_amd_device_attribute_query v3
---
 man/clinfo.1 | 25 ++++++++++++-------------
 src/clinfo.c |  8 +++++++-
 src/ext.h    |  1 +
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/man/clinfo.1 b/man/clinfo.1
index ddf3c9a..79fed4f 100644
--- a/man/clinfo.1
+++ b/man/clinfo.1
@@ -145,20 +145,19 @@ The properties of the ICD loader will also be queried if the
 extension function is found.
 
 .SH BUGS
-The results of the following undocumented properties might be
-interpreted incorrectly:
-.TP 2
+The
 .B CL_DEVICE_GLOBAL_FREE_MEMORY_AMD
-(assumed: two memory sizes expressed in MB);
-.TP
-.B CL_DEVICE_THREAD_TRACE_SUPPORTED_AMD
-(assumed: a boolean that denotes if thread tracing is supported or not);
-.TP
-.B CL_DEVICE_GFXIP_MAJOR_AMD
-.TQ
-.B CL_DEVICE_GFXIP_MINOR_AMD
-(assumed: two integer values that mark the overall hardware generation of
-the GPU, similar to the Compute Capabiity of NVIDIA devices).
+device information is documented in v3 of the
+.B cl_amd_device_attribute_query
+extension specification as being the global free memory in KBytes, but no
+explanation is given on why there are two values.
+
+The
+.B CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD
+device information is documented in v3 of the
+.B cl_amd_device_attribute_query
+extension specification, but not reported by current
+drivers, so it is currently disabled.
 
 .P
 Please report any issues on
diff --git a/src/clinfo.c b/src/clinfo.c
index 221ab17..935b463 100644
--- a/src/clinfo.c
+++ b/src/clinfo.c
@@ -1576,7 +1576,9 @@ struct device_info_traits dinfo_traits[] = {
 	{ CLINFO_RAW, DINFO(CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV, INDENT "Compute Capability Minor (NV)", int), dev_has_nv },
 
 	/* GFXIP (AMD) is multipart, so different for HUMAN and RAW */
-	/* TODO: find a better human-friendly name than GFXIP */
+	/* TODO: find a better human-friendly name than GFXIP; v3 of the cl_amd_device_attribute_query
+	 * extension specification calls it “core engine GFXIP”, which honestly is not better than
+	 * our name choice. */
 	{ CLINFO_HUMAN, DINFO(CL_DEVICE_GFXIP_MAJOR_AMD, "Graphics IP (AMD)", gfxip_amd), dev_is_gpu_amd },
 	{ CLINFO_RAW, DINFO(CL_DEVICE_GFXIP_MAJOR_AMD, INDENT "Graphics IP MAJOR (AMD)", int), dev_is_gpu_amd },
 	{ CLINFO_RAW, DINFO(CL_DEVICE_GFXIP_MINOR_AMD, INDENT "Graphics IP MINOR (AMD)", int), dev_is_gpu_amd },
@@ -1723,6 +1725,10 @@ struct device_info_traits dinfo_traits[] = {
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_KERNEL_EXEC_TIMEOUT_NV, INDENT "Kernel execution timeout (NV)", bool), dev_has_nv },
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_GPU_OVERLAP_NV, "Concurrent copy and kernel execution (NV)", bool), dev_has_nv },
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_ATTRIBUTE_ASYNC_ENGINE_COUNT_NV, INDENT "Number of async copy engines", int), dev_has_nv },
+	/* TODO FIXME Current drivers don't seem to respond to this, should probably be queried based on driver version,
+	 * or maybe it depends on some other device property?
+	{ CLINFO_BOTH, DINFO(CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD, INDENT "Number of async queues (AMD)", int), dev_is_gpu_amd },
+	*/
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_SPIR_VERSIONS, INDENT "SPIR versions", str), dev_has_spir },
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_PREFERRED_INTEROP_USER_SYNC, "Prefer user sync for interop", bool), dev_is_12 },
 	{ CLINFO_BOTH, DINFO(CL_DEVICE_PRINTF_BUFFER_SIZE, "printf() buffer size", mem), dev_is_12 },
diff --git a/src/ext.h b/src/ext.h
index e68a036..9143801 100644
--- a/src/ext.h
+++ b/src/ext.h
@@ -96,6 +96,7 @@ typedef cl_bitfield         cl_device_svm_capabilities;
 #define CL_DEVICE_THREAD_TRACE_SUPPORTED_AMD		0x4049
 #define CL_DEVICE_GFXIP_MAJOR_AMD			0x404A
 #define CL_DEVICE_GFXIP_MINOR_AMD			0x404B
+#define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD		0x404C
 
 #ifndef CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD
 #define CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD		1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/clinfo.git