caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libclc] Re-use shuffle_decl.inc in OpenCL shuffle2 declaration (#140679)

Browse Source 
Also internalize __clc_get_el_* symbols in clc_shuffle2. llvm-diff shows
no change to amdgcn--amdhsa.bc.
This commit is contained in:
Wenju He
2025-05-21 08:49:24 +00:00
committed by GitHub
parent 67489c7f0f
commit e70568e28e
3 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libclc/clc/lib/generic/misc/clc_shuffle.cl
View File

@@ -52,7 +52,7 @@
return VAR.sF;
#define _CLC_GET_ELEMENT_DEFINE(ARGTYPE, ARGSIZE, IDXTYPE) \
inline ARGTYPE __clc_get_el_##ARGTYPE##ARGSIZE##_##IDXTYPE( \
_CLC_INLINE ARGTYPE __clc_get_el_##ARGTYPE##ARGSIZE##_##IDXTYPE( \
ARGTYPE##ARGSIZE x, IDXTYPE idx) { \
switch (idx) { _CLC_ELEMENT_CASES##ARGSIZE(x) default : return 0; } \
}

5
libclc/clc/lib/generic/misc/clc_shuffle2.cl
View File

@@ -52,9 +52,8 @@
return VAR.sF;
#define _CLC_GET_ELEMENT_DEFINE(ARGTYPE, ARGSIZE, IDXTYPE) \
__attribute__((always_inline)) ARGTYPE \
__clc_get_el_##ARGTYPE##ARGSIZE##_##IDXTYPE( \
ARGTYPE##ARGSIZE x, ARGTYPE##ARGSIZE y, IDXTYPE idx) { \
_CLC_INLINE ARGTYPE __clc_get_el_##ARGTYPE##ARGSIZE##_##IDXTYPE( \
ARGTYPE##ARGSIZE x, ARGTYPE##ARGSIZE y, IDXTYPE idx) { \
if (idx < ARGSIZE) \
switch (idx) { _CLC_ELEMENT_CASES##ARGSIZE(x) default : return 0; } \
else \

43
libclc/opencl/include/clc/opencl/misc/shuffle2.h
View File

@@ -6,41 +6,14 @@
//
//===----------------------------------------------------------------------===//
#define _CLC_SHUFFLE2_DECL(TYPE, MASKTYPE, RETTYPE) \
_CLC_OVERLOAD _CLC_DECL RETTYPE shuffle2(TYPE x, TYPE y, MASKTYPE mask);
#define __CLC_FUNCTION shuffle2
// Return type is same base type as the input type, with the same vector size as
// the mask. Elements in the mask must be the same size (number of bits) as the
// input value. E.g. char8 ret = shuffle2(char2 x, char2 y, uchar8 mask);
// Integer-type decls
#define __CLC_BODY <clc/misc/shuffle2_decl.inc>
#include <clc/integer/gentype.inc>
#define _CLC_VECTOR_SHUFFLE2_MASKSIZE(INBASE, INTYPE, MASKTYPE) \
_CLC_SHUFFLE2_DECL(INTYPE, MASKTYPE##2, INBASE##2) \
_CLC_SHUFFLE2_DECL(INTYPE, MASKTYPE##4, INBASE##4) \
_CLC_SHUFFLE2_DECL(INTYPE, MASKTYPE##8, INBASE##8) \
_CLC_SHUFFLE2_DECL(INTYPE, MASKTYPE##16, INBASE##16)
// Floating-point decls
#define __CLC_BODY <clc/misc/shuffle2_decl.inc>
#include <clc/math/gentype.inc>
#define _CLC_VECTOR_SHUFFLE2_INSIZE(TYPE, MASKTYPE) \
_CLC_VECTOR_SHUFFLE2_MASKSIZE(TYPE, TYPE##2, MASKTYPE) \
_CLC_VECTOR_SHUFFLE2_MASKSIZE(TYPE, TYPE##4, MASKTYPE) \
_CLC_VECTOR_SHUFFLE2_MASKSIZE(TYPE, TYPE##8, MASKTYPE) \
_CLC_VECTOR_SHUFFLE2_MASKSIZE(TYPE, TYPE##16, MASKTYPE)
_CLC_VECTOR_SHUFFLE2_INSIZE(char, uchar)
_CLC_VECTOR_SHUFFLE2_INSIZE(short, ushort)
_CLC_VECTOR_SHUFFLE2_INSIZE(int, uint)
_CLC_VECTOR_SHUFFLE2_INSIZE(long, ulong)
_CLC_VECTOR_SHUFFLE2_INSIZE(uchar, uchar)
_CLC_VECTOR_SHUFFLE2_INSIZE(ushort, ushort)
_CLC_VECTOR_SHUFFLE2_INSIZE(uint, uint)
_CLC_VECTOR_SHUFFLE2_INSIZE(ulong, ulong)
_CLC_VECTOR_SHUFFLE2_INSIZE(float, uint)
#ifdef cl_khr_fp64
_CLC_VECTOR_SHUFFLE2_INSIZE(double, ulong)
#endif
#ifdef cl_khr_fp16
_CLC_VECTOR_SHUFFLE2_INSIZE(half, ushort)
#endif
#undef _CLC_SHUFFLE_DECL
#undef _CLC_VECTOR_SHUFFLE2_MASKSIZE
#undef _CLC_VECTOR_SHUFFLE2_INSIZE
#undef __CLC_FUNCTION