commit 3f97c029b218a04e65c1ec0eeafc04acc9c282d8
author Andrew Woloszyn <andrew.woloszyn@gmail.com> Thu Aug 15 11:31:21 2024 -0400
committer GitHub <noreply@github.com> Thu Aug 15 11:31:21 2024 -0400
tree 84a64414406895ba1a3b9258ac375eddd0fa46c4
parent b144e905701572d6bd89ea1d4bf55f817b9d3a2b

[cuda][hip] Fixed tracing when device tracing is disabled at runtime (#18171)

Fixes a crash if `--hip_tracing=false` or `--cuda_tracing=false` at
runtime while iree was compiled with
`IREE_ENABLE_RUNTIME_TRACING=ON`.

Signed-off-by: Andrew Woloszyn <andrew.woloszyn@gmail.com>

runtime/src/iree/hal/drivers/cuda/tracing.c

diff --git a/runtime/src/iree/hal/drivers/cuda/tracing.c b/runtime/src/iree/hal/drivers/cuda/tracing.c
index ea508be..913ca5d 100644
--- a/runtime/src/iree/hal/drivers/cuda/tracing.c
+++ b/runtime/src/iree/hal/drivers/cuda/tracing.c
@@ -427,7 +427,7 @@
     iree_hal_cuda_tracing_context_t* context,
     iree_hal_cuda_tracing_context_event_list_t* event_list, CUstream stream,
     const iree_tracing_location_t* src_loc) {
-  IREE_ASSERT_ARGUMENT(context);
+  if (!context) return;
   uint16_t query_id = iree_hal_cuda_stream_tracing_context_insert_query(
       context, event_list, stream);
   iree_tracing_gpu_zone_begin(context->id, query_id, src_loc);
@@ -439,7 +439,7 @@
     const char* file_name, size_t file_name_length, uint32_t line,
     const char* function_name, size_t function_name_length, const char* name,
     size_t name_length) {
-  IREE_ASSERT_ARGUMENT(context);
+  if (!context) return;
   uint16_t query_id = iree_hal_cuda_stream_tracing_context_insert_query(
       context, event_list, stream);
   iree_tracing_gpu_zone_begin_external(context->id, query_id, file_name,

runtime/src/iree/hal/drivers/hip/tracing.c

diff --git a/runtime/src/iree/hal/drivers/hip/tracing.c b/runtime/src/iree/hal/drivers/hip/tracing.c
index 0fbe2bb..f1a7007 100644
--- a/runtime/src/iree/hal/drivers/hip/tracing.c
+++ b/runtime/src/iree/hal/drivers/hip/tracing.c
@@ -426,7 +426,7 @@
     iree_hal_hip_tracing_context_t* context,
     iree_hal_hip_tracing_context_event_list_t* event_list, hipStream_t stream,
     const iree_tracing_location_t* src_loc) {
-  IREE_ASSERT_ARGUMENT(context);
+  if (!context) return;
   uint16_t query_id = iree_hal_hip_stream_tracing_context_insert_query(
       context, event_list, stream);
   iree_tracing_gpu_zone_begin(context->id, query_id, src_loc);
@@ -438,7 +438,7 @@
     const char* file_name, size_t file_name_length, uint32_t line,
     const char* function_name, size_t function_name_length, const char* name,
     size_t name_length) {
-  IREE_ASSERT_ARGUMENT(context);
+  if (!context) return;
   uint16_t query_id = iree_hal_hip_stream_tracing_context_insert_query(
       context, event_list, stream);
   iree_tracing_gpu_zone_begin_external(context->id, query_id, file_name,