Skip to content

[NFC][libclc] Rename __CLC_FUNCTION to either FUNCTION or __IMPL_FUNCTION #146999

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
merged 1 commit into from
Jul 7, 2025
Merged

[NFC][libclc] Rename __CLC_FUNCTION to either FUNCTION or __IMPL_FUNCTION #146999

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/common/clc_degrees.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
#define __CLC_COMMON_CLC_DEGREES_H__

#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_degrees
#define FUNCTION __clc_degrees

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_COMMON_CLC_DEGREES_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/common/clc_radians.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
#define __CLC_COMMON_CLC_RADIANS_H__

#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_radians
#define FUNCTION __clc_radians

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_COMMON_CLC_RADIANS_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/common/clc_sign.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_COMMON_CLC_SIGN_H__
#define __CLC_COMMON_CLC_SIGN_H__

#define __CLC_FUNCTION __clc_sign
#define FUNCTION __clc_sign
#define __CLC_BODY <clc/math/unary_decl.inc>

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_COMMON_CLC_SIGN_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/common/clc_step.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_COMMON_CLC_STEP_H__
#define __CLC_COMMON_CLC_STEP_H__

#define __CLC_FUNCTION __clc_step
#define FUNCTION __clc_step
#define __CLC_BODY <clc/shared/binary_decl.inc>

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_COMMON_CLC_STEP_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/geometric/binary_decl.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#if (__CLC_VECSIZE_OR_1 == 1 || __CLC_VECSIZE_OR_1 == 2 || \
__CLC_VECSIZE_OR_1 == 3 || __CLC_VECSIZE_OR_1 == 4)

_CLC_OVERLOAD _CLC_DECL __CLC_SCALAR_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE a,
__CLC_GENTYPE b);
_CLC_OVERLOAD _CLC_DECL __CLC_SCALAR_GENTYPE FUNCTION(__CLC_GENTYPE a,
__CLC_GENTYPE b);

#endif
6 changes: 3 additions & 3 deletions libclc/clc/include/clc/geometric/binary_def.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include <clc/utils.h>

#ifndef __CLC_FUNCTION
#define __CLC_FUNCTION(x) __CLC_CONCAT(__clc_, x)
#ifndef __IMPL_FUNCTION
#define __IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)
#endif

// Geometric functions are only defined for scalar, vec2, vec3 and vec4
Expand All @@ -18,7 +18,7 @@

_CLC_OVERLOAD _CLC_DEF __CLC_SCALAR_GENTYPE FUNCTION(__CLC_GENTYPE a,
__CLC_GENTYPE b) {
return __CLC_FUNCTION(FUNCTION)(a, b);
return __IMPL_FUNCTION(FUNCTION)(a, b);
}

#endif
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/geometric/clc_distance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_GEOMETRIC_CLC_DISTANCE_H__
#define __CLC_GEOMETRIC_CLC_DISTANCE_H__

#define __CLC_FUNCTION __clc_distance
#define FUNCTION __clc_distance
#define __CLC_BODY <clc/geometric/binary_decl.inc>

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_GEOMETRIC_CLC_DISTANCE_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/geometric/clc_dot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_GEOMETRIC_CLC_DOT_H__
#define __CLC_GEOMETRIC_CLC_DOT_H__

#define __CLC_FUNCTION __clc_dot
#define FUNCTION __clc_dot
#define __CLC_BODY <clc/geometric/binary_decl.inc>

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_GEOMETRIC_CLC_DOT_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/geometric/clc_fast_distance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#define __CLC_GEOMETRIC_CLC_FAST_DISTANCE_H__

#define __FLOAT_ONLY
#define __CLC_FUNCTION __clc_fast_distance
#define FUNCTION __clc_fast_distance
#define __CLC_BODY <clc/geometric/binary_decl.inc>

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_GEOMETRIC_CLC_FAST_DISTANCE_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/geometric/clc_fast_length.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#define __CLC_GEOMETRIC_CLC_FAST_LENGTH_H__

#define __FLOAT_ONLY
#define __CLC_FUNCTION __clc_fast_length
#define FUNCTION __clc_fast_length
#define __CLC_BODY <clc/geometric/unary_decl.inc>

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_GEOMETRIC_CLC_FAST_LENGTH_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/geometric/clc_fast_normalize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

#define __FLOAT_ONLY
#define __CLC_GEOMETRIC_RET_GENTYPE
#define __CLC_FUNCTION __clc_fast_normalize
#define FUNCTION __clc_fast_normalize
#define __CLC_BODY <clc/geometric/unary_decl.inc>
#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION
#undef __CLC_GEOMETRIC_RET_GENTYPE

#endif // __CLC_GEOMETRIC_CLC_FAST_NORMALIZE_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/geometric/clc_length.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_GEOMETRIC_CLC_LENGTH_H__
#define __CLC_GEOMETRIC_CLC_LENGTH_H__

#define __CLC_FUNCTION __clc_length
#define FUNCTION __clc_length
#define __CLC_BODY <clc/geometric/unary_decl.inc>

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_GEOMETRIC_CLC_LENGTH_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/geometric/clc_normalize.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
#define __CLC_GEOMETRIC_CLC_NORMALIZE_H__

#define __CLC_GEOMETRIC_RET_GENTYPE
#define __CLC_FUNCTION __clc_normalize
#define FUNCTION __clc_normalize
#define __CLC_BODY <clc/geometric/unary_decl.inc>
#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION
#undef __CLC_GEOMETRIC_RET_GENTYPE

