From 7ed62f815fde0f386c71f0bc5fd788adc1a5dab4 Mon Sep 17 00:00:00 2001 From: Sean Keely Date: Wed, 22 Nov 2017 15:18:26 -0600 Subject: [PATCH] Pull from github (pmargheritta): Corrected semantics used in hsa_queue_load_write_index_relaxed. The semantics that was used in hsa_queue_load_write_index_relaxed didn't seem to match the name of the function. I also removed a useless return keyword. Change-Id: If3819d38fb367f122fc382edf8ee3771a23279ae [ROCm/ROCR-Runtime commit: 5872b618deae12de3630242ae4f764d59e4eed33] --- .../rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp index e8ce17b188..aa83ff88da 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp @@ -805,7 +805,7 @@ uint64_t hsa_queue_load_write_index_relaxed(const hsa_queue_t* queue) { TRY; core::Queue* cmd_queue = core::Queue::Convert(queue); assert(IsValid(cmd_queue)); - return cmd_queue->LoadWriteIndexAcquire(); + return cmd_queue->LoadWriteIndexRelaxed(); CATCHRET(uint64_t); } @@ -1354,7 +1354,7 @@ void hsa_signal_add_relaxed(hsa_signal_t hsa_signal, hsa_signal_value_t value) { TRY; core::Signal* signal = core::Signal::Convert(hsa_signal); assert(IsValid(signal)); - return signal->AddRelaxed(value); + signal->AddRelaxed(value); CATCHRET(void); }