Skip to content

[libclc] Move smoothstep to CLC and optimize its codegen #123183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frasercrmck merged 1 commit into from
Jan 16, 2025
Merged

[libclc] Move smoothstep to CLC and optimize its codegen #123183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions libclc/clc/include/clc/clcmacro.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,29 +102,6 @@
FUNCTION(x.hi, y.hi, z.hi)); \
}

#define _CLC_V_S_S_V_VECTORIZE(DECLSPEC, RET_TYPE, FUNCTION, ARG1_TYPE, \
ARG2_TYPE, ARG3_TYPE) \
DECLSPEC RET_TYPE##2 FUNCTION(ARG1_TYPE x, ARG2_TYPE y, ARG3_TYPE##2 z) { \
return (RET_TYPE##2)(FUNCTION(x, y, z.lo), FUNCTION(x, y, z.hi)); \
} \
\
DECLSPEC RET_TYPE##3 FUNCTION(ARG1_TYPE x, ARG2_TYPE y, ARG3_TYPE##3 z) { \
return (RET_TYPE##3)(FUNCTION(x, y, z.x), FUNCTION(x, y, z.y), \
FUNCTION(x, y, z.z)); \
} \
\
DECLSPEC RET_TYPE##4 FUNCTION(ARG1_TYPE x, ARG2_TYPE y, ARG3_TYPE##4 z) { \
return (RET_TYPE##4)(FUNCTION(x, y, z.lo), FUNCTION(x, y, z.hi)); \
} \
\
DECLSPEC RET_TYPE##8 FUNCTION(ARG1_TYPE x, ARG2_TYPE y, ARG3_TYPE##8 z) { \
return (RET_TYPE##8)(FUNCTION(x, y, z.lo), FUNCTION(x, y, z.hi)); \
} \
\
DECLSPEC RET_TYPE##16 FUNCTION(ARG1_TYPE x, ARG2_TYPE y, ARG3_TYPE##16 z) { \
return (RET_TYPE##16)(FUNCTION(x, y, z.lo), FUNCTION(x, y, z.hi)); \
}

#define _CLC_V_V_VP_VECTORIZE(DECLSPEC, RET_TYPE, FUNCTION, ARG1_TYPE, \
ADDR_SPACE, ARG2_TYPE) \
DECLSPEC __CLC_XCONCAT(RET_TYPE, 2) \
Expand Down
11 changes: 11 additions & 0 deletions libclc/clc/include/clc/common/clc_smoothstep.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#ifndef __CLC_COMMON_CLC_SMOOTHSTEP_H__
#define __CLC_COMMON_CLC_SMOOTHSTEP_H__

// note: Unlike OpenCL __clc_smoothstep is only defined for three matching
// argument types.

#define __CLC_BODY <clc/common/clc_smoothstep.inc>
#include <clc/math/gentype.inc>
#undef __CLC_BODY

#endif // __CLC_COMMON_CLC_SMOOTHSTEP_H__
3 changes: 3 additions & 0 deletions libclc/clc/include/clc/common/clc_smoothstep.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __clc_smoothstep(__CLC_GENTYPE edge0,
__CLC_GENTYPE edge1,
__CLC_GENTYPE x);
7 changes: 0 additions & 7 deletions libclc/clc/include/clc/shared/clc_clamp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
#ifndef __CLC_SHARED_CLC_CLAMP_H__
#define __CLC_SHARED_CLC_CLAMP_H__

#if defined(CLC_CLSPV) || defined(CLC_SPIRV)
// clspv and spir-v targets provide their own OpenCL-compatible clamp
#define __clc_clamp clamp
#else

#define __CLC_BODY <clc/shared/clc_clamp.inc>
#include <clc/integer/gentype.inc>

#define __CLC_BODY <clc/shared/clc_clamp.inc>
#include <clc/math/gentype.inc>

#endif

#endif // __CLC_SHARED_CLC_CLAMP_H__
1 change: 1 addition & 0 deletions libclc/clc/lib/clspv/SOURCES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
../generic/math/clc_floor.cl
../generic/math/clc_rint.cl
../generic/math/clc_trunc.cl
../generic/shared/clc_clamp.cl
1 change: 1 addition & 0 deletions libclc/clc/lib/generic/SOURCES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
common/clc_smoothstep.cl
geometric/clc_dot.cl
integer/clc_abs.cl
integer/clc_abs_diff.cl
Expand Down
52 changes: 52 additions & 0 deletions libclc/clc/lib/generic/common/clc_smoothstep.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
Copy link
Contributor Author

@frasercrmck frasercrmck Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't sure if the AMD copyright still applies to this copied file, so I kept it.

* Copyright (c) 2014,2015 Advanced Micro Devices, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <clc/clcmacro.h>
#include <clc/internal/clc.h>
#include <clc/shared/clc_clamp.h>

