Detect and enable VK_EXT_memory_budget if available

Author: azonenberg

scopehal/Unit.cpp

@@ -91,6 +91,8 @@ Unit::Unit(const string& rhs)
 		m_type = UNIT_VOLT_SEC;
 	else if(rhs == "hex")
 		m_type = UNIT_HEXNUM;
+	else if(rhs == "B")
+		m_type = UNIT_BYTES;
 	else
 		LogWarning("Unrecognized unit \"%s\"\n", rhs.c_str());
 }
@@ -174,6 +176,9 @@ string Unit::ToString() const
 		case UNIT_HEXNUM:
 			return "hex";
 
+		case UNIT_BYTES:
+			return "B";
+
 		default:
 			return "unknown";
 	}
@@ -388,6 +393,16 @@ void Unit::GetUnitSuffix(UnitType type, double num, double& scaleFactor, string&
 			suffix = "Vs";
 			break;
 
+		//Bytes: use binary rather than decimal scaling factors
+		case UNIT_BYTES:
+			if(scaleFactor <= 1e-9)
+				scaleFactor = 1.0 / (1024 * 1024 * 1024);
+			else if(scaleFactor <= 1e-6)
+				scaleFactor = 1.0 / (1024 * 1024);
+			else if(scaleFactor <= 1e-3)
+				scaleFactor = 1.0 / 1024;
+			break;
+
 		default:
 			break;
 	}

scopehal/Unit.h

@@ -75,6 +75,8 @@ class Unit
 		UNIT_MILLIVOLTS,	//Hack needed for voltage in the X axis since we use integer coordinates there
 		UNIT_VOLT_SEC,      //Hack needed to measure area under the curve in terms of volt-seconds
 
+		UNIT_BYTES,			//used mostly for displaying memory usage
+
 		//TODO: more here
 	};
 

scopehal/VulkanInit.cpp

@@ -127,13 +127,24 @@ uint32_t g_vkComputeDeviceDriverVer;
  */
 vk::raii::PhysicalDevice* g_vkComputePhysicalDevice;
 
+/**
+	@brief Heap from which g_vkPinnedMemoryType is allocated
+ */
+uint32_t g_vkPinnedMemoryHeap = 0;
+
+/**
+	@brief Heap from which g_vkLocalMemoryType is allocated
+ */
+uint32_t g_vkLocalMemoryHeap = 0;
+
 bool IsDevicePreferred(const vk::PhysicalDeviceProperties& a, const vk::PhysicalDeviceProperties& b);
 
 //Feature flags indicating that we have support for specific data types / features on the GPU
 bool g_hasShaderInt64 = false;
 bool g_hasShaderInt16 = false;
 bool g_hasShaderInt8 = false;
 bool g_hasDebugUtils = false;
+bool g_hasMemoryBudget = false;
 
 //Feature flags indicating specific drivers, for bug workarounds
 bool g_vulkanDeviceIsIntelMesa = false;
@@ -690,7 +701,18 @@ bool VulkanInit(bool skipGLFW)
 					if(!strcmp(&ext.extensionName[0], "VK_KHR_shader_non_semantic_info"))
 					{
 						hasNonSemanticInfo = true;
-						LogDebug("Device has KHR_shader_non_semantic_info, requesting it\n");
+						LogDebug("Device has VK_KHR_shader_non_semantic_info, requesting it\n");
+					}
+
+					if(!strcmp(&ext.extensionName[0], "VK_EXT_memory_budget"))
+					{
+						if(!hasPhysicalDeviceProperties2)
+							LogWarning("VK_EXT_memory_budget is supported, but not VK_KHR_get_physical_device_properties2 so it's useless\n");
+						else
+						{
+							LogDebug("Device has VK_EXT_memory_budget, requesting it\n");
+							g_hasMemoryBudget = true;
+						}
 					}
 				}
 
@@ -701,6 +723,8 @@ bool VulkanInit(bool skipGLFW)
 					devextensions.push_back("VK_KHR_portability_subset");
 				if(hasNonSemanticInfo)
 					devextensions.push_back("VK_KHR_shader_non_semantic_info");
+				if(g_hasMemoryBudget)
+					devextensions.push_back("VK_EXT_memory_budget");
 				vk::DeviceCreateInfo devinfo(
 					{},
 					qinfo,
@@ -715,6 +739,8 @@ bool VulkanInit(bool skipGLFW)
 				bool foundLocalType = false;
 				g_vkPinnedMemoryType = 0;
 				g_vkLocalMemoryType = 0;
+				g_vkPinnedMemoryType = 0;
+				g_vkLocalMemoryType = 0;
 				auto memProperties = device.getMemoryProperties();
 				auto devtype = device.getProperties().deviceType;
 				for(size_t j=0; j<memProperties.memoryTypeCount; j++)
@@ -743,6 +769,7 @@ bool VulkanInit(bool skipGLFW)
 						{
 							foundPinnedType = true;
 							g_vkPinnedMemoryType = j;
+							g_vkPinnedMemoryHeap = mtype.heapIndex;
 						}
 					}
 
@@ -762,6 +789,7 @@ bool VulkanInit(bool skipGLFW)
 						{
 							foundLocalType = true;
 							g_vkLocalMemoryType = j;
+							g_vkLocalMemoryHeap = mtype.heapIndex;
 						}
 					}
 				}

scopehal/scopehal.h

@@ -198,6 +198,8 @@ extern std::unique_ptr<QueueManager> g_vkQueueManager;
 extern bool g_vulkanDeviceIsIntelMesa;
 extern bool g_vulkanDeviceIsAnyMesa;
 extern bool g_vulkanDeviceIsMoltenVK;
+extern uint32_t g_vkPinnedMemoryHeap;
+extern uint32_t g_vkLocalMemoryHeap;
 
 //Enable flags for various features
 extern bool g_gpuFilterEnabled;
@@ -206,6 +208,7 @@ extern bool g_hasShaderInt64;
 extern bool g_hasShaderInt16;
 extern bool g_hasShaderInt8;
 extern bool g_hasDebugUtils;
+extern bool g_hasMemoryBudget;
 
 //Shader args for frequently used kernels
 struct ConvertRawSamplesShaderArgs