Skip to content

Commit e70568e

Browse files
authored
[libclc] Re-use shuffle_decl.inc in OpenCL shuffle2 declaration (#140679)
Also internalize __clc_get_el_* symbols in clc_shuffle2. llvm-diff shows no change to amdgcn--amdhsa.bc.
1 parent 67489c7 commit e70568e

File tree

3 files changed

+11
-39
lines changed

3 files changed

+11
-39
lines changed

libclc/clc/lib/generic/misc/clc_shuffle.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
return VAR.sF;
5353

5454
#define _CLC_GET_ELEMENT_DEFINE(ARGTYPE, ARGSIZE, IDXTYPE) \
55-
inline ARGTYPE __clc_get_el_##ARGTYPE##ARGSIZE##_##IDXTYPE( \
55+
_CLC_INLINE ARGTYPE __clc_get_el_##ARGTYPE##ARGSIZE##_##IDXTYPE( \
5656
ARGTYPE##ARGSIZE x, IDXTYPE idx) { \
5757
switch (idx) { _CLC_ELEMENT_CASES##ARGSIZE(x) default : return 0; } \
5858
}

libclc/clc/lib/generic/misc/clc_shuffle2.cl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@
5252
return VAR.sF;
5353

5454
#define _CLC_GET_ELEMENT_DEFINE(ARGTYPE, ARGSIZE, IDXTYPE) \
55-
__attribute__((always_inline)) ARGTYPE \
56-
__clc_get_el_##ARGTYPE##ARGSIZE##_##IDXTYPE( \
57-
ARGTYPE##ARGSIZE x, ARGTYPE##ARGSIZE y, IDXTYPE idx) { \
55+
_CLC_INLINE ARGTYPE __clc_get_el_##ARGTYPE##ARGSIZE##_##IDXTYPE( \
56+
ARGTYPE##ARGSIZE x, ARGTYPE##ARGSIZE y, IDXTYPE idx) { \
5857
if (idx < ARGSIZE) \
5958
switch (idx) { _CLC_ELEMENT_CASES##ARGSIZE(x) default : return 0; } \
6059
else \

libclc/opencl/include/clc/opencl/misc/shuffle2.h

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,14 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#define _CLC_SHUFFLE2_DECL(TYPE, MASKTYPE, RETTYPE) \
10-
_CLC_OVERLOAD _CLC_DECL RETTYPE shuffle2(TYPE x, TYPE y, MASKTYPE mask);
9+
#define __CLC_FUNCTION shuffle2
1110

12-
// Return type is same base type as the input type, with the same vector size as
13-
// the mask. Elements in the mask must be the same size (number of bits) as the
14-
// input value. E.g. char8 ret = shuffle2(char2 x, char2 y, uchar8 mask);
11+
// Integer-type decls
12+
#define __CLC_BODY <clc/misc/shuffle2_decl.inc>
13+
#include <clc/integer/gentype.inc>
1514

16-
#define _CLC_VECTOR_SHUFFLE2_MASKSIZE(INBASE, INTYPE, MASKTYPE) \
17-
_CLC_SHUFFLE2_DECL(INTYPE, MASKTYPE##2, INBASE##2) \
18-
_CLC_SHUFFLE2_DECL(INTYPE, MASKTYPE##4, INBASE##4) \
19-
_CLC_SHUFFLE2_DECL(INTYPE, MASKTYPE##8, INBASE##8) \
20-
_CLC_SHUFFLE2_DECL(INTYPE, MASKTYPE##16, INBASE##16)
15+
// Floating-point decls
16+
#define __CLC_BODY <clc/misc/shuffle2_decl.inc>
17+
#include <clc/math/gentype.inc>
2118

22-
#define _CLC_VECTOR_SHUFFLE2_INSIZE(TYPE, MASKTYPE) \
23-
_CLC_VECTOR_SHUFFLE2_MASKSIZE(TYPE, TYPE##2, MASKTYPE) \
24-
_CLC_VECTOR_SHUFFLE2_MASKSIZE(TYPE, TYPE##4, MASKTYPE) \
25-
_CLC_VECTOR_SHUFFLE2_MASKSIZE(TYPE, TYPE##8, MASKTYPE) \
26-
_CLC_VECTOR_SHUFFLE2_MASKSIZE(TYPE, TYPE##16, MASKTYPE)
27-
28-
_CLC_VECTOR_SHUFFLE2_INSIZE(char, uchar)
29-
_CLC_VECTOR_SHUFFLE2_INSIZE(short, ushort)
30-
_CLC_VECTOR_SHUFFLE2_INSIZE(int, uint)
31-
_CLC_VECTOR_SHUFFLE2_INSIZE(long, ulong)
32-
_CLC_VECTOR_SHUFFLE2_INSIZE(uchar, uchar)
33-
_CLC_VECTOR_SHUFFLE2_INSIZE(ushort, ushort)
34-
_CLC_VECTOR_SHUFFLE2_INSIZE(uint, uint)
35-
_CLC_VECTOR_SHUFFLE2_INSIZE(ulong, ulong)
36-
_CLC_VECTOR_SHUFFLE2_INSIZE(float, uint)
37-
#ifdef cl_khr_fp64
38-
_CLC_VECTOR_SHUFFLE2_INSIZE(double, ulong)
39-
#endif
40-
#ifdef cl_khr_fp16
41-
_CLC_VECTOR_SHUFFLE2_INSIZE(half, ushort)
42-
#endif
43-
44-
#undef _CLC_SHUFFLE_DECL
45-
#undef _CLC_VECTOR_SHUFFLE2_MASKSIZE
46-
#undef _CLC_VECTOR_SHUFFLE2_INSIZE
19+
#undef __CLC_FUNCTION

0 commit comments

Comments
 (0)