Add support for displaying and storing cooperative matrix properties

KHR extension only
Refs #190

Author: SaschaWillems

VulkanContext.h

@@ -2,7 +2,7 @@
 *
 * Vulkan hardware capability viewer
 *
-* Copyright (C) 2016-2022 by Sascha Willems (www.saschawillems.de)
+* Copyright (C) 2016-2025 by Sascha Willems (www.saschawillems.de)
 *
 * This code is free software, you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -31,6 +31,7 @@ struct VulkanContext
 	PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR = nullptr;
 	PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR = nullptr;
 	PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR = nullptr;
+	PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR = nullptr;
 };
 
 extern VulkanContext vulkanContext;

VulkanDeviceInfoExtensions.cpp

@@ -962,6 +962,21 @@ void VulkanDeviceInfoExtensions::readPhysicalProperties_KHR() {
 		deviceProps2 = initDeviceProperties2(extProps);
 		vulkanContext.vkGetPhysicalDeviceProperties2KHR(device, &deviceProps2);
 		pushProperty2(extension, "cooperativeMatrixSupportedStages", QVariant(extProps->cooperativeMatrixSupportedStages));
+		// This extension needs some special handling, this code has to be adjusted manually after header generation
+		// If changed after header-update, DO NOT COMMIT the changes, but revert them
+		if (vulkanContext.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR != nullptr) {
+			uint32_t propCount = 0;
+			vulkanContext.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(device, &propCount, nullptr);
+			std::vector<VkCooperativeMatrixPropertiesKHR> props(propCount);
+			vulkanContext.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR(device, &propCount, props.data());
+			// The structure is flattened to an array without property names due to database column size limits
+			QVariantList qvl{};
+			for (auto& prop : props) {
+				auto value = QVariantList({ prop.MSize, prop.NSize, prop.KSize, prop.AType, prop.BType, prop.CType, prop.ResultType, prop.saturatingAccumulation, prop.scope});
+				qvl.push_back(value);
+			}
+			pushProperty2(extension, "cooperativeMatrixProperties", qvl);
+		};
 		delete extProps;
 	}
 	if (extensionSupported("VK_KHR_compute_shader_derivatives")) {

vulkancapsviewer.cpp

@@ -736,6 +736,8 @@ bool VulkanCapsViewer::initVulkan()
             deviceProperties2Available = false;
             QMessageBox::warning(this, tr("Error"), "Could not get function pointer for vkGetPhysicalDeviceProperties2KHR (even though extension is enabled!)\nNew features and properties won't be displayed!");
         }
+        // These are optional and only required for certain extensions
+        vulkanContext.vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR>(vkGetInstanceProcAddr(vulkanContext.instance, "vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR"));
     }
 
     vulkanContext.vkGetPhysicalDeviceSurfaceSupportKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceSurfaceSupportKHR>(vkGetInstanceProcAddr(vulkanContext.instance, "vkGetPhysicalDeviceSurfaceSupportKHR"));
@@ -1101,6 +1103,15 @@ void addVkBool32Item(QStandardItem* parent, const QVariantMap::const_iterator& i
     parent->appendRow(item);
 }
 
