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 ```
172 rindas
7.3 KiB
C++
172 rindas
7.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 palFence.h
|
|
* @brief Defines the Platform Abstraction Library (PAL) IFence interface and related types.
|
|
***********************************************************************************************************************
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "pal.h"
|
|
#include "palDestroyable.h"
|
|
|
|
namespace Pal
|
|
{
|
|
|
|
/// Specifies properties for fence @ref IFence fence creation. Input structure to IDevice::CreateFence().
|
|
struct FenceCreateInfo
|
|
{
|
|
union
|
|
{
|
|
struct
|
|
{
|
|
uint32 signaled : 1; ///< Specify whether the initial status of the fence is signaled or not.
|
|
uint32 eventCanBeInherited : 1; ///< The event handle can be inherited by child process.
|
|
uint32 shareable : 1; ///< This fence may be opened for use by a different device.
|
|
uint32 reserved : 29; ///< Reserved for future use.
|
|
};
|
|
uint32 u32All; ///< Flags packed as 32-bit uint.
|
|
} flags; ///< Fence creation flags.
|
|
#if defined(_WIN32)
|
|
const wchar_t* pName; /// The name of the event object, Windows uses this name to uniquely identify fence objects
|
|
/// across processes.
|
|
#endif
|
|
};
|
|
|
|
/// Specifies properties for fence opening. Input structure to IDevice::OpenFence().
|
|
struct FenceOpenInfo
|
|
{
|
|
union
|
|
{
|
|
struct
|
|
{
|
|
uint32 isReference : 1; ///< If set, then the opened fence will reference the same sync object
|
|
///< in the kernel. Otherwise, the object is copied to the new Fence.
|
|
uint32 reserved : 31; ///< Reserved for future use.
|
|
};
|
|
uint32 u32All; ///< Flags packed as 32-bit uint.
|
|
} flags;
|
|
|
|
OsExternalHandle externalFence; ///< External shared fence handle.
|
|
#if defined(_WIN32)
|
|
const wchar_t* pName; /// The name of the event object,Windows uses this name to uniquely identify
|
|
/// fence objects across processes.
|
|
#endif
|
|
};
|
|
|
|
/// Specifies properties for fence exporting. Input structure to IFence::ExportExternalHandle().
|
|
struct FenceExportInfo
|
|
{
|
|
union
|
|
{
|
|
struct
|
|
{
|
|
uint32 isReference : 1; ///< If set, then the fence exporting a handle that reference the same sync
|
|
///< object in the kernel. Otherwise, the object is copied to the new Fence.
|
|
uint32 implicitReset : 1; ///< If set, a fence reset will be done for the sync fd exported.
|
|
uint32 reserved : 30; ///< Reserved for future use.
|
|
};
|
|
uint32 u32All; ///< Flags packed as 32-bit uint.
|
|
} flags;
|
|
};
|
|
|
|
/**
|
|
***********************************************************************************************************************
|
|
* @interface IFence
|
|
* @brief Represents a command buffer fence the client can use for coarse-level synchronization between the GPU and
|
|
* CPU.
|
|
*
|
|
* Fences can be specified when calling IQueue::Submit() and will be signaled when certain prior queue operations have
|
|
* completed. The status of the fence can be queried by the client to determine when the GPU work of interest has
|
|
* completed.
|
|
*
|
|
* Fences are guaranteed to wait for:
|
|
* + Prior command buffer submissions.
|
|
* + Prior queue semaphore signals and waits.
|
|
* + Prior direct presents.
|
|
*
|
|
* @see IDevice::CreateFence()
|
|
***********************************************************************************************************************
|
|
*/
|
|
class IFence : public IDestroyable
|
|
{
|
|
public:
|
|
/// Gets the status (completed or not) of the fence.
|
|
///
|
|
/// @returns Success if the fence has been reached, or NotReady if the fence hasn't been reached. Other return
|
|
/// codes indicate an error:
|
|
/// + ErrorFenceNeverSubmitted if the fence hasn't been submitted yet and the fence is not created with
|
|
/// initialSignaled set to true.
|
|
virtual Result GetStatus() const = 0;
|
|
|
|
/// Export the event handle or sync object handle of the fence for external usage.
|
|
/// If @ref FenceExportInfo::isReference is not set, then this also performs an implicit reset operation on
|
|
/// the Fence.
|
|
///
|
|
/// @param [in] exportInfo Information describing how the Fence handle should be exported.
|
|
/// @returns the handle in the type OsExternalHandle
|
|
virtual OsExternalHandle ExportExternalHandle(
|
|
const FenceExportInfo& exportInfo) const = 0;
|
|
|
|
/// Returns the value of the associated arbitrary client data pointer.
|
|
/// Can be used to associate arbitrary data with a particular PAL object.
|
|
///
|
|
/// @returns Pointer to client data.
|
|
void* GetClientData() const
|
|
{
|
|
return m_pClientData;
|
|
}
|
|
|
|
/// Sets the value of the associated arbitrary client data pointer.
|
|
/// Can be used to associate arbitrary data with a particular PAL object.
|
|
///
|
|
/// @param [in] pClientData A pointer to arbitrary client data.
|
|
void SetClientData(
|
|
void* pClientData)
|
|
{
|
|
m_pClientData = pClientData;
|
|
}
|
|
|
|
protected:
|
|
/// @internal Constructor. Prevent use of new operator on this interface. Client must create objects by explicitly
|
|
/// called the proper create method.
|
|
IFence() : m_pClientData(nullptr) {}
|
|
|
|
/// @internal Destructor. Prevent use of delete operator on this interface. Client must destroy objects by
|
|
/// explicitly calling IDestroyable::Destroy() and is responsible for freeing the system memory allocated for the
|
|
/// object on their own.
|
|
virtual ~IFence() { }
|
|
|
|
private:
|
|
/// @internal Client data pointer. This can have an arbitrary value and can be returned by calling GetClientData()
|
|
/// and set via SetClientData().
|
|
/// For non-top-layer objects, this will point to the layer above the current object.
|
|
void* m_pClientData;
|
|
};
|
|
|
|
} // Pal
|