[clinfo] 56/148: Found some extra NVIDIA properties

[Andreas Beckmann]

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

anbe pushed a commit to branch clinfo
in repository clinfo.

commit a239d27f4cfdaad617aff8cb967d179a94c4bc5e
Author: Giuseppe Bilotta <giuseppe.bilotta at gmail.com>
Date:   Wed Aug 13 17:38:04 2014 +0200

    Found some extra NVIDIA properties
---
 src/clinfo.c | 8 ++++++++
 src/ext.h    | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/src/clinfo.c b/src/clinfo.c
index 4657cbe..5c81077 100644
--- a/src/clinfo.c
+++ b/src/clinfo.c
@@ -340,6 +340,13 @@ printDeviceInfo(cl_uint d)
 		}
 		STR_PRINT("Device Topology (AMD)", strbuf);
 	}
+	if (*has_nv) {
+		cl_uint bus, slot;
+		GET_PARAM(PCI_BUS_ID_NV, bus);
+		GET_PARAM(PCI_SLOT_ID_NV, slot);
+		snprintf(strbuf, bufsz, "%02x:%02x", bus, slot);
+		STR_PRINT("Device Topology (NV)", strbuf);
+	}
 
 	// compute units and clock
 	INT_PARAM(MAX_COMPUTE_UNITS, "Max compute units",);
@@ -576,6 +583,7 @@ printDeviceInfo(cl_uint d)
 	if (*has_nv) {
 		BOOL_PARAM(INTEGRATED_MEMORY_NV, "NVIDIA integrated memory");
 		BOOL_PARAM(GPU_OVERLAP_NV, "NVIDIA concurrent copy and kernel execution");
+		INT_PARAM(ATTRIBUTE_ASYNC_ENGINE_COUNT_NV, INDENT "Number of copy engines",);
 	}
 	INT_PARAM(MIN_DATA_TYPE_ALIGN_SIZE, "Minimum alignment for any data type", " bytes");
 	GET_PARAM(MEM_BASE_ADDR_ALIGN, uintval);
diff --git a/src/ext.h b/src/ext.h
index a145c78..1909e35 100644
--- a/src/ext.h
+++ b/src/ext.h
@@ -8,6 +8,13 @@
 #include <CL/cl_ext.h>
 #endif
 
+/* cl_nv_device_attribute_query extension */
+/* these clGetDeviceInfo param_names are not included in the official
+ * headers */
+#define CL_DEVICE_ATTRIBUTE_ASYNC_ENGINE_COUNT_NV   0x4007
+#define CL_DEVICE_PCI_BUS_ID_NV                     0x4008
+#define CL_DEVICE_PCI_SLOT_ID_NV                    0x4009
+
 /* cl_amd_device_attribute_query */
 
 #define CL_DEVICE_PROFILING_TIMER_OFFSET_AMD        0x4036

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