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 lignes
6.3 KiB
C++
142 lignes
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 palGpuUtil.h
|
|
* @brief Common include for the PAL GPU utility collection. Defines common types, macros, enums, etc.
|
|
***********************************************************************************************************************
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "pal.h"
|
|
|
|
// Forward declarations.
|
|
namespace Pal
|
|
{
|
|
struct DeviceProperties;
|
|
class IImage;
|
|
class IGpuMemory;
|
|
struct ImageCopyRegion;
|
|
struct TypedBufferCopyRegion;
|
|
struct MemoryImageCopyRegion;
|
|
}
|
|
|
|
/// Library-wide namespace encapsulating all PAL GPU utility entities.
|
|
namespace GpuUtil
|
|
{
|
|
|
|
/// Validate image copy region.
|
|
///
|
|
/// @param [in] properties The device properties.
|
|
/// @param [in] engineType Engine to validate.
|
|
/// @param [in] src Src image.
|
|
/// @param [in] dst Des image.
|
|
/// @param [in] region Copy region.
|
|
///
|
|
/// @returns true if the image copy is supported by the specific engine, otherwise false.
|
|
extern bool ValidateImageCopyRegion(
|
|
const Pal::DeviceProperties& properties,
|
|
Pal::EngineType engineType,
|
|
const Pal::IImage& src,
|
|
const Pal::IImage& dst,
|
|
const Pal::ImageCopyRegion& region);
|
|
|
|
/// Validate typed buffer copy region.
|
|
///
|
|
/// @param [in] properties The device properties.
|
|
/// @param [in] engineType Engine to validate.
|
|
/// @param [in] region Copy region.
|
|
///
|
|
/// @returns true if the typed buffer copy is supported by the specific engine, otherwise false.
|
|
extern bool ValidateTypedBufferCopyRegion(
|
|
const Pal::DeviceProperties& properties,
|
|
Pal::EngineType engineType,
|
|
const Pal::TypedBufferCopyRegion& region);
|
|
|
|
/// Validate image-memory copy region.
|
|
///
|
|
/// @param [in] properties The device properties.
|
|
/// @param [in] engineType Engine to validate.
|
|
/// @param [in] image The IImage object.
|
|
/// @param [in] region Copy region.
|
|
///
|
|
/// @returns true if the image-memory copy is supported by the specific engine, otherwise false.
|
|
extern bool ValidateMemoryImageRegion(
|
|
const Pal::DeviceProperties& properties,
|
|
Pal::EngineType engineType,
|
|
const Pal::IImage& image,
|
|
const Pal::IGpuMemory& memory,
|
|
const Pal::MemoryImageCopyRegion& region);
|
|
|
|
/// Generate a 64-bit uniqueId for a GPU memory allocation
|
|
///
|
|
/// @param [in] isInterprocess Indicates this uniqueId is for an externally shareable GPU memory allocation
|
|
///
|
|
/// @returns 64-bit uniqueId
|
|
extern Pal::uint64 GenerateGpuMemoryUniqueId(
|
|
bool isInterprocess);
|
|
|
|
} // GpuUtil
|
|
|
|
/**
|
|
***********************************************************************************************************************
|
|
* @page GpuUtilOverview GPU Utility Collection
|
|
*
|
|
* In addition to the generic, OS-abstracted software utilities, PAL provides GPU-specific utilities in the @ref GpuUtil
|
|
* namespace. The PAL GPU Utility Collection relies on both PAL core and PAL Utility. They are also available for use by
|
|
* its clients.
|
|
*
|
|
* All available PAL GPU utilities are defined in the @ref GpuUtil namespace, and are briefly summarized below. See the
|
|
* Reference topics for more detailed information on specific classes, enums, etc.
|
|
*
|
|
* ### TextWriter
|
|
* The TextWriter GPU utility class provides a method for clients to write text directly to an image. This can be used
|
|
* for debugging purposes. PAL's internal DbgOverlay uses the TextWriter class to write information about the current
|
|
* FPS and total allocated GPU video memory usage.
|
|
*
|
|
* The TextWriter class is broken up into palTextWriter.h and palTextWriterImpl.h. The intention is that palTextWriter.h
|
|
* will be included from other header files that need a full TextWriter definition, while palTextWriterImpl.h will be
|
|
* included by .cpp files that actually interact with the TextWriter. This should keep build times down versus putting
|
|
* all implementations directly in palTextWriter.h.
|
|
*
|
|
* Also included in the TextWriter is the TextWriterFont namespace, which defines the shader IL for drawing the text via
|
|
* a compute shader. It also defines the Font data, which is a packed binary that represents which pixels of a 10x16
|
|
* rectangle to render. The font is monospaced.
|
|
*
|
|
* ### Helper Functions
|
|
* ValidateImageCopyRegion - Validate the image copy region, returns true if the image copy is supported by the specific
|
|
* engine, otherwise false.
|
|
*
|
|
* ValidateTypedBufferCopyRegion - Validate the typed buffer copy region, returns true if the typed buffer copy is
|
|
* supported by the specific engine, otherwise false.
|
|
*
|
|
* ValidateMemoryImageRegion - Validate the image-memory copy region, returns true if the image-memory copy is supported
|
|
* by the specific engine, otherwise false.
|
|
*
|
|
* Next: @ref Overview
|
|
***********************************************************************************************************************
|
|
*/
|