Skip to content

Commit 36964ad

Browse files
wenju-hewenju-he
committed
use #if to guard cl_khr_(local|global)_int32_(base|extended)_atomics
1 parent 46d2df7 commit 36964ad

22 files changed

+92
-45
lines changed

‎libclc/generic/include/clc/atomic/atom_add.h

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

9-
// cl_khr_global_int32_base_atomics
9+
#ifdef cl_khr_global_int32_base_atomics
1010
#define __CLC_FUNCTION atom_add
1111
#define __CLC_ADDRESS_SPACE global
1212
#include <clc/atomic/atom_decl_int32.inc>
13+
#endif // cl_khr_global_int32_base_atomics
1314

14-
// cl_khr_local_int32_base_atomics
15+
#ifdef cl_khr_local_int32_base_atomics
1516
#define __CLC_FUNCTION atom_add
1617
#define __CLC_ADDRESS_SPACE local
1718
#include <clc/atomic/atom_decl_int32.inc>
19+
#endif // cl_khr_local_int32_base_atomics
1820

1921
#ifdef cl_khr_int64_base_atomics
2022
#define __CLC_FUNCTION atom_add

‎libclc/generic/include/clc/atomic/atom_and.h

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

9-
// cl_khr_global_int32_extended_atomics
9+
#ifdef cl_khr_global_int32_extended_atomics
1010
#define __CLC_FUNCTION atom_and
1111
#define __CLC_ADDRESS_SPACE global
1212
#include <clc/atomic/atom_decl_int32.inc>
13+
#endif // cl_khr_global_int32_extended_atomics
1314

14-
// cl_khr_local_int32_extended_atomics
15+
#ifdef cl_khr_local_int32_extended_atomics
1516
#define __CLC_FUNCTION atom_and
1617
#define __CLC_ADDRESS_SPACE local
1718
#include <clc/atomic/atom_decl_int32.inc>
19+
#endif // cl_khr_local_int32_extended_atomics
1820

1921
#ifdef cl_khr_int64_base_atomics
2022
#define __CLC_FUNCTION atom_and

‎libclc/generic/include/clc/atomic/atom_cmpxchg.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,21 @@
99
#include <clc/clcfunc.h>
1010
#include <clc/clctypes.h>
1111

12-
// cl_khr_global_int32_base_atomics
12+
#ifdef cl_khr_global_int32_base_atomics
1313
_CLC_OVERLOAD _CLC_DECL int atom_cmpxchg(volatile global int *p, int cmp,
1414
int val);
1515
_CLC_OVERLOAD _CLC_DECL unsigned int
1616
atom_cmpxchg(volatile global unsigned int *p, unsigned int cmp,
1717
unsigned int val);
18+
#endif // cl_khr_global_int32_base_atomics
1819

19-
// cl_khr_local_int32_base_atomics
20+
#ifdef cl_khr_local_int32_base_atomics
2021
_CLC_OVERLOAD _CLC_DECL int atom_cmpxchg(volatile local int *p, int cmp,
2122
int val);
2223
_CLC_OVERLOAD _CLC_DECL unsigned int
2324
atom_cmpxchg(volatile local unsigned int *p, unsigned int cmp,
2425
unsigned int val);
26+
#endif // cl_khr_local_int32_base_atomics
2527