#endif // __CLC_GEOMETRIC_CLC_NORMALIZE_H__
2 changes: 1 addition & 1 deletion libclc/clc/include/clc/geometric/unary_decl.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ _CLC_OVERLOAD _CLC_DECL
#else
__CLC_SCALAR_GENTYPE
#endif
__CLC_FUNCTION(__CLC_GENTYPE a);
FUNCTION(__CLC_GENTYPE a);

#endif
6 changes: 3 additions & 3 deletions libclc/clc/include/clc/geometric/unary_def.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include <clc/utils.h>

#ifndef __CLC_FUNCTION
#define __CLC_FUNCTION(x) __CLC_CONCAT(__clc_, x)
#ifndef __IMPL_FUNCTION
#define __IMPL_FUNCTION(x) __CLC_CONCAT(__clc_, x)
#endif

// Geometric functions are only defined for scalar, vec2, vec3 and vec4
Expand All @@ -23,7 +23,7 @@ _CLC_OVERLOAD _CLC_DEF
__CLC_SCALAR_GENTYPE
#endif
FUNCTION(__CLC_GENTYPE a) {
return __CLC_FUNCTION(FUNCTION)(a);
return __IMPL_FUNCTION(FUNCTION)(a);
}

#endif
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_add_sat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_ADD_SAT_H__
#define __CLC_INTEGER_CLC_ADD_SAT_H__

#define __CLC_FUNCTION __clc_add_sat
#define FUNCTION __clc_add_sat
#define __CLC_BODY <clc/shared/binary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_ADD_SAT_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_clz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_CLZ_H__
#define __CLC_INTEGER_CLC_CLZ_H__

#define __CLC_FUNCTION __clc_clz
#define FUNCTION __clc_clz
#define __CLC_BODY <clc/shared/unary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_CLZ_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_ctz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_CTZ_H__
#define __CLC_INTEGER_CLC_CTZ_H__

#define __CLC_FUNCTION __clc_ctz
#define FUNCTION __clc_ctz
#define __CLC_BODY <clc/shared/unary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_CTZ_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_hadd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_HADD_H__
#define __CLC_INTEGER_CLC_HADD_H__

#define __CLC_FUNCTION __clc_hadd
#define FUNCTION __clc_hadd
#define __CLC_BODY <clc/shared/binary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_HADD_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_mad24.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_MAD24_H__
#define __CLC_INTEGER_CLC_MAD24_H__

#define __CLC_FUNCTION __clc_mad24
#define FUNCTION __clc_mad24
#define __CLC_BODY <clc/shared/ternary_decl.inc>

#include <clc/integer/gentype24.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_MAD24_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_mad_sat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_MAD_SAT_H__
#define __CLC_INTEGER_CLC_MAD_SAT_H__

#define __CLC_FUNCTION __clc_mad_sat
#define FUNCTION __clc_mad_sat
#define __CLC_BODY <clc/shared/ternary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_MAD_SAT_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_mul24.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_MUL24_H__
#define __CLC_INTEGER_CLC_MUL24_H__

#define __CLC_FUNCTION __clc_mul24
#define FUNCTION __clc_mul24
#define __CLC_BODY <clc/shared/binary_decl.inc>

#include <clc/integer/gentype24.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_MUL24_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_mul_hi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_MUL_HI_H__
#define __CLC_INTEGER_CLC_MUL_HI_H__

#define __CLC_FUNCTION __clc_mul_hi
#define FUNCTION __clc_mul_hi
#define __CLC_BODY <clc/shared/binary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_MUL_HI_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_popcount.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#ifndef __CLC_INTEGER_CLC_POPCOUNT_H__
#define __CLC_INTEGER_CLC_POPCOUNT_H__

#define __CLC_FUNCTION __clc_popcount
#define FUNCTION __clc_popcount
#define __CLC_BODY <clc/shared/unary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_INTRINSIC
#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_POPCOUNT_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_rhadd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_RHADD_H__
#define __CLC_INTEGER_CLC_RHADD_H__

#define __CLC_FUNCTION __clc_rhadd
#define FUNCTION __clc_rhadd
#define __CLC_BODY <clc/shared/binary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_RHADD_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_rotate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_ROTATE_H__
#define __CLC_INTEGER_CLC_ROTATE_H__

#define __CLC_FUNCTION __clc_rotate
#define FUNCTION __clc_rotate
#define __CLC_BODY <clc/shared/binary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_ROTATE_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/integer/clc_sub_sat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTEGER_CLC_SUB_SAT_H__
#define __CLC_INTEGER_CLC_SUB_SAT_H__

#define __CLC_FUNCTION __clc_sub_sat
#define FUNCTION __clc_sub_sat
#define __CLC_BODY <clc/shared/binary_decl.inc>

#include <clc/integer/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTEGER_CLC_SUB_SAT_H__
4 changes: 2 additions & 2 deletions libclc/clc/include/clc/internal/math/clc_sw_fma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
#ifndef __CLC_INTERNAL_MATH_CLC_SW_FMA_H__
#define __CLC_INTERNAL_MATH_CLC_SW_FMA_H__

#define __CLC_FUNCTION __clc_sw_fma
#define FUNCTION __clc_sw_fma
#define __CLC_BODY <clc/shared/ternary_decl.inc>

#include <clc/math/gentype.inc>

#undef __CLC_FUNCTION
#undef FUNCTION

#endif // __CLC_INTERNAL_MATH_CLC_SW_FMA_H__
Loading
Loading