From bbe079ab6dcbe02873febc8abf20c7fda264eb44 Mon Sep 17 00:00:00 2001 From: Ewan Crawford Date: Wed, 14 May 2025 10:03:23 +0100 Subject: [PATCH] [UR][CUDA] Fix command-buffer handle inheritance The `ur_exp_command_buffer_handle_t_` definition in the CUDA adapter was missed in https://github.com/intel/llvm/pull/17118 in the changes to inherit from a base handle. Discovered by seeing segfaults in the UR CTS tests locally, and git bisecting back to that change. --- unified-runtime/source/adapters/cuda/command_buffer.cpp | 2 +- unified-runtime/source/adapters/cuda/command_buffer.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/unified-runtime/source/adapters/cuda/command_buffer.cpp b/unified-runtime/source/adapters/cuda/command_buffer.cpp index 8aa68cc2269a..a0b708e1d3e3 100644 --- a/unified-runtime/source/adapters/cuda/command_buffer.cpp +++ b/unified-runtime/source/adapters/cuda/command_buffer.cpp @@ -57,7 +57,7 @@ ur_result_t commandHandleDestroy( ur_exp_command_buffer_handle_t_::ur_exp_command_buffer_handle_t_( ur_context_handle_t Context, ur_device_handle_t Device, bool IsUpdatable) - : Context(Context), Device(Device), IsUpdatable(IsUpdatable), + : handle_base(), Context(Context), Device(Device), IsUpdatable(IsUpdatable), CudaGraph{nullptr}, CudaGraphExec{nullptr}, RefCount{1}, NextSyncPoint{0} { urContextRetain(Context); diff --git a/unified-runtime/source/adapters/cuda/command_buffer.hpp b/unified-runtime/source/adapters/cuda/command_buffer.hpp index d6273c325235..efc96d7df9bb 100644 --- a/unified-runtime/source/adapters/cuda/command_buffer.hpp +++ b/unified-runtime/source/adapters/cuda/command_buffer.hpp @@ -128,7 +128,7 @@ struct ur_exp_command_buffer_command_handle_t_ : ur::cuda::handle_base { command_data_type_t CommandData; }; -struct ur_exp_command_buffer_handle_t_ { +struct ur_exp_command_buffer_handle_t_ : ur::cuda::handle_base { ur_exp_command_buffer_handle_t_(ur_context_handle_t Context, ur_device_handle_t Device, bool IsUpdatable);