Skip to content

Commit 64735ad

Browse files
frasercrmckfrasercrmck
authored
[libclc] Move sign to the CLC builtins library (llvm#115699)
This commit moves the sign builtin's implementation to the CLC library. It simultaneously optimizes it (for vector types) by removing control-flow from the implementation. The __CLC_INTERNAL preprocessor definition has been repurposed (without the leading underscores) to be passed when building the internal CLC library. It was only used in one other place to guard an extra maths preprocessor definition, which we can do unconditionally.
1 parent 1a8d2a4 commit 64735ad

File tree

8 files changed

+76
-38
lines changed

8 files changed

+76
-38
lines changed

‎libclc/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
351351
string( TOUPPER "CLC_${MACRO_ARCH}" CLC_TARGET_DEFINE )
352352

353353
list( APPEND build_flags
354-
-D__CLC_INTERNAL
355354
-D${CLC_TARGET_DEFINE}
356355
# All libclc builtin libraries see CLC headers
357356
-I${CMAKE_CURRENT_SOURCE_DIR}/clc/include
@@ -363,12 +362,14 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
363362
list( APPEND build_flags -mcpu=${cpu} )
364363
endif()
365364

365+
set( clc_build_flags ${build_flags} -DCLC_INTERNAL )
366+
366367
add_libclc_builtin_set(
367368
CLC_INTERNAL
368369
ARCH ${ARCH}
369370
ARCH_SUFFIX clc-${arch_suffix}
370371
TRIPLE ${clang_triple}
371-
COMPILE_FLAGS ${build_flags}
372+
COMPILE_FLAGS ${clc_build_flags}
372373
OPT_FLAGS ${opt_flags}
373374
LIB_FILES ${clc_lib_files}
374375
)

‎libclc/clc/include/clc/common/clc_sign.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#ifndef __CLC_COMMON_CLC_SIGN_H__
2+
#define __CLC_COMMON_CLC_SIGN_H__
3+
4+
#define __CLC_FUNCTION __clc_sign
5+
#define __CLC_BODY <clc/math/unary_decl.inc>
6+
7+
#include <clc/math/gentype.inc>
8+
9+
#undef __CLC_BODY
10+
#undef __CLC_FUNCTION
11+
12+
#endif // __CLC_COMMON_CLC_SIGN_H__

‎libclc/clc/include/clc/math/gentype.inc‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,55 +3,69 @@
33

44
#define __CLC_SCALAR_GENTYPE float
55
#define __CLC_FPSIZE 32
6+
#define __CLC_FP_LIT(x) x##F
67

78
#define __CLC_GENTYPE float
89
#define __CLC_INTN int
10+
#define __CLC_BIT_INTN int
911
#define __CLC_SCALAR
1012
#include __CLC_BODY
1113
#undef __CLC_GENTYPE
14+
#undef __CLC_BIT_INTN
1215
#undef __CLC_INTN
1316
#undef __CLC_SCALAR
1417

1518
#define __CLC_GENTYPE float2
1619
#define __CLC_INTN int2
20+
#define __CLC_BIT_INTN int2
1721
#define __CLC_VECSIZE 2
1822
#include __CLC_BODY
1923
#undef __CLC_VECSIZE
2024
#undef __CLC_GENTYPE
25+
#undef __CLC_BIT_INTN
2126
#undef __CLC_INTN
2227

2328
#define __CLC_GENTYPE float3
2429
#define __CLC_INTN int3
30+
#define __CLC_BIT_INTN int3
2531
#define __CLC_VECSIZE 3
2632
#include __CLC_BODY
2733
#undef __CLC_VECSIZE
2834
#undef __CLC_GENTYPE
35+
#undef __CLC_BIT_INTN
2936
#undef __CLC_INTN
3037

3138
#define __CLC_GENTYPE float4
3239
#define __CLC_INTN int4
40+
#define __CLC_BIT_INTN int4
3341
#define __CLC_VECSIZE 4
3442
#include __CLC_BODY
3543
#undef __CLC_VECSIZE
3644
#undef __CLC_GENTYPE
45+
#undef __CLC_BIT_INTN
3746
#undef __CLC_INTN
3847

3948
#define __CLC_GENTYPE float8
4049
#define __CLC_INTN int8
50+
#define __CLC_BIT_INTN int8
4151
#define __CLC_VECSIZE 8
4252
#include __CLC_BODY
4353
#undef __CLC_VECSIZE
4454
#undef __CLC_GENTYPE
55+
#undef __CLC_BIT_INTN
4556
#undef __CLC_INTN
4657

4758
#define __CLC_GENTYPE float16
4859
#define __CLC_INTN int16
60+
#define __CLC_BIT_INTN int16
4961
#define __CLC_VECSIZE 16
5062
#include __CLC_BODY
5163
#undef __CLC_VECSIZE
5264
#undef __CLC_GENTYPE
65+
#undef __CLC_BIT_INTN
5366
#undef __CLC_INTN
5467

68+
#undef __CLC_FP_LIT
5569
#undef __CLC_FPSIZE
5670
#undef __CLC_SCALAR_GENTYPE
5771

@@ -61,55 +75,69 @@
6175

6276
#define __CLC_SCALAR_GENTYPE double
6377
#define __CLC_FPSIZE 64
78+
#define __CLC_FP_LIT(x) (x)
6479

6580
#define __CLC_SCALAR
6681
#define __CLC_GENTYPE double
6782
#define __CLC_INTN int
83+
#define __CLC_BIT_INTN long
6884
#include __CLC_BODY
6985
#undef __CLC_GENTYPE
86+
#undef __CLC_BIT_INTN
7087
#undef __CLC_INTN
7188
#undef __CLC_SCALAR
7289

7390
#define __CLC_GENTYPE double2
7491
#define __CLC_INTN int2
92+
#define __CLC_BIT_INTN long2
7593
#define __CLC_VECSIZE 2
7694
#include __CLC_BODY
7795
#undef __CLC_VECSIZE
7896
#undef __CLC_GENTYPE
97+
#undef __CLC_BIT_INTN
7998
#undef __CLC_INTN
8099

81100
#define __CLC_GENTYPE double3
82101
#define __CLC_INTN int3
102+
#define __CLC_BIT_INTN long3
83103
#define __CLC_VECSIZE 3
84104
#include __CLC_BODY
85105
#undef __CLC_VECSIZE
86106
#undef __CLC_GENTYPE
107+
#undef __CLC_BIT_INTN
87108
#undef __CLC_INTN
88109

89110
#define __CLC_GENTYPE double4
90111
#define __CLC_INTN int4
112+
#define __CLC_BIT_INTN long4
91113
#define __CLC_VECSIZE 4
92114
#include __CLC_BODY
93115
#undef __CLC_VECSIZE
94116
#undef __CLC_GENTYPE
117+
#undef __CLC_BIT_INTN
95118
#undef __CLC_INTN
96119

97120
#define __CLC_GENTYPE double8
98121
#define __CLC_INTN int8
122+
#define __CLC_BIT_INTN long8
99123
#define __CLC_VECSIZE 8
100124
#include __CLC_BODY
101125
#undef __CLC_VECSIZE
102126
#undef __CLC_GENTYPE
127+
#undef __CLC_BIT_INTN
103128
#undef __CLC_INTN
104129

105130
#define __CLC_GENTYPE double16
106131
#define __CLC_INTN int16
132+
#define __CLC_BIT_INTN long16
107133
#define __CLC_VECSIZE 16
108134
#include __CLC_BODY
109135
#undef __CLC_VECSIZE
110136
#undef __CLC_GENTYPE
137+
#undef __CLC_BIT_INTN
111138
#undef __CLC_INTN
112139

140+
#undef __CLC_FP_LIT
113141
#undef __CLC_FPSIZE
114142
#undef __CLC_SCALAR_GENTYPE
115143
#endif
@@ -121,55 +149,69 @@
121149

122150
#define __CLC_SCALAR_GENTYPE half
123151
#define __CLC_FPSIZE 16
152+
#define __CLC_FP_LIT(x) x##H
124153

125154
#define __CLC_SCALAR
126155
#define __CLC_GENTYPE half
127156
#define __CLC_INTN int
157+
#define __CLC_BIT_INTN short
128158
#include __CLC_BODY
129159
#undef __CLC_GENTYPE
160+
#undef __CLC_BIT_INTN
130161
#undef __CLC_INTN
131162
#undef __CLC_SCALAR
132163

133164
#define __CLC_GENTYPE half2
134165
#define __CLC_INTN int2
166+
#define __CLC_BIT_INTN short2
135167
#define __CLC_VECSIZE 2
136168
#include __CLC_BODY
137169
#undef __CLC_VECSIZE
138170
#undef __CLC_GENTYPE
171+
#undef __CLC_BIT_INTN
139172
#undef __CLC_INTN
140173

141174
#define __CLC_GENTYPE half3
142175
#define __CLC_INTN int3
176+
#define __CLC_BIT_INTN short3
143177
#define __CLC_VECSIZE 3
144178
#include __CLC_BODY
145179
#undef __CLC_VECSIZE
146180
#undef __CLC_GENTYPE
181+
#undef __CLC_BIT_INTN
147182
#undef __CLC_INTN
148183

149184
#define __CLC_GENTYPE half4
150185
#define __CLC_INTN int4
186+
#define __CLC_BIT_INTN short4
151187
#define __CLC_VECSIZE 4
152188
#include __CLC_BODY
153189
#undef __CLC_VECSIZE
154190
#undef __CLC_GENTYPE
191+
#undef __CLC_BIT_INTN
155192
#undef __CLC_INTN
156193

157194
#define __CLC_GENTYPE half8
158195
#define __CLC_INTN int8
196+
#define __CLC_BIT_INTN short8
159197
#define __CLC_VECSIZE 8
160198
#include __CLC_BODY
161199
#undef __CLC_VECSIZE
162200
#undef __CLC_GENTYPE
201+
#undef __CLC_BIT_INTN
163202
#undef __CLC_INTN
164203

165204
#define __CLC_GENTYPE half16
166205
#define __CLC_INTN int16
206+
#define __CLC_BIT_INTN short16
167207
#define __CLC_VECSIZE 16
168208
#include __CLC_BODY
169209
#undef __CLC_VECSIZE
170210
#undef __CLC_GENTYPE
211+
#undef __CLC_BIT_INTN
171212
#undef __CLC_INTN
172213

214+
#undef __CLC_FP_LIT
173215
#undef __CLC_FPSIZE
174216
#undef __CLC_SCALAR_GENTYPE
175217
#endif

‎libclc/clc/lib/generic/SOURCES‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
common/clc_degrees.cl
22
common/clc_radians.cl
3+
common/clc_sign.cl
34
common/clc_smoothstep.cl
45
geometric/clc_dot.cl
56
integer/clc_abs.cl

‎libclc/clc/lib/generic/common/clc_sign.cl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include <clc/math/clc_copysign.h>
2+
#include <clc/relational/clc_isnan.h>
3+
#include <clc/relational/clc_select.h>
4+
5+
#define __CLC_BODY <clc_sign.inc>
6+
#include <clc/math/gentype.inc>

‎libclc/clc/lib/generic/common/clc_sign.inc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
_CLC_DEF _CLC_OVERLOAD __CLC_GENTYPE __clc_sign(__CLC_GENTYPE x) {
2+
__CLC_BIT_INTN ret_zero = __clc_isnan(x) || x == __CLC_FP_LIT(0.0);
3+
__CLC_GENTYPE ret_val =
4+
__clc_select((__CLC_GENTYPE)__CLC_FP_LIT(1.0),
5+
(__CLC_GENTYPE)__CLC_FP_LIT(0.0), ret_zero);
6+
return __clc_copysign(ret_val, x);
7+
}

‎libclc/generic/include/clc/float/definitions.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
#define M_SQRT2_F 0x1.6a09e6p+0f
3232
#define M_SQRT1_2_F 0x1.6a09e6p-1f
3333

34-
#ifdef __CLC_INTERNAL
35-
#define M_LOG210_F 0x1.a934f0p+1f
36-
#endif
34+
#define M_LOG210_F 0x1.a934f0p+1f
3735

3836
#ifdef cl_khr_fp64
3937

‎libclc/generic/lib/common/sign.cl‎

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,8 @@
11
#include <clc/clc.h>
22
#include <clc/clcmacro.h>
3+
#include <clc/common/clc_sign.h>
34

4-
#define SIGN(TYPE, F) \
5-
_CLC_DEF _CLC_OVERLOAD TYPE sign(TYPE x) { \
6-
if (isnan(x)) { \
7-
return 0.0F; \
8-
} \
9-
if (x > 0.0F) { \
10-
return 1.0F; \
11-
} \
12-
if (x < 0.0F) { \
13-
return -1.0F; \
14-
} \
15-
return x; /* -0.0 or +0.0 */ \
16-
}
5+
#define FUNCTION sign
6+
#define __CLC_BODY <clc/shared/unary_def.inc>
177

18-
SIGN(float, f)
19-
_CLC_UNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, sign, float)
20-
21-
#ifdef cl_khr_fp64
22-
23-
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
24-
25-
SIGN(double, )
26-
_CLC_UNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, sign, double)
27-
28-
#endif
29-
30-
#ifdef cl_khr_fp16
31-
32-
#pragma OPENCL EXTENSION cl_khr_fp16 : enable
33-
34-
SIGN(half,)
35-
_CLC_UNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, half, sign, half)
36-
37-
#endif
8+
#include <clc/math/gentype.inc>

0 commit comments

Comments
 (0)