Add support for VK_KHR_pipeline_executable_properties

AnKi/Gr/Vulkan/Common.h

@@ -67,7 +67,8 @@ enum class VulkanExtensions : U16
 	EXT_DEBUG_REPORT = 1 << 9,
 	AMD_SHADER_INFO = 1 << 10,
 	AMD_RASTERIZATION_ORDER = 1 << 11,
-	KHR_RAY_TRACING = 1 << 12
+	KHR_RAY_TRACING = 1 << 12,
+	PIPELINE_EXECUTABLE_PROPERTIES = 1 << 13,
 };
 ANKI_ENUM_ALLOW_NUMERIC_OPERATIONS(VulkanExtensions)
 

AnKi/Gr/Vulkan/GrManagerImpl.cpp

@@ -10,6 +10,7 @@
 #include <AnKi/Gr/Fence.h>
 #include <AnKi/Gr/Vulkan/FenceImpl.h>
 #include <AnKi/Util/Functions.h>
+#include <AnKi/Util/StringList.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <glslang/Public/ShaderLang.h>
 
@@ -547,6 +548,12 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 			{
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
+			else if(extensionName == VK_KHR_PIPELINE_EXECUTABLE_PROPERTIES_EXTENSION_NAME
+					&& init.m_config->getBool("core_displayStats"))
+			{
+				m_extensions |= VulkanExtensions::PIPELINE_EXECUTABLE_PROPERTIES;
+				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
+			}
 		}
 
 		ANKI_VK_LOGI("Will enable the following device extensions:");
@@ -695,6 +702,17 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 		ci.pNext = &m_rtPipelineFeatures;
 	}
 
+	// Pipeline features
+	if(!!(m_extensions & VulkanExtensions::PIPELINE_EXECUTABLE_PROPERTIES))
+	{
+		m_pplineExecutablePropertiesFeatures.sType =
+			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR;
+		m_pplineExecutablePropertiesFeatures.pipelineExecutableInfo = true;
+
+		m_pplineExecutablePropertiesFeatures.pNext = const_cast<void*>(ci.pNext);
+		ci.pNext = &m_pplineExecutablePropertiesFeatures;
+	}
+
 	ANKI_VK_CHECK(vkCreateDevice(m_physicalDevice, &ci, nullptr, &m_device));
 
 	// Get debug marker
@@ -1119,6 +1137,71 @@ Error GrManagerImpl::printPipelineShaderInfoInternal(VkPipeline ppline, CString
 		ANKI_CHECK(m_shaderStatsFile.flush());
 	}
 
+	if(!!(m_extensions & VulkanExtensions::PIPELINE_EXECUTABLE_PROPERTIES))
+	{
+		StringListAuto log(m_alloc);
+
+		VkPipelineInfoKHR pplineInf = {};
+		pplineInf.sType = VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR;
+		pplineInf.pipeline = ppline;
+		U32 executableCount = 0;
+		ANKI_VK_CHECK(vkGetPipelineExecutablePropertiesKHR(m_device, &pplineInf, &executableCount, nullptr));
+		DynamicArrayAuto<VkPipelineExecutablePropertiesKHR> executableProps(m_alloc, executableCount);
+		ANKI_VK_CHECK(
+			vkGetPipelineExecutablePropertiesKHR(m_device, &pplineInf, &executableCount, &executableProps[0]));
+
+		log.pushBackSprintf("Pipeline info \"%s\" (0x%016" PRIx64 "): ", name.cstr(), hash);
+		for(U32 i = 0; i < executableCount; ++i)
+		{
+			const VkPipelineExecutablePropertiesKHR& p = executableProps[i];
+			log.pushBackSprintf("%s: ", p.description);
+
+			// Get stats
+			VkPipelineExecutableInfoKHR exeInf = {};
+			exeInf.sType = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR;
+			exeInf.executableIndex = i;
+			exeInf.pipeline = ppline;
+			U32 statCount = 0;
+			vkGetPipelineExecutableStatisticsKHR(m_device, &exeInf, &statCount, nullptr);
+			DynamicArrayAuto<VkPipelineExecutableStatisticKHR> stats(m_alloc, statCount);
+			vkGetPipelineExecutableStatisticsKHR(m_device, &exeInf, &statCount, &stats[0]);
+
+			for(U32 s = 0; s < statCount; ++s)
+			{
+				const VkPipelineExecutableStatisticKHR& ss = stats[s];
+
+				switch(ss.format)
+				{
+				case VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_BOOL32_KHR:
+					log.pushBackSprintf("%s: %u, ", ss.name, ss.value.b32);
+					break;
+				case VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_INT64_KHR:
+					log.pushBackSprintf("%s: %" PRId64 ", ", ss.name, ss.value.i64);
+					break;
+				case VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_UINT64_KHR:
+					log.pushBackSprintf("%s: %" PRIu64 ", ", ss.name, ss.value.u64);
+					break;
+				case VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_FLOAT64_KHR:
+					log.pushBackSprintf("%s: %f, ", ss.name, ss.value.f64);
+					break;
+				default:
+					ANKI_ASSERT(0);
+				}
+			}
+
+			log.pushBackSprintf("Subgroup size: %u", p.subgroupSize);
+
+			if(i < executableCount - 1)
+			{
+				log.pushBack(", ");
+			}
+		}
+
+		StringAuto finalLog(m_alloc);
+		log.join("", finalLog);
+		ANKI_VK_LOGI("%s", finalLog.cstr());
+	}
+
 	return Error::NONE;
 }
 

AnKi/Gr/Vulkan/GrManagerImpl.h

@@ -260,6 +260,7 @@ private:
 	VkPhysicalDeviceRayQueryFeaturesKHR m_rayQueryFeatures = {};
 	VkPhysicalDeviceVulkan11Features m_11Features = {};
 	VkPhysicalDeviceVulkan12Features m_12Features = {};
+	VkPhysicalDevicePipelineExecutablePropertiesFeaturesKHR m_pplineExecutablePropertiesFeatures = {};
 
 	PFN_vkDebugMarkerSetObjectNameEXT m_pfnDebugMarkerSetObjectNameEXT = nullptr;
 	PFN_vkCmdDebugMarkerBeginEXT m_pfnCmdDebugMarkerBeginEXT = nullptr;

AnKi/Shaders/ClusterBinning.ankiprog

@@ -228,10 +228,10 @@ void main()
 	{
 		objectArrayIdx = clustererObjectIdx
 						 - (u_unis.m_pointLightCount + u_unis.m_spotLightCount + u_unis.m_reflectionProbeCount
-							+ u_unis.m_reflectionProbeCount + u_unis.m_giProbeCount + u_unis.m_fogDensityVolumesCount);
+							+ u_unis.m_reflectionProbeCount + u_unis.m_giProbeCount + u_unis.m_fogDensityVolumeCount);
 		const Decal2 decal = u_decals[objectArrayIdx];
 
-		collides = testRayObb(rayOrigin, rayDir, decal.m_extend, decal.m_invertedTransform, t0, t1);
+		collides = testRayObb(rayOrigin, rayDir, decal.m_obbExtend, decal.m_invertedTransform, t0, t1);
 	}
 
 	// Update the masks