2628
#ifdef cl_khr_int64_base_atomics
2729
_CLC_OVERLOAD _CLC_DECL long atom_cmpxchg(volatile global long *p, long cmp,

‎libclc/generic/include/clc/atomic/atom_dec.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
#include <clc/clcfunc.h>
1010
#include <clc/clctypes.h>
1111

12-
// cl_khr_global_int32_base_atomics
12+
#ifdef cl_khr_global_int32_base_atomics
1313
_CLC_OVERLOAD _CLC_DECL int atom_dec(volatile global int *p);
1414
_CLC_OVERLOAD _CLC_DECL unsigned int atom_dec(volatile global unsigned int *p);
15+
#endif // cl_khr_global_int32_base_atomics
1516

16-
// cl_khr_local_int32_base_atomics
17+
#ifdef cl_khr_local_int32_base_atomics
1718
_CLC_OVERLOAD _CLC_DECL int atom_dec(volatile local int *p);
1819
_CLC_OVERLOAD _CLC_DECL unsigned int atom_dec(volatile local unsigned int *p);
20+
#endif // cl_khr_local_int32_base_atomics
1921

2022
#ifdef cl_khr_int64_base_atomics
2123
_CLC_OVERLOAD _CLC_DECL long atom_dec(volatile global long *p);

‎libclc/generic/include/clc/atomic/atom_inc.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
#include <clc/clcfunc.h>
1010
#include <clc/clctypes.h>
1111

12-
// cl_khr_global_int32_base_atomics
12+
#ifdef cl_khr_global_int32_base_atomics
1313
_CLC_OVERLOAD _CLC_DECL int atom_inc(volatile global int *p);
1414
_CLC_OVERLOAD _CLC_DECL unsigned int atom_inc(volatile global unsigned int *p);
15+
#endif // cl_khr_global_int32_base_atomics
1516

16-
// cl_khr_local_int32_base_atomics
17+
#ifdef cl_khr_local_int32_base_atomics
1718
_CLC_OVERLOAD _CLC_DECL int atom_inc(volatile local int *p);
1819
_CLC_OVERLOAD _CLC_DECL unsigned int atom_inc(volatile local unsigned int *p);
20+
#endif // cl_khr_local_int32_base_atomics
1921

2022
#ifdef cl_khr_int64_base_atomics
2123
_CLC_OVERLOAD _CLC_DECL long atom_inc(volatile global long *p);

‎libclc/generic/include/clc/atomic/atom_max.h

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

9-
// cl_khr_global_int32_extended_atomics
9+
#ifdef cl_khr_global_int32_extended_atomics
1010
#define __CLC_FUNCTION atom_max
1111
#define __CLC_ADDRESS_SPACE global
1212
#include <clc/atomic/atom_decl_int32.inc>
13+
#endif // cl_khr_global_int32_extended_atomics
1314

14-
// cl_khr_local_int32_extended_atomics
15+
#ifdef cl_khr_local_int32_extended_atomics
1516
#define __CLC_FUNCTION atom_max
1617
#define __CLC_ADDRESS_SPACE local
1718
#include <clc/atomic/atom_decl_int32.inc>
19+
#endif // cl_khr_local_int32_extended_atomics
1820

1921
#ifdef cl_khr_int64_base_atomics
2022
#define __CLC_FUNCTION atom_max

‎libclc/generic/include/clc/atomic/atom_min.h

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

9-
// cl_khr_global_int32_extended_atomics
9+
#ifdef cl_khr_global_int32_extended_atomics
1010
#define __CLC_FUNCTION atom_min
1111
#define __CLC_ADDRESS_SPACE global
1212
#include <clc/atomic/atom_decl_int32.inc>
13+
#endif // cl_khr_global_int32_extended_atomics
1314

14-
// cl_khr_local_int32_extended_atomics
15+
#ifdef cl_khr_local_int32_extended_atomics
1516
#define __CLC_FUNCTION atom_min
1617
#define __CLC_ADDRESS_SPACE local
1718
#include <clc/atomic/atom_decl_int32.inc>
19+
#endif // cl_khr_local_int32_extended_atomics
1820

1921
#ifdef cl_khr_int64_base_atomics
2022
#define __CLC_FUNCTION atom_min

‎libclc/generic/include/clc/atomic/atom_or.h

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

9-
// cl_khr_global_int32_extended_atomics
9+
#ifdef cl_khr_global_int32_extended_atomics
1010
#define __CLC_FUNCTION atom_or
1111
#define __CLC_ADDRESS_SPACE global
1212
#include <clc/atomic/atom_decl_int32.inc>
13+
#endif // cl_khr_global_int32_extended_atomics
1314

14-
// cl_khr_local_int32_extended_atomics
15+
#ifdef cl_khr_local_int32_extended_atomics
1516
#define __CLC_FUNCTION atom_or
1617
#define __CLC_ADDRESS_SPACE local
1718
#include <clc/atomic/atom_decl_int32.inc>
19+
#endif // cl_khr_local_int32_extended_atomics
1820

1921
#ifdef cl_khr_int64_base_atomics
2022
#define __CLC_FUNCTION atom_or

‎libclc/generic/include/clc/atomic/atom_sub.h

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

9-
// cl_khr_global_int32_base_atomics
9+
#ifdef cl_khr_global_int32_base_atomics
1010
#define __CLC_FUNCTION atom_sub
1111
#define __CLC_ADDRESS_SPACE global
1212
#include <clc/atomic/atom_decl_int32.inc>
13+
#endif // cl_khr_global_int32_base_atomics
1314

14-
// cl_khr_local_int32_base_atomics
15+
#ifdef cl_khr_local_int32_base_atomics
1516
#define __CLC_FUNCTION atom_sub
1617
#define __CLC_ADDRESS_SPACE local
1718
#include <clc/atomic/atom_decl_int32.inc>
19+
#endif // cl_khr_local_int32_base_atomics
1820

1921
#ifdef cl_khr_int64_base_atomics
2022
#define __CLC_FUNCTION atom_sub

‎libclc/generic/include/clc/atomic/atom_xchg.h

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

9-
// cl_khr_global_int32_base_atomics
9+
#ifdef cl_khr_global_int32_base_atomics
1010
#define __CLC_FUNCTION atom_xchg
1111
#define __CLC_ADDRESS_SPACE global
1212
#include <clc/atomic/atom_decl_int32.inc>
13+
#endif // cl_khr_global_int32_base_atomics
1314

14-
// cl_khr_local_int32_base_atomics
15+
#ifdef cl_khr_local_int32_base_atomics
1516
#define __CLC_FUNCTION atom_xchg
1617
#define __CLC_ADDRESS_SPACE local
1718
#include <clc/atomic/atom_decl_int32.inc>
19+
#endif // cl_khr_local_int32_base_atomics
1820

1921
#ifdef cl_khr_int64_base_atomics
2022
#define __CLC_FUNCTION atom_xchg

‎libclc/generic/include/clc/atomic/atom_xor.h

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

9-
// cl_khr_global_int32_extended_atomics
9+
#ifdef cl_khr_global_int32_extended_atomics
1010
#define __CLC_FUNCTION atom_xor
1111
#define __CLC_ADDRESS_SPACE global
1212
#include <clc/atomic/atom_decl_int32.inc>
13+
#endif // cl_khr_global_int32_extended_atomics
1314

14-
// cl_khr_local_int32_extended_atomics
15+
#ifdef cl_khr_local_int32_extended_atomics
1516
#define __CLC_FUNCTION atom_xor
1617
#define __CLC_ADDRESS_SPACE local
1718
#include <clc/atomic/atom_decl_int32.inc>
19+
#endif // cl_khr_local_int32_extended_atomics
1820

1921
#ifdef cl_khr_int64_base_atomics
2022
#define __CLC_FUNCTION atom_xor

‎libclc/generic/lib/atomic/atom_add.cl

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

99
#include <clc/atomic/atom_add.h>
1010

11-
// cl_khr_global_int32_base_atomics
11+
#ifdef cl_khr_global_int32_base_atomics
1212
#define __CLC_ATOMIC_OP add
1313
#define __CLC_ATOMIC_ADDRESS_SPACE global
1414
#include "atom_int32_binary.inc"
15+
#endif // cl_khr_global_int32_base_atomics
1516

16-
// cl_khr_local_int32_base_atomics
17+
#ifdef cl_khr_local_int32_base_atomics
1718
#define __CLC_ATOMIC_OP add
1819
#define __CLC_ATOMIC_ADDRESS_SPACE local
1920
#include "atom_int32_binary.inc"
21+
#endif // cl_khr_local_int32_base_atomics
2022

2123
#ifdef cl_khr_int64_base_atomics
2224

‎libclc/generic/lib/atomic/atom_and.cl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@
88

99
#include <clc/atomic/atom_and.h>
1010

11-
// cl_khr_global_int32_extended_atomics
11+
#ifdef cl_khr_global_int32_extended_atomics
1212
#define __CLC_ATOMIC_OP and
1313
#define __CLC_ATOMIC_ADDRESS_SPACE global
1414
#include "atom_int32_binary.inc"
15+
#endif // cl_khr_global_int32_extended_atomics
1516

16-
// cl_khr_local_int32_extended_atomics
17+
#ifdef cl_khr_local_int32_extended_atomics
1718
#define __CLC_ATOMIC_OP and
1819
#define __CLC_ATOMIC_ADDRESS_SPACE local
1920
#include "atom_int32_binary.inc"
21+
#endif // cl_khr_local_int32_extended_atomics
2022

2123
#ifdef cl_khr_int64_extended_atomics
2224

@@ -31,4 +33,4 @@ IMPL(local, long)
3133
IMPL(local, unsigned long)
3234
#undef IMPL
3335

34-
#endif // cl_khr_local_int32_extended_atomics
36+
#endif #ifdef cl_khr_local_int32_extended_atomics

‎libclc/generic/lib/atomic/atom_cmpxchg.cl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
return atomic_cmpxchg(p, cmp, val); \
1616
}
1717

