Meserve, Mark
61307442f0
* SWDEV-515895: Fix for hang in hsa_barrier
- Root cause of hang is enqueue_packet using a completed barrier
- This occurs because set_barrier does not correctly mark the barrier
as complete.
- Fixed by consolidating duplicate code for how a barrier is:
- Marked as complete
- Added common function and trace message
- Checked as complete
- Removed internal completion tracking variable in favor of signal
- Added some log messages which were useful in tracking this hang
- Destroying an hsa_barrier now calls the provided completion callback
* formatting
* Fix hsa_barrier test
- Removes assumption that enqueue_packet always generates packets
- Add assertion that a complete barrier does not generate packets
* formatting
* Address review comments
89 lines
3.4 KiB
C++
89 lines
3.4 KiB
C++
// MIT License
|
|
//
|
|
// Copyright (c) 2023-2025 Advanced Micro Devices, Inc. All rights reserved.
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
// of this software and associated documentation files (the "Software"), to deal
|
|
// in the Software without restriction, including without limitation the rights
|
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
// copies of the Software, and to permit persons to whom the Software is
|
|
// furnished to do so, subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in all
|
|
// copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
// SOFTWARE.
|
|
|
|
#pragma once
|
|
|
|
#include "lib/common/synchronized.hpp"
|
|
#include "lib/rocprofiler-sdk/hsa/rocprofiler_packet.hpp"
|
|
|
|
#include <rocprofiler-sdk/fwd.h>
|
|
|
|
#include <hsa/hsa.h>
|
|
#include <hsa/hsa_api_trace.h>
|
|
#include <hsa/hsa_ext_amd.h>
|
|
|
|
#include <atomic>
|
|
#include <functional>
|
|
#include <optional>
|
|
#include <unordered_map>
|
|
#include <unordered_set>
|
|
|
|
namespace rocprofiler
|
|
{
|
|
namespace hsa
|
|
{
|
|
class Queue;
|
|
|
|
class hsa_barrier
|
|
{
|
|
public:
|
|
using queue_map_ptr_t = std::unordered_map<hsa_queue_t*, Queue*>;
|
|
hsa_barrier(std::function<void()>&& finished, CoreApiTable core_api);
|
|
~hsa_barrier();
|
|
|
|
// If a queue in q currently has active async packets, sets the barrier and saves how many
|
|
// packets are currently in each queue to track barrier completion. If there are no queues with
|
|
// packets, clears the barrier and marks it as complete.
|
|
void set_barrier(const queue_map_ptr_t& q);
|
|
|
|
// Returns the packets needed to place this barrier in a queue.
|
|
// If the barrier has already been enqueued in the queue given or the barrier is complete, no
|
|
// packets are returned.
|
|
std::optional<rocprofiler_packet> enqueue_packet(const Queue* queue);
|
|
|
|
// To be called when 1 async packet is finished in the given queue to decrement the remaining
|
|
// packets counter. If all packets in all queues given in set_barrier are completed, clears the
|
|
// barrier and marks it as complete. Returns true if the given queue had async packets waiting.
|
|
bool register_completion(const Queue* queue);
|
|
|
|
// Checks if this barrier is complete
|
|
bool complete() const;
|
|
|
|
// Removes a queue from the barrier dependency list.
|
|
// If this is the last queue waiting, clears the barrier and marks it as complete.
|
|
void remove_queue(const Queue* queue);
|
|
|
|
private:
|
|
std::function<void()> _barrier_finished = {};
|
|
CoreApiTable _core_api = {};
|
|
common::Synchronized<std::unordered_map<int64_t, int64_t>> _queue_waiting = {};
|
|
common::Synchronized<std::unordered_set<int64_t>> _barrier_enqueued = {};
|
|
|
|
void clear_barrier();
|
|
|
|
// Blocks all queues from executing until the barrier is lifted
|
|
hsa_signal_t _barrier_signal = {};
|
|
};
|
|
|
|
} // namespace hsa
|
|
} // namespace rocprofiler
|