SWDEV-399203 - Use clang pragma only with clang

Change-Id: I21d84ccde07e243b6bc06f1980c24b399e74d1c3

hipamd/include/hip/amd_detail/amd_device_functions.h

@@ -444,8 +444,10 @@ __device__ static inline unsigned long long int __double2ull_ru(double x) {
 __device__ static inline unsigned long long int __double2ull_rz(double x) {
   return (unsigned long long int)x;
 }
+#if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
 __device__ static inline long long int __double_as_longlong(double x) {
     static_assert(sizeof(long long) == sizeof(double), "");
 
@@ -454,7 +456,9 @@ __device__ static inline long long int __double_as_longlong(double x) {
 
     return tmp;
 }
+#if defined(__clang__)
 #pragma clang diagnostic pop
+#endif
 
 /*
 __device__ unsigned short __float2half_rn(float x);

hipamd/include/hip/amd_detail/amd_hip_cooperative_groups.h

@@ -32,12 +32,14 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_AMD_DETAIL_HIP_COOPERATIVE_GROUPS_H
 #define HIP_INCLUDE_HIP_AMD_DETAIL_HIP_COOPERATIVE_GROUPS_H
 
+#if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wc++98-compat"
 #pragma clang diagnostic ignored "-Wsign-conversion"
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #pragma clang diagnostic ignored "-Wreserved-macro-identifier"
 #pragma clang diagnostic ignored "-Wpadded"
+#endif
 
 #if __cplusplus
 #if !defined(__HIPCC_RTC__)
@@ -779,6 +781,10 @@ __CG_QUALIFIER__ thread_block_tile<size, ParentCGTy> tiled_partition(const Paren
   return impl::tiled_partition_internal<size, ParentCGTy>(g);
 }
 }  // namespace cooperative_groups
+
+#if defined(__clang__)
 #pragma clang diagnostic pop
+#endif
+
 #endif  // __cplusplus
 #endif  // HIP_INCLUDE_HIP_AMD_DETAIL_HIP_COOPERATIVE_GROUPS_H

hipamd/include/hip/amd_detail/amd_hip_fp16.h

@@ -24,6 +24,7 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_AMD_DETAIL_HIP_FP16_H
 #define HIP_INCLUDE_HIP_AMD_DETAIL_HIP_FP16_H
 
+#if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wreserved-identifier"
 #pragma clang diagnostic ignored "-Wreserved-macro-identifier"
@@ -35,6 +36,7 @@ THE SOFTWARE.
 #pragma clang diagnostic ignored "-Wnested-anon-types"
 #pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
 #pragma clang diagnostic ignored "-Wfloat-equal"
+#endif
 
 #if defined(__HIPCC_RTC__)
   #define __HOST_DEVICE__ __device__
@@ -1791,5 +1793,8 @@ THE SOFTWARE.
     #endif
 #endif // !defined(__clang__) && defined(__GNUC__)
 
+#if defined(__clang__)
 #pragma clang diagnostic pop
+#endif
+
 #endif // HIP_INCLUDE_HIP_AMD_DETAIL_HIP_FP16_H

hipamd/include/hip/amd_detail/amd_hip_unsafe_atomics.h

@@ -23,8 +23,11 @@ THE SOFTWARE.
 #pragma once
 
 #ifdef __cplusplus
+
+#if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wold-style-cast"
+#endif
 
 /**
  * @brief Unsafe floating point rmw atomic add.
@@ -564,5 +567,8 @@ __device__ inline double safeAtomicMin(double* addr, double val) {
   #endif
 }
 
+#if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
+
+#endif

hipamd/include/hip/amd_detail/amd_warp_functions.h

@@ -23,6 +23,7 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_AMD_DETAIL_WARP_FUNCTIONS_H
 #define HIP_INCLUDE_HIP_AMD_DETAIL_WARP_FUNCTIONS_H
 
+#if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wreserved-identifier"
 #pragma clang diagnostic ignored "-Wreserved-macro-identifier"
@@ -30,6 +31,7 @@ THE SOFTWARE.
 #pragma clang diagnostic ignored "-Wold-style-cast"
 #pragma clang diagnostic ignored "-Wc++98-compat"
 #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
 
 __device__ static inline unsigned __hip_ds_bpermute(int index, unsigned src) {
     union { int i; unsigned u; float f; } tmp; tmp.u = src;
@@ -499,5 +501,8 @@ unsigned long long __shfl_xor(unsigned long long var, int lane_mask, int width =
     return tmp1;
 }
 
+#if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
+
+#endif

hipamd/include/hip/amd_detail/hip_cooperative_groups_helper.h

@@ -39,11 +39,13 @@ THE SOFTWARE.
 #define __align__(x) __attribute__((aligned(x)))
 #endif
 
+#if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wreserved-macro-identifier"
 #pragma clang diagnostic ignored "-Wc++98-compat"
 #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
 #pragma clang diagnostic ignored "-Wshorten-64-to-32"
+#endif
 
 #if !defined(__CG_QUALIFIER__)
 #define __CG_QUALIFIER__ __device__ __forceinline__
@@ -238,6 +240,9 @@ __CG_STATIC_QUALIFIER__ unsigned int masked_bit_count(lane_mask x, unsigned int
 /**
 *  @}
 */
+#if defined(__clang__)
 #pragma clang diagnostic pop
+#endif
+
 #endif  // __cplusplus
 #endif  // HIP_INCLUDE_HIP_AMD_DETAIL_HIP_COOPERATIVE_GROUPS_HELPER_H