18-
// cl_khr_global_int32_base_atomics
18+
#ifdef cl_khr_global_int32_base_atomics
1919
IMPL(global, int)
2020
IMPL(global, unsigned int)
21-
// cl_khr_local_int32_base_atomics
21+
#endif // cl_khr_global_int32_base_atomics
22+
#ifdef cl_khr_local_int32_base_atomics
2223
IMPL(local, int)
2324
IMPL(local, unsigned int)
25+
#endif // cl_khr_local_int32_base_atomics
26+
2427
#undef IMPL
2528

2629
#ifdef cl_khr_int64_base_atomics

‎libclc/generic/lib/atomic/atom_dec.cl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
return atomic_dec(p); \
1616
}
1717

18-
// cl_khr_global_int32_base_atomics
18+
#ifdef cl_khr_global_int32_base_atomics
1919
IMPL(global, int)
2020
IMPL(global, unsigned int)
21-
// cl_khr_local_int32_base_atomics
21+
#endif // cl_khr_global_int32_base_atomics
22+
#ifdef cl_khr_local_int32_base_atomics
2223
IMPL(local, int)
2324
IMPL(local, unsigned int)
25+
#endif // cl_khr_local_int32_base_atomics
26+
2427
#undef IMPL
2528

2629
#ifdef cl_khr_int64_base_atomics

