fa772be675
## Overview and rationale This reverts https://github.com/ROCm/rocm-systems/pull/1886, which... * Re-applies https://github.com/ROCm/rocm-systems/pull/1866 * Reverts https://github.com/ROCm/rocm-systems/pull/1728 (So it restores the [`amdgpu-windows-interop/`](https://github.com/ROCm/rocm-systems/tree/develop/shared/amdgpu-windows-interop) folder back to the state from a few weeks ago) The rationale for this change is at https://github.com/ROCm/rocm-systems/pull/1866: > Last PAL update broke applications on gfx12 Windows. ## Cross-repository change details That PR failed to build but was merged with this explanation: > TheRock CI Windows build fails as expected with this revert. > > References to these PAL members need to be stripped out in a patch on TheRock. > > ``` > 11.3 C:\home\runner\_work\rocm-systems\rocm-systems\projects\clr\rocclr\device\pal\palubercapturemgr.cpp(152): error C2039: 'RegisterTraceStateChangeCallback': is not a member of 'GpuUtil::TraceSession' > 11.4 C:\home\runner\_work\rocm-systems\rocm-systems\shared\amdgpu-windows-interop\pal\inc\gpuUtil\palTraceSession.h(372): note: see declaration of 'GpuUtil::TraceSession' > 11.4 C:\home\runner\_work\rocm-systems\rocm-systems\projects\clr\rocclr\device\pal\palubercapturemgr.cpp(195): error C2039: 'UnregisterTraceStateChangeCallback': is not a member of 'GpuUtil::TraceSession' > 11.4 C:\home\runner\_work\rocm-systems\rocm-systems\shared\amdgpu-windows-interop\pal\inc\gpuUtil\palTraceSession.h(372): note: see declaration of 'GpuUtil::TraceSession' > ``` The patch in TheRock was updated in https://github.com/ROCm/TheRock/pull/2154. This rolls forward by updating the ref for TheRock. That original PR could have been sequenced differently to avoid a build break - perhaps by * Pointing to a branch in TheRock with the patch rebased * Deleting the patch in the workflows here but holding a local copy of the path to be applied in workflows * Landing the patch as a normal commit instead of carrying it at all ## Test plan 1. Watch TheRock CI here (https://github.com/ROCm/rocm-systems/actions/runs/19447202693/job/55644411119?pr=1893) 2. Build locally: ```bash # In rocm-systems git am --whitespace=nowarn D:\projects\TheRock\patches\amd-mainline\rocm-systems\0001-Revert-SWDEV-543498-Some-compute-Ubertrace-profiles-.patch git am --whitespace=nowarn D:\projects\TheRock\patches\amd-mainline\rocm-systems\0003-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch git am --whitespace=nowarn D:\projects\TheRock\patches\amd-mainline\rocm-systems\0006-Explicitly-load-libamdhip64.so.7.patch # Note: the build fails with the observed errors if patch 0001 is not applied! # In TheRock cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe \ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DPython3_EXECUTABLE=d:/projects/TheRock/.venv/Scripts/python \ -DTHEROCK_ROCM_SYSTEMS_SOURCE_DIR=d:/projects/TheRock/../rocm-systems \ # IMPORTANT -DTHEROCK_AMDGPU_FAMILIES=gfx110X-all \ -DBUILD_TESTING=ON \ -DTHEROCK_ENABLE_ALL=ON \ -Damd-llvm_BUILD_TYPE=RelWithDebInfo \ -S D:/projects/TheRock \ -B D:/projects/TheRock/build \ -G Ninja cmake --build D:/projects/TheRock/build --target hip-clr # [build] Build finished with exit code 0 cmake --build D:/projects/TheRock/build --target ocl-clr+dist # [build] Build finished with exit code 0 ```
142 regels
6.3 KiB
C++
142 regels
6.3 KiB
C++
/*
|
|
***********************************************************************************************************************
|
|
*
|
|
* Copyright (c) 2014-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.
|
|
*
|
|
**********************************************************************************************************************/
|
|
/**
|
|
***********************************************************************************************************************
|
|
* @file palEvent.h
|
|
* @brief PAL utility collection Event class declaration.
|
|
***********************************************************************************************************************
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "palTime.h"
|
|
#include "palUtil.h"
|
|
|
|
namespace Util
|
|
{
|
|
|
|
/// Specifies the flags for event.
|
|
struct EventCreateFlags
|
|
{
|
|
union
|
|
{
|
|
struct
|
|
{
|
|
uint32 manualReset : 1; ///< If true, the event is created as manual reset.
|
|
uint32 initiallySignaled : 1; ///< If true, the event is created in signaled state.
|
|
#if defined(_WIN32)
|
|
uint32 canBeInherited : 1; ///< If true, the event can be inherited by child process, it's
|
|
/// Windows-specific.
|
|
uint32 reserved : 29; ///< Reserved for future use.
|
|
#else
|
|
uint32 semaphore : 1; ///< If true, provide semaphore-like semantics for reads from the file
|
|
/// descriptor.
|
|
uint32 nonBlocking : 1; ///< If true, set the O_NONBLOCK file status flag on the new file descriptor.
|
|
uint32 closeOnExecute : 1; ///< If true, set the close-on-exec flag for the new file descriptor.
|
|
uint32 reserved : 27; ///< Reserved for future use.
|
|
#endif
|
|
};
|
|
uint32 u32All; ///< Flags packed as 32-bit uint.
|
|
};
|
|
};
|
|
|
|
/**
|
|
***********************************************************************************************************************
|
|
* @brief Synchronization primitive that can either be in the _set_ or _reset_ state.
|
|
*
|
|
* Threads can call WaitForEvents() to block waiting for an Event object to be _set_. This is useful for fine-grain
|
|
* synchronization between threads.
|
|
*
|
|
* Event objects start out in the _reset_ state.
|
|
***********************************************************************************************************************
|
|
*/
|
|
class Event
|
|
{
|
|
public:
|
|
Event();
|
|
~Event();
|
|
/// Initializes the event object. Clients must call this before using the Event object.
|
|
///
|
|
/// @param flags Event creation flags.
|
|
/// @param pName Specified the event's name, it's Windows-specific, Windows uses this name to
|
|
/// uniquely identify fence objects across processes.
|
|
/// @returns Success if the event was successfully initialized, otherwise an appropriate error code.
|
|
Result Init(
|
|
const EventCreateFlags& flags
|
|
#if defined(_WIN32)
|
|
,
|
|
const wchar_t* pName = nullptr
|
|
#endif
|
|
);
|
|
/// Changes the event state to _set_
|
|
///
|
|
/// @returns Success unless the Event has not been initialized yet (@ref ErrorUnavailable) or an unexpected internal
|
|
/// error occured when calling the OS (ErrorUnknown).
|
|
Result Set() const;
|
|
|
|
/// Changes the event state to _reset_.
|
|
///
|
|
/// @returns Success unless the Event has not been initialized yet (ErrorUnavailable) or an unexpected
|
|
/// internal error occured when calling the OS (ErrorUnknown).
|
|
Result Reset() const;
|
|
|
|
/// Waits for the event to enter the _set_ state before returning control to the caller. The event will change to
|
|
/// the _reset_ state if manualReset was false on initialization.
|
|
///
|
|
/// @param [in] timeout Max time to wait, in seconds. If zero, this call will poll the event without blocking.
|
|
///
|
|
/// @returns Success if the wait completed successfully or Timeout if the wait did not complete but the operation
|
|
/// timed out. Otherwise, one of the following errors may be returned:
|
|
/// + ErrorInvalidValue will be returned if the timeout is negative.
|
|
/// + ErrorUnknown may be returned if an unexpected internal occurs when calling the OS.
|
|
Result Wait(fseconds timeout) const;
|
|
|
|
#if defined(_WIN32)
|
|
/// On Windows, a handle to an OS event primitive is a HANDLE, which is just a void*.
|
|
typedef void* EventHandle;
|
|
#else
|
|
/// On Linux, a handle to an OS event primitive is a file descriptor, which is just an int.
|
|
typedef int32 EventHandle;
|
|
#endif
|
|
|
|
/// Returns a handle to the actual OS event primitive associated with this object.
|
|
EventHandle GetHandle() const { return m_hEvent; }
|
|
|
|
/// Open event handle.
|
|
Result Open(EventHandle handle, bool isReference);
|
|
|
|
/// Constant EventHandle value which represents an invalid event object.
|
|
static const EventHandle InvalidEvent;
|
|
|
|
private:
|
|
EventHandle m_hEvent; // OS-specific event handle.
|
|
bool m_isReference; // If true, the event is a global sharing object handle (not a duplicate) which is
|
|
// imported from external, so it can't be closed in the currect destructor, and can only
|
|
// be closed by the creater.
|
|
|
|
PAL_DISALLOW_COPY_AND_ASSIGN(Event);
|
|
};
|
|
} // Util
|