From 89cd5bd78bf7a1c0f38cce750d48d22867dfe529 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Tue, 2 Nov 2021 08:12:13 +0100 Subject: [PATCH] Remove inline static keyword in inc_vendor.h for HIP platform since it's the default setting with HIP 4.4 --- OpenCL/inc_vendor.h | 10 +--------- OpenCL/m10700-optimized.cl | 8 ++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OpenCL/inc_vendor.h b/OpenCL/inc_vendor.h index 7ab1b46b0..480408921 100644 --- a/OpenCL/inc_vendor.h +++ b/OpenCL/inc_vendor.h @@ -125,7 +125,7 @@ #if defined IS_AMD && defined IS_GPU #define DECLSPEC inline static #elif defined IS_HIP -#define DECLSPEC inline static __device__ +#define DECLSPEC __device__ #else #define DECLSPEC #endif @@ -133,14 +133,6 @@ #define INLINE0 __attribute__ ((noinline)) #define INLINE1 __attribute__ ((inline)) -#if defined IS_AMD && defined IS_GPU -#define INLINE INLINE0 -#elif defined IS_HIP -#define INLINE INLINE0 -#else -#define INLINE -#endif - /** * AMD specific */ diff --git a/OpenCL/m10700-optimized.cl b/OpenCL/m10700-optimized.cl index 6ff23bd73..74d41ce1b 100644 --- a/OpenCL/m10700-optimized.cl +++ b/OpenCL/m10700-optimized.cl @@ -17,6 +17,14 @@ #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" +#if defined IS_AMD && defined IS_GPU +#define INLINE +#elif defined IS_HIP +#define INLINE INLINE0 +#else +#define INLINE +#endif + typedef struct pdf { int V;