+void addVkBool32Item(QStandardItem* parent, const QString& name, const bool value)
+{
+    QList<QStandardItem*> item;
+    item << new QStandardItem(name);
+    item << new QStandardItem(value ? "true" : "false");
+    item[1]->setForeground(value ? QColor::fromRgb(0, 128, 0) : QColor::fromRgb(255, 0, 0));
+    parent->appendRow(item);
+}
+
 void addVkSampleCountFlagsItem(QStandardItem* parent, const QVariantMap::const_iterator& iterator)
 {
     const auto samples = static_cast<VkSampleCountFlags>(iterator.value().toUInt());
@@ -1162,6 +1173,13 @@ void addHexItem(QStandardItem* parent, const QVariantMap::const_iterator& iterat
     parent->appendRow(item);
 }
 
+void addCaptionedRow(QStandardItem* parent, QString caption, QString value) {
+    QList<QStandardItem*> item;
+    item << new QStandardItem(caption);
+    item << new QStandardItem(value);
+    parent->appendRow(item);
+}
+
 void addVariantListItem(QStandardItem* parent, const QVariantMap::const_iterator& iterator)
 {
     QList<QStandardItem*> item;
@@ -1304,6 +1322,7 @@ void addExtensionPropertiesRow(QList<QStandardItem*> item, Property2 property)
     }
 
     if (property.value.canConvert(QVariant::List)) {
+        bool displayRawValue{ true };
         if ((strcmp(property.extension, VK_EXT_HOST_IMAGE_COPY_EXTENSION_NAME) == 0) && ((property.name == "pCopySrcLayouts") || (property.name == "pCopyDstLayouts"))) {
             QList<QVariant> list = property.value.toList();
             for (auto i = 0; i < list.size(); i++) {
@@ -1312,7 +1331,28 @@ void addExtensionPropertiesRow(QList<QStandardItem*> item, Property2 property)
                 propertyItem.first()->appendRow(formatItem);
             }
         }
-        propertyItem << new QStandardItem(arrayToStr(property.value));
+        if ((strcmp(property.extension, VK_KHR_COOPERATIVE_MATRIX_EXTENSION_NAME) == 0) && (property.name == "cooperativeMatrixProperties")) {
+            QList<QVariant> list = property.value.toList();
+            for (auto i = 0; i < list.size(); i++) {
+                QStandardItem* entryItem = new QStandardItem();
+                QVariantList value = list[i].toList();
+                entryItem->setText("[" + QString::number(i) + "]");
+                addCaptionedRow(entryItem, "MSize", value[0].toString());
+                addCaptionedRow(entryItem, "NSize", value[1].toString());
+                addCaptionedRow(entryItem, "KSize", value[2].toString());
+                addCaptionedRow(entryItem, "AType", vulkanResources::VkComponentTypeKHRString((VkComponentTypeKHR)value[3].toInt()));
+                addCaptionedRow(entryItem, "BType", vulkanResources::VkComponentTypeKHRString((VkComponentTypeKHR)value[4].toInt()));
+                addCaptionedRow(entryItem, "CType", vulkanResources::VkComponentTypeKHRString((VkComponentTypeKHR)value[5].toInt()));
+                addCaptionedRow(entryItem, "ResultType", vulkanResources::VkComponentTypeKHRString((VkComponentTypeKHR)value[6].toInt()));
+                addVkBool32Item(entryItem,"saturatingAccumulation", value[7].toBool());
+                addCaptionedRow(entryItem, "scope", vulkanResources::VkScopeKHRString((VkScopeKHR)value[8].toInt()));
+                propertyItem.first()->appendRow(entryItem);
+            }
+            displayRawValue = false;
+        }
+        if (displayRawValue) {
+            propertyItem << new QStandardItem(arrayToStr(property.value));
+        }
     }
     else {
         switch (property.value.type()) {

vulkanresources.h

@@ -679,6 +679,39 @@ namespace vulkanResources {
 		};
 	}
 
+	inline QString VkComponentTypeKHRString(const VkComponentTypeKHR value)
+	{
+		switch (value) {
+#define STR(r) case VK_COMPONENT_TYPE_##r: return #r
+			STR(FLOAT16_KHR);
+			STR(FLOAT32_KHR);
+			STR(FLOAT64_KHR);
+			STR(SINT8_KHR);
+			STR(SINT16_KHR);
+			STR(SINT32_KHR);
+			STR(SINT64_KHR);
+			STR(UINT8_KHR);
+			STR(UINT16_KHR);
+			STR(UINT32_KHR);
+			STR(UINT64_KHR);
+#undef STR
+		default: QString::fromStdString("UNKNOWN_ENUM (" + toHexString(value) + ")");
+		};
+	}
+
+	inline QString VkScopeKHRString(const VkScopeKHR value)
+	{
+		switch (value) {
+#define STR(r) case VK_SCOPE_##r: return #r
+			STR(DEVICE_KHR);
+			STR(WORKGROUP_KHR);
+			STR(SUBGROUP_KHR);
+			STR(QUEUE_FAMILY_KHR);
+#undef STR
+		default: QString::fromStdString("UNKNOWN_ENUM (" + toHexString(value) + ")");
+		};
+	}
+
 	inline std::string joinString(const char separator, const std::vector<std::string>& stringList)
 	{
 		std::stringstream ss;