Merge pull request #938 from Devsh-Graphics-Programming/gpu_info

GPU Diagnostics

Author: AnastaZIuk

.github/workflows/build-nabla.yml

@@ -364,6 +364,17 @@ jobs:
           sparse-checkout: |
             smoke
 
+      - name: Download VulkanSDK
+        uses: jakoch/install-vulkan-sdk-action@v1
+        with:
+            install_runtime: true
+            cache: false
+            stripdown: true
+            install_lavapipe: true
+
+      - name: Add lavapipe driver
+        run: reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Khronos\Vulkan\Drivers" /v "C:\lavapipe\share\vulkan\icd.d\lvp_icd.x86_64.json" /t REG_DWORD /d 0 /f
+
       - name: Download Nabla install artifact
         uses: actions/download-artifact@v4
         with:
@@ -385,4 +396,4 @@ jobs:
         run: cmake --build smoke/out --config ${{ matrix.config }}
 
       - name: CTest Smoke
-        run: ctest --test-dir smoke/out --force-new-ctest-process --output-on-failure --no-tests=error -C ${{ matrix.config }}
+        run: ctest --verbose --test-dir smoke/out --force-new-ctest-process --output-on-failure --no-tests=error -C ${{ matrix.config }}

.gitmodules

@@ -125,4 +125,7 @@
 	path = ci
 	url = git@github.com:Devsh-Graphics-Programming/Nabla-CI.git
 	branch = ditt
-	update = none
+	update = none
+[submodule "3rdparty/Vulkan-Tools"]
+	path = 3rdparty/Vulkan-Tools
+	url = git@github.com:Devsh-Graphics-Programming/Vulkan-Tools.git

3rdparty/CMakeLists.txt

@@ -454,6 +454,10 @@ if (NBL_BUILD_BULLET)
 	set(BULLET_INCLUDE_PATH ${BULLET_INCLUDE_PATH} PARENT_SCOPE)
 endif()
 
+add_library(Vulkan-Headers INTERFACE)
+target_include_directories(Vulkan-Headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include")
+add_subdirectory(Vulkan-Tools/vulkaninfo vulkaninfo EXCLUDE_FROM_ALL)
+
 # Final gather
 set(NBL_3RDPARTY_TARGETS
 				lzma
@@ -475,6 +479,7 @@ set(NBL_3RDPARTY_TARGETS
 				SPIRV 
 				SPIRV-Tools-static # SPIRV-Tools-shared in case of SHARED lib
 				SPIRV-Tools-opt
+				vulkaninfo
 				Imath
 				freetype
 				${NBL_MSDFGEN_TARGETS}

3rdparty/Vulkan-Headers

@@ -13,6 +13,8 @@
 namespace nbl::video
 {
 
+NBL_API2 int vulkaninfo(const std::span<const char*> args);
+
 class NBL_API2 CVulkanConnection final : public IAPIConnection
 {
     public:
@@ -27,6 +29,7 @@ class NBL_API2 CVulkanConnection final : public IAPIConnection
 
         inline IDebugCallback* getDebugCallback() const override {return m_debugCallback.get();}
 
+
         bool startCapture() override;
         bool endCapture() override;
 

3rdparty/Vulkan-Tools

@@ -36,11 +36,45 @@ class Smoke final : public system::IApplicationFramework
             return false;
         }
 
+        exportGpuProfiles();
+
         return true;
     }
 
     void workLoopBody() override {}
     bool keepRunning() override { return false; }
+
+private:
+    static void exportGpuProfiles()
+    {
+        std::string arg2 = "-o";
+        std::string buf;
+        std::string arg1;
+        std::string arg3;
+
+        for (size_t i = 0;; i++)
+        {
+            auto stringifiedIndex = std::to_string(i);
+            arg1 = "--json=" + stringifiedIndex;
+            arg3 = "device_" + stringifiedIndex + ".json";
+            std::array<const char*, 3> args = { arg1.data(), arg2.data(), arg3.data() };
+
+            int code = nbl::video::vulkaninfo(args);
+
+            if (code != 0)
+                break;
+
+            // print out file content
+            std::ifstream input(arg3);
+            
+            while (std::getline(input, buf))
+            {
+                std::cout << buf << "\n";
+            }
+
+            std::cout << "\n\n";
+        }
+    }
 };
 
 NBL_MAIN_FUNC(Smoke)

examples_tests

@@ -753,6 +753,13 @@ list(APPEND INTERFACE_BUILD_DEFINITIONS
 # TODO: private
 target_link_libraries(Nabla PUBLIC $<BUILD_INTERFACE:gtml>)
 
+# vulkaninfo
+if (NBL_STATIC_BUILD)
+	target_link_libraries(Nabla PUBLIC $<BUILD_INTERFACE:vulkaninfo>)
+else()
+	target_link_libraries(Nabla PRIVATE $<BUILD_INTERFACE:vulkaninfo>)
+endif()
+
 # NGFX
 if(TARGET ngfx)
 	if(NBL_STATIC_BUILD)

include/nbl/video/CVulkanConnection.h

@@ -7,6 +7,8 @@
 // TODO: move inside `create` and call it LOG_FAIL and return nullptr
 #define LOG(logger, ...) if (logger) {logger->log(__VA_ARGS__);}
 
+extern int vulkaninfo(int, char**);
+
 namespace nbl::video
 {
 
@@ -306,6 +308,7 @@ core::smart_refctd_ptr<CVulkanConnection> CVulkanConnection::create(core::smart_
             continue;
         }
         api->m_physicalDevices.emplace_back(std::move(device));
+        // device enumeration
     }
 #undef LOF
 
@@ -372,4 +375,9 @@ bool CVulkanConnection::endCapture()
     return true;
 }
 
+int vulkaninfo(const std::span<const char*> args)
+{
+    return ::vulkaninfo(args.size(), const_cast<char**>(args.data())); 
+}
+
 }