From f7e860c6f7b8cd08587c3b77bc66bda560bf4a0d Mon Sep 17 00:00:00 2001 From: Andrew Woloszyn Date: Thu, 15 Aug 2024 11:10:07 -0500 Subject: [PATCH] Fix compilation post-merge. Signed-off-by: Andrew Woloszyn --- .../iree/hal/drivers/cuda/graph_command_buffer.c | 11 ++++++----- .../iree/hal/drivers/cuda/stream_command_buffer.c | 14 +++++++------- .../iree/hal/drivers/hip/graph_command_buffer.c | 11 ++++++----- .../iree/hal/drivers/hip/stream_command_buffer.c | 14 +++++++------- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/runtime/src/iree/hal/drivers/cuda/graph_command_buffer.c b/runtime/src/iree/hal/drivers/cuda/graph_command_buffer.c index a8526acd34df..e5b88df0286f 100644 --- a/runtime/src/iree/hal/drivers/cuda/graph_command_buffer.c +++ b/runtime/src/iree/hal/drivers/cuda/graph_command_buffer.c @@ -913,10 +913,10 @@ static iree_status_t iree_hal_cuda_graph_command_buffer_dispatch2( executable, entry_point, &kernel_info)); IREE_CUDA_GRAPH_COMMAND_BUFFER_TRACE_ZONE_BEGIN_EXTERNAL( - command_buffer, kernel_info.source_filename.data, - kernel_info.source_filename.size, kernel_info.source_line, - kernel_info.function_name.data, kernel_info.function_name.size, - /*name=*/NULL, 0); + command_buffer, IREE_HAL_CUDA_TRACING_VERBOSITY_FINE, + kernel_info.source_filename.data, kernel_info.source_filename.size, + kernel_info.source_line, kernel_info.function_name.data, + kernel_info.function_name.size, /*name=*/NULL, 0); IREE_RETURN_AND_END_ZONE_IF_ERROR( z0, iree_hal_resource_set_insert(command_buffer->resource_set, 1, @@ -1005,7 +1005,8 @@ static iree_status_t iree_hal_cuda_graph_command_buffer_dispatch2( dependency_count, ¶ms), "cuGraphAddKernelNode"); - IREE_CUDA_GRAPH_COMMAND_BUFFER_TRACE_ZONE_END(command_buffer); + IREE_CUDA_GRAPH_COMMAND_BUFFER_TRACE_ZONE_END( + command_buffer, IREE_HAL_CUDA_TRACING_VERBOSITY_FINE); IREE_TRACE_ZONE_END(z0); return iree_ok_status(); } diff --git a/runtime/src/iree/hal/drivers/cuda/stream_command_buffer.c b/runtime/src/iree/hal/drivers/cuda/stream_command_buffer.c index 2f5c0974ef1e..4b8a0b106f8f 100644 --- a/runtime/src/iree/hal/drivers/cuda/stream_command_buffer.c +++ b/runtime/src/iree/hal/drivers/cuda/stream_command_buffer.c @@ -674,10 +674,10 @@ static iree_status_t iree_hal_cuda_stream_command_buffer_dispatch2( IREE_CUDA_STREAM_TRACE_ZONE_BEGIN_EXTERNAL( command_buffer->tracing_context, &command_buffer->tracing_event_list, - command_buffer->cu_stream, kernel_info.source_filename.data, - kernel_info.source_filename.size, kernel_info.source_line, - kernel_info.function_name.data, kernel_info.function_name.size, - /*name=*/NULL, 0); + command_buffer->cu_stream, IREE_HAL_CUDA_TRACING_VERBOSITY_FINE, + kernel_info.source_filename.data, kernel_info.source_filename.size, + kernel_info.source_line, kernel_info.function_name.data, + kernel_info.function_name.size, /*name=*/NULL, 0); IREE_RETURN_AND_END_ZONE_IF_ERROR( z0, iree_hal_resource_set_insert(command_buffer->resource_set, 1, @@ -749,9 +749,9 @@ static iree_status_t iree_hal_cuda_stream_command_buffer_dispatch2( command_buffer->cu_stream, params_ptr, NULL), "cuLaunchKernel"); - IREE_CUDA_STREAM_TRACE_ZONE_END(command_buffer->tracing_context, - &command_buffer->tracing_event_list, - command_buffer->cu_stream); + IREE_CUDA_STREAM_TRACE_ZONE_END( + command_buffer->tracing_context, &command_buffer->tracing_event_list, + command_buffer->cu_stream, IREE_HAL_CUDA_TRACING_VERBOSITY_FINE); IREE_TRACE_ZONE_END(z0); return iree_ok_status(); diff --git a/runtime/src/iree/hal/drivers/hip/graph_command_buffer.c b/runtime/src/iree/hal/drivers/hip/graph_command_buffer.c index a946a89faba9..afade26d4be0 100644 --- a/runtime/src/iree/hal/drivers/hip/graph_command_buffer.c +++ b/runtime/src/iree/hal/drivers/hip/graph_command_buffer.c @@ -923,10 +923,10 @@ static iree_status_t iree_hal_hip_graph_command_buffer_dispatch2( executable, entry_point, &kernel_info)); IREE_HIP_GRAPH_COMMAND_BUFFER_TRACE_ZONE_BEGIN_EXTERNAL( - command_buffer, kernel_info.source_filename.data, - kernel_info.source_filename.size, kernel_info.source_line, - kernel_info.function_name.data, kernel_info.function_name.size, - /*name=*/NULL, 0); + command_buffer, IREE_HAL_HIP_TRACING_VERBOSITY_FINE, + kernel_info.source_filename.data, kernel_info.source_filename.size, + kernel_info.source_line, kernel_info.function_name.data, + kernel_info.function_name.size, /*name=*/NULL, 0); IREE_RETURN_AND_END_ZONE_IF_ERROR( z0, iree_hal_resource_set_insert(command_buffer->resource_set, 1, @@ -1006,7 +1006,8 @@ static iree_status_t iree_hal_hip_graph_command_buffer_dispatch2( dependency_count, ¶ms), "hipGraphAddKernelNode"); - IREE_HIP_GRAPH_COMMAND_BUFFER_TRACE_ZONE_END(command_buffer); + IREE_HIP_GRAPH_COMMAND_BUFFER_TRACE_ZONE_END( + command_buffer, IREE_HAL_HIP_TRACING_VERBOSITY_FINE); IREE_TRACE_ZONE_END(z0); return iree_ok_status(); } diff --git a/runtime/src/iree/hal/drivers/hip/stream_command_buffer.c b/runtime/src/iree/hal/drivers/hip/stream_command_buffer.c index 8924ed4068fa..1b8b6b665289 100644 --- a/runtime/src/iree/hal/drivers/hip/stream_command_buffer.c +++ b/runtime/src/iree/hal/drivers/hip/stream_command_buffer.c @@ -654,10 +654,10 @@ static iree_status_t iree_hal_hip_stream_command_buffer_dispatch2( IREE_HIP_STREAM_TRACE_ZONE_BEGIN_EXTERNAL( command_buffer->tracing_context, &command_buffer->tracing_event_list, - command_buffer->hip_stream, kernel_info.source_filename.data, - kernel_info.source_filename.size, kernel_info.source_line, - kernel_info.function_name.data, kernel_info.function_name.size, - /*name=*/NULL, 0); + command_buffer->hip_stream, IREE_HAL_HIP_TRACING_VERBOSITY_FINE, + kernel_info.source_filename.data, kernel_info.source_filename.size, + kernel_info.source_line, kernel_info.function_name.data, + kernel_info.function_name.size, /*name=*/NULL, 0); IREE_RETURN_AND_END_ZONE_IF_ERROR( z0, iree_hal_resource_set_insert(command_buffer->resource_set, 1, @@ -720,9 +720,9 @@ static iree_status_t iree_hal_hip_stream_command_buffer_dispatch2( params_ptr, NULL), "hipModuleLaunchKernel"); - IREE_HIP_STREAM_TRACE_ZONE_END(command_buffer->tracing_context, - &command_buffer->tracing_event_list, - command_buffer->hip_stream); + IREE_HIP_STREAM_TRACE_ZONE_END( + command_buffer->tracing_context, &command_buffer->tracing_event_list, + command_buffer->hip_stream, IREE_HAL_HIP_TRACING_VERBOSITY_FINE); IREE_TRACE_ZONE_END(z0); return status;