AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-334908 - Guard the __noinline__ macro as it is also supported as keyword by clang

Browse Source 
Change-Id: I314b3ac463ea63132a5107f4f24ce769d8112b9b


[ROCm/clr commit: 8dfa7e7f98]
This commit is contained in:
Satyanvesh Dittakavi
2022-05-13 10:38:16 +00:00
parent b2188142d9
commit 8e9541dbbd
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/hipamd/include/hip/amd_detail/host_defines.h
+4 -1
View File
@@ -1,5 +1,5 @@
/* /*
Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved. Copyright (c) 2015 - 2022 Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,10 @@ THE SOFTWARE.
#define __constant__ __attribute__((constant)) #define __constant__ __attribute__((constant))
#endif // !__CLANG_HIP_RUNTIME_WRAPPER_INCLUDED__ #endif // !__CLANG_HIP_RUNTIME_WRAPPER_INCLUDED__
#if !defined(__has_feature) || !__has_feature(cuda_noinline_keyword)
#define __noinline__ __attribute__((noinline)) #define __noinline__ __attribute__((noinline))
#endif
#define __forceinline__ inline __attribute__((always_inline)) #define __forceinline__ inline __attribute__((always_inline))
#if __HIP_NO_IMAGE_SUPPORT #if __HIP_NO_IMAGE_SUPPORT
projects/clr/hipamd/src/hiprtc/cmake/HIPRTC.cmake
+2
View File
@@ -35,7 +35,9 @@ function(get_hiprtc_macros HIPRTC_DEFINES)
#define __constant__ __attribute__((constant))\n\ #define __constant__ __attribute__((constant))\n\
#define __shared__ __attribute__((shared))\n\ #define __shared__ __attribute__((shared))\n\
#define __align__(x) __attribute__((aligned(x)))\n\ #define __align__(x) __attribute__((aligned(x)))\n\
#if !defined(__has_feature) || !__has_feature(cuda_noinline_keyword)\n\
#define __noinline__ __attribute__((noinline))\n\ #define __noinline__ __attribute__((noinline))\n\
#endif\n\
#define __forceinline__ inline __attribute__((always_inline))\n\ #define __forceinline__ inline __attribute__((always_inline))\n\
#define launch_bounds_impl0(requiredMaxThreadsPerBlock) \\\n\ #define launch_bounds_impl0(requiredMaxThreadsPerBlock) \\\n\