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 ```
189 خطوط
6.9 KiB
C++
189 خطوط
6.9 KiB
C++
/*
|
|
***********************************************************************************************************************
|
|
*
|
|
* Copyright (c) 2020-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 palStringUtil.h
|
|
* @brief PAL String utility collection functions.
|
|
***********************************************************************************************************************
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <cstring>
|
|
#include <cwchar>
|
|
#include <type_traits>
|
|
|
|
#include "palUtil.h"
|
|
|
|
namespace Util
|
|
{
|
|
#if PAL_CLIENT_INTERFACE_MAJOR_VERSION < 919
|
|
/// Returns the length of a wchar_t based string.
|
|
///
|
|
/// @param [in] wide string to query
|
|
///
|
|
/// @returns The length of the given string in wide characters
|
|
extern size_t PalWcslen(
|
|
const wchar_t* pWideStr);
|
|
|
|
/// Performs a reverse string find of wide character wc.
|
|
///
|
|
/// @param [in] wide string to scan
|
|
/// @param [in] wide character to find
|
|
///
|
|
/// @returns The matching character at the end of the string or nullptr if not found.
|
|
extern wchar_t* PalWcsrchr(
|
|
wchar_t *pStr,
|
|
wchar_t wc);
|
|
#endif
|
|
|
|
/// When the -fshort-char compiler option is specified, wchar_t is 16 bits, but mbstowcs still treats the dest
|
|
/// as 32 bit so we provide our own implementation.
|
|
///
|
|
/// @param [out] dst string
|
|
/// @param [in] src string
|
|
/// @param [in] size of the destination buffer in words
|
|
///
|
|
/// @returns Returns whether or not the conversion was successful.
|
|
extern bool ConvertCharStringToUtf16(
|
|
wchar_t* pDst,
|
|
const char* pSrc,
|
|
size_t dstSizeInWords);
|
|
|
|
/// When the -fshort-char compiler option is specified, wchar_t is 16 bits, but wcstombs still treats the src
|
|
/// as 32 bit so we provide our own implementation.
|
|
///
|
|
/// @param [out] dst string
|
|
/// @param [in] src string
|
|
/// @param [in] size of the destination buffer in bytes
|
|
///
|
|
/// @returns Returns whether or not the conversion was successful.
|
|
extern bool ConvertUtf16StringToUtf8(
|
|
char* pDst,
|
|
const wchar_t* pSrc,
|
|
size_t dstSizeInBytes);
|
|
|
|
/// Convert wchar_t string to UTF-8 string. Works whether wchar_t is 16 or 32 bits.
|
|
/// If wchar_t is 16 bits, this decodes UTF-16.
|
|
///
|
|
/// @param [out] dst string
|
|
/// @param [in] src string
|
|
/// @param [in] size of the destination buffer in bytes
|
|
///
|
|
/// @returns Returns whether or not the conversion was successful.
|
|
bool ConvertWcharStringToUtf8(char* pDst, const wchar_t* pSrc, size_t dstSizeInBytes);
|
|
|
|
/// When the -fshort-char compiler option is specified, wchar_t is 16 bits, but wcsncpy still treats its arguments
|
|
/// as 32 bit so we provide our own implementation.
|
|
///
|
|
/// @param [out] pDst Destination string.
|
|
/// @param [in] pSrc Source string to copy.
|
|
/// @param [in] dstSize Length of the destination buffer, in wchar_t's.
|
|
extern void CopyUtf16String(
|
|
wchar_t* pDst,
|
|
const wchar_t* pSrc,
|
|
size_t dstSize);
|
|
|
|
/// A shared helper function which takes an arbitrary blob of data and formats it into a human readable "memory view"
|
|
/// string. This is intended to be used by logging code.
|
|
///
|
|
/// Imagine your input buffer is: { 0xef, 0xbe, 0xad, 0xde, 0x78, 0x56, 0x34, 0x12, 0xab }, then the string looks like
|
|
/// this with a blockSize of 4: "0xdeadbeef 0x12345678 0xab". So the block size determines how many bytes are combined
|
|
/// into one "0x" character block. The whole block is effetively cast into an integer of that size and printed in big
|
|
/// endian. Trailing bytes are printed without being size-extended. If a block won't fit at the end of the string it
|
|
/// is skipped (update your buffer pointer and call again to continue).
|
|
///
|
|
/// The return value is the number of bytes consumed from pBuffer. The idea is that you can loop until the full size
|
|
/// is consumed, printing a new line for each call.
|
|
///
|
|
/// @param [out] pDst The caller-provided destination string.
|
|
/// @param [in] dstSize The length of pDst in bytes.
|
|
/// @param [in] pBuffer The arbitrary data blob to turn into a string.
|
|
/// @param [in] bufferSize The length of pBuffer in bytes.
|
|
/// @param [in] blockSize How many bytes to combine into one hexidecimal big endian string.
|
|
///
|
|
/// @returns The number of bytes from pBuffer that were formatted into pDst.
|
|
extern size_t BytesToStr(
|
|
char* pDst,
|
|
size_t dstSize,
|
|
const void* pBuffer,
|
|
size_t bufferSize,
|
|
size_t blockSize);
|
|
|
|
/// Returns the length of the string.
|
|
///
|
|
/// @returns String length.
|
|
constexpr uint32 StringLength(
|
|
const char* pString)
|
|
{
|
|
// TODO: On C++23 we can replace this with consteval-if.
|
|
// TODO: When we upgrade PAL_CPLUSPLUS then we can rely that std::is_constant_evaluated() is always defined.
|
|
#if defined(__cpp_lib_is_constant_evaluated)
|
|
if (std::is_constant_evaluated())
|
|
#else
|
|
if (__builtin_is_constant_evaluated())
|
|
#endif
|
|
{
|
|
uint32 length = 0;
|
|
while (pString[length] != '\0')
|
|
{
|
|
length++;
|
|
}
|
|
return length;
|
|
}
|
|
else
|
|
{
|
|
return uint32(std::strlen(pString));
|
|
}
|
|
}
|
|
/// Returns the length of the string.
|
|
///
|
|
/// @returns String length.
|
|
constexpr uint32 StringLength(
|
|
const wchar_t* pString)
|
|
{
|
|
// TODO: On C++23 we can replace this with consteval-if.
|
|
// TODO: When we upgrade PAL_CPLUSPLUS then we can rely that std::is_constant_evaluated() is always defined.
|
|
#if defined(__cpp_lib_is_constant_evaluated)
|
|
if (std::is_constant_evaluated())
|
|
#else
|
|
if (__builtin_is_constant_evaluated())
|
|
#endif
|
|
{
|
|
uint32 length = 0;
|
|
while (pString[length] != L'\0')
|
|
{
|
|
length++;
|
|
}
|
|
return length;
|
|
}
|
|
else
|
|
{
|
|
return uint32(std::wcslen(pString));
|
|
}
|
|
}
|
|
|
|
} // Util
|