Mirrors/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2025-01-27 04:23:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Add renderdoc tracing support

Browse Source
This commit is contained in:
0cc4m 2025-01-12 13:47:36 +00:00
parent c05e8c9934
commit 9af90481d0
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ggml/CMakeLists.txt
View File

@ -162,6 +162,7 @@ option(GGML_VULKAN_SHADER_DEBUG_INFO "ggml: enable Vulkan shader debug in
option(GGML_VULKAN_PERF "ggml: enable Vulkan perf output" OFF)
option(GGML_VULKAN_VALIDATE "ggml: enable Vulkan validation" OFF)
option(GGML_VULKAN_RUN_TESTS "ggml: run Vulkan tests" OFF)
option(GGML_VULKAN_RENDERDOC_PATH "ggml: Set renderdoc path and enable tracing" OFF)
option(GGML_KOMPUTE "ggml: use Kompute" OFF)
option(GGML_METAL "ggml: use Metal" ${GGML_METAL_DEFAULT})
option(GGML_METAL_USE_BF16 "ggml: use bfloat if available" OFF)

7
ggml/src/ggml-vulkan/CMakeLists.txt
View File

@ -73,6 +73,13 @@ if (Vulkan_FOUND)
add_compile_definitions(GGML_VULKAN_RUN_TESTS)
endif()
if (GGML_VULKAN_RENDERDOC_PATH)
message(STATUS "Using renderdoc in ${GGML_VULKAN_RENDERDOC_PATH} for tracing")
target_include_directories(ggml-vulkan PRIVATE ${GGML_VULKAN_RENDERDOC_PATH}/include)
# target_link_libraries(ggml-vulkan PRIVATE ${GGML_VULKAN_RENDERDOC_PATH}/lib/librenderdoc.so)
add_compile_definitions(GGML_VULKAN_RENDERDOC_PATH=\"${GGML_VULKAN_RENDERDOC_PATH}\")
endif()
add_subdirectory(vulkan-shaders)
set (_ggml_vk_genshaders_cmd vulkan-shaders-gen)

30
ggml/src/ggml-vulkan/ggml-vulkan.cpp
View File

@ -31,6 +31,12 @@
#define VK_API_VERSION VK_API_VERSION_1_2
#ifdef GGML_VULKAN_RENDERDOC_PATH
#include "renderdoc_app.h"
RENDERDOC_API_1_1_2* rdoc_api = nullptr;
#endif
#define CEIL_DIV(M, N) (((M) + (N)-1) / (N))
#define VK_VENDOR_ID_AMD 0x1002
@ -2802,6 +2808,15 @@ void ggml_vk_instance_init() {
for (size_t i = 0; i < vk_instance.device_indices.size(); i++) {
ggml_vk_print_gpu_info(i);
}
#ifdef GGML_VULKAN_RENDERDOC_PATH
if (void* mod = dlopen("librenderdoc.so", RTLD_NOW | RTLD_NOLOAD)) {
pRENDERDOC_GetAPI RENDERDOC_GetAPI = (pRENDERDOC_GetAPI)dlsym(mod, "RENDERDOC_GetAPI");
int ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_6_0, (void **)&rdoc_api);
assert(ret == 1);
GGML_LOG_DEBUG("ggml_vulkan: Renderdoc tracing active");
}
#endif
}
static void ggml_vk_init(ggml_backend_vk_context * ctx, size_t idx) {
@ -7454,10 +7469,18 @@ static const char * ggml_backend_vk_name(ggml_backend_t backend) {
return ctx->name.c_str();
}
#ifdef GGML_VULKAN_RENDERDOC_PATH
static RENDERDOC_DevicePointer rd_dev_ptr = nullptr;
#endif
static void ggml_backend_vk_free(ggml_backend_t backend) {
ggml_backend_vk_context * ctx = (ggml_backend_vk_context *)backend->context;
VK_LOG_DEBUG("ggml_backend_vk_free(" << ctx->name << ")");
#ifdef GGML_VULKAN_RENDERDOC_PATH
if(rdoc_api) rdoc_api->EndFrameCapture(rd_dev_ptr, NULL);
#endif
ggml_vk_cleanup(ctx);
delete ctx;
@ -7576,6 +7599,7 @@ static bool ggml_vk_is_empty(ggml_tensor * node) {
static ggml_status ggml_backend_vk_graph_compute(ggml_backend_t backend, ggml_cgraph * cgraph) {
VK_LOG_DEBUG("ggml_backend_vk_graph_compute(" << cgraph->n_nodes << " nodes)");
ggml_backend_vk_context * ctx = (ggml_backend_vk_context *)backend->context;
for (int i = 0; i < cgraph->n_nodes; i++) {
@ -7682,6 +7706,12 @@ ggml_backend_t ggml_backend_vk_init(size_t dev_num) {
/* .context = */ ctx,
};
#ifdef GGML_VULKAN_RENDERDOC_PATH
rd_dev_ptr = RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(((VkInstance)vk_instance.instance));
if(rdoc_api) rdoc_api->StartFrameCapture(rd_dev_ptr, NULL);
#endif
return vk_backend;
}