Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions projects/miopen/src/kernels/miopen_cstdint.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,13 @@ typedef unsigned short uint16_t;
#if HIP_PACKAGE_VERSION_FLAT >= 6000025000ULL
typedef signed int int32_t;
typedef unsigned int uint32_t;
typedef __hip_internal::uint64_t uint64_t;
typedef __hip_internal::int64_t int64_t;
#ifdef __LP64__
typedef unsigned long uint64_t;
typedef signed long int64_t;
#else
typedef unsigned long long uint64_t;
typedef signed long long int64_t;
#endif
Comment thread
schung-amd marked this conversation as resolved.
Resolved
#endif

#else
Expand Down
68 changes: 68 additions & 0 deletions projects/miopen/test/gtest/miopen_cstdint_lp64.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*******************************************************************************
*
* MIT License
*
* Copyright (c) 2026 Advanced Micro Devices, Inc.
*
* 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.
*
*******************************************************************************/
Comment thread
schung-amd marked this conversation as resolved.
Resolved

// Regression test for TheRock#6258 / LP64 typedef conflict in miopen_cstdint.hpp.
//
// On LP64 platforms (64-bit Linux, macOS), <stdint.h> defines uint64_t as
// 'unsigned long', but __hip_internal::uint64_t is 'unsigned long long'.
// These are distinct C++ types despite being the same width, so a typedef
// redefinition is a hard error when both are visible.

#include <gtest/gtest.h>
#include <cstdint>
#include <type_traits>

#define MIOPEN_HIP_RUNTIME_COMPILE
#define HIP_PACKAGE_VERSION_FLAT 7015026333ULL

// Provide __hip_internal types as they would appear during HIPRTC compilation
namespace __hip_internal {
typedef unsigned long long uint64_t;
typedef signed long long int64_t;
} // namespace __hip_internal

// Include the header under test — this must not conflict with <cstdint> above
#include "miopen_cstdint.hpp"

#undef MIOPEN_HIP_RUNTIME_COMPILE

TEST(CPU_MiopenCstdintLP64_NONE, Uint64TypeMatchesSystem)
Comment thread
averinevg marked this conversation as resolved.
Resolved
{
EXPECT_TRUE((std::is_same<::uint64_t, std::uint64_t>::value))
<< "miopen_cstdint.hpp uint64_t must be the same type as <cstdint> uint64_t";
}

TEST(CPU_MiopenCstdintLP64_NONE, Int64TypeMatchesSystem)
{
EXPECT_TRUE((std::is_same<::int64_t, std::int64_t>::value))
<< "miopen_cstdint.hpp int64_t must be the same type as <cstdint> int64_t";
}

TEST(CPU_MiopenCstdintLP64_NONE, SizesAre64Bit)
{
EXPECT_EQ(sizeof(::uint64_t), 8u);
EXPECT_EQ(sizeof(::int64_t), 8u);
}
Loading