#define SMOOTHSTEP_SINGLE_DEF(edge_type, x_type, lit_suff) \
_CLC_OVERLOAD _CLC_DEF x_type __clc_smoothstep(edge_type edge0, \
edge_type edge1, x_type x) { \
x_type t = __clc_clamp((x - edge0) / (edge1 - edge0), 0.0##lit_suff, \
1.0##lit_suff); \
return t * t * (3.0##lit_suff - 2.0##lit_suff * t); \
}

#define SMOOTHSTEP_DEF(type, lit_suffix) \
SMOOTHSTEP_SINGLE_DEF(type, type, lit_suffix) \
SMOOTHSTEP_SINGLE_DEF(type##2, type##2, lit_suffix) \
SMOOTHSTEP_SINGLE_DEF(type##3, type##3, lit_suffix) \
SMOOTHSTEP_SINGLE_DEF(type##4, type##4, lit_suffix) \
SMOOTHSTEP_SINGLE_DEF(type##8, type##8, lit_suffix) \
SMOOTHSTEP_SINGLE_DEF(type##16, type##16, lit_suffix)

SMOOTHSTEP_DEF(float, F)

#ifdef cl_khr_fp64
#pragma OPENCL EXTENSION cl_khr_fp64 : enable
SMOOTHSTEP_DEF(double, );
#endif

#ifdef cl_khr_fp16
#pragma OPENCL EXTENSION cl_khr_fp16 : enable
SMOOTHSTEP_DEF(half, H);
#endif
2 changes: 2 additions & 0 deletions libclc/clc/lib/spirv/SOURCES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
../generic/common/clc_smoothstep.cl
../generic/geometric/clc_dot.cl
../generic/math/clc_ceil.cl
../generic/math/clc_fabs.cl
../generic/math/clc_floor.cl
../generic/math/clc_rint.cl
../generic/math/clc_trunc.cl
../generic/shared/clc_clamp.cl
2 changes: 2 additions & 0 deletions libclc/clc/lib/spirv64/SOURCES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
../generic/common/clc_smoothstep.cl
../generic/geometric/clc_dot.cl
../generic/math/clc_ceil.cl
../generic/math/clc_fabs.cl
../generic/math/clc_floor.cl
../generic/math/clc_rint.cl
../generic/math/clc_trunc.cl
../generic/shared/clc_clamp.cl
66 changes: 46 additions & 20 deletions libclc/generic/lib/common/smoothstep.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,35 +22,61 @@

#include <clc/clc.h>
#include <clc/clcmacro.h>
#include <clc/common/clc_smoothstep.h>

_CLC_OVERLOAD _CLC_DEF float smoothstep(float edge0, float edge1, float x) {
float t = clamp((x - edge0) / (edge1 - edge0), 0.0f, 1.0f);
return t * t * (3.0f - 2.0f * t);
}
#define SMOOTHSTEP_SINGLE_DEF(X_TYPE) \
_CLC_OVERLOAD _CLC_DEF X_TYPE smoothstep(X_TYPE edge0, X_TYPE edge1, \
X_TYPE x) { \
return __clc_smoothstep(edge0, edge1, x); \
}

_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, smoothstep, float, float, float);
#define SMOOTHSTEP_S_S_V_DEFS(X_TYPE) \
_CLC_OVERLOAD _CLC_DEF X_TYPE##2 smoothstep(X_TYPE x, X_TYPE y, \
X_TYPE##2 z) { \
return __clc_smoothstep((X_TYPE##2)x, (X_TYPE##2)y, z); \
} \
\
_CLC_OVERLOAD _CLC_DEF X_TYPE##3 smoothstep(X_TYPE x, X_TYPE y, \
X_TYPE##3 z) { \
return __clc_smoothstep((X_TYPE##3)x, (X_TYPE##3)y, z); \
} \
\
_CLC_OVERLOAD _CLC_DEF X_TYPE##4 smoothstep(X_TYPE x, X_TYPE y, \
X_TYPE##4 z) { \
return __clc_smoothstep((X_TYPE##4)x, (X_TYPE##4)y, z); \
} \
\
_CLC_OVERLOAD _CLC_DEF X_TYPE##8 smoothstep(X_TYPE x, X_TYPE y, \
X_TYPE##8 z) { \
return __clc_smoothstep((X_TYPE##8)x, (X_TYPE##8)y, z); \
} \
\
_CLC_OVERLOAD _CLC_DEF X_TYPE##16 smoothstep(X_TYPE x, X_TYPE y, \
X_TYPE##16 z) { \
return __clc_smoothstep((X_TYPE##16)x, (X_TYPE##16)y, z); \
}

_CLC_V_S_S_V_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, smoothstep, float, float, float);
#define SMOOTHSTEP_DEF(type) \
SMOOTHSTEP_SINGLE_DEF(type) \
SMOOTHSTEP_SINGLE_DEF(type##2) \
SMOOTHSTEP_SINGLE_DEF(type##3) \
SMOOTHSTEP_SINGLE_DEF(type##4) \
SMOOTHSTEP_SINGLE_DEF(type##8) \
SMOOTHSTEP_SINGLE_DEF(type##16) \
SMOOTHSTEP_S_S_V_DEFS(type)

SMOOTHSTEP_DEF(float)

#ifdef cl_khr_fp64
#pragma OPENCL EXTENSION cl_khr_fp64 : enable

#define SMOOTH_STEP_DEF(edge_type, x_type, impl) \
_CLC_OVERLOAD _CLC_DEF x_type smoothstep(edge_type edge0, edge_type edge1, x_type x) { \
double t = clamp((x - edge0) / (edge1 - edge0), 0.0, 1.0); \
return t * t * (3.0 - 2.0 * t); \
}

SMOOTH_STEP_DEF(double, double, SMOOTH_STEP_IMPL_D);
SMOOTHSTEP_DEF(double);

_CLC_TERNARY_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, smoothstep, double, double, double);
#endif

#if !defined(CLC_SPIRV)
SMOOTH_STEP_DEF(float, double, SMOOTH_STEP_IMPL_D);
SMOOTH_STEP_DEF(double, float, SMOOTH_STEP_IMPL_D);
#ifdef cl_khr_fp16
#pragma OPENCL EXTENSION cl_khr_fp16 : enable

_CLC_V_S_S_V_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, double, smoothstep, float, float, double);
_CLC_V_S_S_V_VECTORIZE(_CLC_OVERLOAD _CLC_DEF, float, smoothstep, double, double, float);
#endif
SMOOTHSTEP_DEF(half);

#endif
Loading