From 5f2a988464a7e9febcda0cdd27a54e58457d1e48 Mon Sep 17 00:00:00 2001 From: Ammar ELWazir Date: Wed, 4 May 2022 09:11:29 -0500 Subject: [PATCH] SWDEV-335490: Unused variables Compilers doesn't see assert as a usage of the variables, I added [[maybe_unused]] to the variables that are used only in assert to make sure that the compiler is skipping them in the check. Note: [[maybe_unused]] is introduced in C++17 Change-Id: I96bb53cb2ab55ee7120681c2d279271c0075095d [ROCm/roctracer commit: 78869032ada05637866a320f1764e089be6450f9] --- projects/roctracer/src/core/roctracer.cpp | 4 ++-- projects/roctracer/src/core/tracker.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/roctracer/src/core/roctracer.cpp b/projects/roctracer/src/core/roctracer.cpp index 708c90ca70..28e6c1b11b 100644 --- a/projects/roctracer/src/core/roctracer.cpp +++ b/projects/roctracer/src/core/roctracer.cpp @@ -294,7 +294,7 @@ static thread_local std::stack external_id_stack; static inline void CorrelationIdRegistr(const activity_correlation_id_t& correlation_id) { std::lock_guard lck(correlation_id_mutex); - const auto ret = correlation_id_map.insert({correlation_id, correlation_id_tls}); + [[maybe_unused]] const auto ret = correlation_id_map.insert({correlation_id, correlation_id_tls}); assert(ret.second && "HIP activity id is not unique"); DEBUG_TRACE("CorrelationIdRegistr id(%lu) id_tls(%lu)\n", correlation_id, correlation_id_tls); @@ -1229,7 +1229,7 @@ PUBLIC_API roctracer_status_t roctracer_set_properties(roctracer_domain_t domain #endif // HSA async-copy tracing - hsa_status_t status = hsa_amd_profiling_async_copy_enable(true); + [[maybe_unused]] hsa_status_t status = hsa_amd_profiling_async_copy_enable(true); assert(status == HSA_STATUS_SUCCESS && "hsa_amd_profiling_async_copy_enable failed"); roctracer::hsa_amd_memory_async_copy_fn = table->amd_ext_->hsa_amd_memory_async_copy_fn; roctracer::hsa_amd_memory_async_copy_rect_fn = diff --git a/projects/roctracer/src/core/tracker.h b/projects/roctracer/src/core/tracker.h index f86fb49b30..3d73b6d6e9 100644 --- a/projects/roctracer/src/core/tracker.h +++ b/projects/roctracer/src/core/tracker.h @@ -141,7 +141,7 @@ class Tracker { orig_signal_ptr->start_ts = prof_signal_ptr->start_ts; orig_signal_ptr->end_ts = prof_signal_ptr->end_ts; - const hsa_signal_value_t new_value = hsa_signal_load_relaxed(orig) - 1; + [[maybe_unused]] const hsa_signal_value_t new_value = hsa_signal_load_relaxed(orig) - 1; assert(signal_value == new_value && "Tracker::Complete bad signal value"); hsa_signal_store_screlease(orig, signal_value); }