Vulkan: include backend name in deviceName

src/Reactor/LLVMReactor.cpp

@@ -1000,6 +1000,11 @@ void createScatter(llvm::Value *base, llvm::Value *val, llvm::Value *offsets, ll
 
 namespace rr {
 
+std::string BackendName()
+{
+	return std::string("LLVM ") + LLVM_VERSION_STRING;
+}
+
 const Capabilities Caps = {
 	true,  // CoroutinesSupported
 };

src/Reactor/Reactor.hpp

@@ -50,6 +50,8 @@ void FlushDebug();
 
 namespace rr {
 
+std::string BackendName();
+
 struct Capabilities
 {
 	bool CoroutinesSupported;  // Support for rr::Coroutine<F>

src/Reactor/SubzeroReactor.cpp

@@ -170,6 +170,11 @@ static_assert(!subzeroEmitTextAsm, "Compile Subzero with ALLOW_DUMP=1 for subzer
 
 namespace rr {
 
+std::string BackendName()
+{
+	return "Subzero";
+}
+
 const Capabilities Caps = {
 	false,  // CoroutinesSupported
 };

src/Vulkan/VkPhysicalDevice.cpp

@@ -16,6 +16,7 @@
 
 #include "VkConfig.h"
 #include "Pipeline/SpirvShader.hpp"  // sw::SIMD::Width
+#include "Reactor/Reactor.hpp"
 
 #include <cstring>
 #include <limits>
@@ -286,18 +287,27 @@ const VkPhysicalDeviceLimits &PhysicalDevice::getLimits() const
 
 const VkPhysicalDeviceProperties &PhysicalDevice::getProperties() const
 {
-	static const VkPhysicalDeviceProperties properties{
-		API_VERSION,
-		DRIVER_VERSION,
-		VENDOR_ID,
-		DEVICE_ID,
-		VK_PHYSICAL_DEVICE_TYPE_CPU,  // deviceType
-		SWIFTSHADER_DEVICE_NAME,      // deviceName
-		SWIFTSHADER_UUID,             // pipelineCacheUUID
-		getLimits(),                  // limits
-		{}                            // sparseProperties
+	auto getProperties = [&]() -> VkPhysicalDeviceProperties {
+		VkPhysicalDeviceProperties properties = {
+			API_VERSION,
+			DRIVER_VERSION,
+			VENDOR_ID,
+			DEVICE_ID,
+			VK_PHYSICAL_DEVICE_TYPE_CPU,  // deviceType
+			"",                           // deviceName
+			SWIFTSHADER_UUID,             // pipelineCacheUUID
+			getLimits(),                  // limits
+			{}                            // sparseProperties
+		};
+
+		// Append Reactor JIT backend name and version
+		snprintf(properties.deviceName, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE,
+		         "%s (%s)", SWIFTSHADER_DEVICE_NAME, rr::BackendName().c_str());
+
+		return properties;
 	};
 
+	static const VkPhysicalDeviceProperties properties = getProperties();
 	return properties;
 }
 

tests/VulkanUnitTests/unittests.cpp

@@ -102,7 +102,7 @@ TEST_F(SwiftShaderVulkanTest, Version)
     EXPECT_EQ(physicalDeviceProperties.deviceID, 0xC0DEU);
     EXPECT_EQ(physicalDeviceProperties.deviceType, VK_PHYSICAL_DEVICE_TYPE_CPU);
 
-    EXPECT_EQ(strncmp(physicalDeviceProperties.deviceName, "SwiftShader Device", VK_MAX_PHYSICAL_DEVICE_NAME_SIZE), 0);
+    EXPECT_NE(strstr(physicalDeviceProperties.deviceName, "SwiftShader Device"), nullptr);
 
 	VkPhysicalDeviceProperties2 physicalDeviceProperties2;
 	VkPhysicalDeviceDriverPropertiesKHR physicalDeviceDriverProperties;