[libclc] [libclc][NFC] Add clang-tidy config and standardize header guards (PR #184721)
Wenju He via cfe-commits
cfe-commits at lists.llvm.org
Wed Mar 4 18:20:47 PST 2026
https://github.com/wenju-he updated https://github.com/llvm/llvm-project/pull/184721
>From 2c989586aad6c506aefe6a87059e33967246b3d3 Mon Sep 17 00:00:00 2001
From: Wenju He <wenju.he at intel.com>
Date: Thu, 5 Mar 2026 02:53:15 +0100
Subject: [PATCH 1/2] [libclc] Add clang-tidy config and standardize header
guards
Our downstream clang-tidy CI reports warning:
header guard does not follow preferred style [llvm-header-guard]
Changes:
- Add a clang-tidy configuration file.
- Add libclc/.clang-tidy configuration file that:
* Disables bugprone-reserved-identifier to allow `__` prefix for internal
macros (__CLC_FUNCTION, __CLC_BODY, etc.) avoiding namespace conflicts
* Disables bugprone-macro-parentheses for include macros like
`#define __CLC_BODY <file.inc>`
* Enables llvm-header-guard check to standardize header guards
* Disables readability-identifier-naming to preserve existing constant
naming conventions (LOG2_HEAD, LOG2_TAIL, etc.)
- Update all header guards from `__CLC_*_H__` to `CLC_*_H` format to match
libclc's CLC_ namespace convention and avoid reserved identifier warnings
Co-Authored-By: Claude Sonnet 4.5 <noreply at anthropic.com>
---
libclc/.clang-tidy | 7 +++++++
libclc/clc/include/clc/async/clc_prefetch.h | 6 +++---
.../clc/include/clc/atomic/clc_atomic_compare_exchange.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_dec.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_exchange.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h | 6 +++---
.../clc/include/clc/atomic/clc_atomic_flag_test_and_set.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_inc.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_load.h | 6 +++---
libclc/clc/include/clc/atomic/clc_atomic_store.h | 6 +++---
libclc/clc/include/clc/clc_as_type.h | 6 +++---
libclc/clc/include/clc/clc_convert.h | 6 +++---
libclc/clc/include/clc/clcfunc.h | 6 +++---
libclc/clc/include/clc/common/clc_degrees.h | 6 +++---
libclc/clc/include/clc/common/clc_radians.h | 6 +++---
libclc/clc/include/clc/common/clc_sign.h | 6 +++---
libclc/clc/include/clc/common/clc_smoothstep.h | 6 +++---
libclc/clc/include/clc/common/clc_step.h | 6 +++---
libclc/clc/include/clc/float/definitions.h | 5 +++++
libclc/clc/include/clc/geometric/clc_cross.h | 6 +++---
libclc/clc/include/clc/geometric/clc_distance.h | 6 +++---
libclc/clc/include/clc/geometric/clc_dot.h | 6 +++---
libclc/clc/include/clc/geometric/clc_fast_distance.h | 6 +++---
libclc/clc/include/clc/geometric/clc_fast_length.h | 6 +++---
libclc/clc/include/clc/geometric/clc_fast_normalize.h | 6 +++---
libclc/clc/include/clc/geometric/clc_length.h | 6 +++---
libclc/clc/include/clc/geometric/clc_normalize.h | 6 +++---
libclc/clc/include/clc/integer/clc_abs.h | 6 +++---
libclc/clc/include/clc/integer/clc_abs_diff.h | 6 +++---
libclc/clc/include/clc/integer/clc_add_sat.h | 6 +++---
libclc/clc/include/clc/integer/clc_bit_reverse.h | 6 +++---
.../clc/include/clc/integer/clc_bitfield_extract_signed.h | 6 +++---
.../include/clc/integer/clc_bitfield_extract_unsigned.h | 6 +++---
libclc/clc/include/clc/integer/clc_bitfield_insert.h | 6 +++---
libclc/clc/include/clc/integer/clc_clz.h | 6 +++---
libclc/clc/include/clc/integer/clc_ctz.h | 6 +++---
libclc/clc/include/clc/integer/clc_hadd.h | 6 +++---
libclc/clc/include/clc/integer/clc_mad24.h | 6 +++---
libclc/clc/include/clc/integer/clc_mad_hi.h | 6 +++---
libclc/clc/include/clc/integer/clc_mad_sat.h | 6 +++---
libclc/clc/include/clc/integer/clc_mul24.h | 6 +++---
libclc/clc/include/clc/integer/clc_mul_hi.h | 6 +++---
libclc/clc/include/clc/integer/clc_popcount.h | 6 +++---
libclc/clc/include/clc/integer/clc_rhadd.h | 6 +++---
libclc/clc/include/clc/integer/clc_rotate.h | 6 +++---
libclc/clc/include/clc/integer/clc_sub_sat.h | 6 +++---
libclc/clc/include/clc/integer/clc_upsample.h | 6 +++---
libclc/clc/include/clc/integer/definitions.h | 6 +++---
libclc/clc/include/clc/internal/clc.h | 6 +++---
libclc/clc/include/clc/internal/math/clc_sw_fma.h | 6 +++---
libclc/clc/include/clc/math/clc_acos.h | 6 +++---
libclc/clc/include/clc/math/clc_acosh.h | 6 +++---
libclc/clc/include/clc/math/clc_acospi.h | 6 +++---
libclc/clc/include/clc/math/clc_asin.h | 6 +++---
libclc/clc/include/clc/math/clc_asinh.h | 6 +++---
libclc/clc/include/clc/math/clc_asinpi.h | 6 +++---
libclc/clc/include/clc/math/clc_atan.h | 6 +++---
libclc/clc/include/clc/math/clc_atan2.h | 6 +++---
libclc/clc/include/clc/math/clc_atan2pi.h | 6 +++---
libclc/clc/include/clc/math/clc_atanh.h | 6 +++---
libclc/clc/include/clc/math/clc_atanpi.h | 6 +++---
libclc/clc/include/clc/math/clc_cbrt.h | 6 +++---
libclc/clc/include/clc/math/clc_ceil.h | 6 +++---
libclc/clc/include/clc/math/clc_copysign.h | 6 +++---
libclc/clc/include/clc/math/clc_cos.h | 6 +++---
libclc/clc/include/clc/math/clc_cosh.h | 6 +++---
libclc/clc/include/clc/math/clc_cospi.h | 6 +++---
libclc/clc/include/clc/math/clc_ep_log.h | 6 +++---
libclc/clc/include/clc/math/clc_erf.h | 6 +++---
libclc/clc/include/clc/math/clc_erfc.h | 6 +++---
libclc/clc/include/clc/math/clc_exp.h | 6 +++---
libclc/clc/include/clc/math/clc_exp10.h | 6 +++---
libclc/clc/include/clc/math/clc_exp2.h | 6 +++---
libclc/clc/include/clc/math/clc_exp_helper.h | 6 +++---
libclc/clc/include/clc/math/clc_expm1.h | 6 +++---
libclc/clc/include/clc/math/clc_fabs.h | 6 +++---
libclc/clc/include/clc/math/clc_fdim.h | 6 +++---
libclc/clc/include/clc/math/clc_floor.h | 6 +++---
libclc/clc/include/clc/math/clc_fma.h | 6 +++---
libclc/clc/include/clc/math/clc_fmax.h | 6 +++---
libclc/clc/include/clc/math/clc_fmin.h | 6 +++---
libclc/clc/include/clc/math/clc_fmod.h | 6 +++---
libclc/clc/include/clc/math/clc_fract.h | 6 +++---
libclc/clc/include/clc/math/clc_frexp.h | 6 +++---
libclc/clc/include/clc/math/clc_half_cos.h | 6 +++---
libclc/clc/include/clc/math/clc_half_divide.h | 6 +++---
libclc/clc/include/clc/math/clc_half_exp.h | 6 +++---
libclc/clc/include/clc/math/clc_half_exp10.h | 6 +++---
libclc/clc/include/clc/math/clc_half_exp2.h | 6 +++---
libclc/clc/include/clc/math/clc_half_log.h | 6 +++---
libclc/clc/include/clc/math/clc_half_log10.h | 6 +++---
libclc/clc/include/clc/math/clc_half_log2.h | 6 +++---
libclc/clc/include/clc/math/clc_half_powr.h | 6 +++---
libclc/clc/include/clc/math/clc_half_recip.h | 6 +++---
libclc/clc/include/clc/math/clc_half_rsqrt.h | 6 +++---
libclc/clc/include/clc/math/clc_half_sin.h | 6 +++---
libclc/clc/include/clc/math/clc_half_sqrt.h | 6 +++---
libclc/clc/include/clc/math/clc_half_tan.h | 6 +++---
libclc/clc/include/clc/math/clc_hypot.h | 6 +++---
libclc/clc/include/clc/math/clc_ilogb.h | 6 +++---
libclc/clc/include/clc/math/clc_ldexp.h | 6 +++---
libclc/clc/include/clc/math/clc_lgamma.h | 6 +++---
libclc/clc/include/clc/math/clc_lgamma_r.h | 6 +++---
libclc/clc/include/clc/math/clc_log.h | 6 +++---
libclc/clc/include/clc/math/clc_log10.h | 6 +++---
libclc/clc/include/clc/math/clc_log1p.h | 6 +++---
libclc/clc/include/clc/math/clc_log2.h | 6 +++---
libclc/clc/include/clc/math/clc_logb.h | 6 +++---
libclc/clc/include/clc/math/clc_mad.h | 6 +++---
libclc/clc/include/clc/math/clc_maxmag.h | 6 +++---
libclc/clc/include/clc/math/clc_minmag.h | 6 +++---
libclc/clc/include/clc/math/clc_modf.h | 6 +++---
libclc/clc/include/clc/math/clc_nan.h | 6 +++---
libclc/clc/include/clc/math/clc_native_cos.h | 6 +++---
libclc/clc/include/clc/math/clc_native_divide.h | 6 +++---
libclc/clc/include/clc/math/clc_native_exp.h | 6 +++---
libclc/clc/include/clc/math/clc_native_exp10.h | 6 +++---
libclc/clc/include/clc/math/clc_native_exp2.h | 6 +++---
libclc/clc/include/clc/math/clc_native_log.h | 6 +++---
libclc/clc/include/clc/math/clc_native_log10.h | 6 +++---
libclc/clc/include/clc/math/clc_native_log2.h | 6 +++---
libclc/clc/include/clc/math/clc_native_powr.h | 6 +++---
libclc/clc/include/clc/math/clc_native_recip.h | 6 +++---
libclc/clc/include/clc/math/clc_native_rsqrt.h | 6 +++---
libclc/clc/include/clc/math/clc_native_sin.h | 6 +++---
libclc/clc/include/clc/math/clc_native_sqrt.h | 6 +++---
libclc/clc/include/clc/math/clc_native_tan.h | 6 +++---
libclc/clc/include/clc/math/clc_nextafter.h | 6 +++---
libclc/clc/include/clc/math/clc_pow.h | 6 +++---
libclc/clc/include/clc/math/clc_pown.h | 6 +++---
libclc/clc/include/clc/math/clc_powr.h | 6 +++---
libclc/clc/include/clc/math/clc_remainder.h | 6 +++---
libclc/clc/include/clc/math/clc_remquo.h | 6 +++---
libclc/clc/include/clc/math/clc_rint.h | 6 +++---
libclc/clc/include/clc/math/clc_rootn.h | 6 +++---
libclc/clc/include/clc/math/clc_round.h | 6 +++---
libclc/clc/include/clc/math/clc_rsqrt.h | 6 +++---
libclc/clc/include/clc/math/clc_sin.h | 6 +++---
libclc/clc/include/clc/math/clc_sincos.h | 6 +++---
libclc/clc/include/clc/math/clc_sincos_helpers.h | 6 +++---
libclc/clc/include/clc/math/clc_sinh.h | 6 +++---
libclc/clc/include/clc/math/clc_sinpi.h | 6 +++---
libclc/clc/include/clc/math/clc_sqrt.h | 6 +++---
libclc/clc/include/clc/math/clc_subnormal_config.h | 6 +++---
libclc/clc/include/clc/math/clc_tan.h | 6 +++---
libclc/clc/include/clc/math/clc_tanh.h | 6 +++---
libclc/clc/include/clc/math/clc_tanpi.h | 6 +++---
libclc/clc/include/clc/math/clc_tgamma.h | 6 +++---
libclc/clc/include/clc/math/clc_trunc.h | 6 +++---
libclc/clc/include/clc/math/math.h | 6 +++---
libclc/clc/include/clc/math/tables.h | 6 +++---
libclc/clc/include/clc/mem_fence/clc_mem_fence.h | 6 +++---
libclc/clc/include/clc/mem_fence/clc_mem_semantic.h | 6 +++---
libclc/clc/include/clc/misc/clc_shuffle.h | 6 +++---
libclc/clc/include/clc/misc/clc_shuffle2.h | 6 +++---
libclc/clc/include/clc/relational/clc_all.h | 6 +++---
libclc/clc/include/clc/relational/clc_any.h | 6 +++---
libclc/clc/include/clc/relational/clc_bitselect.h | 6 +++---
libclc/clc/include/clc/relational/clc_isequal.h | 6 +++---
libclc/clc/include/clc/relational/clc_isfinite.h | 6 +++---
libclc/clc/include/clc/relational/clc_isgreater.h | 6 +++---
libclc/clc/include/clc/relational/clc_isgreaterequal.h | 6 +++---
libclc/clc/include/clc/relational/clc_isinf.h | 6 +++---
libclc/clc/include/clc/relational/clc_isless.h | 6 +++---
libclc/clc/include/clc/relational/clc_islessequal.h | 6 +++---
libclc/clc/include/clc/relational/clc_islessgreater.h | 6 +++---
libclc/clc/include/clc/relational/clc_isnan.h | 6 +++---
libclc/clc/include/clc/relational/clc_isnormal.h | 6 +++---
libclc/clc/include/clc/relational/clc_isnotequal.h | 6 +++---
libclc/clc/include/clc/relational/clc_isordered.h | 6 +++---
libclc/clc/include/clc/relational/clc_issubnormal.h | 6 +++---
libclc/clc/include/clc/relational/clc_isunordered.h | 6 +++---
libclc/clc/include/clc/relational/clc_select.h | 6 +++---
libclc/clc/include/clc/relational/clc_signbit.h | 6 +++---
libclc/clc/include/clc/relational/relational.h | 6 +++---
libclc/clc/include/clc/shared/clc_clamp.h | 6 +++---
libclc/clc/include/clc/shared/clc_less_aligned_types.h | 6 +++---
libclc/clc/include/clc/shared/clc_max.h | 6 +++---
libclc/clc/include/clc/shared/clc_min.h | 6 +++---
libclc/clc/include/clc/shared/clc_vload.h | 6 +++---
libclc/clc/include/clc/shared/clc_vstore.h | 6 +++---
.../include/clc/synchronization/clc_work_group_barrier.h | 6 +++---
libclc/clc/include/clc/utils.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_global_id.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_global_offset.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_global_size.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_group_id.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_local_id.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_local_linear_id.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_local_size.h | 6 +++---
.../clc/include/clc/workitem/clc_get_max_sub_group_size.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_num_groups.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_sub_group_id.h | 6 +++---
.../clc/include/clc/workitem/clc_get_sub_group_local_id.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_sub_group_size.h | 6 +++---
libclc/clc/include/clc/workitem/clc_get_work_dim.h | 6 +++---
libclc/clc/lib/generic/integer/clc_mad24.cl | 2 +-
libclc/clc/lib/generic/math/clc_log_base.h | 5 +++++
libclc/clc/lib/generic/math/clc_sincos_helpers.inc | 3 +--
207 files changed, 625 insertions(+), 609 deletions(-)
create mode 100644 libclc/.clang-tidy
diff --git a/libclc/.clang-tidy b/libclc/.clang-tidy
new file mode 100644
index 0000000000000..3638581156209
--- /dev/null
+++ b/libclc/.clang-tidy
@@ -0,0 +1,7 @@
+InheritParentConfig: true
+# Disable bugprone-reserved-identifier and bugprone-macro-parentheses as libclc,
+# uses reserved identifiers (__prefix) for internal macros/functions.
+# Disable readability-identifier-naming to preserve existing naming (LOG2_HEAD, etc).
+Checks: 'bugprone-*,-bugprone-reserved-identifier,-bugprone-macro-parentheses,performance-*,llvm-header-guard,-readability-identifier-naming'
+WarningsAsErrors: 'bugprone-*'
+HeaderFilterRegex: 'libclc/.*'
diff --git a/libclc/clc/include/clc/async/clc_prefetch.h b/libclc/clc/include/clc/async/clc_prefetch.h
index a416d97fa0ae7..ddcd43f865e28 100644
--- a/libclc/clc/include/clc/async/clc_prefetch.h
+++ b/libclc/clc/include/clc/async/clc_prefetch.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ASYNC_CLC_PREFETCH_H__
-#define __CLC_ASYNC_CLC_PREFETCH_H__
+#ifndef CLC_ASYNC_CLC_PREFETCH_H
+#define CLC_ASYNC_CLC_PREFETCH_H
#define __CLC_BODY <clc/async/clc_prefetch.inc>
#include <clc/integer/gentype.inc>
@@ -15,4 +15,4 @@
#define __CLC_BODY <clc/async/clc_prefetch.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_ASYNC_CLC_PREFETCH_H__
+#endif // CLC_ASYNC_CLC_PREFETCH_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h b/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h
index 31b8167223502..c59afd17e20fb 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_compare_exchange.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H
+#define CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H
#include <clc/internal/clc.h>
@@ -23,4 +23,4 @@
#undef __CLC_COMPARE_EXCHANGE
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_COMPARE_EXCHANGE_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_dec.h b/libclc/clc/include/clc/atomic/clc_atomic_dec.h
index 66302b6b9ade2..103c1bae9b727 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_dec.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_dec.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_DEC_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_DEC_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_DEC_H
+#define CLC_ATOMIC_CLC_ATOMIC_DEC_H
#include <clc/internal/clc.h>
@@ -20,4 +20,4 @@
#undef __CLC_NO_VALUE_ARG
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_DEC_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_DEC_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_exchange.h b/libclc/clc/include/clc/atomic/clc_atomic_exchange.h
index 321cfb4030851..1200435ba89bf 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_exchange.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_exchange.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H
+#define CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H
#include <clc/internal/clc.h>
@@ -21,4 +21,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_EXCHANGE_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h
index 4ef29fce50af8..c2af41df7535c 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_add.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H
+#define CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H
#include <clc/internal/clc.h>
@@ -21,4 +21,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_FETCH_ADD_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h
index 688c11287db50..4e72a2e3b0455 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_and.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H
+#define CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H
#include <clc/internal/clc.h>
@@ -18,4 +18,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_FETCH_AND_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h
index a4e44b88a697f..1d480240cbf9d 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_max.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H
+#define CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H
#include <clc/internal/clc.h>
@@ -21,4 +21,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_FETCH_MAX_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h
index b58b538649e19..9c24f00e77bc7 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_min.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H
+#define CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H
#include <clc/internal/clc.h>
@@ -21,4 +21,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_FETCH_MIN_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h
index ab303cc673ba2..d3ce578dc8e08 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_or.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H
+#define CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H
#include <clc/internal/clc.h>
@@ -18,4 +18,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_FETCH_OR_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h
index d9deae085a61e..cd34f3052ee15 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_sub.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H
+#define CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H
#include <clc/internal/clc.h>
@@ -21,4 +21,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_FETCH_SUB_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h b/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h
index fe13a641fc1cd..1d8d8598677c2 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_fetch_xor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H
+#define CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H
#include <clc/internal/clc.h>
@@ -18,4 +18,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_FETCH_XOR_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h b/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h
index fee7c0506abc1..7b0a80343f74d 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_flag_clear.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H
+#define CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H
#include <clc/internal/clc.h>
@@ -21,4 +21,4 @@ __CLC_DECLARE_ATOMIC_FLAG_CLEAR(local)
__CLC_DECLARE_ATOMIC_FLAG_CLEAR()
#endif
-#endif // __CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_FLAG_CLEAR_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h b/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h
index afc373204ad70..392a78ce52f18 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_flag_test_and_set.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H
+#define CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H
#include <clc/internal/clc.h>
@@ -21,4 +21,4 @@ __CLC_DECLARE_ATOMIC_FLAG_TEST_AND_SET(local)
__CLC_DECLARE_ATOMIC_FLAG_TEST_AND_SET()
#endif
-#endif // __CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_FLAG_TEST_AND_SET_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_inc.h b/libclc/clc/include/clc/atomic/clc_atomic_inc.h
index c6fcdad30949b..73540a41d63d3 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_inc.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_inc.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_INC_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_INC_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_INC_H
+#define CLC_ATOMIC_CLC_ATOMIC_INC_H
#include <clc/internal/clc.h>
@@ -20,4 +20,4 @@
#undef __CLC_NO_VALUE_ARG
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_INC_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_INC_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_load.h b/libclc/clc/include/clc/atomic/clc_atomic_load.h
index 3abfce86b1947..c177d1cdf841d 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_load.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_load.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_LOAD_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_LOAD_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_LOAD_H
+#define CLC_ATOMIC_CLC_ATOMIC_LOAD_H
#include <clc/internal/clc.h>
@@ -23,4 +23,4 @@
#undef __CLC_NO_VALUE_ARG
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_LOAD_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_LOAD_H
diff --git a/libclc/clc/include/clc/atomic/clc_atomic_store.h b/libclc/clc/include/clc/atomic/clc_atomic_store.h
index 94d77621735d0..4e1ed1df427ba 100644
--- a/libclc/clc/include/clc/atomic/clc_atomic_store.h
+++ b/libclc/clc/include/clc/atomic/clc_atomic_store.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_ATOMIC_CLC_ATOMIC_STORE_H__
-#define __CLC_ATOMIC_CLC_ATOMIC_STORE_H__
+#ifndef CLC_ATOMIC_CLC_ATOMIC_STORE_H
+#define CLC_ATOMIC_CLC_ATOMIC_STORE_H
#include <clc/internal/clc.h>
@@ -23,4 +23,4 @@
#undef __CLC_RETURN_VOID
#undef __CLC_FUNCTION
-#endif // __CLC_ATOMIC_CLC_ATOMIC_STORE_H__
+#endif // CLC_ATOMIC_CLC_ATOMIC_STORE_H
diff --git a/libclc/clc/include/clc/clc_as_type.h b/libclc/clc/include/clc/clc_as_type.h
index 62fee71da8b02..fce97937b3251 100644
--- a/libclc/clc/include/clc/clc_as_type.h
+++ b/libclc/clc/include/clc/clc_as_type.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_CLC_AS_TYPE_H__
-#define __CLC_CLC_AS_TYPE_H__
+#ifndef CLC_CLC_AS_TYPE_H
+#define CLC_CLC_AS_TYPE_H
#define __clc_as_char(x) __builtin_astype(x, char)
#define __clc_as_uchar(x) __builtin_astype(x, uchar)
@@ -87,4 +87,4 @@
#define __clc_as_half16(x) __builtin_astype(x, half16)
#endif
-#endif // __CLC_CLC_AS_TYPE_H__
+#endif // CLC_CLC_AS_TYPE_H
diff --git a/libclc/clc/include/clc/clc_convert.h b/libclc/clc/include/clc/clc_convert.h
index 97cfa667c8b16..9bc6a87f1552a 100644
--- a/libclc/clc/include/clc/clc_convert.h
+++ b/libclc/clc/include/clc/clc_convert.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_CLC_CONVERT_H__
-#define __CLC_CLC_CONVERT_H__
+#ifndef CLC_CLC_CONVERT_H
+#define CLC_CLC_CONVERT_H
#include <clc/internal/clc.h>
@@ -105,4 +105,4 @@ _CLC_VECTOR_CONVERT_TO_SUFFIX()
#undef _CLC_VECTOR_CONVERT_DECL
#undef _CLC_CONVERT_DECL
-#endif // __CLC_CLC_CONVERT_H__
+#endif // CLC_CLC_CONVERT_H
diff --git a/libclc/clc/include/clc/clcfunc.h b/libclc/clc/include/clc/clcfunc.h
index 5457a1892ac87..bdc92d7656f1e 100644
--- a/libclc/clc/include/clc/clcfunc.h
+++ b/libclc/clc/include/clc/clcfunc.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_CLCFUNC_H_
-#define __CLC_CLCFUNC_H_
+#ifndef CLC_CLCFUNC_H
+#define CLC_CLCFUNC_H
#define _CLC_OVERLOAD __attribute__((overloadable))
#define _CLC_DECL
@@ -34,4 +34,4 @@
#define _CLC_DISTINCT_GENERIC_AS_SUPPORTED 0
#endif
-#endif // __CLC_CLCFUNC_H_
+#endif // CLC_CLCFUNC_H
diff --git a/libclc/clc/include/clc/common/clc_degrees.h b/libclc/clc/include/clc/common/clc_degrees.h
index 5f04fac1f2612..7dacf4f190cd7 100644
--- a/libclc/clc/include/clc/common/clc_degrees.h
+++ b/libclc/clc/include/clc/common/clc_degrees.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_COMMON_CLC_DEGREES_H__
-#define __CLC_COMMON_CLC_DEGREES_H__
+#ifndef CLC_COMMON_CLC_DEGREES_H
+#define CLC_COMMON_CLC_DEGREES_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_degrees
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_COMMON_CLC_DEGREES_H__
+#endif // CLC_COMMON_CLC_DEGREES_H
diff --git a/libclc/clc/include/clc/common/clc_radians.h b/libclc/clc/include/clc/common/clc_radians.h
index 03d7c4b9e3014..c798f3f4677cd 100644
--- a/libclc/clc/include/clc/common/clc_radians.h
+++ b/libclc/clc/include/clc/common/clc_radians.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_COMMON_CLC_RADIANS_H__
-#define __CLC_COMMON_CLC_RADIANS_H__
+#ifndef CLC_COMMON_CLC_RADIANS_H
+#define CLC_COMMON_CLC_RADIANS_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_radians
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_COMMON_CLC_RADIANS_H__
+#endif // CLC_COMMON_CLC_RADIANS_H
diff --git a/libclc/clc/include/clc/common/clc_sign.h b/libclc/clc/include/clc/common/clc_sign.h
index 9737f1e54441b..ac91ab512fddb 100644
--- a/libclc/clc/include/clc/common/clc_sign.h
+++ b/libclc/clc/include/clc/common/clc_sign.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_COMMON_CLC_SIGN_H__
-#define __CLC_COMMON_CLC_SIGN_H__
+#ifndef CLC_COMMON_CLC_SIGN_H
+#define CLC_COMMON_CLC_SIGN_H
#define __CLC_FUNCTION __clc_sign
#define __CLC_BODY <clc/math/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_COMMON_CLC_SIGN_H__
+#endif // CLC_COMMON_CLC_SIGN_H
diff --git a/libclc/clc/include/clc/common/clc_smoothstep.h b/libclc/clc/include/clc/common/clc_smoothstep.h
index 80a28a1bbb1f8..803d3f7aa1518 100644
--- a/libclc/clc/include/clc/common/clc_smoothstep.h
+++ b/libclc/clc/include/clc/common/clc_smoothstep.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_COMMON_CLC_SMOOTHSTEP_H__
-#define __CLC_COMMON_CLC_SMOOTHSTEP_H__
+#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.
@@ -15,4 +15,4 @@
#define __CLC_BODY <clc/common/clc_smoothstep.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_COMMON_CLC_SMOOTHSTEP_H__
+#endif // CLC_COMMON_CLC_SMOOTHSTEP_H
diff --git a/libclc/clc/include/clc/common/clc_step.h b/libclc/clc/include/clc/common/clc_step.h
index 6b093d06896c0..dc51d50cc35c2 100644
--- a/libclc/clc/include/clc/common/clc_step.h
+++ b/libclc/clc/include/clc/common/clc_step.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_COMMON_CLC_STEP_H__
-#define __CLC_COMMON_CLC_STEP_H__
+#ifndef CLC_COMMON_CLC_STEP_H
+#define CLC_COMMON_CLC_STEP_H
#define __CLC_FUNCTION __clc_step
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_COMMON_CLC_STEP_H__
+#endif // CLC_COMMON_CLC_STEP_H
diff --git a/libclc/clc/include/clc/float/definitions.h b/libclc/clc/include/clc/float/definitions.h
index 25f35a4ef68ec..4eaca6a90bd9a 100644
--- a/libclc/clc/include/clc/float/definitions.h
+++ b/libclc/clc/include/clc/float/definitions.h
@@ -1,3 +1,6 @@
+#ifndef CLC_FLOAT_DEFINITIONS_H
+#define CLC_FLOAT_DEFINITIONS_H
+
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -60,3 +63,5 @@
#define HALF_NAN __builtin_nanf16("")
#endif
+
+#endif
diff --git a/libclc/clc/include/clc/geometric/clc_cross.h b/libclc/clc/include/clc/geometric/clc_cross.h
index c0a9cacbc3383..e007843464941 100644
--- a/libclc/clc/include/clc/geometric/clc_cross.h
+++ b/libclc/clc/include/clc/geometric/clc_cross.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_GEOMETRIC_CLC_CROSS_H__
-#define __CLC_GEOMETRIC_CLC_CROSS_H__
+#ifndef CLC_GEOMETRIC_CLC_CROSS_H
+#define CLC_GEOMETRIC_CLC_CROSS_H
#include <clc/internal/clc.h>
@@ -30,4 +30,4 @@ _CLC_OVERLOAD _CLC_CONST _CLC_DECL half4 __clc_cross(half4 p0, half4 p1);
#endif
-#endif // __CLC_GEOMETRIC_CLC_CROSS_H__
+#endif // CLC_GEOMETRIC_CLC_CROSS_H
diff --git a/libclc/clc/include/clc/geometric/clc_distance.h b/libclc/clc/include/clc/geometric/clc_distance.h
index 1acea411a08b6..76eb390e607e7 100644
--- a/libclc/clc/include/clc/geometric/clc_distance.h
+++ b/libclc/clc/include/clc/geometric/clc_distance.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_GEOMETRIC_CLC_DISTANCE_H__
-#define __CLC_GEOMETRIC_CLC_DISTANCE_H__
+#ifndef CLC_GEOMETRIC_CLC_DISTANCE_H
+#define CLC_GEOMETRIC_CLC_DISTANCE_H
#define __CLC_FUNCTION __clc_distance
#define __CLC_BODY <clc/geometric/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_GEOMETRIC_CLC_DISTANCE_H__
+#endif // CLC_GEOMETRIC_CLC_DISTANCE_H
diff --git a/libclc/clc/include/clc/geometric/clc_dot.h b/libclc/clc/include/clc/geometric/clc_dot.h
index a5a97d1bdd2bc..18d0d9df34764 100644
--- a/libclc/clc/include/clc/geometric/clc_dot.h
+++ b/libclc/clc/include/clc/geometric/clc_dot.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_GEOMETRIC_CLC_DOT_H__
-#define __CLC_GEOMETRIC_CLC_DOT_H__
+#ifndef CLC_GEOMETRIC_CLC_DOT_H
+#define CLC_GEOMETRIC_CLC_DOT_H
#define __CLC_FUNCTION __clc_dot
#define __CLC_BODY <clc/geometric/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_GEOMETRIC_CLC_DOT_H__
+#endif // CLC_GEOMETRIC_CLC_DOT_H
diff --git a/libclc/clc/include/clc/geometric/clc_fast_distance.h b/libclc/clc/include/clc/geometric/clc_fast_distance.h
index 47292130e9d68..14a5f15981caf 100644
--- a/libclc/clc/include/clc/geometric/clc_fast_distance.h
+++ b/libclc/clc/include/clc/geometric/clc_fast_distance.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_GEOMETRIC_CLC_FAST_DISTANCE_H__
-#define __CLC_GEOMETRIC_CLC_FAST_DISTANCE_H__
+#ifndef CLC_GEOMETRIC_CLC_FAST_DISTANCE_H
+#define CLC_GEOMETRIC_CLC_FAST_DISTANCE_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_fast_distance
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_GEOMETRIC_CLC_FAST_DISTANCE_H__
+#endif // CLC_GEOMETRIC_CLC_FAST_DISTANCE_H
diff --git a/libclc/clc/include/clc/geometric/clc_fast_length.h b/libclc/clc/include/clc/geometric/clc_fast_length.h
index 2244d8c77feaa..c7cd9219444f1 100644
--- a/libclc/clc/include/clc/geometric/clc_fast_length.h
+++ b/libclc/clc/include/clc/geometric/clc_fast_length.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_GEOMETRIC_CLC_FAST_LENGTH_H__
-#define __CLC_GEOMETRIC_CLC_FAST_LENGTH_H__
+#ifndef CLC_GEOMETRIC_CLC_FAST_LENGTH_H
+#define CLC_GEOMETRIC_CLC_FAST_LENGTH_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_fast_length
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_GEOMETRIC_CLC_FAST_LENGTH_H__
+#endif // CLC_GEOMETRIC_CLC_FAST_LENGTH_H
diff --git a/libclc/clc/include/clc/geometric/clc_fast_normalize.h b/libclc/clc/include/clc/geometric/clc_fast_normalize.h
index ee9747c1af1e3..677d45b9978f5 100644
--- a/libclc/clc/include/clc/geometric/clc_fast_normalize.h
+++ b/libclc/clc/include/clc/geometric/clc_fast_normalize.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_GEOMETRIC_CLC_FAST_NORMALIZE_H__
-#define __CLC_GEOMETRIC_CLC_FAST_NORMALIZE_H__
+#ifndef CLC_GEOMETRIC_CLC_FAST_NORMALIZE_H
+#define CLC_GEOMETRIC_CLC_FAST_NORMALIZE_H
#define __CLC_FLOAT_ONLY
#define __CLC_GEOMETRIC_RET_GENTYPE
@@ -18,4 +18,4 @@
#undef __CLC_FUNCTION
#undef __CLC_GEOMETRIC_RET_GENTYPE
-#endif // __CLC_GEOMETRIC_CLC_FAST_NORMALIZE_H__
+#endif // CLC_GEOMETRIC_CLC_FAST_NORMALIZE_H
diff --git a/libclc/clc/include/clc/geometric/clc_length.h b/libclc/clc/include/clc/geometric/clc_length.h
index f8ce12db07871..43e8dbd9b8459 100644
--- a/libclc/clc/include/clc/geometric/clc_length.h
+++ b/libclc/clc/include/clc/geometric/clc_length.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_GEOMETRIC_CLC_LENGTH_H__
-#define __CLC_GEOMETRIC_CLC_LENGTH_H__
+#ifndef CLC_GEOMETRIC_CLC_LENGTH_H
+#define CLC_GEOMETRIC_CLC_LENGTH_H
#define __CLC_FUNCTION __clc_length
#define __CLC_BODY <clc/geometric/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_GEOMETRIC_CLC_LENGTH_H__
+#endif // CLC_GEOMETRIC_CLC_LENGTH_H
diff --git a/libclc/clc/include/clc/geometric/clc_normalize.h b/libclc/clc/include/clc/geometric/clc_normalize.h
index 3058a72b2bbbe..49e42e1d5933a 100644
--- a/libclc/clc/include/clc/geometric/clc_normalize.h
+++ b/libclc/clc/include/clc/geometric/clc_normalize.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_GEOMETRIC_CLC_NORMALIZE_H__
-#define __CLC_GEOMETRIC_CLC_NORMALIZE_H__
+#ifndef CLC_GEOMETRIC_CLC_NORMALIZE_H
+#define CLC_GEOMETRIC_CLC_NORMALIZE_H
#define __CLC_GEOMETRIC_RET_GENTYPE
#define __CLC_FUNCTION __clc_normalize
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
#undef __CLC_GEOMETRIC_RET_GENTYPE
-#endif // __CLC_GEOMETRIC_CLC_NORMALIZE_H__
+#endif // CLC_GEOMETRIC_CLC_NORMALIZE_H
diff --git a/libclc/clc/include/clc/integer/clc_abs.h b/libclc/clc/include/clc/integer/clc_abs.h
index a3474dbe7d824..45fb922707b7d 100644
--- a/libclc/clc/include/clc/integer/clc_abs.h
+++ b/libclc/clc/include/clc/integer/clc_abs.h
@@ -6,10 +6,10 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_ABS_H__
-#define __CLC_INTEGER_CLC_ABS_H__
+#ifndef CLC_INTEGER_CLC_ABS_H
+#define CLC_INTEGER_CLC_ABS_H
#define __CLC_BODY <clc/integer/clc_abs.inc>
#include <clc/integer/gentype.inc>
-#endif // __CLC_INTEGER_CLC_ABS_H__
+#endif // CLC_INTEGER_CLC_ABS_H
diff --git a/libclc/clc/include/clc/integer/clc_abs_diff.h b/libclc/clc/include/clc/integer/clc_abs_diff.h
index 1bad6dc0f469d..8a1ab11719ee4 100644
--- a/libclc/clc/include/clc/integer/clc_abs_diff.h
+++ b/libclc/clc/include/clc/integer/clc_abs_diff.h
@@ -6,10 +6,10 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_ABS_DIFF_H__
-#define __CLC_INTEGER_CLC_ABS_DIFF_H__
+#ifndef CLC_INTEGER_CLC_ABS_DIFF_H
+#define CLC_INTEGER_CLC_ABS_DIFF_H
#define __CLC_BODY <clc/integer/clc_abs_diff.inc>
#include <clc/integer/gentype.inc>
-#endif // __CLC_INTEGER_CLC_ABS_DIFF_H__
+#endif // CLC_INTEGER_CLC_ABS_DIFF_H
diff --git a/libclc/clc/include/clc/integer/clc_add_sat.h b/libclc/clc/include/clc/integer/clc_add_sat.h
index 8c3495f6c5193..952c7dded955b 100644
--- a/libclc/clc/include/clc/integer/clc_add_sat.h
+++ b/libclc/clc/include/clc/integer/clc_add_sat.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_ADD_SAT_H__
-#define __CLC_INTEGER_CLC_ADD_SAT_H__
+#ifndef CLC_INTEGER_CLC_ADD_SAT_H
+#define CLC_INTEGER_CLC_ADD_SAT_H
#define __CLC_FUNCTION __clc_add_sat
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_ADD_SAT_H__
+#endif // CLC_INTEGER_CLC_ADD_SAT_H
diff --git a/libclc/clc/include/clc/integer/clc_bit_reverse.h b/libclc/clc/include/clc/integer/clc_bit_reverse.h
index de0c354b3fa4e..ea040068c51f8 100644
--- a/libclc/clc/include/clc/integer/clc_bit_reverse.h
+++ b/libclc/clc/include/clc/integer/clc_bit_reverse.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_BIT_REVERSE_H__
-#define __CLC_INTEGER_CLC_BIT_REVERSE_H__
+#ifndef CLC_INTEGER_CLC_BIT_REVERSE_H
+#define CLC_INTEGER_CLC_BIT_REVERSE_H
#define __CLC_FUNCTION __clc_bit_reverse
#define __CLC_BODY <clc/shared/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_BIT_REVERSE_H__
+#endif // CLC_INTEGER_CLC_BIT_REVERSE_H
diff --git a/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h b/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h
index 7998196512b30..208d17b1ccd6a 100644
--- a/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h
+++ b/libclc/clc/include/clc/integer/clc_bitfield_extract_signed.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
-#define __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
+#ifndef CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H
+#define CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H
#include <clc/internal/clc.h>
@@ -20,4 +20,4 @@
#undef __CLC_RETTYPE
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
+#endif // CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H
diff --git a/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h b/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h
index 84614056417f4..3e6e42f7f0102 100644
--- a/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h
+++ b/libclc/clc/include/clc/integer/clc_bitfield_extract_unsigned.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
-#define __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
+#ifndef CLC_INTEGER_CLC_BITFIELD_EXTRACT_UNSIGNED_H
+#define CLC_INTEGER_CLC_BITFIELD_EXTRACT_UNSIGNED_H
#include <clc/internal/clc.h>
@@ -20,4 +20,4 @@
#undef __CLC_RETTYPE
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_BITFIELD_EXTRACT_SIGNED_H__
+#endif // CLC_INTEGER_CLC_BITFIELD_EXTRACT_UNSIGNED_H
diff --git a/libclc/clc/include/clc/integer/clc_bitfield_insert.h b/libclc/clc/include/clc/integer/clc_bitfield_insert.h
index b284c0bf932d5..97918fa4493e4 100644
--- a/libclc/clc/include/clc/integer/clc_bitfield_insert.h
+++ b/libclc/clc/include/clc/integer/clc_bitfield_insert.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_BITFIELD_INSERT_H__
-#define __CLC_INTEGER_CLC_BITFIELD_INSERT_H__
+#ifndef CLC_INTEGER_CLC_BITFIELD_INSERT_H
+#define CLC_INTEGER_CLC_BITFIELD_INSERT_H
#include <clc/internal/clc.h>
@@ -15,4 +15,4 @@
#define __CLC_BODY <clc/integer/clc_bitfield_insert.inc>
#include <clc/integer/gentype.inc>
-#endif // __CLC_INTEGER_CLC_BITFIELD_INSERT_H__
+#endif // CLC_INTEGER_CLC_BITFIELD_INSERT_H
diff --git a/libclc/clc/include/clc/integer/clc_clz.h b/libclc/clc/include/clc/integer/clc_clz.h
index dd62cc935f8cd..3da3ce985ad7e 100644
--- a/libclc/clc/include/clc/integer/clc_clz.h
+++ b/libclc/clc/include/clc/integer/clc_clz.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_CLZ_H__
-#define __CLC_INTEGER_CLC_CLZ_H__
+#ifndef CLC_INTEGER_CLC_CLZ_H
+#define CLC_INTEGER_CLC_CLZ_H
#define __CLC_FUNCTION __clc_clz
#define __CLC_BODY <clc/shared/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_CLZ_H__
+#endif // CLC_INTEGER_CLC_CLZ_H
diff --git a/libclc/clc/include/clc/integer/clc_ctz.h b/libclc/clc/include/clc/integer/clc_ctz.h
index 3f2079e023f67..73b6a92863522 100644
--- a/libclc/clc/include/clc/integer/clc_ctz.h
+++ b/libclc/clc/include/clc/integer/clc_ctz.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_CTZ_H__
-#define __CLC_INTEGER_CLC_CTZ_H__
+#ifndef CLC_INTEGER_CLC_CTZ_H
+#define CLC_INTEGER_CLC_CTZ_H
#define __CLC_FUNCTION __clc_ctz
#define __CLC_BODY <clc/shared/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_CTZ_H__
+#endif // CLC_INTEGER_CLC_CTZ_H
diff --git a/libclc/clc/include/clc/integer/clc_hadd.h b/libclc/clc/include/clc/integer/clc_hadd.h
index 679369d3c9d4e..e26df1529196d 100644
--- a/libclc/clc/include/clc/integer/clc_hadd.h
+++ b/libclc/clc/include/clc/integer/clc_hadd.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_HADD_H__
-#define __CLC_INTEGER_CLC_HADD_H__
+#ifndef CLC_INTEGER_CLC_HADD_H
+#define CLC_INTEGER_CLC_HADD_H
#define __CLC_FUNCTION __clc_hadd
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_HADD_H__
+#endif // CLC_INTEGER_CLC_HADD_H
diff --git a/libclc/clc/include/clc/integer/clc_mad24.h b/libclc/clc/include/clc/integer/clc_mad24.h
index e19bd905d22eb..a291ce08de0a4 100644
--- a/libclc/clc/include/clc/integer/clc_mad24.h
+++ b/libclc/clc/include/clc/integer/clc_mad24.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_MAD24_H__
-#define __CLC_INTEGER_CLC_MAD24_H__
+#ifndef CLC_INTEGER_CLC_MAD24_H
+#define CLC_INTEGER_CLC_MAD24_H
#define __CLC_FUNCTION __clc_mad24
#define __CLC_BODY <clc/shared/ternary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_MAD24_H__
+#endif // CLC_INTEGER_CLC_MAD24_H
diff --git a/libclc/clc/include/clc/integer/clc_mad_hi.h b/libclc/clc/include/clc/integer/clc_mad_hi.h
index 07e8c0bb6beec..a27ae38514806 100644
--- a/libclc/clc/include/clc/integer/clc_mad_hi.h
+++ b/libclc/clc/include/clc/integer/clc_mad_hi.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_MAD_HI_H__
-#define __CLC_INTEGER_CLC_MAD_HI_H__
+#ifndef CLC_INTEGER_CLC_MAD_HI_H
+#define CLC_INTEGER_CLC_MAD_HI_H
#include <clc/integer/clc_mul_hi.h>
#define __clc_mad_hi(a, b, c) (__clc_mul_hi((a), (b)) + (c))
-#endif // __CLC_INTEGER_CLC_MAD_HI_H__
+#endif // CLC_INTEGER_CLC_MAD_HI_H
diff --git a/libclc/clc/include/clc/integer/clc_mad_sat.h b/libclc/clc/include/clc/integer/clc_mad_sat.h
index 845378b3e7c46..3710798bb04a0 100644
--- a/libclc/clc/include/clc/integer/clc_mad_sat.h
+++ b/libclc/clc/include/clc/integer/clc_mad_sat.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_MAD_SAT_H__
-#define __CLC_INTEGER_CLC_MAD_SAT_H__
+#ifndef CLC_INTEGER_CLC_MAD_SAT_H
+#define CLC_INTEGER_CLC_MAD_SAT_H
#define __CLC_FUNCTION __clc_mad_sat
#define __CLC_BODY <clc/shared/ternary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_MAD_SAT_H__
+#endif // CLC_INTEGER_CLC_MAD_SAT_H
diff --git a/libclc/clc/include/clc/integer/clc_mul24.h b/libclc/clc/include/clc/integer/clc_mul24.h
index f813de55c71e5..50fc7a96fcda5 100644
--- a/libclc/clc/include/clc/integer/clc_mul24.h
+++ b/libclc/clc/include/clc/integer/clc_mul24.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_MUL24_H__
-#define __CLC_INTEGER_CLC_MUL24_H__
+#ifndef CLC_INTEGER_CLC_MUL24_H
+#define CLC_INTEGER_CLC_MUL24_H
#define __CLC_FUNCTION __clc_mul24
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_MUL24_H__
+#endif // CLC_INTEGER_CLC_MUL24_H
diff --git a/libclc/clc/include/clc/integer/clc_mul_hi.h b/libclc/clc/include/clc/integer/clc_mul_hi.h
index e4738e5570e81..9ac8b79efeceb 100644
--- a/libclc/clc/include/clc/integer/clc_mul_hi.h
+++ b/libclc/clc/include/clc/integer/clc_mul_hi.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_MUL_HI_H__
-#define __CLC_INTEGER_CLC_MUL_HI_H__
+#ifndef CLC_INTEGER_CLC_MUL_HI_H
+#define CLC_INTEGER_CLC_MUL_HI_H
#define __CLC_FUNCTION __clc_mul_hi
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_MUL_HI_H__
+#endif // CLC_INTEGER_CLC_MUL_HI_H
diff --git a/libclc/clc/include/clc/integer/clc_popcount.h b/libclc/clc/include/clc/integer/clc_popcount.h
index 55ca6ccfcec28..4afb162870107 100644
--- a/libclc/clc/include/clc/integer/clc_popcount.h
+++ b/libclc/clc/include/clc/integer/clc_popcount.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_POPCOUNT_H__
-#define __CLC_INTEGER_CLC_POPCOUNT_H__
+#ifndef CLC_INTEGER_CLC_POPCOUNT_H
+#define CLC_INTEGER_CLC_POPCOUNT_H
#define __CLC_FUNCTION __clc_popcount
#define __CLC_BODY <clc/shared/unary_decl.inc>
@@ -17,4 +17,4 @@
#undef __CLC_INTRINSIC
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_POPCOUNT_H__
+#endif // CLC_INTEGER_CLC_POPCOUNT_H
diff --git a/libclc/clc/include/clc/integer/clc_rhadd.h b/libclc/clc/include/clc/integer/clc_rhadd.h
index b8b0b1a3a56ed..ff32b467ca677 100644
--- a/libclc/clc/include/clc/integer/clc_rhadd.h
+++ b/libclc/clc/include/clc/integer/clc_rhadd.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_RHADD_H__
-#define __CLC_INTEGER_CLC_RHADD_H__
+#ifndef CLC_INTEGER_CLC_RHADD_H
+#define CLC_INTEGER_CLC_RHADD_H
#define __CLC_FUNCTION __clc_rhadd
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_RHADD_H__
+#endif // CLC_INTEGER_CLC_RHADD_H
diff --git a/libclc/clc/include/clc/integer/clc_rotate.h b/libclc/clc/include/clc/integer/clc_rotate.h
index 513bf98526233..a7af2bef63709 100644
--- a/libclc/clc/include/clc/integer/clc_rotate.h
+++ b/libclc/clc/include/clc/integer/clc_rotate.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_ROTATE_H__
-#define __CLC_INTEGER_CLC_ROTATE_H__
+#ifndef CLC_INTEGER_CLC_ROTATE_H
+#define CLC_INTEGER_CLC_ROTATE_H
#define __CLC_FUNCTION __clc_rotate
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_ROTATE_H__
+#endif // CLC_INTEGER_CLC_ROTATE_H
diff --git a/libclc/clc/include/clc/integer/clc_sub_sat.h b/libclc/clc/include/clc/integer/clc_sub_sat.h
index 94a5484adefcf..d138ccc3eadd5 100644
--- a/libclc/clc/include/clc/integer/clc_sub_sat.h
+++ b/libclc/clc/include/clc/integer/clc_sub_sat.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_SUB_SAT_H__
-#define __CLC_INTEGER_CLC_SUB_SAT_H__
+#ifndef CLC_INTEGER_CLC_SUB_SAT_H
+#define CLC_INTEGER_CLC_SUB_SAT_H
#define __CLC_FUNCTION __clc_sub_sat
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTEGER_CLC_SUB_SAT_H__
+#endif // CLC_INTEGER_CLC_SUB_SAT_H
diff --git a/libclc/clc/include/clc/integer/clc_upsample.h b/libclc/clc/include/clc/integer/clc_upsample.h
index ca3b8a9102991..788332f9cb1fd 100644
--- a/libclc/clc/include/clc/integer/clc_upsample.h
+++ b/libclc/clc/include/clc/integer/clc_upsample.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_CLC_UPSAMPLE_H__
-#define __CLC_INTEGER_CLC_UPSAMPLE_H__
+#ifndef CLC_INTEGER_CLC_UPSAMPLE_H
+#define CLC_INTEGER_CLC_UPSAMPLE_H
#include <clc/clcfunc.h>
@@ -36,4 +36,4 @@ __CLC_UPSAMPLE_TYPES()
#undef __CLC_UPSAMPLE_DECL
#undef __CLC_UPSAMPLE_VEC
-#endif // __CLC_INTEGER_CLC_UPSAMPLE_H__
+#endif // CLC_INTEGER_CLC_UPSAMPLE_H
diff --git a/libclc/clc/include/clc/integer/definitions.h b/libclc/clc/include/clc/integer/definitions.h
index 3ef8ad27d7c3b..ba615ccb8b5ed 100644
--- a/libclc/clc/include/clc/integer/definitions.h
+++ b/libclc/clc/include/clc/integer/definitions.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTEGER_DEFINITIONS_H__
-#define __CLC_INTEGER_DEFINITIONS_H__
+#ifndef CLC_INTEGER_DEFINITIONS_H
+#define CLC_INTEGER_DEFINITIONS_H
#define CHAR_BIT 8
#define INT_MAX 2147483647
@@ -25,4 +25,4 @@
#define ULONG_MAX 0xffffffffffffffffUL
#define ULONG_MIN 0UL
-#endif // __CLC_INTEGER_DEFINITIONS_H__
+#endif // CLC_INTEGER_DEFINITIONS_H
diff --git a/libclc/clc/include/clc/internal/clc.h b/libclc/clc/include/clc/internal/clc.h
index fcfb223d5a12d..9121498c07a39 100644
--- a/libclc/clc/include/clc/internal/clc.h
+++ b/libclc/clc/include/clc/internal/clc.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTERNAL_CLC_H_
-#define __CLC_INTERNAL_CLC_H_
+#ifndef CLC_INTERNAL_CLC_H
+#define CLC_INTERNAL_CLC_H
#ifndef cl_clang_storage_class_specifiers
#error Implementation requires cl_clang_storage_class_specifiers extension!
@@ -33,4 +33,4 @@
#pragma OPENCL EXTENSION all : disable
-#endif // __CLC_INTERNAL_CLC_H_
+#endif // CLC_INTERNAL_CLC_H
diff --git a/libclc/clc/include/clc/internal/math/clc_sw_fma.h b/libclc/clc/include/clc/internal/math/clc_sw_fma.h
index 4338fb01861c1..c7e64295abb40 100644
--- a/libclc/clc/include/clc/internal/math/clc_sw_fma.h
+++ b/libclc/clc/include/clc/internal/math/clc_sw_fma.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_INTERNAL_MATH_CLC_SW_FMA_H__
-#define __CLC_INTERNAL_MATH_CLC_SW_FMA_H__
+#ifndef CLC_INTERNAL_MATH_CLC_SW_FMA_H
+#define CLC_INTERNAL_MATH_CLC_SW_FMA_H
#define __CLC_FUNCTION __clc_sw_fma
#define __CLC_FLOAT_ONLY
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_INTERNAL_MATH_CLC_SW_FMA_H__
+#endif // CLC_INTERNAL_MATH_CLC_SW_FMA_H
diff --git a/libclc/clc/include/clc/math/clc_acos.h b/libclc/clc/include/clc/math/clc_acos.h
index 1d484fa5b56c9..78d9948caea97 100644
--- a/libclc/clc/include/clc/math/clc_acos.h
+++ b/libclc/clc/include/clc/math/clc_acos.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ACOS_H__
-#define __CLC_MATH_CLC_ACOS_H__
+#ifndef CLC_MATH_CLC_ACOS_H
+#define CLC_MATH_CLC_ACOS_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_acos
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ACOS_H__
+#endif // CLC_MATH_CLC_ACOS_H
diff --git a/libclc/clc/include/clc/math/clc_acosh.h b/libclc/clc/include/clc/math/clc_acosh.h
index 9492724bb27ba..e602ec40b40d7 100644
--- a/libclc/clc/include/clc/math/clc_acosh.h
+++ b/libclc/clc/include/clc/math/clc_acosh.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ACOSH_H__
-#define __CLC_MATH_CLC_ACOSH_H__
+#ifndef CLC_MATH_CLC_ACOSH_H
+#define CLC_MATH_CLC_ACOSH_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_acosh
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ACOSH_H__
+#endif // CLC_MATH_CLC_ACOSH_H
diff --git a/libclc/clc/include/clc/math/clc_acospi.h b/libclc/clc/include/clc/math/clc_acospi.h
index 90cfc06b7dffb..18e26d9bd98ff 100644
--- a/libclc/clc/include/clc/math/clc_acospi.h
+++ b/libclc/clc/include/clc/math/clc_acospi.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ACOSPI_H__
-#define __CLC_MATH_CLC_ACOSPI_H__
+#ifndef CLC_MATH_CLC_ACOSPI_H
+#define CLC_MATH_CLC_ACOSPI_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_acospi
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ACOSPI_H__
+#endif // CLC_MATH_CLC_ACOSPI_H
diff --git a/libclc/clc/include/clc/math/clc_asin.h b/libclc/clc/include/clc/math/clc_asin.h
index f6246c49f8022..2970cce2d0f7c 100644
--- a/libclc/clc/include/clc/math/clc_asin.h
+++ b/libclc/clc/include/clc/math/clc_asin.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ASIN_H__
-#define __CLC_MATH_CLC_ASIN_H__
+#ifndef CLC_MATH_CLC_ASIN_H
+#define CLC_MATH_CLC_ASIN_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_asin
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ASIN_H__
+#endif // CLC_MATH_CLC_ASIN_H
diff --git a/libclc/clc/include/clc/math/clc_asinh.h b/libclc/clc/include/clc/math/clc_asinh.h
index 05e44fa438cee..005ef4dc89f3b 100644
--- a/libclc/clc/include/clc/math/clc_asinh.h
+++ b/libclc/clc/include/clc/math/clc_asinh.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ASINH_H__
-#define __CLC_MATH_CLC_ASINH_H__
+#ifndef CLC_MATH_CLC_ASINH_H
+#define CLC_MATH_CLC_ASINH_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_asinh
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ASINH_H__
+#endif // CLC_MATH_CLC_ASINH_H
diff --git a/libclc/clc/include/clc/math/clc_asinpi.h b/libclc/clc/include/clc/math/clc_asinpi.h
index 8f308dd06022e..b30b101196200 100644
--- a/libclc/clc/include/clc/math/clc_asinpi.h
+++ b/libclc/clc/include/clc/math/clc_asinpi.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ASINPI_H__
-#define __CLC_MATH_CLC_ASINPI_H__
+#ifndef CLC_MATH_CLC_ASINPI_H
+#define CLC_MATH_CLC_ASINPI_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_asinpi
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ASINPI_H__
+#endif // CLC_MATH_CLC_ASINPI_H
diff --git a/libclc/clc/include/clc/math/clc_atan.h b/libclc/clc/include/clc/math/clc_atan.h
index 203e46c2b8a4a..352974d56beb5 100644
--- a/libclc/clc/include/clc/math/clc_atan.h
+++ b/libclc/clc/include/clc/math/clc_atan.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ATAN_H__
-#define __CLC_MATH_CLC_ATAN_H__
+#ifndef CLC_MATH_CLC_ATAN_H
+#define CLC_MATH_CLC_ATAN_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_atan
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ATAN_H__
+#endif // CLC_MATH_CLC_ATAN_H
diff --git a/libclc/clc/include/clc/math/clc_atan2.h b/libclc/clc/include/clc/math/clc_atan2.h
index 6edc9dda48f4d..94bdef7944f7e 100644
--- a/libclc/clc/include/clc/math/clc_atan2.h
+++ b/libclc/clc/include/clc/math/clc_atan2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ATAN2_H__
-#define __CLC_MATH_CLC_ATAN2_H__
+#ifndef CLC_MATH_CLC_ATAN2_H
+#define CLC_MATH_CLC_ATAN2_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_atan2
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ATAN2_H__
+#endif // CLC_MATH_CLC_ATAN2_H
diff --git a/libclc/clc/include/clc/math/clc_atan2pi.h b/libclc/clc/include/clc/math/clc_atan2pi.h
index 2f26d1d9ae985..5452c81d15f6f 100644
--- a/libclc/clc/include/clc/math/clc_atan2pi.h
+++ b/libclc/clc/include/clc/math/clc_atan2pi.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ATAN2PI_H__
-#define __CLC_MATH_CLC_ATAN2PI_H__
+#ifndef CLC_MATH_CLC_ATAN2PI_H
+#define CLC_MATH_CLC_ATAN2PI_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_atan2pi
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ATAN2PI_H__
+#endif // CLC_MATH_CLC_ATAN2PI_H
diff --git a/libclc/clc/include/clc/math/clc_atanh.h b/libclc/clc/include/clc/math/clc_atanh.h
index 85f9fc53be1a6..8494583b9c8c4 100644
--- a/libclc/clc/include/clc/math/clc_atanh.h
+++ b/libclc/clc/include/clc/math/clc_atanh.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ATANH_H__
-#define __CLC_MATH_CLC_ATANH_H__
+#ifndef CLC_MATH_CLC_ATANH_H
+#define CLC_MATH_CLC_ATANH_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_atanh
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ATANH_H__
+#endif // CLC_MATH_CLC_ATANH_H
diff --git a/libclc/clc/include/clc/math/clc_atanpi.h b/libclc/clc/include/clc/math/clc_atanpi.h
index 2b3c6b373ed42..4a26e03a7c005 100644
--- a/libclc/clc/include/clc/math/clc_atanpi.h
+++ b/libclc/clc/include/clc/math/clc_atanpi.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ATANPI_H__
-#define __CLC_MATH_CLC_ATANPI_H__
+#ifndef CLC_MATH_CLC_ATANPI_H
+#define CLC_MATH_CLC_ATANPI_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_atanpi
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ATANPI_H__
+#endif // CLC_MATH_CLC_ATANPI_H
diff --git a/libclc/clc/include/clc/math/clc_cbrt.h b/libclc/clc/include/clc/math/clc_cbrt.h
index fd9b750c8fd89..b75cc4a3c1bb8 100644
--- a/libclc/clc/include/clc/math/clc_cbrt.h
+++ b/libclc/clc/include/clc/math/clc_cbrt.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_CBRT_H__
-#define __CLC_MATH_CLC_CBRT_H__
+#ifndef CLC_MATH_CLC_CBRT_H
+#define CLC_MATH_CLC_CBRT_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_cbrt
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_CBRT_H__
+#endif // CLC_MATH_CLC_CBRT_H
diff --git a/libclc/clc/include/clc/math/clc_ceil.h b/libclc/clc/include/clc/math/clc_ceil.h
index 45668224c6176..03e37acb50d8e 100644
--- a/libclc/clc/include/clc/math/clc_ceil.h
+++ b/libclc/clc/include/clc/math/clc_ceil.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_CEIL_H__
-#define __CLC_MATH_CLC_CEIL_H__
+#ifndef CLC_MATH_CLC_CEIL_H
+#define CLC_MATH_CLC_CEIL_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_ceil
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_CEIL_H__
+#endif // CLC_MATH_CLC_CEIL_H
diff --git a/libclc/clc/include/clc/math/clc_copysign.h b/libclc/clc/include/clc/math/clc_copysign.h
index 563dd2827839a..739f834b99294 100644
--- a/libclc/clc/include/clc/math/clc_copysign.h
+++ b/libclc/clc/include/clc/math/clc_copysign.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_COPYSIGN_H__
-#define __CLC_MATH_CLC_COPYSIGN_H__
+#ifndef CLC_MATH_CLC_COPYSIGN_H
+#define CLC_MATH_CLC_COPYSIGN_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_copysign
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_COPYSIGN_H__
+#endif // CLC_MATH_CLC_COPYSIGN_H
diff --git a/libclc/clc/include/clc/math/clc_cos.h b/libclc/clc/include/clc/math/clc_cos.h
index 44681608efc37..2aa559ead6557 100644
--- a/libclc/clc/include/clc/math/clc_cos.h
+++ b/libclc/clc/include/clc/math/clc_cos.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_COS_H__
-#define __CLC_MATH_CLC_COS_H__
+#ifndef CLC_MATH_CLC_COS_H
+#define CLC_MATH_CLC_COS_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_cos
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_COS_H__
+#endif // CLC_MATH_CLC_COS_H
diff --git a/libclc/clc/include/clc/math/clc_cosh.h b/libclc/clc/include/clc/math/clc_cosh.h
index 7bcfa2ea26e06..cd5dcf9f519d3 100644
--- a/libclc/clc/include/clc/math/clc_cosh.h
+++ b/libclc/clc/include/clc/math/clc_cosh.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_COSH_H__
-#define __CLC_MATH_CLC_COSH_H__
+#ifndef CLC_MATH_CLC_COSH_H
+#define CLC_MATH_CLC_COSH_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_cosh
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_COSH_H__
+#endif // CLC_MATH_CLC_COSH_H
diff --git a/libclc/clc/include/clc/math/clc_cospi.h b/libclc/clc/include/clc/math/clc_cospi.h
index 4d82100649b01..cbb179f26e12f 100644
--- a/libclc/clc/include/clc/math/clc_cospi.h
+++ b/libclc/clc/include/clc/math/clc_cospi.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_COSPI_H__
-#define __CLC_MATH_CLC_COSPI_H__
+#ifndef CLC_MATH_CLC_COSPI_H
+#define CLC_MATH_CLC_COSPI_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_cospi
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_COSPI_H__
+#endif // CLC_MATH_CLC_COSPI_H
diff --git a/libclc/clc/include/clc/math/clc_ep_log.h b/libclc/clc/include/clc/math/clc_ep_log.h
index 855e2f2b3300e..a6abc0b81cbe3 100644
--- a/libclc/clc/include/clc/math/clc_ep_log.h
+++ b/libclc/clc/include/clc/math/clc_ep_log.h
@@ -6,10 +6,10 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_EP_LOG_H__
-#define __CLC_MATH_CLC_EP_LOG_H__
+#ifndef CLC_MATH_CLC_EP_LOG_H
+#define CLC_MATH_CLC_EP_LOG_H
#define __CLC_BODY <clc/math/clc_ep_log.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_MATH_CLC_EP_LOG_H__
+#endif // CLC_MATH_CLC_EP_LOG_H
diff --git a/libclc/clc/include/clc/math/clc_erf.h b/libclc/clc/include/clc/math/clc_erf.h
index 01a21b36b352f..0f8994fca0c27 100644
--- a/libclc/clc/include/clc/math/clc_erf.h
+++ b/libclc/clc/include/clc/math/clc_erf.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ERF_H__
-#define __CLC_MATH_CLC_ERF_H__
+#ifndef CLC_MATH_CLC_ERF_H
+#define CLC_MATH_CLC_ERF_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_erf
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ERF_H__
+#endif // CLC_MATH_CLC_ERF_H
diff --git a/libclc/clc/include/clc/math/clc_erfc.h b/libclc/clc/include/clc/math/clc_erfc.h
index efd581542879f..56acf60240e9c 100644
--- a/libclc/clc/include/clc/math/clc_erfc.h
+++ b/libclc/clc/include/clc/math/clc_erfc.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ERFC_H__
-#define __CLC_MATH_CLC_ERFC_H__
+#ifndef CLC_MATH_CLC_ERFC_H
+#define CLC_MATH_CLC_ERFC_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_erfc
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ERFC_H__
+#endif // CLC_MATH_CLC_ERFC_H
diff --git a/libclc/clc/include/clc/math/clc_exp.h b/libclc/clc/include/clc/math/clc_exp.h
index 84369bb8fbdd6..85ee84a7d7cb9 100644
--- a/libclc/clc/include/clc/math/clc_exp.h
+++ b/libclc/clc/include/clc/math/clc_exp.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_EXP_H__
-#define __CLC_MATH_CLC_EXP_H__
+#ifndef CLC_MATH_CLC_EXP_H
+#define CLC_MATH_CLC_EXP_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_exp
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_EXP_H__
+#endif // CLC_MATH_CLC_EXP_H
diff --git a/libclc/clc/include/clc/math/clc_exp10.h b/libclc/clc/include/clc/math/clc_exp10.h
index 500271cb07429..2831dcc873737 100644
--- a/libclc/clc/include/clc/math/clc_exp10.h
+++ b/libclc/clc/include/clc/math/clc_exp10.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_EXP10_H__
-#define __CLC_MATH_CLC_EXP10_H__
+#ifndef CLC_MATH_CLC_EXP10_H
+#define CLC_MATH_CLC_EXP10_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_exp10
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_EXP10_H__
+#endif // CLC_MATH_CLC_EXP10_H
diff --git a/libclc/clc/include/clc/math/clc_exp2.h b/libclc/clc/include/clc/math/clc_exp2.h
index 4ad0ddea48a7c..61c40bc7ebd39 100644
--- a/libclc/clc/include/clc/math/clc_exp2.h
+++ b/libclc/clc/include/clc/math/clc_exp2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_EXP2_H__
-#define __CLC_MATH_CLC_EXP2_H__
+#ifndef CLC_MATH_CLC_EXP2_H
+#define CLC_MATH_CLC_EXP2_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_exp2
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_EXP2_H__
+#endif // CLC_MATH_CLC_EXP2_H
diff --git a/libclc/clc/include/clc/math/clc_exp_helper.h b/libclc/clc/include/clc/math/clc_exp_helper.h
index a2b3f1bebaf49..974d10c7d3e89 100644
--- a/libclc/clc/include/clc/math/clc_exp_helper.h
+++ b/libclc/clc/include/clc/math/clc_exp_helper.h
@@ -6,12 +6,12 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_EXP_HELPER
-#define __CLC_MATH_CLC_EXP_HELPER
+#ifndef CLC_MATH_CLC_EXP_HELPER_H
+#define CLC_MATH_CLC_EXP_HELPER_H
#define __CLC_DOUBLE_ONLY
#define __CLC_BODY <clc/math/clc_exp_helper.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_MATH_CLC_EXP_HELPER
+#endif // CLC_MATH_CLC_EXP_HELPER_H
diff --git a/libclc/clc/include/clc/math/clc_expm1.h b/libclc/clc/include/clc/math/clc_expm1.h
index 5c60960ca5b03..cc814cd9224cf 100644
--- a/libclc/clc/include/clc/math/clc_expm1.h
+++ b/libclc/clc/include/clc/math/clc_expm1.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_EXPM1_H__
-#define __CLC_MATH_CLC_EXPM1_H__
+#ifndef CLC_MATH_CLC_EXPM1_H
+#define CLC_MATH_CLC_EXPM1_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_expm1
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_EXPM1_H__
+#endif // CLC_MATH_CLC_EXPM1_H
diff --git a/libclc/clc/include/clc/math/clc_fabs.h b/libclc/clc/include/clc/math/clc_fabs.h
index 1ef38a8c75957..5ec1013110228 100644
--- a/libclc/clc/include/clc/math/clc_fabs.h
+++ b/libclc/clc/include/clc/math/clc_fabs.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_FABS_H__
-#define __CLC_MATH_CLC_FABS_H__
+#ifndef CLC_MATH_CLC_FABS_H
+#define CLC_MATH_CLC_FABS_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_fabs
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_FABS_H__
+#endif // CLC_MATH_CLC_FABS_H
diff --git a/libclc/clc/include/clc/math/clc_fdim.h b/libclc/clc/include/clc/math/clc_fdim.h
index 50ad045db62cf..aea872aefbc6e 100644
--- a/libclc/clc/include/clc/math/clc_fdim.h
+++ b/libclc/clc/include/clc/math/clc_fdim.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_FDIM_H__
-#define __CLC_MATH_CLC_FDIM_H__
+#ifndef CLC_MATH_CLC_FDIM_H
+#define CLC_MATH_CLC_FDIM_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_fdim
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_FDIM_H__
+#endif // CLC_MATH_CLC_FDIM_H
diff --git a/libclc/clc/include/clc/math/clc_floor.h b/libclc/clc/include/clc/math/clc_floor.h
index d243819e0a42c..8e39b0f70f05a 100644
--- a/libclc/clc/include/clc/math/clc_floor.h
+++ b/libclc/clc/include/clc/math/clc_floor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_FLOOR_H__
-#define __CLC_MATH_CLC_FLOOR_H__
+#ifndef CLC_MATH_CLC_FLOOR_H
+#define CLC_MATH_CLC_FLOOR_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_floor
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_FLOOR_H__
+#endif // CLC_MATH_CLC_FLOOR_H
diff --git a/libclc/clc/include/clc/math/clc_fma.h b/libclc/clc/include/clc/math/clc_fma.h
index 5e87f4c470850..d5d8add881117 100644
--- a/libclc/clc/include/clc/math/clc_fma.h
+++ b/libclc/clc/include/clc/math/clc_fma.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_FMA_H__
-#define __CLC_MATH_CLC_FMA_H__
+#ifndef CLC_MATH_CLC_FMA_H
+#define CLC_MATH_CLC_FMA_H
#define __CLC_FUNCTION __clc_fma
#define __CLC_BODY <clc/shared/ternary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_FMA_H__
+#endif // CLC_MATH_CLC_FMA_H
diff --git a/libclc/clc/include/clc/math/clc_fmax.h b/libclc/clc/include/clc/math/clc_fmax.h
index f367a9b6ea1ca..7c868d9afa45b 100644
--- a/libclc/clc/include/clc/math/clc_fmax.h
+++ b/libclc/clc/include/clc/math/clc_fmax.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_FMAX_H__
-#define __CLC_MATH_CLC_FMAX_H__
+#ifndef CLC_MATH_CLC_FMAX_H
+#define CLC_MATH_CLC_FMAX_H
#define __CLC_FUNCTION __clc_fmax
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_FMAX_H__
+#endif // CLC_MATH_CLC_FMAX_H
diff --git a/libclc/clc/include/clc/math/clc_fmin.h b/libclc/clc/include/clc/math/clc_fmin.h
index 47ed3fad2d8c2..99c0b43dc5b93 100644
--- a/libclc/clc/include/clc/math/clc_fmin.h
+++ b/libclc/clc/include/clc/math/clc_fmin.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_FMIN_H__
-#define __CLC_MATH_CLC_FMIN_H__
+#ifndef CLC_MATH_CLC_FMIN_H
+#define CLC_MATH_CLC_FMIN_H
#define __CLC_FUNCTION __clc_fmin
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_FMIN_H__
+#endif // CLC_MATH_CLC_FMIN_H
diff --git a/libclc/clc/include/clc/math/clc_fmod.h b/libclc/clc/include/clc/math/clc_fmod.h
index 44179babd7fed..7e02c9b870a98 100644
--- a/libclc/clc/include/clc/math/clc_fmod.h
+++ b/libclc/clc/include/clc/math/clc_fmod.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_FMOD_H__
-#define __CLC_MATH_CLC_FMOD_H__
+#ifndef CLC_MATH_CLC_FMOD_H
+#define CLC_MATH_CLC_FMOD_H
#define __CLC_FUNCTION __clc_fmod
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_FMOD_H__
+#endif // CLC_MATH_CLC_FMOD_H
diff --git a/libclc/clc/include/clc/math/clc_fract.h b/libclc/clc/include/clc/math/clc_fract.h
index af762ecc59ea5..2daeffac6262d 100644
--- a/libclc/clc/include/clc/math/clc_fract.h
+++ b/libclc/clc/include/clc/math/clc_fract.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_FRACT_H__
-#define __CLC_MATH_CLC_FRACT_H__
+#ifndef CLC_MATH_CLC_FRACT_H
+#define CLC_MATH_CLC_FRACT_H
#define __CLC_FUNCTION __clc_fract
#define __CLC_BODY <clc/math/unary_decl_with_ptr.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_FRACT_H__
+#endif // CLC_MATH_CLC_FRACT_H
diff --git a/libclc/clc/include/clc/math/clc_frexp.h b/libclc/clc/include/clc/math/clc_frexp.h
index d6ed2754d0d40..a838eed8a2de6 100644
--- a/libclc/clc/include/clc/math/clc_frexp.h
+++ b/libclc/clc/include/clc/math/clc_frexp.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_FREXP_H__
-#define __CLC_MATH_CLC_FREXP_H__
+#ifndef CLC_MATH_CLC_FREXP_H
+#define CLC_MATH_CLC_FREXP_H
#define __CLC_FUNCTION __clc_frexp
#define __CLC_BODY <clc/math/unary_decl_with_int_ptr.inc>
@@ -15,4 +15,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_FREXP_H__
+#endif // CLC_MATH_CLC_FREXP_H
diff --git a/libclc/clc/include/clc/math/clc_half_cos.h b/libclc/clc/include/clc/math/clc_half_cos.h
index d0122987899c3..6b3b28ecefb16 100644
--- a/libclc/clc/include/clc/math/clc_half_cos.h
+++ b/libclc/clc/include/clc/math/clc_half_cos.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_COS_H__
-#define __CLC_MATH_CLC_HALF_COS_H__
+#ifndef CLC_MATH_CLC_HALF_COS_H
+#define CLC_MATH_CLC_HALF_COS_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_cos
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_COS_H__
+#endif // CLC_MATH_CLC_HALF_COS_H
diff --git a/libclc/clc/include/clc/math/clc_half_divide.h b/libclc/clc/include/clc/math/clc_half_divide.h
index e5d5cdc9df34e..3f4a2ff466dc2 100644
--- a/libclc/clc/include/clc/math/clc_half_divide.h
+++ b/libclc/clc/include/clc/math/clc_half_divide.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_DIVIDE_H__
-#define __CLC_MATH_CLC_HALF_DIVIDE_H__
+#ifndef CLC_MATH_CLC_HALF_DIVIDE_H
+#define CLC_MATH_CLC_HALF_DIVIDE_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_divide
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_DIVIDE_H__
+#endif // CLC_MATH_CLC_HALF_DIVIDE_H
diff --git a/libclc/clc/include/clc/math/clc_half_exp.h b/libclc/clc/include/clc/math/clc_half_exp.h
index 2284eaf8df360..7dc4d222fa7f7 100644
--- a/libclc/clc/include/clc/math/clc_half_exp.h
+++ b/libclc/clc/include/clc/math/clc_half_exp.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_EXP_H__
-#define __CLC_MATH_CLC_HALF_EXP_H__
+#ifndef CLC_MATH_CLC_HALF_EXP_H
+#define CLC_MATH_CLC_HALF_EXP_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_exp
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_EXP_H__
+#endif // CLC_MATH_CLC_HALF_EXP_H
diff --git a/libclc/clc/include/clc/math/clc_half_exp10.h b/libclc/clc/include/clc/math/clc_half_exp10.h
index 662df93e06855..95885b16927c3 100644
--- a/libclc/clc/include/clc/math/clc_half_exp10.h
+++ b/libclc/clc/include/clc/math/clc_half_exp10.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_EXP10_H__
-#define __CLC_MATH_CLC_HALF_EXP10_H__
+#ifndef CLC_MATH_CLC_HALF_EXP10_H
+#define CLC_MATH_CLC_HALF_EXP10_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_exp10
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_EXP10_H__
+#endif // CLC_MATH_CLC_HALF_EXP10_H
diff --git a/libclc/clc/include/clc/math/clc_half_exp2.h b/libclc/clc/include/clc/math/clc_half_exp2.h
index d2af0f2e3fa9a..2080758572a3a 100644
--- a/libclc/clc/include/clc/math/clc_half_exp2.h
+++ b/libclc/clc/include/clc/math/clc_half_exp2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_EXP2_H__
-#define __CLC_MATH_CLC_HALF_EXP2_H__
+#ifndef CLC_MATH_CLC_HALF_EXP2_H
+#define CLC_MATH_CLC_HALF_EXP2_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_exp2
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_EXP2_H__
+#endif // CLC_MATH_CLC_HALF_EXP2_H
diff --git a/libclc/clc/include/clc/math/clc_half_log.h b/libclc/clc/include/clc/math/clc_half_log.h
index 8ae30e5abe5f8..726a449aec377 100644
--- a/libclc/clc/include/clc/math/clc_half_log.h
+++ b/libclc/clc/include/clc/math/clc_half_log.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_LOG_H__
-#define __CLC_MATH_CLC_HALF_LOG_H__
+#ifndef CLC_MATH_CLC_HALF_LOG_H
+#define CLC_MATH_CLC_HALF_LOG_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_log
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_LOG_H__
+#endif // CLC_MATH_CLC_HALF_LOG_H
diff --git a/libclc/clc/include/clc/math/clc_half_log10.h b/libclc/clc/include/clc/math/clc_half_log10.h
index fe5248350abad..2f7b9bf1c90ee 100644
--- a/libclc/clc/include/clc/math/clc_half_log10.h
+++ b/libclc/clc/include/clc/math/clc_half_log10.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_LOG10_H__
-#define __CLC_MATH_CLC_HALF_LOG10_H__
+#ifndef CLC_MATH_CLC_HALF_LOG10_H
+#define CLC_MATH_CLC_HALF_LOG10_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_log10
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_LOG10_H__
+#endif // CLC_MATH_CLC_HALF_LOG10_H
diff --git a/libclc/clc/include/clc/math/clc_half_log2.h b/libclc/clc/include/clc/math/clc_half_log2.h
index c57aa1bffb335..6ea6fc5490da4 100644
--- a/libclc/clc/include/clc/math/clc_half_log2.h
+++ b/libclc/clc/include/clc/math/clc_half_log2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_LOG2_H__
-#define __CLC_MATH_CLC_HALF_LOG2_H__
+#ifndef CLC_MATH_CLC_HALF_LOG2_H
+#define CLC_MATH_CLC_HALF_LOG2_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_log2
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_LOG2_H__
+#endif // CLC_MATH_CLC_HALF_LOG2_H
diff --git a/libclc/clc/include/clc/math/clc_half_powr.h b/libclc/clc/include/clc/math/clc_half_powr.h
index 188b32b8b49c6..ee825a15babc4 100644
--- a/libclc/clc/include/clc/math/clc_half_powr.h
+++ b/libclc/clc/include/clc/math/clc_half_powr.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_POWR_H__
-#define __CLC_MATH_CLC_HALF_POWR_H__
+#ifndef CLC_MATH_CLC_HALF_POWR_H
+#define CLC_MATH_CLC_HALF_POWR_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_powr
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_POWR_H__
+#endif // CLC_MATH_CLC_HALF_POWR_H
diff --git a/libclc/clc/include/clc/math/clc_half_recip.h b/libclc/clc/include/clc/math/clc_half_recip.h
index f5f71fa1988c8..544003d30b24f 100644
--- a/libclc/clc/include/clc/math/clc_half_recip.h
+++ b/libclc/clc/include/clc/math/clc_half_recip.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_RECIP_H__
-#define __CLC_MATH_CLC_HALF_RECIP_H__
+#ifndef CLC_MATH_CLC_HALF_RECIP_H
+#define CLC_MATH_CLC_HALF_RECIP_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_recip
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_RECIP_H__
+#endif // CLC_MATH_CLC_HALF_RECIP_H
diff --git a/libclc/clc/include/clc/math/clc_half_rsqrt.h b/libclc/clc/include/clc/math/clc_half_rsqrt.h
index d5a05ac8b84ac..9ef251845d222 100644
--- a/libclc/clc/include/clc/math/clc_half_rsqrt.h
+++ b/libclc/clc/include/clc/math/clc_half_rsqrt.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_RSQRT_H__
-#define __CLC_MATH_CLC_HALF_RSQRT_H__
+#ifndef CLC_MATH_CLC_HALF_RSQRT_H
+#define CLC_MATH_CLC_HALF_RSQRT_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_rsqrt
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_RSQRT_H__
+#endif // CLC_MATH_CLC_HALF_RSQRT_H
diff --git a/libclc/clc/include/clc/math/clc_half_sin.h b/libclc/clc/include/clc/math/clc_half_sin.h
index d2d3da9b11dbf..d9f3e36189e13 100644
--- a/libclc/clc/include/clc/math/clc_half_sin.h
+++ b/libclc/clc/include/clc/math/clc_half_sin.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_SIN_H__
-#define __CLC_MATH_CLC_HALF_SIN_H__
+#ifndef CLC_MATH_CLC_HALF_SIN_H
+#define CLC_MATH_CLC_HALF_SIN_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_sin
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_SIN_H__
+#endif // CLC_MATH_CLC_HALF_SIN_H
diff --git a/libclc/clc/include/clc/math/clc_half_sqrt.h b/libclc/clc/include/clc/math/clc_half_sqrt.h
index a54b8122cb15e..63e744d48d529 100644
--- a/libclc/clc/include/clc/math/clc_half_sqrt.h
+++ b/libclc/clc/include/clc/math/clc_half_sqrt.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_SQRT_H__
-#define __CLC_MATH_CLC_HALF_SQRT_H__
+#ifndef CLC_MATH_CLC_HALF_SQRT_H
+#define CLC_MATH_CLC_HALF_SQRT_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_sqrt
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_SQRT_H__
+#endif // CLC_MATH_CLC_HALF_SQRT_H
diff --git a/libclc/clc/include/clc/math/clc_half_tan.h b/libclc/clc/include/clc/math/clc_half_tan.h
index 503ebe29c3cec..39e9d9f23794e 100644
--- a/libclc/clc/include/clc/math/clc_half_tan.h
+++ b/libclc/clc/include/clc/math/clc_half_tan.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HALF_TAN_H__
-#define __CLC_MATH_CLC_HALF_TAN_H__
+#ifndef CLC_MATH_CLC_HALF_TAN_H
+#define CLC_MATH_CLC_HALF_TAN_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_half_tan
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HALF_TAN_H__
+#endif // CLC_MATH_CLC_HALF_TAN_H
diff --git a/libclc/clc/include/clc/math/clc_hypot.h b/libclc/clc/include/clc/math/clc_hypot.h
index 40b354154fa53..77eeb68660826 100644
--- a/libclc/clc/include/clc/math/clc_hypot.h
+++ b/libclc/clc/include/clc/math/clc_hypot.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_HYPOT_H__
-#define __CLC_MATH_CLC_HYPOT_H__
+#ifndef CLC_MATH_CLC_HYPOT_H
+#define CLC_MATH_CLC_HYPOT_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_hypot
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_HYPOT_H__
+#endif // CLC_MATH_CLC_HYPOT_H
diff --git a/libclc/clc/include/clc/math/clc_ilogb.h b/libclc/clc/include/clc/math/clc_ilogb.h
index 6aeaf6be3ac6c..2b5c966b024af 100644
--- a/libclc/clc/include/clc/math/clc_ilogb.h
+++ b/libclc/clc/include/clc/math/clc_ilogb.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ILOGB_H__
-#define __CLC_MATH_CLC_ILOGB_H__
+#ifndef CLC_MATH_CLC_ILOGB_H
+#define CLC_MATH_CLC_ILOGB_H
#define __CLC_FUNCTION __clc_ilogb
#define __CLC_BODY <clc/math/unary_decl_with_int_return.inc>
@@ -15,4 +15,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ILOGB_H__
+#endif // CLC_MATH_CLC_ILOGB_H
diff --git a/libclc/clc/include/clc/math/clc_ldexp.h b/libclc/clc/include/clc/math/clc_ldexp.h
index e90732680e2a6..e0fbbcf60db46 100644
--- a/libclc/clc/include/clc/math/clc_ldexp.h
+++ b/libclc/clc/include/clc/math/clc_ldexp.h
@@ -6,10 +6,10 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_LDEXP_H__
-#define __CLC_MATH_CLC_LDEXP_H__
+#ifndef CLC_MATH_CLC_LDEXP_H
+#define CLC_MATH_CLC_LDEXP_H
#define __CLC_BODY <clc/math/clc_ldexp.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_MATH_CLC_LDEXP_H__
+#endif // CLC_MATH_CLC_LDEXP_H
diff --git a/libclc/clc/include/clc/math/clc_lgamma.h b/libclc/clc/include/clc/math/clc_lgamma.h
index f54c5e2b61b67..42048ed1421a7 100644
--- a/libclc/clc/include/clc/math/clc_lgamma.h
+++ b/libclc/clc/include/clc/math/clc_lgamma.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_LGAMMA_H__
-#define __CLC_MATH_CLC_LGAMMA_H__
+#ifndef CLC_MATH_CLC_LGAMMA_H
+#define CLC_MATH_CLC_LGAMMA_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_lgamma
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_LGAMMA_H__
+#endif // CLC_MATH_CLC_LGAMMA_H
diff --git a/libclc/clc/include/clc/math/clc_lgamma_r.h b/libclc/clc/include/clc/math/clc_lgamma_r.h
index 262e62372227a..4b9ed950a6a95 100644
--- a/libclc/clc/include/clc/math/clc_lgamma_r.h
+++ b/libclc/clc/include/clc/math/clc_lgamma_r.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_LGAMMA_R_H__
-#define __CLC_MATH_CLC_LGAMMA_R_H__
+#ifndef CLC_MATH_CLC_LGAMMA_R_H
+#define CLC_MATH_CLC_LGAMMA_R_H
#define __CLC_FUNCTION __clc_lgamma_r
#define __CLC_BODY <clc/math/unary_decl_with_int_ptr.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_LGAMMA_R_H__
+#endif // CLC_MATH_CLC_LGAMMA_R_H
diff --git a/libclc/clc/include/clc/math/clc_log.h b/libclc/clc/include/clc/math/clc_log.h
index 8b0e44b425a89..597bc60fc57f9 100644
--- a/libclc/clc/include/clc/math/clc_log.h
+++ b/libclc/clc/include/clc/math/clc_log.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_LOG_H__
-#define __CLC_MATH_CLC_LOG_H__
+#ifndef CLC_MATH_CLC_LOG_H
+#define CLC_MATH_CLC_LOG_H
#define __CLC_FUNCTION __clc_log
#define __CLC_BODY <clc/shared/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_LOG_H__
+#endif // CLC_MATH_CLC_LOG_H
diff --git a/libclc/clc/include/clc/math/clc_log10.h b/libclc/clc/include/clc/math/clc_log10.h
index 6e086690c6ada..d293f5b6064cc 100644
--- a/libclc/clc/include/clc/math/clc_log10.h
+++ b/libclc/clc/include/clc/math/clc_log10.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_LOG10_H__
-#define __CLC_MATH_CLC_LOG10_H__
+#ifndef CLC_MATH_CLC_LOG10_H
+#define CLC_MATH_CLC_LOG10_H
#define __CLC_FUNCTION __clc_log10
#define __CLC_BODY <clc/shared/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_LOG10_H__
+#endif // CLC_MATH_CLC_LOG10_H
diff --git a/libclc/clc/include/clc/math/clc_log1p.h b/libclc/clc/include/clc/math/clc_log1p.h
index 1be8c8548d488..3ef25d611bd98 100644
--- a/libclc/clc/include/clc/math/clc_log1p.h
+++ b/libclc/clc/include/clc/math/clc_log1p.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_LOG1P_H__
-#define __CLC_MATH_CLC_LOG1P_H__
+#ifndef CLC_MATH_CLC_LOG1P_H
+#define CLC_MATH_CLC_LOG1P_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_log1p
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_LOG1P_H__
+#endif // CLC_MATH_CLC_LOG1P_H
diff --git a/libclc/clc/include/clc/math/clc_log2.h b/libclc/clc/include/clc/math/clc_log2.h
index c5f9e37f39845..d7eaa68f6ee56 100644
--- a/libclc/clc/include/clc/math/clc_log2.h
+++ b/libclc/clc/include/clc/math/clc_log2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_LOG2_H__
-#define __CLC_MATH_CLC_LOG2_H__
+#ifndef CLC_MATH_CLC_LOG2_H
+#define CLC_MATH_CLC_LOG2_H
#define __CLC_FUNCTION __clc_log2
#define __CLC_BODY <clc/shared/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_LOG2_H__
+#endif // CLC_MATH_CLC_LOG2_H
diff --git a/libclc/clc/include/clc/math/clc_logb.h b/libclc/clc/include/clc/math/clc_logb.h
index 75a2ce7e578b1..20cd7e2014dc2 100644
--- a/libclc/clc/include/clc/math/clc_logb.h
+++ b/libclc/clc/include/clc/math/clc_logb.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_LOGB_H__
-#define __CLC_MATH_CLC_LOGB_H__
+#ifndef CLC_MATH_CLC_LOGB_H
+#define CLC_MATH_CLC_LOGB_H
#define __CLC_FUNCTION __clc_logb
#define __CLC_BODY <clc/shared/unary_decl.inc>
@@ -15,4 +15,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_LOGB_H__
+#endif // CLC_MATH_CLC_LOGB_H
diff --git a/libclc/clc/include/clc/math/clc_mad.h b/libclc/clc/include/clc/math/clc_mad.h
index 117e361380eda..53acb187b8e9c 100644
--- a/libclc/clc/include/clc/math/clc_mad.h
+++ b/libclc/clc/include/clc/math/clc_mad.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_MAD_H__
-#define __CLC_MATH_CLC_MAD_H__
+#ifndef CLC_MATH_CLC_MAD_H
+#define CLC_MATH_CLC_MAD_H
#define __CLC_BODY <clc/shared/ternary_decl.inc>
#define __CLC_FUNCTION __clc_mad
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_MAD_H__
+#endif // CLC_MATH_CLC_MAD_H
diff --git a/libclc/clc/include/clc/math/clc_maxmag.h b/libclc/clc/include/clc/math/clc_maxmag.h
index 857ad7867b05d..21df1d7a97ba9 100644
--- a/libclc/clc/include/clc/math/clc_maxmag.h
+++ b/libclc/clc/include/clc/math/clc_maxmag.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_MAXMAG_H__
-#define __CLC_MATH_CLC_MAXMAG_H__
+#ifndef CLC_MATH_CLC_MAXMAG_H
+#define CLC_MATH_CLC_MAXMAG_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_maxmag
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_MAXMAG_H__
+#endif // CLC_MATH_CLC_MAXMAG_H
diff --git a/libclc/clc/include/clc/math/clc_minmag.h b/libclc/clc/include/clc/math/clc_minmag.h
index 9615d029bfed2..d58c414b14ad5 100644
--- a/libclc/clc/include/clc/math/clc_minmag.h
+++ b/libclc/clc/include/clc/math/clc_minmag.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_MINMAG_H__
-#define __CLC_MATH_CLC_MINMAG_H__
+#ifndef CLC_MATH_CLC_MINMAG_H
+#define CLC_MATH_CLC_MINMAG_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_minmag
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_MINMAG_H__
+#endif // CLC_MATH_CLC_MINMAG_H
diff --git a/libclc/clc/include/clc/math/clc_modf.h b/libclc/clc/include/clc/math/clc_modf.h
index aa8f9e20892ab..e505a05304229 100644
--- a/libclc/clc/include/clc/math/clc_modf.h
+++ b/libclc/clc/include/clc/math/clc_modf.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_MODF_H__
-#define __CLC_MATH_CLC_MODF_H__
+#ifndef CLC_MATH_CLC_MODF_H
+#define CLC_MATH_CLC_MODF_H
#define __CLC_FUNCTION __clc_modf
#define __CLC_BODY <clc/math/unary_decl_with_ptr.inc>
@@ -15,4 +15,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_MODF_H__
+#endif // CLC_MATH_CLC_MODF_H
diff --git a/libclc/clc/include/clc/math/clc_nan.h b/libclc/clc/include/clc/math/clc_nan.h
index 91901fd9369f2..915a7e99fe2e3 100644
--- a/libclc/clc/include/clc/math/clc_nan.h
+++ b/libclc/clc/include/clc/math/clc_nan.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NAN_H__
-#define __CLC_MATH_CLC_NAN_H__
+#ifndef CLC_MATH_CLC_NAN_H
+#define CLC_MATH_CLC_NAN_H
#define __CLC_FUNCTION __clc_nan
#define __CLC_BODY <clc/math/clc_nan.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NAN_H__
+#endif // CLC_MATH_CLC_NAN_H
diff --git a/libclc/clc/include/clc/math/clc_native_cos.h b/libclc/clc/include/clc/math/clc_native_cos.h
index eefd133911e48..545e7a625e8e8 100644
--- a/libclc/clc/include/clc/math/clc_native_cos.h
+++ b/libclc/clc/include/clc/math/clc_native_cos.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_COS_H__
-#define __CLC_MATH_CLC_NATIVE_COS_H__
+#ifndef CLC_MATH_CLC_NATIVE_COS_H
+#define CLC_MATH_CLC_NATIVE_COS_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_cos
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_COS_H__
+#endif // CLC_MATH_CLC_NATIVE_COS_H
diff --git a/libclc/clc/include/clc/math/clc_native_divide.h b/libclc/clc/include/clc/math/clc_native_divide.h
index 97d97c2670a6b..3b7a6f805bdd5 100644
--- a/libclc/clc/include/clc/math/clc_native_divide.h
+++ b/libclc/clc/include/clc/math/clc_native_divide.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_DIVIDE_H__
-#define __CLC_MATH_CLC_NATIVE_DIVIDE_H__
+#ifndef CLC_MATH_CLC_NATIVE_DIVIDE_H
+#define CLC_MATH_CLC_NATIVE_DIVIDE_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_divide
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_DIVIDE_H__
+#endif // CLC_MATH_CLC_NATIVE_DIVIDE_H
diff --git a/libclc/clc/include/clc/math/clc_native_exp.h b/libclc/clc/include/clc/math/clc_native_exp.h
index 30c0d1edf18fb..b91c03fea9ac0 100644
--- a/libclc/clc/include/clc/math/clc_native_exp.h
+++ b/libclc/clc/include/clc/math/clc_native_exp.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_EXP_H__
-#define __CLC_MATH_CLC_NATIVE_EXP_H__
+#ifndef CLC_MATH_CLC_NATIVE_EXP_H
+#define CLC_MATH_CLC_NATIVE_EXP_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_exp
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_EXP_H__
+#endif // CLC_MATH_CLC_NATIVE_EXP_H
diff --git a/libclc/clc/include/clc/math/clc_native_exp10.h b/libclc/clc/include/clc/math/clc_native_exp10.h
index a88b5a3897377..7d0966d30ae6d 100644
--- a/libclc/clc/include/clc/math/clc_native_exp10.h
+++ b/libclc/clc/include/clc/math/clc_native_exp10.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_EXP10_H__
-#define __CLC_MATH_CLC_NATIVE_EXP10_H__
+#ifndef CLC_MATH_CLC_NATIVE_EXP10_H
+#define CLC_MATH_CLC_NATIVE_EXP10_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_exp10
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_EXP10_H__
+#endif // CLC_MATH_CLC_NATIVE_EXP10_H
diff --git a/libclc/clc/include/clc/math/clc_native_exp2.h b/libclc/clc/include/clc/math/clc_native_exp2.h
index 09f4bfe6979dd..3ba6c1f236b06 100644
--- a/libclc/clc/include/clc/math/clc_native_exp2.h
+++ b/libclc/clc/include/clc/math/clc_native_exp2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_EXP2_H__
-#define __CLC_MATH_CLC_NATIVE_EXP2_H__
+#ifndef CLC_MATH_CLC_NATIVE_EXP2_H
+#define CLC_MATH_CLC_NATIVE_EXP2_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_exp2
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_EXP2_H__
+#endif // CLC_MATH_CLC_NATIVE_EXP2_H
diff --git a/libclc/clc/include/clc/math/clc_native_log.h b/libclc/clc/include/clc/math/clc_native_log.h
index c32fc812d4770..9515ed07c1fab 100644
--- a/libclc/clc/include/clc/math/clc_native_log.h
+++ b/libclc/clc/include/clc/math/clc_native_log.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_LOG_H__
-#define __CLC_MATH_CLC_NATIVE_LOG_H__
+#ifndef CLC_MATH_CLC_NATIVE_LOG_H
+#define CLC_MATH_CLC_NATIVE_LOG_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_log
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_LOG_H__
+#endif // CLC_MATH_CLC_NATIVE_LOG_H
diff --git a/libclc/clc/include/clc/math/clc_native_log10.h b/libclc/clc/include/clc/math/clc_native_log10.h
index 329b8a7437556..de4d6d7cd673c 100644
--- a/libclc/clc/include/clc/math/clc_native_log10.h
+++ b/libclc/clc/include/clc/math/clc_native_log10.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_LOG10_H__
-#define __CLC_MATH_CLC_NATIVE_LOG10_H__
+#ifndef CLC_MATH_CLC_NATIVE_LOG10_H
+#define CLC_MATH_CLC_NATIVE_LOG10_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_log10
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_LOG10_H__
+#endif // CLC_MATH_CLC_NATIVE_LOG10_H
diff --git a/libclc/clc/include/clc/math/clc_native_log2.h b/libclc/clc/include/clc/math/clc_native_log2.h
index b8ad663b470d8..07186ab622464 100644
--- a/libclc/clc/include/clc/math/clc_native_log2.h
+++ b/libclc/clc/include/clc/math/clc_native_log2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_LOG2_H__
-#define __CLC_MATH_CLC_NATIVE_LOG2_H__
+#ifndef CLC_MATH_CLC_NATIVE_LOG2_H
+#define CLC_MATH_CLC_NATIVE_LOG2_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_log2
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_LOG2_H__
+#endif // CLC_MATH_CLC_NATIVE_LOG2_H
diff --git a/libclc/clc/include/clc/math/clc_native_powr.h b/libclc/clc/include/clc/math/clc_native_powr.h
index 3a0c8cc8b9d58..44e12deda3254 100644
--- a/libclc/clc/include/clc/math/clc_native_powr.h
+++ b/libclc/clc/include/clc/math/clc_native_powr.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_POWR_H__
-#define __CLC_MATH_CLC_NATIVE_POWR_H__
+#ifndef CLC_MATH_CLC_NATIVE_POWR_H
+#define CLC_MATH_CLC_NATIVE_POWR_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_powr
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_POWR_H__
+#endif // CLC_MATH_CLC_NATIVE_POWR_H
diff --git a/libclc/clc/include/clc/math/clc_native_recip.h b/libclc/clc/include/clc/math/clc_native_recip.h
index a6540e846f2b6..138bed5ed4b40 100644
--- a/libclc/clc/include/clc/math/clc_native_recip.h
+++ b/libclc/clc/include/clc/math/clc_native_recip.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_RECIP_H__
-#define __CLC_MATH_CLC_NATIVE_RECIP_H__
+#ifndef CLC_MATH_CLC_NATIVE_RECIP_H
+#define CLC_MATH_CLC_NATIVE_RECIP_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_recip
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_RECIP_H__
+#endif // CLC_MATH_CLC_NATIVE_RECIP_H
diff --git a/libclc/clc/include/clc/math/clc_native_rsqrt.h b/libclc/clc/include/clc/math/clc_native_rsqrt.h
index 0c8f3da039299..b0daae8ddc15e 100644
--- a/libclc/clc/include/clc/math/clc_native_rsqrt.h
+++ b/libclc/clc/include/clc/math/clc_native_rsqrt.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_RSQRT_H__
-#define __CLC_MATH_CLC_NATIVE_RSQRT_H__
+#ifndef CLC_MATH_CLC_NATIVE_RSQRT_H
+#define CLC_MATH_CLC_NATIVE_RSQRT_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_rsqrt
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_RSQRT_H__
+#endif // CLC_MATH_CLC_NATIVE_RSQRT_H
diff --git a/libclc/clc/include/clc/math/clc_native_sin.h b/libclc/clc/include/clc/math/clc_native_sin.h
index 22ab7868e20fb..d2ea8cd2a5441 100644
--- a/libclc/clc/include/clc/math/clc_native_sin.h
+++ b/libclc/clc/include/clc/math/clc_native_sin.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_SIN_H__
-#define __CLC_MATH_CLC_NATIVE_SIN_H__
+#ifndef CLC_MATH_CLC_NATIVE_SIN_H
+#define CLC_MATH_CLC_NATIVE_SIN_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_sin
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_SIN_H__
+#endif // CLC_MATH_CLC_NATIVE_SIN_H
diff --git a/libclc/clc/include/clc/math/clc_native_sqrt.h b/libclc/clc/include/clc/math/clc_native_sqrt.h
index fd071f1d463ab..227375581110d 100644
--- a/libclc/clc/include/clc/math/clc_native_sqrt.h
+++ b/libclc/clc/include/clc/math/clc_native_sqrt.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_SQRT_H__
-#define __CLC_MATH_CLC_NATIVE_SQRT_H__
+#ifndef CLC_MATH_CLC_NATIVE_SQRT_H
+#define CLC_MATH_CLC_NATIVE_SQRT_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_sqrt
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_SQRT_H__
+#endif // CLC_MATH_CLC_NATIVE_SQRT_H
diff --git a/libclc/clc/include/clc/math/clc_native_tan.h b/libclc/clc/include/clc/math/clc_native_tan.h
index 4b381312d8d51..4e82e41116a46 100644
--- a/libclc/clc/include/clc/math/clc_native_tan.h
+++ b/libclc/clc/include/clc/math/clc_native_tan.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NATIVE_TAN_H__
-#define __CLC_MATH_CLC_NATIVE_TAN_H__
+#ifndef CLC_MATH_CLC_NATIVE_TAN_H
+#define CLC_MATH_CLC_NATIVE_TAN_H
#define __CLC_FLOAT_ONLY
#define __CLC_FUNCTION __clc_native_tan
@@ -17,4 +17,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NATIVE_TAN_H__
+#endif // CLC_MATH_CLC_NATIVE_TAN_H
diff --git a/libclc/clc/include/clc/math/clc_nextafter.h b/libclc/clc/include/clc/math/clc_nextafter.h
index f24742b9e9c37..5375d23d9068c 100644
--- a/libclc/clc/include/clc/math/clc_nextafter.h
+++ b/libclc/clc/include/clc/math/clc_nextafter.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_NEXTAFTER_H__
-#define __CLC_MATH_CLC_NEXTAFTER_H__
+#ifndef CLC_MATH_CLC_NEXTAFTER_H
+#define CLC_MATH_CLC_NEXTAFTER_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_nextafter
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_NEXTAFTER_H__
+#endif // CLC_MATH_CLC_NEXTAFTER_H
diff --git a/libclc/clc/include/clc/math/clc_pow.h b/libclc/clc/include/clc/math/clc_pow.h
index 5e37e5bf6da65..185e065dc4afa 100644
--- a/libclc/clc/include/clc/math/clc_pow.h
+++ b/libclc/clc/include/clc/math/clc_pow.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_POW_H__
-#define __CLC_MATH_CLC_POW_H__
+#ifndef CLC_MATH_CLC_POW_H
+#define CLC_MATH_CLC_POW_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_pow
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_POW_H__
+#endif // CLC_MATH_CLC_POW_H
diff --git a/libclc/clc/include/clc/math/clc_pown.h b/libclc/clc/include/clc/math/clc_pown.h
index 30628efb19001..b5062ae0423be 100644
--- a/libclc/clc/include/clc/math/clc_pown.h
+++ b/libclc/clc/include/clc/math/clc_pown.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_POWN_H__
-#define __CLC_MATH_CLC_POWN_H__
+#ifndef CLC_MATH_CLC_POWN_H
+#define CLC_MATH_CLC_POWN_H
#define __CLC_BODY <clc/shared/binary_decl_with_int_second_arg.inc>
#define __CLC_FUNCTION __clc_pown
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_POWN_H__
+#endif // CLC_MATH_CLC_POWN_H
diff --git a/libclc/clc/include/clc/math/clc_powr.h b/libclc/clc/include/clc/math/clc_powr.h
index baa494cce6989..b6ed7b50c8a22 100644
--- a/libclc/clc/include/clc/math/clc_powr.h
+++ b/libclc/clc/include/clc/math/clc_powr.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_POWR_H__
-#define __CLC_MATH_CLC_POWR_H__
+#ifndef CLC_MATH_CLC_POWR_H
+#define CLC_MATH_CLC_POWR_H
#define __CLC_BODY <clc/shared/binary_decl.inc>
#define __CLC_FUNCTION __clc_powr
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_POWR_H__
+#endif // CLC_MATH_CLC_POWR_H
diff --git a/libclc/clc/include/clc/math/clc_remainder.h b/libclc/clc/include/clc/math/clc_remainder.h
index a7700c95103b4..0e4ce1b1ea375 100644
--- a/libclc/clc/include/clc/math/clc_remainder.h
+++ b/libclc/clc/include/clc/math/clc_remainder.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_REMAINDER_H__
-#define __CLC_MATH_CLC_REMAINDER_H__
+#ifndef CLC_MATH_CLC_REMAINDER_H
+#define CLC_MATH_CLC_REMAINDER_H
#define __CLC_FUNCTION __clc_remainder
#define __CLC_BODY <clc/shared/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_REMAINDER_H__
+#endif // CLC_MATH_CLC_REMAINDER_H
diff --git a/libclc/clc/include/clc/math/clc_remquo.h b/libclc/clc/include/clc/math/clc_remquo.h
index 48a8844a6e384..f895a7ab1e71c 100644
--- a/libclc/clc/include/clc/math/clc_remquo.h
+++ b/libclc/clc/include/clc/math/clc_remquo.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_REMQUO_H__
-#define __CLC_MATH_CLC_REMQUO_H__
+#ifndef CLC_MATH_CLC_REMQUO_H
+#define CLC_MATH_CLC_REMQUO_H
#define __CLC_FUNCTION __clc_remquo
#define __CLC_BODY <clc/math/remquo_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_REMQUO_H__
+#endif // CLC_MATH_CLC_REMQUO_H
diff --git a/libclc/clc/include/clc/math/clc_rint.h b/libclc/clc/include/clc/math/clc_rint.h
index 17b1549f439b8..e26968800998b 100644
--- a/libclc/clc/include/clc/math/clc_rint.h
+++ b/libclc/clc/include/clc/math/clc_rint.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_RINT_H__
-#define __CLC_MATH_CLC_RINT_H__
+#ifndef CLC_MATH_CLC_RINT_H
+#define CLC_MATH_CLC_RINT_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_rint
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_RINT_H__
+#endif // CLC_MATH_CLC_RINT_H
diff --git a/libclc/clc/include/clc/math/clc_rootn.h b/libclc/clc/include/clc/math/clc_rootn.h
index 90a25ad52d867..a0d5fef8e31fe 100644
--- a/libclc/clc/include/clc/math/clc_rootn.h
+++ b/libclc/clc/include/clc/math/clc_rootn.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ROOTN_H__
-#define __CLC_MATH_CLC_ROOTN_H__
+#ifndef CLC_MATH_CLC_ROOTN_H
+#define CLC_MATH_CLC_ROOTN_H
#define __CLC_BODY <clc/shared/binary_decl_with_int_second_arg.inc>
#define __CLC_FUNCTION __clc_rootn
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ROOTN_H__
+#endif // CLC_MATH_CLC_ROOTN_H
diff --git a/libclc/clc/include/clc/math/clc_round.h b/libclc/clc/include/clc/math/clc_round.h
index 78ebf4db99e9f..d0c460f3fad75 100644
--- a/libclc/clc/include/clc/math/clc_round.h
+++ b/libclc/clc/include/clc/math/clc_round.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_ROUND_H__
-#define __CLC_MATH_CLC_ROUND_H__
+#ifndef CLC_MATH_CLC_ROUND_H
+#define CLC_MATH_CLC_ROUND_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_round
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_ROUND_H__
+#endif // CLC_MATH_CLC_ROUND_H
diff --git a/libclc/clc/include/clc/math/clc_rsqrt.h b/libclc/clc/include/clc/math/clc_rsqrt.h
index 59402fbead2b2..fbbc034f19cf0 100644
--- a/libclc/clc/include/clc/math/clc_rsqrt.h
+++ b/libclc/clc/include/clc/math/clc_rsqrt.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_RSQRT_H__
-#define __CLC_MATH_CLC_RSQRT_H__
+#ifndef CLC_MATH_CLC_RSQRT_H
+#define CLC_MATH_CLC_RSQRT_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_rsqrt
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_RSQRT_H__
+#endif // CLC_MATH_CLC_RSQRT_H
diff --git a/libclc/clc/include/clc/math/clc_sin.h b/libclc/clc/include/clc/math/clc_sin.h
index de4c722ca123f..e6938ddac8fa1 100644
--- a/libclc/clc/include/clc/math/clc_sin.h
+++ b/libclc/clc/include/clc/math/clc_sin.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_SIN_H__
-#define __CLC_MATH_CLC_SIN_H__
+#ifndef CLC_MATH_CLC_SIN_H
+#define CLC_MATH_CLC_SIN_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_sin
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_SIN_H__
+#endif // CLC_MATH_CLC_SIN_H
diff --git a/libclc/clc/include/clc/math/clc_sincos.h b/libclc/clc/include/clc/math/clc_sincos.h
index e26dc7c024c9c..06b9e7194e302 100644
--- a/libclc/clc/include/clc/math/clc_sincos.h
+++ b/libclc/clc/include/clc/math/clc_sincos.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_SINCOS_H__
-#define __CLC_MATH_CLC_SINCOS_H__
+#ifndef CLC_MATH_CLC_SINCOS_H
+#define CLC_MATH_CLC_SINCOS_H
#define __CLC_BODY <clc/math/unary_decl_with_ptr.inc>
#define __CLC_FUNCTION __clc_sincos
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_SINCOS_H__
+#endif // CLC_MATH_CLC_SINCOS_H
diff --git a/libclc/clc/include/clc/math/clc_sincos_helpers.h b/libclc/clc/include/clc/math/clc_sincos_helpers.h
index 909afe476ad90..43b1589b3c48b 100644
--- a/libclc/clc/include/clc/math/clc_sincos_helpers.h
+++ b/libclc/clc/include/clc/math/clc_sincos_helpers.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_SINCOS_HELPERS_H__
-#define __CLC_MATH_CLC_SINCOS_HELPERS_H__
+#ifndef CLC_MATH_CLC_SINCOS_HELPERS_H
+#define CLC_MATH_CLC_SINCOS_HELPERS_H
#define __CLC_FLOAT_ONLY
#define __CLC_BODY <clc/math/clc_sincos_helpers.inc>
@@ -19,4 +19,4 @@
#include <clc/math/gentype.inc>
-#endif // __CLC_MATH_CLC_SINCOS_HELPERS_H__
+#endif // CLC_MATH_CLC_SINCOS_HELPERS_H
diff --git a/libclc/clc/include/clc/math/clc_sinh.h b/libclc/clc/include/clc/math/clc_sinh.h
index fa9cabe79cb0e..e7ac0e41c1721 100644
--- a/libclc/clc/include/clc/math/clc_sinh.h
+++ b/libclc/clc/include/clc/math/clc_sinh.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_SINH_H__
-#define __CLC_MATH_CLC_SINH_H__
+#ifndef CLC_MATH_CLC_SINH_H
+#define CLC_MATH_CLC_SINH_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_sinh
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_SINH_H__
+#endif // CLC_MATH_CLC_SINH_H
diff --git a/libclc/clc/include/clc/math/clc_sinpi.h b/libclc/clc/include/clc/math/clc_sinpi.h
index db563c2e7e14a..c70ac9129c464 100644
--- a/libclc/clc/include/clc/math/clc_sinpi.h
+++ b/libclc/clc/include/clc/math/clc_sinpi.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_SINPI_H__
-#define __CLC_MATH_CLC_SINPI_H__
+#ifndef CLC_MATH_CLC_SINPI_H
+#define CLC_MATH_CLC_SINPI_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_sinpi
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_SINPI_H__
+#endif // CLC_MATH_CLC_SINPI_H
diff --git a/libclc/clc/include/clc/math/clc_sqrt.h b/libclc/clc/include/clc/math/clc_sqrt.h
index 7084515533291..368a66e1fb954 100644
--- a/libclc/clc/include/clc/math/clc_sqrt.h
+++ b/libclc/clc/include/clc/math/clc_sqrt.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_SQRT_H__
-#define __CLC_MATH_CLC_SQRT_H__
+#ifndef CLC_MATH_CLC_SQRT_H
+#define CLC_MATH_CLC_SQRT_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_sqrt
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_SQRT_H__
+#endif // CLC_MATH_CLC_SQRT_H
diff --git a/libclc/clc/include/clc/math/clc_subnormal_config.h b/libclc/clc/include/clc/math/clc_subnormal_config.h
index 14693ed01e033..8b2911f55f176 100644
--- a/libclc/clc/include/clc/math/clc_subnormal_config.h
+++ b/libclc/clc/include/clc/math/clc_subnormal_config.h
@@ -5,8 +5,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_SUBNORMAL_CONFIG_H__
-#define __CLC_MATH_CLC_SUBNORMAL_CONFIG_H__
+#ifndef CLC_MATH_CLC_SUBNORMAL_CONFIG_H
+#define CLC_MATH_CLC_SUBNORMAL_CONFIG_H
#include <clc/clcfunc.h>
@@ -15,4 +15,4 @@ _CLC_DECL bool __clc_fp16_subnormals_supported();
_CLC_DECL bool __clc_fp32_subnormals_supported();
_CLC_DECL bool __clc_fp64_subnormals_supported();
-#endif // __CLC_MATH_CLC_SUBNORMAL_CONFIG_H__
+#endif // CLC_MATH_CLC_SUBNORMAL_CONFIG_H
diff --git a/libclc/clc/include/clc/math/clc_tan.h b/libclc/clc/include/clc/math/clc_tan.h
index 028ff28ecd69d..92da532f75086 100644
--- a/libclc/clc/include/clc/math/clc_tan.h
+++ b/libclc/clc/include/clc/math/clc_tan.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_TAN_H__
-#define __CLC_MATH_CLC_TAN_H__
+#ifndef CLC_MATH_CLC_TAN_H
+#define CLC_MATH_CLC_TAN_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_tan
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_TAN_H__
+#endif // CLC_MATH_CLC_TAN_H
diff --git a/libclc/clc/include/clc/math/clc_tanh.h b/libclc/clc/include/clc/math/clc_tanh.h
index 88fce2340d99b..eb4b71bf64e2d 100644
--- a/libclc/clc/include/clc/math/clc_tanh.h
+++ b/libclc/clc/include/clc/math/clc_tanh.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_TANH_H__
-#define __CLC_MATH_CLC_TANH_H__
+#ifndef CLC_MATH_CLC_TANH_H
+#define CLC_MATH_CLC_TANH_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_tanh
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_TANH_H__
+#endif // CLC_MATH_CLC_TANH_H
diff --git a/libclc/clc/include/clc/math/clc_tanpi.h b/libclc/clc/include/clc/math/clc_tanpi.h
index 596bb72b4b8de..ba75d2f135497 100644
--- a/libclc/clc/include/clc/math/clc_tanpi.h
+++ b/libclc/clc/include/clc/math/clc_tanpi.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_TANPI_H__
-#define __CLC_MATH_CLC_TANPI_H__
+#ifndef CLC_MATH_CLC_TANPI_H
+#define CLC_MATH_CLC_TANPI_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_tanpi
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_TANPI_H__
+#endif // CLC_MATH_CLC_TANPI_H
diff --git a/libclc/clc/include/clc/math/clc_tgamma.h b/libclc/clc/include/clc/math/clc_tgamma.h
index dd76e041875d5..e8a33c940403d 100644
--- a/libclc/clc/include/clc/math/clc_tgamma.h
+++ b/libclc/clc/include/clc/math/clc_tgamma.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_TGAMMA_H__
-#define __CLC_MATH_CLC_TGAMMA_H__
+#ifndef CLC_MATH_CLC_TGAMMA_H
+#define CLC_MATH_CLC_TGAMMA_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_tgamma
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_TGAMMA_H__
+#endif // CLC_MATH_CLC_TGAMMA_H
diff --git a/libclc/clc/include/clc/math/clc_trunc.h b/libclc/clc/include/clc/math/clc_trunc.h
index 33445f9fe15d6..aa3228883b7f1 100644
--- a/libclc/clc/include/clc/math/clc_trunc.h
+++ b/libclc/clc/include/clc/math/clc_trunc.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_CLC_TRUNC_H__
-#define __CLC_MATH_CLC_TRUNC_H__
+#ifndef CLC_MATH_CLC_TRUNC_H
+#define CLC_MATH_CLC_TRUNC_H
#define __CLC_BODY <clc/math/unary_decl.inc>
#define __CLC_FUNCTION __clc_trunc
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MATH_CLC_TRUNC_H__
+#endif // CLC_MATH_CLC_TRUNC_H
diff --git a/libclc/clc/include/clc/math/math.h b/libclc/clc/include/clc/math/math.h
index 59418eaac26fc..7e47198c8e8a6 100644
--- a/libclc/clc/include/clc/math/math.h
+++ b/libclc/clc/include/clc/math/math.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_MATH_H__
-#define __CLC_MATH_MATH_H__
+#ifndef CLC_MATH_MATH_H
+#define CLC_MATH_MATH_H
#include <clc/clc_as_type.h>
#include <clc/clcfunc.h>
@@ -113,4 +113,4 @@ _CLC_OVERLOAD _CLC_INLINE float __clc_flush_denormal_if_not_supported(float x) {
#endif // cl_khr_fp16
-#endif // __CLC_MATH_MATH_H__
+#endif // CLC_MATH_MATH_H
diff --git a/libclc/clc/include/clc/math/tables.h b/libclc/clc/include/clc/math/tables.h
index 12361a30357ac..7b1af2528d425 100644
--- a/libclc/clc/include/clc/math/tables.h
+++ b/libclc/clc/include/clc/math/tables.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MATH_TABLES_H__
-#define __CLC_MATH_TABLES_H__
+#ifndef CLC_MATH_TABLES_H
+#define CLC_MATH_TABLES_H
#define __CLC_TABLE_SPACE __constant
@@ -102,4 +102,4 @@ __CLC_TABLE_FUNCTION_DECL_VEC(double, log_f_inv_tbl_tail);
#endif // cl_khr_fp64
-#endif // __CLC_MATH_TABLES_H__
+#endif // CLC_MATH_TABLES_H
diff --git a/libclc/clc/include/clc/mem_fence/clc_mem_fence.h b/libclc/clc/include/clc/mem_fence/clc_mem_fence.h
index 0776caddde0d5..2243b73e524bd 100644
--- a/libclc/clc/include/clc/mem_fence/clc_mem_fence.h
+++ b/libclc/clc/include/clc/mem_fence/clc_mem_fence.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MEM_FENCE_CLC_MEM_FENCE_H__
-#define __CLC_MEM_FENCE_CLC_MEM_FENCE_H__
+#ifndef CLC_MEM_FENCE_CLC_MEM_FENCE_H
+#define CLC_MEM_FENCE_CLC_MEM_FENCE_H
#include <clc/internal/clc.h>
#include <clc/mem_fence/clc_mem_semantic.h>
@@ -16,4 +16,4 @@ _CLC_OVERLOAD _CLC_DECL void
__clc_mem_fence(int memory_scope, int memory_order,
__CLC_MemorySemantics memory_semantics);
-#endif // __CLC_MEM_FENCE_CLC_MEM_FENCE_H__
+#endif // CLC_MEM_FENCE_CLC_MEM_FENCE_H
diff --git a/libclc/clc/include/clc/mem_fence/clc_mem_semantic.h b/libclc/clc/include/clc/mem_fence/clc_mem_semantic.h
index 4d9f5f1db8ee9..def95a12dfc82 100644
--- a/libclc/clc/include/clc/mem_fence/clc_mem_semantic.h
+++ b/libclc/clc/include/clc/mem_fence/clc_mem_semantic.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MEM_FENCE_CLC_MEM_SEMANTIC_H__
-#define __CLC_MEM_FENCE_CLC_MEM_SEMANTIC_H__
+#ifndef CLC_MEM_FENCE_CLC_MEM_SEMANTIC_H
+#define CLC_MEM_FENCE_CLC_MEM_SEMANTIC_H
// The memory or address space to which the memory ordering is applied.
typedef enum __CLC_MemorySemantics {
@@ -18,4 +18,4 @@ typedef enum __CLC_MemorySemantics {
__CLC_MEMORY_GENERIC = 1 << 4,
} __CLC_MemorySemantics;
-#endif // __CLC_MEM_FENCE_CLC_MEM_SEMANTIC_H__
+#endif // CLC_MEM_FENCE_CLC_MEM_SEMANTIC_H
diff --git a/libclc/clc/include/clc/misc/clc_shuffle.h b/libclc/clc/include/clc/misc/clc_shuffle.h
index ba3d7a2bddd62..cb95b871972d8 100644
--- a/libclc/clc/include/clc/misc/clc_shuffle.h
+++ b/libclc/clc/include/clc/misc/clc_shuffle.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MISC_CLC_SHUFFLE_H__
-#define __CLC_MISC_CLC_SHUFFLE_H__
+#ifndef CLC_MISC_CLC_SHUFFLE_H
+#define CLC_MISC_CLC_SHUFFLE_H
#define __CLC_FUNCTION __clc_shuffle
@@ -21,4 +21,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MISC_CLC_SHUFFLE_H__
+#endif // CLC_MISC_CLC_SHUFFLE_H
diff --git a/libclc/clc/include/clc/misc/clc_shuffle2.h b/libclc/clc/include/clc/misc/clc_shuffle2.h
index 84bafba12b211..b4d7e74f8aa76 100644
--- a/libclc/clc/include/clc/misc/clc_shuffle2.h
+++ b/libclc/clc/include/clc/misc/clc_shuffle2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_MISC_CLC_SHUFFLE2_H__
-#define __CLC_MISC_CLC_SHUFFLE2_H__
+#ifndef CLC_MISC_CLC_SHUFFLE2_H
+#define CLC_MISC_CLC_SHUFFLE2_H
#define __CLC_FUNCTION __clc_shuffle2
@@ -21,4 +21,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_MISC_CLC_SHUFFLE2_H__
+#endif // CLC_MISC_CLC_SHUFFLE2_H
diff --git a/libclc/clc/include/clc/relational/clc_all.h b/libclc/clc/include/clc/relational/clc_all.h
index a99e2ae172d5c..1cef2cc7ff6b8 100644
--- a/libclc/clc/include/clc/relational/clc_all.h
+++ b/libclc/clc/include/clc/relational/clc_all.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ALL_H__
-#define __CLC_RELATIONAL_CLC_ALL_H__
+#ifndef CLC_RELATIONAL_CLC_ALL_H
+#define CLC_RELATIONAL_CLC_ALL_H
#include <clc/clcfunc.h>
@@ -30,4 +30,4 @@ _CLC_VECTOR_ALL_DECL(long)
#undef _CLC_ALL_DECL
#undef _CLC_VECTOR_ALL_DECL
-#endif // __CLC_RELATIONAL_CLC_ALL_H__
+#endif // CLC_RELATIONAL_CLC_ALL_H
diff --git a/libclc/clc/include/clc/relational/clc_any.h b/libclc/clc/include/clc/relational/clc_any.h
index 5e52be4563f36..f299f92c5fad4 100644
--- a/libclc/clc/include/clc/relational/clc_any.h
+++ b/libclc/clc/include/clc/relational/clc_any.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ANY_H__
-#define __CLC_RELATIONAL_CLC_ANY_H__
+#ifndef CLC_RELATIONAL_CLC_ANY_H
+#define CLC_RELATIONAL_CLC_ANY_H
#include <clc/clcfunc.h>
@@ -30,4 +30,4 @@ _CLC_VECTOR_ANY_DECL(long)
#undef _CLC_ANY_DECL
#undef _CLC_VECTOR_ANY_DECL
-#endif // __CLC_RELATIONAL_CLC_ANY_H__
+#endif // CLC_RELATIONAL_CLC_ANY_H
diff --git a/libclc/clc/include/clc/relational/clc_bitselect.h b/libclc/clc/include/clc/relational/clc_bitselect.h
index 5490ea7374f8d..e5915d9468163 100644
--- a/libclc/clc/include/clc/relational/clc_bitselect.h
+++ b/libclc/clc/include/clc/relational/clc_bitselect.h
@@ -6,12 +6,12 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_BITSELECT_H__
-#define __CLC_RELATIONAL_CLC_BITSELECT_H__
+#ifndef CLC_RELATIONAL_CLC_BITSELECT_H
+#define CLC_RELATIONAL_CLC_BITSELECT_H
#define __CLC_BODY <clc/relational/clc_bitselect.inc>
#include <clc/math/gentype.inc>
#define __CLC_BODY <clc/relational/clc_bitselect.inc>
#include <clc/integer/gentype.inc>
-#endif // __CLC_RELATIONAL_CLC_BITSELECT_H__
+#endif // CLC_RELATIONAL_CLC_BITSELECT_H
diff --git a/libclc/clc/include/clc/relational/clc_isequal.h b/libclc/clc/include/clc/relational/clc_isequal.h
index 18e05387759e3..7cba4460573ee 100644
--- a/libclc/clc/include/clc/relational/clc_isequal.h
+++ b/libclc/clc/include/clc/relational/clc_isequal.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISEQUAL_H__
-#define __CLC_RELATIONAL_CLC_ISEQUAL_H__
+#ifndef CLC_RELATIONAL_CLC_ISEQUAL_H
+#define CLC_RELATIONAL_CLC_ISEQUAL_H
#include <clc/clcfunc.h>
@@ -39,4 +39,4 @@ _CLC_VECTOR_ISEQUAL_DECL(half, short)
#undef _CLC_ISEQUAL_DECL
#undef _CLC_VECTOR_ISEQUAL_DECL
-#endif // __CLC_RELATIONAL_CLC_ISEQUAL_H__
+#endif // CLC_RELATIONAL_CLC_ISEQUAL_H
diff --git a/libclc/clc/include/clc/relational/clc_isfinite.h b/libclc/clc/include/clc/relational/clc_isfinite.h
index 596b81f51b853..36088d4909516 100644
--- a/libclc/clc/include/clc/relational/clc_isfinite.h
+++ b/libclc/clc/include/clc/relational/clc_isfinite.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISFINITE_H__
-#define __CLC_RELATIONAL_CLC_ISFINITE_H__
+#ifndef CLC_RELATIONAL_CLC_ISFINITE_H
+#define CLC_RELATIONAL_CLC_ISFINITE_H
#define __CLC_FUNCTION __clc_isfinite
#define __CLC_BODY <clc/relational/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISFINITE_H__
+#endif // CLC_RELATIONAL_CLC_ISFINITE_H
diff --git a/libclc/clc/include/clc/relational/clc_isgreater.h b/libclc/clc/include/clc/relational/clc_isgreater.h
index fc5b3cdad084a..cf53fbf762587 100644
--- a/libclc/clc/include/clc/relational/clc_isgreater.h
+++ b/libclc/clc/include/clc/relational/clc_isgreater.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISGREATER_H__
-#define __CLC_RELATIONAL_CLC_ISGREATER_H__
+#ifndef CLC_RELATIONAL_CLC_ISGREATER_H
+#define CLC_RELATIONAL_CLC_ISGREATER_H
#define __CLC_FUNCTION __clc_isgreater
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISGREATER_H__
+#endif // CLC_RELATIONAL_CLC_ISGREATER_H
diff --git a/libclc/clc/include/clc/relational/clc_isgreaterequal.h b/libclc/clc/include/clc/relational/clc_isgreaterequal.h
index 6209a066cf46d..059dcc1c431f0 100644
--- a/libclc/clc/include/clc/relational/clc_isgreaterequal.h
+++ b/libclc/clc/include/clc/relational/clc_isgreaterequal.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISGREATEREQUAL_H__
-#define __CLC_RELATIONAL_CLC_ISGREATEREQUAL_H__
+#ifndef CLC_RELATIONAL_CLC_ISGREATEREQUAL_H
+#define CLC_RELATIONAL_CLC_ISGREATEREQUAL_H
#define __CLC_FUNCTION __clc_isgreaterequal
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISGREATEREQUAL_H__
+#endif // CLC_RELATIONAL_CLC_ISGREATEREQUAL_H
diff --git a/libclc/clc/include/clc/relational/clc_isinf.h b/libclc/clc/include/clc/relational/clc_isinf.h
index a64b18bd564d3..3ec3997f56fcf 100644
--- a/libclc/clc/include/clc/relational/clc_isinf.h
+++ b/libclc/clc/include/clc/relational/clc_isinf.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISINF_H__
-#define __CLC_RELATIONAL_CLC_ISINF_H__
+#ifndef CLC_RELATIONAL_CLC_ISINF_H
+#define CLC_RELATIONAL_CLC_ISINF_H
#include <clc/clcfunc.h>
@@ -39,4 +39,4 @@ _CLC_VECTOR_ISINF_DECL(short, half)
#undef _CLC_ISINF_DECL
#undef _CLC_VECTOR_ISINF_DECL
-#endif // __CLC_RELATIONAL_CLC_ISINF_H__
+#endif // CLC_RELATIONAL_CLC_ISINF_H
diff --git a/libclc/clc/include/clc/relational/clc_isless.h b/libclc/clc/include/clc/relational/clc_isless.h
index 4e340db121773..5058100f91e52 100644
--- a/libclc/clc/include/clc/relational/clc_isless.h
+++ b/libclc/clc/include/clc/relational/clc_isless.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISLESS_H__
-#define __CLC_RELATIONAL_CLC_ISLESS_H__
+#ifndef CLC_RELATIONAL_CLC_ISLESS_H
+#define CLC_RELATIONAL_CLC_ISLESS_H
#define __CLC_FUNCTION __clc_isless
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISLESS_H__
+#endif // CLC_RELATIONAL_CLC_ISLESS_H
diff --git a/libclc/clc/include/clc/relational/clc_islessequal.h b/libclc/clc/include/clc/relational/clc_islessequal.h
index 14c5a10301836..821ff7a415321 100644
--- a/libclc/clc/include/clc/relational/clc_islessequal.h
+++ b/libclc/clc/include/clc/relational/clc_islessequal.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISLESSEQUAL_H__
-#define __CLC_RELATIONAL_CLC_ISLESSEQUAL_H__
+#ifndef CLC_RELATIONAL_CLC_ISLESSEQUAL_H
+#define CLC_RELATIONAL_CLC_ISLESSEQUAL_H
#define __CLC_FUNCTION __clc_islessequal
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISLESSEQUAL_H__
+#endif // CLC_RELATIONAL_CLC_ISLESSEQUAL_H
diff --git a/libclc/clc/include/clc/relational/clc_islessgreater.h b/libclc/clc/include/clc/relational/clc_islessgreater.h
index 530564bbf0595..07a2e11f08c50 100644
--- a/libclc/clc/include/clc/relational/clc_islessgreater.h
+++ b/libclc/clc/include/clc/relational/clc_islessgreater.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISLESSGREATER_H__
-#define __CLC_RELATIONAL_CLC_ISLESSGREATER_H__
+#ifndef CLC_RELATIONAL_CLC_ISLESSGREATER_H
+#define CLC_RELATIONAL_CLC_ISLESSGREATER_H
#define __CLC_FUNCTION __clc_islessgreater
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISLESSGREATER_H__
+#endif // CLC_RELATIONAL_CLC_ISLESSGREATER_H
diff --git a/libclc/clc/include/clc/relational/clc_isnan.h b/libclc/clc/include/clc/relational/clc_isnan.h
index 48cfa7f7fbb8e..b81ac0a0dec97 100644
--- a/libclc/clc/include/clc/relational/clc_isnan.h
+++ b/libclc/clc/include/clc/relational/clc_isnan.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISNAN_H__
-#define __CLC_RELATIONAL_CLC_ISNAN_H__
+#ifndef CLC_RELATIONAL_CLC_ISNAN_H
+#define CLC_RELATIONAL_CLC_ISNAN_H
#include <clc/clcfunc.h>
@@ -39,4 +39,4 @@ _CLC_VECTOR_ISNAN_DECL(short, half)
#undef _CLC_ISNAN_DECL
#undef _CLC_VECTOR_ISNAN_DECL
-#endif // __CLC_RELATIONAL_CLC_ISNAN_H__
+#endif // CLC_RELATIONAL_CLC_ISNAN_H
diff --git a/libclc/clc/include/clc/relational/clc_isnormal.h b/libclc/clc/include/clc/relational/clc_isnormal.h
index 9572b02004686..896600ddaa371 100644
--- a/libclc/clc/include/clc/relational/clc_isnormal.h
+++ b/libclc/clc/include/clc/relational/clc_isnormal.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISNORMAL_H__
-#define __CLC_RELATIONAL_CLC_ISNORMAL_H__
+#ifndef CLC_RELATIONAL_CLC_ISNORMAL_H
+#define CLC_RELATIONAL_CLC_ISNORMAL_H
#define __CLC_FUNCTION __clc_isnormal
#define __CLC_BODY <clc/relational/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISNORMAL_H__
+#endif // CLC_RELATIONAL_CLC_ISNORMAL_H
diff --git a/libclc/clc/include/clc/relational/clc_isnotequal.h b/libclc/clc/include/clc/relational/clc_isnotequal.h
index f90622db9fe1d..f59b8a8788f70 100644
--- a/libclc/clc/include/clc/relational/clc_isnotequal.h
+++ b/libclc/clc/include/clc/relational/clc_isnotequal.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISNOTEQUAL_H__
-#define __CLC_RELATIONAL_CLC_ISNOTEQUAL_H__
+#ifndef CLC_RELATIONAL_CLC_ISNOTEQUAL_H
+#define CLC_RELATIONAL_CLC_ISNOTEQUAL_H
#define __CLC_FUNCTION __clc_isnotequal
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISNOTEQUAL_H__
+#endif // CLC_RELATIONAL_CLC_ISNOTEQUAL_H
diff --git a/libclc/clc/include/clc/relational/clc_isordered.h b/libclc/clc/include/clc/relational/clc_isordered.h
index 3f5cc097f4a72..d673826cf4cb4 100644
--- a/libclc/clc/include/clc/relational/clc_isordered.h
+++ b/libclc/clc/include/clc/relational/clc_isordered.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISORDERED_H__
-#define __CLC_RELATIONAL_CLC_ISORDERED_H__
+#ifndef CLC_RELATIONAL_CLC_ISORDERED_H
+#define CLC_RELATIONAL_CLC_ISORDERED_H
#define __CLC_FUNCTION __clc_isordered
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISORDERED_H__
+#endif // CLC_RELATIONAL_CLC_ISORDERED_H
diff --git a/libclc/clc/include/clc/relational/clc_issubnormal.h b/libclc/clc/include/clc/relational/clc_issubnormal.h
index 548d50a08a6e3..693d52495eb03 100644
--- a/libclc/clc/include/clc/relational/clc_issubnormal.h
+++ b/libclc/clc/include/clc/relational/clc_issubnormal.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISSUBNORMAL_H__
-#define __CLC_RELATIONAL_CLC_ISSUBNORMAL_H__
+#ifndef CLC_RELATIONAL_CLC_ISSUBNORMAL_H
+#define CLC_RELATIONAL_CLC_ISSUBNORMAL_H
#include <clc/clcfunc.h>
@@ -39,4 +39,4 @@ _CLC_VECTOR_ISSUBNORMAL_DECL(short, half)
#undef _CLC_ISSUBNORMAL_DECL
#undef _CLC_VECTOR_ISSUBNORMAL_DECL
-#endif // __CLC_RELATIONAL_CLC_ISSUBNORMAL_H__
+#endif // CLC_RELATIONAL_CLC_ISSUBNORMAL_H
diff --git a/libclc/clc/include/clc/relational/clc_isunordered.h b/libclc/clc/include/clc/relational/clc_isunordered.h
index 6134ba849d229..ee644e06b6a52 100644
--- a/libclc/clc/include/clc/relational/clc_isunordered.h
+++ b/libclc/clc/include/clc/relational/clc_isunordered.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_ISUNORDERED_H__
-#define __CLC_RELATIONAL_CLC_ISUNORDERED_H__
+#ifndef CLC_RELATIONAL_CLC_ISUNORDERED_H
+#define CLC_RELATIONAL_CLC_ISUNORDERED_H
#define __CLC_FUNCTION __clc_isunordered
#define __CLC_BODY <clc/relational/binary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_ISUNORDERED_H__
+#endif // CLC_RELATIONAL_CLC_ISUNORDERED_H
diff --git a/libclc/clc/include/clc/relational/clc_select.h b/libclc/clc/include/clc/relational/clc_select.h
index de0a9afa6b8cf..3d1af0321fe65 100644
--- a/libclc/clc/include/clc/relational/clc_select.h
+++ b/libclc/clc/include/clc/relational/clc_select.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_SELECT_H__
-#define __CLC_RELATIONAL_CLC_SELECT_H__
+#ifndef CLC_RELATIONAL_CLC_SELECT_H
+#define CLC_RELATIONAL_CLC_SELECT_H
#include <clc/utils.h>
@@ -20,4 +20,4 @@
#undef __CLC_SELECT_FN
-#endif // __CLC_RELATIONAL_CLC_SELECT_H__
+#endif // CLC_RELATIONAL_CLC_SELECT_H
diff --git a/libclc/clc/include/clc/relational/clc_signbit.h b/libclc/clc/include/clc/relational/clc_signbit.h
index a8e04ce494f2c..1f2af164b1fa9 100644
--- a/libclc/clc/include/clc/relational/clc_signbit.h
+++ b/libclc/clc/include/clc/relational/clc_signbit.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_CLC_SIGNBIT_H__
-#define __CLC_RELATIONAL_CLC_SIGNBIT_H__
+#ifndef CLC_RELATIONAL_CLC_SIGNBIT_H
+#define CLC_RELATIONAL_CLC_SIGNBIT_H
#define __CLC_FUNCTION __clc_signbit
#define __CLC_BODY <clc/relational/unary_decl.inc>
@@ -16,4 +16,4 @@
#undef __CLC_FUNCTION
-#endif // __CLC_RELATIONAL_CLC_SIGNBIT_H__
+#endif // CLC_RELATIONAL_CLC_SIGNBIT_H
diff --git a/libclc/clc/include/clc/relational/relational.h b/libclc/clc/include/clc/relational/relational.h
index 32ed9f431ddbd..a19399f8b7a4a 100644
--- a/libclc/clc/include/clc/relational/relational.h
+++ b/libclc/clc/include/clc/relational/relational.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_RELATIONAL_RELATIONAL_H__
-#define __CLC_RELATIONAL_RELATIONAL_H__
+#ifndef CLC_RELATIONAL_RELATIONAL_H
+#define CLC_RELATIONAL_RELATIONAL_H
/*
* Contains relational macros that have to return 1 for scalar and -1 for vector
@@ -71,4 +71,4 @@
_CLC_DEFINE_ISFPCLASS_VEC(VEC_RET_TYPE##16, __CLC_FUNCTION, MASK, \
ARG_TYPE##16)
-#endif // __CLC_RELATIONAL_RELATIONAL_H__
+#endif // CLC_RELATIONAL_RELATIONAL_H
diff --git a/libclc/clc/include/clc/shared/clc_clamp.h b/libclc/clc/include/clc/shared/clc_clamp.h
index c4a482d12221e..063cad732bc91 100644
--- a/libclc/clc/include/clc/shared/clc_clamp.h
+++ b/libclc/clc/include/clc/shared/clc_clamp.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_SHARED_CLC_CLAMP_H__
-#define __CLC_SHARED_CLC_CLAMP_H__
+#ifndef CLC_SHARED_CLC_CLAMP_H
+#define CLC_SHARED_CLC_CLAMP_H
#define __CLC_BODY <clc/shared/clc_clamp.inc>
#include <clc/integer/gentype.inc>
@@ -15,4 +15,4 @@
#define __CLC_BODY <clc/shared/clc_clamp.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_SHARED_CLC_CLAMP_H__
+#endif // CLC_SHARED_CLC_CLAMP_H
diff --git a/libclc/clc/include/clc/shared/clc_less_aligned_types.h b/libclc/clc/include/clc/shared/clc_less_aligned_types.h
index 73e436147ce0a..48959f82740e0 100644
--- a/libclc/clc/include/clc/shared/clc_less_aligned_types.h
+++ b/libclc/clc/include/clc/shared/clc_less_aligned_types.h
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H__
-#define __CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H__
+#ifndef CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H
+#define CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H
#define __CLC_BODY <clc/shared/clc_less_aligned_types.inc>
#include <clc/integer/gentype.inc>
@@ -20,4 +20,4 @@
#define __CLC_BODY <clc/shared/clc_less_aligned_types.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H__
+#endif // CLC_SHARED_CLC_LESS_ALIGNED_TYPES_H
diff --git a/libclc/clc/include/clc/shared/clc_max.h b/libclc/clc/include/clc/shared/clc_max.h
index 470d56cf31878..0554d772f8870 100644
--- a/libclc/clc/include/clc/shared/clc_max.h
+++ b/libclc/clc/include/clc/shared/clc_max.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_SHARED_CLC_MAX_H__
-#define __CLC_SHARED_CLC_MAX_H__
+#ifndef CLC_SHARED_CLC_MAX_H
+#define CLC_SHARED_CLC_MAX_H
#define __CLC_BODY <clc/shared/clc_max.inc>
#include <clc/integer/gentype.inc>
@@ -15,4 +15,4 @@
#define __CLC_BODY <clc/shared/clc_max.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_SHARED_CLC_MAX_H__
+#endif // CLC_SHARED_CLC_MAX_H
diff --git a/libclc/clc/include/clc/shared/clc_min.h b/libclc/clc/include/clc/shared/clc_min.h
index 3931d4684aec0..d9bf9e1d19a3d 100644
--- a/libclc/clc/include/clc/shared/clc_min.h
+++ b/libclc/clc/include/clc/shared/clc_min.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_SHARED_CLC_MIN_H__
-#define __CLC_SHARED_CLC_MIN_H__
+#ifndef CLC_SHARED_CLC_MIN_H
+#define CLC_SHARED_CLC_MIN_H
#define __CLC_BODY <clc/shared/clc_min.inc>
#include <clc/integer/gentype.inc>
@@ -15,4 +15,4 @@
#define __CLC_BODY <clc/shared/clc_min.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_SHARED_CLC_MIN_H__
+#endif // CLC_SHARED_CLC_MIN_H
diff --git a/libclc/clc/include/clc/shared/clc_vload.h b/libclc/clc/include/clc/shared/clc_vload.h
index c3dbe0696cc19..75d3546eed5e6 100644
--- a/libclc/clc/include/clc/shared/clc_vload.h
+++ b/libclc/clc/include/clc/shared/clc_vload.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_SHARED_CLC_VLOAD_H__
-#define __CLC_SHARED_CLC_VLOAD_H__
+#ifndef CLC_SHARED_CLC_VLOAD_H
+#define CLC_SHARED_CLC_VLOAD_H
#include <clc/shared/clc_less_aligned_types.h>
@@ -17,4 +17,4 @@
#define __CLC_BODY <clc/shared/clc_vload.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_SHARED_CLC_VLOAD_H__
+#endif // CLC_SHARED_CLC_VLOAD_H
diff --git a/libclc/clc/include/clc/shared/clc_vstore.h b/libclc/clc/include/clc/shared/clc_vstore.h
index 647dc7da1afbe..564bcade208d9 100644
--- a/libclc/clc/include/clc/shared/clc_vstore.h
+++ b/libclc/clc/include/clc/shared/clc_vstore.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_SHARED_CLC_VSTORE_H__
-#define __CLC_SHARED_CLC_VSTORE_H__
+#ifndef CLC_SHARED_CLC_VSTORE_H
+#define CLC_SHARED_CLC_VSTORE_H
#include <clc/shared/clc_less_aligned_types.h>
@@ -17,4 +17,4 @@
#define __CLC_BODY <clc/shared/clc_vstore.inc>
#include <clc/math/gentype.inc>
-#endif // __CLC_SHARED_CLC_VSTORE_H__
+#endif // CLC_SHARED_CLC_VSTORE_H
diff --git a/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h b/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h
index 34745bd47c068..7ae5f73afd8a0 100644
--- a/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h
+++ b/libclc/clc/include/clc/synchronization/clc_work_group_barrier.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H__
-#define __CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H__
+#ifndef CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H
+#define CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H
#include <clc/internal/clc.h>
#include <clc/mem_fence/clc_mem_semantic.h>
@@ -16,4 +16,4 @@ _CLC_OVERLOAD _CLC_DECL void
__clc_work_group_barrier(int memory_scope, int memory_order,
__CLC_MemorySemantics memory_semantics);
-#endif // __CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H__
+#endif // CLC_SYNCHRONIZATION_CLC_WORK_GROUP_BARRIER_H
diff --git a/libclc/clc/include/clc/utils.h b/libclc/clc/include/clc/utils.h
index 55afad0625ba0..4bbab16bc45cc 100644
--- a/libclc/clc/include/clc/utils.h
+++ b/libclc/clc/include/clc/utils.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_UTILS_H__
-#define __CLC_UTILS_H__
+#ifndef CLC_UTILS_H
+#define CLC_UTILS_H
#define __CLC_CONCAT(x, y) x##y
#define __CLC_XCONCAT(x, y) __CLC_CONCAT(x, y)
@@ -15,4 +15,4 @@
#define __CLC_STR(x) #x
#define __CLC_XSTR(x) __CLC_STR(x)
-#endif // __CLC_UTILS_H__
+#endif // CLC_UTILS_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_global_id.h b/libclc/clc/include/clc/workitem/clc_get_global_id.h
index 8a78c78bbc164..ddd59f128a35a 100644
--- a/libclc/clc/include/clc/workitem/clc_get_global_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_global_id.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_GLOBAL_ID_H__
-#define __CLC_WORKITEM_CLC_GET_GLOBAL_ID_H__
+#ifndef CLC_WORKITEM_CLC_GET_GLOBAL_ID_H
+#define CLC_WORKITEM_CLC_GET_GLOBAL_ID_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_global_id(uint dim);
-#endif // __CLC_WORKITEM_CLC_GET_GLOBAL_ID_H__
+#endif // CLC_WORKITEM_CLC_GET_GLOBAL_ID_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_global_offset.h b/libclc/clc/include/clc/workitem/clc_get_global_offset.h
index bf6d4e5c7642d..af71a5f6a33a0 100644
--- a/libclc/clc/include/clc/workitem/clc_get_global_offset.h
+++ b/libclc/clc/include/clc/workitem/clc_get_global_offset.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H__
-#define __CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H__
+#ifndef CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H
+#define CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_global_offset(uint dim);
-#endif // __CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H__
+#endif // CLC_WORKITEM_CLC_GET_GLOBAL_OFFSET_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_global_size.h b/libclc/clc/include/clc/workitem/clc_get_global_size.h
index 87b88d7d1b4b0..d8cae7562d226 100644
--- a/libclc/clc/include/clc/workitem/clc_get_global_size.h
+++ b/libclc/clc/include/clc/workitem/clc_get_global_size.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H__
-#define __CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H__
+#ifndef CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H
+#define CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_global_size(uint dim);
-#endif // __CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H__
+#endif // CLC_WORKITEM_CLC_GET_GLOBAL_SIZE_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_group_id.h b/libclc/clc/include/clc/workitem/clc_get_group_id.h
index cc1b0f13ad792..24cb98d8bd7f2 100644
--- a/libclc/clc/include/clc/workitem/clc_get_group_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_group_id.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_GROUP_ID_H__
-#define __CLC_WORKITEM_CLC_GET_GROUP_ID_H__
+#ifndef CLC_WORKITEM_CLC_GET_GROUP_ID_H
+#define CLC_WORKITEM_CLC_GET_GROUP_ID_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_group_id(uint dim);
-#endif // __CLC_WORKITEM_CLC_GET_GROUP_ID_H__
+#endif // CLC_WORKITEM_CLC_GET_GROUP_ID_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_local_id.h b/libclc/clc/include/clc/workitem/clc_get_local_id.h
index a25e5ebaa5e45..f58cc54fc699d 100644
--- a/libclc/clc/include/clc/workitem/clc_get_local_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_local_id.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_LOCAL_ID_H__
-#define __CLC_WORKITEM_CLC_GET_LOCAL_ID_H__
+#ifndef CLC_WORKITEM_CLC_GET_LOCAL_ID_H
+#define CLC_WORKITEM_CLC_GET_LOCAL_ID_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_local_id(uint dim);
-#endif // __CLC_WORKITEM_CLC_GET_LOCAL_ID_H__
+#endif // CLC_WORKITEM_CLC_GET_LOCAL_ID_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h b/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h
index 9548644f05ca9..504cd330e63ac 100644
--- a/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_local_linear_id.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H__
-#define __CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H__
+#ifndef CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H
+#define CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_local_linear_id();
-#endif // __CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H__
+#endif // CLC_WORKITEM_CLC_GET_LOCAL_LINEAR_ID_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_local_size.h b/libclc/clc/include/clc/workitem/clc_get_local_size.h
index 1272227b65e1b..a82a93b591ba1 100644
--- a/libclc/clc/include/clc/workitem/clc_get_local_size.h
+++ b/libclc/clc/include/clc/workitem/clc_get_local_size.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H__
-#define __CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H__
+#ifndef CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H
+#define CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_local_size(uint dim);
-#endif // __CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H__
+#endif // CLC_WORKITEM_CLC_GET_LOCAL_SIZE_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h b/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h
index c8ea2a1fead12..cdd8272251b6a 100644
--- a/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h
+++ b/libclc/clc/include/clc/workitem/clc_get_max_sub_group_size.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H__
-#define __CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H__
+#ifndef CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H
+#define CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_max_sub_group_size();
-#endif // __CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H__
+#endif // CLC_WORKITEM_CLC_GET_MAX_SUB_GROUP_SIZE_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_num_groups.h b/libclc/clc/include/clc/workitem/clc_get_num_groups.h
index 6071fc3f141fb..d4f1a2ba94fde 100644
--- a/libclc/clc/include/clc/workitem/clc_get_num_groups.h
+++ b/libclc/clc/include/clc/workitem/clc_get_num_groups.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_NUM_GROUPS_H__
-#define __CLC_WORKITEM_CLC_GET_NUM_GROUPS_H__
+#ifndef CLC_WORKITEM_CLC_GET_NUM_GROUPS_H
+#define CLC_WORKITEM_CLC_GET_NUM_GROUPS_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL size_t __clc_get_num_groups(uint dim);
-#endif // __CLC_WORKITEM_CLC_GET_NUM_GROUPS_H__
+#endif // CLC_WORKITEM_CLC_GET_NUM_GROUPS_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h b/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h
index f94e898268921..e3de422c1c3f8 100644
--- a/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h
+++ b/libclc/clc/include/clc/workitem/clc_get_num_sub_groups.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H__
-#define __CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H__
+#ifndef CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H
+#define CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_num_sub_groups();
-#endif // __CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H__
+#endif // CLC_WORKITEM_CLC_GET_NUM_SUB_GROUPS_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h b/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h
index 61b54ecde4766..cbd688a622f79 100644
--- a/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_sub_group_id.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H__
-#define __CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H__
+#ifndef CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H
+#define CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_sub_group_id();
-#endif // __CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H__
+#endif // CLC_WORKITEM_CLC_GET_SUB_GROUP_ID_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h b/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h
index a158153bde1e9..fcf070655cbde 100644
--- a/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h
+++ b/libclc/clc/include/clc/workitem/clc_get_sub_group_local_id.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H__
-#define __CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H__
+#ifndef CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H
+#define CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_sub_group_local_id();
-#endif // __CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H__
+#endif // CLC_WORKITEM_CLC_GET_SUB_GROUP_LOCAL_ID_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h b/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h
index c4b1d928b20d2..552907d0c5cf1 100644
--- a/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h
+++ b/libclc/clc/include/clc/workitem/clc_get_sub_group_size.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H__
-#define __CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H__
+#ifndef CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H
+#define CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_sub_group_size();
-#endif // __CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H__
+#endif // CLC_WORKITEM_CLC_GET_SUB_GROUP_SIZE_H
diff --git a/libclc/clc/include/clc/workitem/clc_get_work_dim.h b/libclc/clc/include/clc/workitem/clc_get_work_dim.h
index e93d3773b8ca9..b44ade9a7f309 100644
--- a/libclc/clc/include/clc/workitem/clc_get_work_dim.h
+++ b/libclc/clc/include/clc/workitem/clc_get_work_dim.h
@@ -6,11 +6,11 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __CLC_WORKITEM_CLC_GET_WORK_DIM_H__
-#define __CLC_WORKITEM_CLC_GET_WORK_DIM_H__
+#ifndef CLC_WORKITEM_CLC_GET_WORK_DIM_H
+#define CLC_WORKITEM_CLC_GET_WORK_DIM_H
#include <clc/internal/clc.h>
_CLC_OVERLOAD _CLC_CONST _CLC_DECL uint __clc_get_work_dim();
-#endif // __CLC_WORKITEM_CLC_GET_WORK_DIM_H__
+#endif // CLC_WORKITEM_CLC_GET_WORK_DIM_H
diff --git a/libclc/clc/lib/generic/integer/clc_mad24.cl b/libclc/clc/lib/generic/integer/clc_mad24.cl
index 12b72a20b35cf..aaba6a7d4d632 100644
--- a/libclc/clc/lib/generic/integer/clc_mad24.cl
+++ b/libclc/clc/lib/generic/integer/clc_mad24.cl
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#include <clc/internal/clc.h>
#include <clc/integer/clc_mul24.h>
+#include <clc/internal/clc.h>
#define __CLC_BODY <clc_mad24.inc>
#include <clc/integer/gentype24.inc>
diff --git a/libclc/clc/lib/generic/math/clc_log_base.h b/libclc/clc/lib/generic/math/clc_log_base.h
index ba92679dbaaf4..24e4452e21d27 100644
--- a/libclc/clc/lib/generic/math/clc_log_base.h
+++ b/libclc/clc/lib/generic/math/clc_log_base.h
@@ -1,3 +1,6 @@
+#ifndef LLVM_LIBCLC_CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H
+#define LLVM_LIBCLC_CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H
+
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -322,3 +325,5 @@ __clc_log(half x) {
#endif
#endif // cl_khr_fp16
+
+#endif
diff --git a/libclc/clc/lib/generic/math/clc_sincos_helpers.inc b/libclc/clc/lib/generic/math/clc_sincos_helpers.inc
index 2a71b5626ccc5..6f7064ab20486 100644
--- a/libclc/clc/lib/generic/math/clc_sincos_helpers.inc
+++ b/libclc/clc/lib/generic/math/clc_sincos_helpers.inc
@@ -347,8 +347,7 @@ _CLC_DEF _CLC_OVERLOAD __CLC_INTN __clc_argReductionS(private __CLC_FLOATN *r,
#ifdef __CLC_SCALAR
if (is_small)
return __clc_argReductionSmallS(r, rr, x);
- else
- return __clc_argReductionLargeS(r, rr, x);
+ return __clc_argReductionLargeS(r, rr, x);
#else
__CLC_FLOATN r1, rr1, r2, rr2;
__CLC_INTN ret1 = __clc_argReductionSmallS(&r1, &rr1, x);
>From a81315a8b93ccfb80b2a5d00536f1bb164f60423 Mon Sep 17 00:00:00 2001
From: Wenju He <wenju.he at intel.com>
Date: Thu, 5 Mar 2026 03:19:46 +0100
Subject: [PATCH 2/2] address copilot review comments
---
libclc/.clang-tidy | 2 +-
libclc/clc/include/clc/float/definitions.h | 2 +-
libclc/clc/lib/generic/math/clc_log_base.h | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libclc/.clang-tidy b/libclc/.clang-tidy
index 3638581156209..cb72ad1d07871 100644
--- a/libclc/.clang-tidy
+++ b/libclc/.clang-tidy
@@ -1,5 +1,5 @@
InheritParentConfig: true
-# Disable bugprone-reserved-identifier and bugprone-macro-parentheses as libclc,
+# Disable bugprone-reserved-identifier and bugprone-macro-parentheses as libclc
# uses reserved identifiers (__prefix) for internal macros/functions.
# Disable readability-identifier-naming to preserve existing naming (LOG2_HEAD, etc).
Checks: 'bugprone-*,-bugprone-reserved-identifier,-bugprone-macro-parentheses,performance-*,llvm-header-guard,-readability-identifier-naming'
diff --git a/libclc/clc/include/clc/float/definitions.h b/libclc/clc/include/clc/float/definitions.h
index 4eaca6a90bd9a..bbdda6fbaada2 100644
--- a/libclc/clc/include/clc/float/definitions.h
+++ b/libclc/clc/include/clc/float/definitions.h
@@ -64,4 +64,4 @@
#endif
-#endif
+#endif // CLC_FLOAT_DEFINITIONS_H
diff --git a/libclc/clc/lib/generic/math/clc_log_base.h b/libclc/clc/lib/generic/math/clc_log_base.h
index 24e4452e21d27..dc0fad5856764 100644
--- a/libclc/clc/lib/generic/math/clc_log_base.h
+++ b/libclc/clc/lib/generic/math/clc_log_base.h
@@ -1,5 +1,5 @@
-#ifndef LLVM_LIBCLC_CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H
-#define LLVM_LIBCLC_CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H
+#ifndef CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H
+#define CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H
//===----------------------------------------------------------------------===//
//
@@ -326,4 +326,4 @@ __clc_log(half x) {
#endif // cl_khr_fp16
-#endif
+#endif // CLC_LIB_GENERIC_MATH_CLC_LOG_BASE_H
More information about the cfe-commits
mailing list