[Clang] Fix HIP wrapper inclusion of 'algorithm' when using libc++

[jhuber6]

Summary:
The algorithm header included here sometimes caused issues when using
libc++ over libstdc++. This was primarily because of the order they
were included in. This patch just gets rid of this dependency as it was
only used for min and max which are trivial to reimplement.

Fixes: #67938

[llvmbot]

@llvm/pr-subscribers-backend-x86

@llvm/pr-subscribers-clang

Changes

Summary:
The algorithm header included here sometimes caused issues when using
libc++ over libstdc++. This was primarily because of the order they
were included in. This patch just gets rid of this dependency as it was
only used for min and max which are trivial to reimplement.

---

Full diff: https://github.com/llvm/llvm-project/pull/67981.diff

1 Files Affected:

• (modified) clang/lib/Headers/__clang_hip_math.h (+2-5)

diff --git a/clang/lib/Headers/__clang_hip_math.h b/clang/lib/Headers/__clang_hip_math.h index 58aa55d74769031..11e1e7d032586f8 100644 --- a/clang/lib/Headers/__clang_hip_math.h +++ b/clang/lib/Headers/__clang_hip_math.h @@ -14,9 +14,6 @@ #endif #if !defined(__HIPCC_RTC__) -#if defined(__cplusplus) -#include <algorithm> -#endif #include <limits.h> #include <stdint.h> #ifdef __OPENMP_AMDGCN__ @@ -1311,11 +1308,11 @@ double min(double __x, double __y) { return __builtin_fmin(__x, __y); } #if !defined(__HIPCC_RTC__) && !defined(__OPENMP_AMDGCN__) __host__ inline static int min(int __arg1, int __arg2) { - return std::min(__arg1, __arg2); + return __arg1 < __arg2 ? __arg1 : __arg2; } __host__ inline static int max(int __arg1, int __arg2) { - return std::max(__arg1, __arg2); + return __arg1 > __arg2 ? __arg1 : __arg2; } #endif // !defined(__HIPCC_RTC__) && !defined(__OPENMP_AMDGCN__) #endif 

[yxsamliu]

Did you test it with internal CI? We may need some HIP header changes to avoid regressing existing HIP apps.

[jhuber6]

Did you test it with internal CI? We may need some HIP header changes to avoid regressing existing HIP apps.

No, I don't know how to do that. Hopefully people aren't relying on this to be included elsewhere, since its replacement in this single file is pretty striaghtforward.

[yxsamliu]

LGTM. Thanks. It passed internal PSDB