Skip to content

Commit 229616d

Browse files
frasercrmckfrasercrmck
committed
unify other files
1 parent 93417ef commit 229616d

File tree

13 files changed

+22
-16
lines changed

13 files changed

+22
-16
lines changed

‎libclc/clc/include/clc/integer/clc_clz.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
#include <clc/clcfunc.h>
55
#include <clc/clctypes.h>
66

7-
#define FUNCTION __clc_clz
8-
#define __CLC_BODY "unary_decl.h"
7+
#define __CLC_FUNCTION __clc_clz
8+
#define __CLC_BODY <clc/shared/unary_decl.inc>
99

1010
#include <clc/integer/gentype.inc>
1111

1212
#undef __CLC_BODY
13-
#undef FUNCTION
13+
#undef __CLC_FUNCTION
1414

1515
#endif // __CLC_INTEGER_CLC_CLZ_H__

‎libclc/clc/include/clc/integer/unary_decl.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎libclc/generic/lib/integer/binary_def.inc renamed to ‎libclc/clc/include/clc/shared/binary_def.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <clc/utils.h>
22

3+
#ifndef __CLC_FUNCTION
34
#define __CLC_FUNCTION(x) __CLC_CONCAT(__clc_, x)
5+
#endif
46

57
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE a,
68
__CLC_GENTYPE b) {

‎libclc/generic/lib/integer/ternary_def.inc renamed to ‎libclc/clc/include/clc/shared/ternary_def.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <clc/utils.h>
22

3+
#ifndef __CLC_FUNCTION
34
#define __CLC_FUNCTION(x) __CLC_CONCAT(__clc_, x)
5+
#endif
46

57
_CLC_OVERLOAD _CLC_DEF __CLC_GENTYPE FUNCTION(__CLC_GENTYPE a, __CLC_GENTYPE b,
68
__CLC_GENTYPE c) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_CLC_OVERLOAD _CLC_DECL __CLC_GENTYPE __CLC_FUNCTION(__CLC_GENTYPE x);

‎libclc/generic/include/clc/integer/clz.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#define FUNCTION clz
2-
#define __CLC_BODY "unary_decl.h"
1+
#define __CLC_FUNCTION clz
2+
#define __CLC_BODY <clc/shared/unary_decl.inc>
33

44
#include <clc/integer/gentype.inc>
55

6-
#undef FUNCTION
6+
#undef __CLC_BODY
7+
#undef __CLC_FUNCTION

‎libclc/generic/include/clc/integer/popcount.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#define FUNCTION popcount
2-
#define __CLC_BODY "unary_decl.h"
1+
#define __CLC_FUNCTION popcount
2+
#define __CLC_BODY <clc/shared/unary_decl.inc>
33

44
#include <clc/integer/gentype.inc>
55

6-
#undef FUNCTION
6+
#undef __CLC_BODY
7+
#undef __CLC_FUNCTION

‎libclc/generic/lib/integer/hadd.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#include <clc/integer/clc_hadd.h>
33

44
#define FUNCTION hadd
5-
#define __CLC_BODY "binary_def.inc"
5+
#define __CLC_BODY <clc/shared/binary_def.inc>
66

77
#include <clc/integer/gentype.inc>

‎libclc/generic/lib/integer/mad24.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#include <clc/integer/clc_mad24.h>
33

44
#define FUNCTION mad24
5-
#define __CLC_BODY "ternary_def.inc"
5+
#define __CLC_BODY <clc/shared/ternary_def.inc>
66

77
#include <clc/integer/gentype24.inc>

‎libclc/generic/lib/integer/mad_hi.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#include <clc/integer/clc_mad_hi.h>
33

44
#define FUNCTION mad_hi
5-
#define __CLC_BODY "ternary_def.inc"
5+
#define __CLC_BODY <clc/shared/ternary_def.inc>
66

77
#include <clc/integer/gentype.inc>

‎libclc/generic/lib/integer/mul24.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#include <clc/integer/clc_mul24.h>
33

44
#define FUNCTION mul24
5-
#define __CLC_BODY "binary_def.inc"
5+
#define __CLC_BODY <clc/shared/binary_def.inc>
66

77
#include <clc/integer/gentype24.inc>

‎libclc/generic/lib/integer/mul_hi.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#include <clc/integer/clc_mul_hi.h>
33

44
#define FUNCTION mul_hi
5-
#define __CLC_BODY "binary_def.inc"
5+
#define __CLC_BODY <clc/shared/binary_def.inc>
66

77
#include <clc/integer/gentype.inc>

‎libclc/generic/lib/integer/rhadd.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
#include <clc/integer/clc_rhadd.h>
33

44
#define FUNCTION rhadd
5-
#define __CLC_BODY "binary_def.inc"
5+
#define __CLC_BODY <clc/shared/binary_def.inc>
66

77
#include <clc/integer/gentype.inc>

0 commit comments

Comments
 (0)