‎libclc/generic/lib/atomic/atom_inc.cl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
return atomic_inc(p); \
1616
}
1717

18-
// cl_khr_global_int32_base_atomics
18+
#ifdef cl_khr_global_int32_base_atomics
1919
IMPL(global, int)
2020
IMPL(global, unsigned int)
21-
// cl_khr_local_int32_base_atomics
21+
#endif // cl_khr_global_int32_base_atomics
22+
#ifdef cl_khr_local_int32_base_atomics
2223
IMPL(local, int)
2324
IMPL(local, unsigned int)
25+
#endif // cl_khr_local_int32_base_atomics
26+
2427
#undef IMPL
2528

2629
#ifdef cl_khr_int64_base_atomics

‎libclc/generic/lib/atomic/atom_max.cl

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

99
#include <clc/atomic/atom_max.h>
1010

11-
// cl_khr_global_int32_extended_atomics
11+
#ifdef cl_khr_global_int32_extended_atomics
1212
#define __CLC_ATOMIC_OP max
1313
#define __CLC_ATOMIC_ADDRESS_SPACE global
1414
#include "atom_int32_binary.inc"
15+
#endif // cl_khr_global_int32_extended_atomics
1516

16-
// cl_khr_local_int32_extended_atomics
17+
#ifdef cl_khr_local_int32_extended_atomics
1718
#define __CLC_ATOMIC_OP max
1819
#define __CLC_ATOMIC_ADDRESS_SPACE local
1920
#include "atom_int32_binary.inc"
21+
#endif // cl_khr_local_int32_extended_atomics
2022

2123
#ifdef cl_khr_int64_extended_atomics
2224

‎libclc/generic/lib/atomic/atom_min.cl

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

99
#include <clc/atomic/atom_min.h>
1010

11-
// cl_khr_global_int32_extended_atomics
11+
#ifdef cl_khr_global_int32_extended_atomics
1212
#define __CLC_ATOMIC_OP min
1313
#define __CLC_ATOMIC_ADDRESS_SPACE global
1414
#include "atom_int32_binary.inc"
15+
#endif // cl_khr_global_int32_extended_atomics
1516

16-
// cl_khr_local_int32_extended_atomics
17+
#ifdef cl_khr_local_int32_extended_atomics
1718
#define __CLC_ATOMIC_OP min
1819
#define __CLC_ATOMIC_ADDRESS_SPACE local
1920
#include "atom_int32_binary.inc"
21+
#endif // cl_khr_local_int32_extended_atomics
2022

2123
#ifdef cl_khr_int64_extended_atomics
2224

‎libclc/generic/lib/atomic/atom_or.cl

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

99
#include <clc/atomic/atom_or.h>
1010

11-
// cl_khr_global_int32_extended_atomics
11+
#ifdef cl_khr_global_int32_extended_atomics
1212
#define __CLC_ATOMIC_OP or
1313
#define __CLC_ATOMIC_ADDRESS_SPACE global
1414
#include "atom_int32_binary.inc"
15+
#endif // cl_khr_global_int32_extended_atomics
1516

16-
// cl_khr_local_int32_extended_atomics
17+
#ifdef cl_khr_local_int32_extended_atomics
1718
#define __CLC_ATOMIC_OP or
1819
#define __CLC_ATOMIC_ADDRESS_SPACE local
1920
#include "atom_int32_binary.inc"
21+
#endif // cl_khr_local_int32_extended_atomics
2022

2123
#ifdef cl_khr_int64_extended_atomics
2224

‎libclc/generic/lib/atomic/atom_sub.cl

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

99
#include <clc/atomic/atom_sub.h>
1010

11-
// cl_khr_global_int32_base_atomics
11+
#ifdef cl_khr_global_int32_base_atomics
1212
#define __CLC_ATOMIC_OP sub
1313
#define __CLC_ATOMIC_ADDRESS_SPACE global
1414
#include "atom_int32_binary.inc"
15+
#endif // cl_khr_global_int32_base_atomics
1516

16-
// cl_khr_local_int32_base_atomics
17+
#ifdef cl_khr_local_int32_base_atomics
1718
#define __CLC_ATOMIC_OP sub
1819
#define __CLC_ATOMIC_ADDRESS_SPACE local
1920
#include "atom_int32_binary.inc"
21+
#endif // cl_khr_local_int32_base_atomics
2022

2123
#ifdef cl_khr_int64_base_atomics
2224

0 commit comments

Comments
 (0)