Skip to content

Commit 3f8d53c

Browse files
jsjijsji
committed
[libclc] Move min/max/clamp into the CLC builtins library (#114386) #15948
[libclc] Move min/max/clamp into the CLC builtins library (#114386) These functions are "shared" between integer and floating-point types, hence the directory name. They are used in several CLC internal functions such as __clc_ldexp. Note that clspv and spirv targets don't want to define these functions, so pre-processor macros replace calls to __clc_min with regular min, for example. This means they can use as much of the generic CLC source files as possible, but where CLC functions would usually call out to an external __clc_min symbol, they call out to an external min symbol. Then they opt out of defining __clc_min itself in their CLC builtins library. Preprocessor definitions for these targets have also been changed somewhat: what used to be CLC_SPIRV (the 32-bit target) is now CLC_SPIRV32, and CLC_SPIRV now represents either CLC_SPIRV32 or CLC_SPIRV64. Same goes for CLC_CLSPV. There are no differences (measured with llvm-diff) in any of the final builtins libraries for nvptx, amdgpu, or clspv. Neither are there differences in the SPIR-V targets' LLVM IR before it's actually lowered to SPIR-V. This is a cherry-pick of 3 upstream commits: fba9f05, 86974e1, and d12a8da. It starts to move our downstream libspirv implementations towards reusing upstream's shared CLC implementations. See the removal of libspirv's __clc_(clamp|min|max). Conflicts: libclc/generic/lib/math/clc_ldexp.cl libclc/generic/libspirv/math/clc_hypot.cl
1 parent 8eef21a commit 3f8d53c

31 files changed

+121
-94
lines changed

‎libclc/CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,9 +436,19 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
436436
set ( has_distinct_generic_addrspace TRUE )
437437
if ( ARCH STREQUAL spirv OR ARCH STREQUAL spirv64 )
438438
set( opt_flags -O3 )
439+
list( APPEND build_flags -DCLC_SPIRV )
439440
set( spvflags --spirv-max-version=1.1 )
441+
set( MACRO_ARCH SPIRV32 )
442+
if( ARCH STREQUAL spirv64 )
443+
set( MACRO_ARCH SPIRV64 )
444+
endif()
440445
elseif( ARCH STREQUAL clspv OR ARCH STREQUAL clspv64 )
441446
set( opt_flags -O3 )
447+
list( APPEND build_flags -DCLC_CLSPV )
448+
set( MACRO_ARCH CLSPV32 )
449+
if( ARCH STREQUAL clspv64 )
450+
set( MACRO_ARCH CLSPV64 )
451+
endif()
442452
elseif( ARCH STREQUAL nvptx OR ARCH STREQUAL nvptx64 )
443453
set( opt_flags -O3 "--nvvm-reflect-enable=false" )
444454
set( has_distinct_generic_addrspace FALSE )
@@ -449,6 +459,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
449459
set( has_distinct_generic_addrspace FALSE )
450460
else()
451461
set( opt_flags -O3 )
462+
set( MACRO_ARCH ${ARCH} )
452463
endif()
453464

454465
# Enable SPIR-V builtin function declarations, so they don't
@@ -495,7 +506,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
495506
list(APPEND build_flags -D__unix__)
496507
endif()
497508

498-
string( TOUPPER "CLC_${ARCH}" CLC_TARGET_DEFINE )
509+
string( TOUPPER "CLC_${MACRO_ARCH}" CLC_TARGET_DEFINE )
499510

500511
list( APPEND build_flags
501512
-D__CLC_INTERNAL

‎libclc/clc/include/clc/clcfunc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
// avoid inlines for SPIR-V related targets since we'll optimise later in the
1212
// chain
13-
#if defined(CLC_SPIRV) || defined(CLC_SPIRV64)
13+
#if defined(CLC_SPIRV)
1414
#define _CLC_DEF
15-
#elif defined(CLC_CLSPV) || defined(CLC_CLSPV64)
15+
#elif defined(CLC_CLSPV)
1616
#define _CLC_DEF __attribute__((noinline)) __attribute__((clspv_libclc_builtin))
1717
#else
1818
#define _CLC_DEF __attribute__((always_inline))

‎libclc/generic/include/clc/integer/gentype.inc renamed to ‎libclc/clc/include/clc/integer/gentype.inc

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

9-
//These 2 defines only change when switching between data sizes or base types to
10-
//keep this file manageable.
9+
// These 2 defines only change when switching between data sizes or base types
10+
// to keep this file manageable.
1111

1212
#define __CLC_GENSIZE 8
1313
#define __CLC_SCALAR_GENTYPE char

‎libclc/generic/include/clc/math/gentype.inc renamed to ‎libclc/clc/include/clc/math/gentype.inc

File renamed without changes.

‎libclc/clc/include/clc/shared/clc_clamp.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
2+
// clspv and spir-v targets provide their own OpenCL-compatible clamp
3+
#define __clc_clamp clamp
4+
#else
5+
6+
#include <clc/clcfunc.h>
7+
#include <clc/clctypes.h>
8+
9+
#define __CLC_BODY <clc/shared/clc_clamp.inc>
10+
#include <clc/integer/gentype.inc>
11+
12+
#define __CLC_BODY <clc/shared/clc_clamp.inc>
13+
#include <clc/math/gentype.inc>
14+
15+
#endif

‎libclc/clc/include/clc/shared/clc_clamp.inc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_clamp(__CLC_GENTYPE x,
2+
__CLC_GENTYPE y,
3+
__CLC_GENTYPE z);
4+
5+
#ifndef __CLC_SCALAR
6+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_clamp(__CLC_GENTYPE x,
7+
__CLC_SCALAR_GENTYPE y,
8+
__CLC_SCALAR_GENTYPE z);
9+
#endif

‎libclc/clc/include/clc/shared/clc_max.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
2+
// clspv and spir-v targets provide their own OpenCL-compatible max
3+
#define __clc_max max
4+
#else
5+
6+
#define __CLC_BODY <clc/shared/clc_max.inc>
7+
#include <clc/integer/gentype.inc>
8+
9+
#define __CLC_BODY <clc/shared/clc_max.inc>
10+
#include <clc/math/gentype.inc>
11+
12+
#endif

‎libclc/clc/include/clc/shared/clc_max.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_max(__CLC_GENTYPE a,
2+
__CLC_GENTYPE b);
3+
4+
#ifndef __CLC_SCALAR
5+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_max(__CLC_GENTYPE a,
6+
__CLC_SCALAR_GENTYPE b);
7+
#endif

‎libclc/clc/include/clc/shared/clc_min.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
2+
// clspv and spir-v targets provide their own OpenCL-compatible min
3+
#define __clc_min min
4+
#else
5+
6+
#define __CLC_BODY <clc/shared/clc_min.inc>
7+
#include <clc/integer/gentype.inc>
8+
9+
#define __CLC_BODY <clc/shared/clc_min.inc>
10+
#include <clc/math/gentype.inc>
11+
12+
#endif

‎libclc/clc/include/clc/shared/clc_min.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_min(__CLC_GENTYPE a,
2+
__CLC_GENTYPE b);
3+
4+
#ifndef __CLC_SCALAR
5+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_min(__CLC_GENTYPE a,
6+
__CLC_SCALAR_GENTYPE b);
7+
#endif

‎libclc/clc/lib/generic/SOURCES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
geometric/clc_dot.cl
2+
shared/clc_clamp.cl
3+
shared/clc_max.cl
4+
shared/clc_min.cl

‎libclc/clc/lib/generic/shared/clc_clamp.cl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include <clc/internal/clc.h>
2+
3+
#define __CLC_BODY <clc_clamp.inc>
4+
#include <clc/integer/gentype.inc>
5+
6+
#define __CLC_BODY <clc_clamp.inc>
7+
#include <clc/math/gentype.inc>

‎libclc/generic/libspirv/core/shared/clc_clamp.inc renamed to ‎libclc/clc/lib/generic/shared/clc_clamp.inc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
//===----------------------------------------------------------------------===//
2-
//
3-
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4-
// See https://llvm.org/LICENSE.txt for license information.
5-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6-
//
7-
//===----------------------------------------------------------------------===//
8-
91
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __clc_clamp(__CLC_GENTYPE x,
102
__CLC_GENTYPE y,
113
__CLC_GENTYPE z) {

‎libclc/clc/lib/generic/shared/clc_max.cl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include <clc/internal/clc.h>
2+
3+
#define __CLC_BODY <clc_max.inc>
4+
#include <clc/integer/gentype.inc>
5+
6+
#define __CLC_BODY <clc_max.inc>
7+
#include <clc/math/gentype.inc>

‎libclc/generic/libspirv/core/shared/clc_max.inc renamed to ‎libclc/clc/lib/generic/shared/clc_max.inc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
//===----------------------------------------------------------------------===//
2-
//
3-
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4-
// See https://llvm.org/LICENSE.txt for license information.
5-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6-
//
7-
//===----------------------------------------------------------------------===//
8-
91
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __clc_max(__CLC_GENTYPE a,
102
__CLC_GENTYPE b) {
113
return (a > b ? a : b);

‎libclc/clc/lib/generic/shared/clc_min.cl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include <clc/internal/clc.h>
2+
3+
#define __CLC_BODY <clc_min.inc>
4+
#include <clc/integer/gentype.inc>
5+
6+
#define __CLC_BODY <clc_min.inc>
7+
#include <clc/math/gentype.inc>

‎libclc/generic/libspirv/core/shared/clc_min.inc renamed to ‎libclc/clc/lib/generic/shared/clc_min.inc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
//===----------------------------------------------------------------------===//
2-
//
3-
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4-
// See https://llvm.org/LICENSE.txt for license information.
5-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6-
//
7-
//===----------------------------------------------------------------------===//
8-
91
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE __clc_min(__CLC_GENTYPE a,
102
__CLC_GENTYPE b) {
113
return (b < a ? b : a);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ _CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, smoothstep, double,
4949
_CLC_V_S_S_V_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, smoothstep, double,
5050
double, double);
5151

52-
#if !defined(CLC_SPIRV) && !defined(CLC_SPIRV64)
52+
#if !defined(CLC_SPIRV)
5353
SMOOTH_STEP_DEF(float, double, SMOOTH_STEP_IMPL_D);
5454
SMOOTH_STEP_DEF(double, float, SMOOTH_STEP_IMPL_D);
5555

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ STEP_DEF(double, double);
4444
_CLC_BINARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, step, double, double);
4545
_CLC_V_S_V_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, step, double, double);
4646

47-
#if !defined(CLC_SPIRV) && !defined(CLC_SPIRV64)
47+
#if !defined(CLC_SPIRV)
4848
STEP_DEF(float, double);
4949
STEP_DEF(double, float);
5050

‎libclc/generic/lib/math/clc_ldexp.cl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
* THE SOFTWARE.
2121
*/
2222

23-
#include <clc/clc.h>
24-
#include "config.h"
2523
#include "../clcmacro.h"
24+
#include "config.h"
2625
#include "math.h"
26+
#include <clc/clc.h>
27+
#include <clc/shared/clc_clamp.h>
2728

2829
_CLC_DEF _CLC_OVERLOAD float __clc_ldexp(float x, int n) {
2930

@@ -35,7 +36,7 @@ _CLC_DEF _CLC_OVERLOAD float __clc_ldexp(float x, int n) {
3536
int m = i & 0x007fffff;
3637
int s = i & 0x80000000;
3738
int v = add_sat(e, n);
38-
v = clamp(v, 0, 0xff);
39+
v = __clc_clamp(v, 0, 0xff);
3940
int mr = e == 0 | v == 0 | v == 0xff ? 0 : m;
4041
int c = e == 0xff;
4142
mr = c ? m : mr;
@@ -110,7 +111,7 @@ _CLC_DEF _CLC_OVERLOAD double __clc_ldexp(double x, int n) {
110111
ux = c ? ux : l;
111112

112113
int v = e + n;
113-
v = clamp(v, -0x7ff, 0x7ff);
114+
v = __clc_clamp(v, -0x7ff, 0x7ff);
114115

115116
ux &= ~EXPBITS_DP64;
116117

‎libclc/generic/lib/math/math.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
#if (defined __AMDGCN__ || defined __R600__) && !defined __HAS_FMAF__
4242
#define HAVE_HW_FMA32() (0)
43-
#elif defined CLC_SPIRV || defined CLC_SPIRV64
43+
#elif defined(CLC_SPIRV)
4444
bool __attribute__((noinline)) __clc_runtime_has_hw_fma32(void);
4545
#define HAVE_HW_FMA32() __clc_runtime_has_hw_fma32()
4646
#else

‎libclc/generic/lib/shared/clamp.cl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <clc/clc.h>
2-
#include <core/clc_core.h>
3-
#include <spirv/spirv.h>
2+
#include <clc/shared/clc_clamp.h>
43

54
#define __CLC_BODY <clamp.inc>
65
#include <clc/integer/gentype.inc>

‎libclc/generic/lib/shared/max.cl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <clc/clc.h>
2-
#include <core/clc_core.h>
3-
#include <spirv/spirv.h>
2+
#include <clc/shared/clc_max.h>
43

54
#define __CLC_BODY <max.inc>
65
#include <clc/integer/gentype.inc>

‎libclc/generic/lib/shared/max.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE max(__CLC_GENTYPE a, __CLC_GENTYPE b) {
33
}
44

55
#ifndef __CLC_SCALAR
6-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE max(__CLC_GENTYPE a, __CLC_SCALAR_GENTYPE b) {
6+
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE max(__CLC_GENTYPE a,
7+
__CLC_SCALAR_GENTYPE b) {
78
return __clc_max(a, b);
89
}
910
#endif

‎libclc/generic/lib/shared/min.cl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <clc/clc.h>
2-
#include <core/clc_core.h>
3-
#include <spirv/spirv.h>
2+
#include <clc/shared/clc_min.h>
43

54
#define __CLC_BODY <min.inc>
65
#include <clc/integer/gentype.inc>

‎libclc/generic/lib/shared/min.inc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ _CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_GENTYPE b) {
33
}
44

55
#ifndef __CLC_SCALAR
6-
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE min(__CLC_GENTYPE a, __CLC_SCALAR_GENTYPE b) {
6+
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE min(__CLC_GENTYPE a,
7+
__CLC_SCALAR_GENTYPE b) {
78
return __clc_min(a, b);
89
}
910
#endif

‎libclc/generic/libspirv/SOURCES

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ core/integer/clc_mul_hi.cl
3939
core/integer/clc_rhadd.cl
4040
core/integer/clc_sub_sat.cl
4141
core/integer/clc_upsample.cl
42-
core/shared/clc_clamp.cl
43-
core/shared/clc_max.cl
44-
core/shared/clc_min.cl
4542
geometric/cross.cl
4643
geometric/distance.cl
4744
geometric/dot.cl

‎libclc/generic/libspirv/core/shared/clc_clamp.cl

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎libclc/generic/libspirv/core/shared/clc_max.cl

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎libclc/generic/libspirv/core/shared/clc_min.cl

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎libclc/generic/libspirv/math/clc_hypot.cl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#include <spirv/spirv.h>
1010

11+
#include <clc/clc.h>
12+
#include <clc/shared/clc_clamp.h>
1113
#include <clcmacro.h>
1214
#include <config.h>
1315
#include <math/clc_hypot.h>
@@ -25,8 +27,8 @@ _CLC_DEF _CLC_OVERLOAD float __clc_hypot(float x, float y) {
2527
ux = c ? aux : auy;
2628
uy = c ? auy : aux;
2729

28-
int xexp = __spirv_ocl_s_clamp((int)(ux >> EXPSHIFTBITS_SP32) - EXPBIAS_SP32,
29-
-126, 126);
30+
int xexp =
31+
__clc_clamp((int)(ux >> EXPSHIFTBITS_SP32) - EXPBIAS_SP32, -126, 126);
3032
float fx_exp = as_float((xexp + EXPBIAS_SP32) << EXPSHIFTBITS_SP32);
3133
float fi_exp = as_float((-xexp + EXPBIAS_SP32) << EXPSHIFTBITS_SP32);
3234
float fx = as_float(ux) * fi_exp;

0 commit comments

Comments
 (0)