Skip to content

Commit 730cd3a

Browse files
frasercrmckfrasercrmck
authored
[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)`.
1 parent f6b8fba commit 730cd3a

31 files changed

+256
-228
lines changed

‎libclc/CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,19 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
424424
set ( has_distinct_generic_addrspace TRUE )
425425
if ( ARCH STREQUAL spirv OR ARCH STREQUAL spirv64 )
426426
set( opt_flags -O3 )
427+
list( APPEND build_flags -DCLC_SPIRV )
427428
set( spvflags --spirv-max-version=1.1 )
429+
set( MACRO_ARCH SPIRV32 )
430+
if( ARCH STREQUAL spirv64 )
431+
set( MACRO_ARCH SPIRV64 )
432+
endif()
428433
elseif( ARCH STREQUAL clspv OR ARCH STREQUAL clspv64 )
429434
set( opt_flags -O3 )
435+
list( APPEND build_flags -DCLC_CLSPV )
436+
set( MACRO_ARCH CLSPV32 )
437+
if( ARCH STREQUAL clspv64 )
438+
set( MACRO_ARCH CLSPV64 )
439+
endif()
430440
elseif( ARCH STREQUAL nvptx OR ARCH STREQUAL nvptx64 )
431441
set( opt_flags -O3 "--nvvm-reflect-enable=false" )
432442
set( has_distinct_generic_addrspace FALSE )
@@ -437,6 +447,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
437447
set( has_distinct_generic_addrspace FALSE )
438448
else()
439449
set( opt_flags -O3 )
450+
set( MACRO_ARCH ${ARCH} )
440451
endif()
441452

442453
# Enable SPIR-V builtin function declarations, so they don't
@@ -483,7 +494,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
483494
list(APPEND build_flags -D__unix__)
484495
endif()
485496

486-
string( TOUPPER "CLC_${ARCH}" CLC_TARGET_DEFINE )
497+
string( TOUPPER "CLC_${MACRO_ARCH}" CLC_TARGET_DEFINE )
487498

488499
list( APPEND build_flags
489500
-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

0 commit comments

Comments
 (0)