ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NFC] Do not use reserved names for include guards (#1737)

Browse Source 
Names that begin with an underscore followed by an uppercase letter
are reserved for the C++ implementation.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2023-06-09 11:25:20 +01:00
committed by GitHub
parent c8061ab21a
commit 475a37abbf
16 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test_common/harness/compat.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _COMPAT_H_ #ifndef COMPAT_H_
#define _COMPAT_H_ #define COMPAT_H_
#if defined(_WIN32) && defined(_MSC_VER) #if defined(_WIN32) && defined(_MSC_VER)
#include <Windows.h> #include <Windows.h>
@@ -398,4 +398,4 @@ EXTERN_C int __builtin_clz(unsigned int pattern);
#define sleep(sec) Sleep((sec)*1000) #define sleep(sec) Sleep((sec)*1000)
#endif #endif
#endif // _COMPAT_H_ #endif // COMPAT_H_

4
test_common/harness/crc32.h
View File

@@ -15,8 +15,8 @@ Agreement or Khronos Conformance Test Source License Agreement as
executed between Khronos and the recipient. executed between Khronos and the recipient.
******************************************************************/ ******************************************************************/
#ifndef _CRC32_H_ #ifndef CRC32_H_
#define _CRC32_H_ #define CRC32_H_
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>

6
test_conformance/c11_atomics/common.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _COMMON_H_ #ifndef COMMON_H_
#define _COMMON_H_ #define COMMON_H_
#include "harness/testHarness.h" #include "harness/testHarness.h"
#include "harness/typeWrappers.h" #include "harness/typeWrappers.h"
@@ -1567,4 +1567,4 @@ int CBasicTest<HostAtomicType, HostDataType>::ExecuteSingleTest(
return 0; return 0;
} }
#endif //_COMMON_H_ #endif // COMMON_H_

6
test_conformance/c11_atomics/host_atomics.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _HOST_ATOMICS_H_ #ifndef HOST_ATOMICS_H_
#define _HOST_ATOMICS_H_ #define HOST_ATOMICS_H_
#include "harness/testHarness.h" #include "harness/testHarness.h"
@@ -247,4 +247,4 @@ CorrespondingType host_atomic_fetch_max(volatile AtomicType *a, CorrespondingTyp
bool host_atomic_flag_test_and_set(volatile HOST_ATOMIC_FLAG *a, TExplicitMemoryOrderType order); bool host_atomic_flag_test_and_set(volatile HOST_ATOMIC_FLAG *a, TExplicitMemoryOrderType order);
void host_atomic_flag_clear(volatile HOST_ATOMIC_FLAG *a, TExplicitMemoryOrderType order); void host_atomic_flag_clear(volatile HOST_ATOMIC_FLAG *a, TExplicitMemoryOrderType order);
#endif //_HOST_ATOMICS_H_ #endif // HOST_ATOMICS_H_

4
test_conformance/d3d10/harness.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _HARNESS_H_ #ifndef HARNESS_H_
#define _HARNESS_H_ #define HARNESS_H_
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS

6
test_conformance/extensions/cl_khr_command_buffer/basic_command_buffer.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifndef _CL_KHR_BASIC_COMMAND_BUFFER_H #ifndef CL_KHR_BASIC_COMMAND_BUFFER_H
#define _CL_KHR_BASIC_COMMAND_BUFFER_H #define CL_KHR_BASIC_COMMAND_BUFFER_H
#include "command_buffer_test_base.h" #include "command_buffer_test_base.h"
#include "harness/typeWrappers.h" #include "harness/typeWrappers.h"
@@ -99,4 +99,4 @@ int MakeAndRunTest(cl_device_id device, cl_context context,
return TEST_PASS; return TEST_PASS;
} }
#endif // _CL_KHR_BASIC_COMMAND_BUFFER_H #endif // CL_KHR_BASIC_COMMAND_BUFFER_H

6
test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/mutable_command_basic.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifndef _CL_KHR_MUTABLE_COMMAND_BASIC_H #ifndef CL_KHR_MUTABLE_COMMAND_BASIC_H
#define _CL_KHR_MUTABLE_COMMAND_BASIC_H #define CL_KHR_MUTABLE_COMMAND_BASIC_H
#include "../basic_command_buffer.h" #include "../basic_command_buffer.h"
#include "../command_buffer_test_base.h" #include "../command_buffer_test_base.h"
@@ -104,4 +104,4 @@ struct BasicMutableCommandBufferTest : BasicCommandBufferTest
const size_t global_work_size = 4 * sizeof(cl_int); const size_t global_work_size = 4 * sizeof(cl_int);
}; };
#endif //_CL_KHR_MUTABLE_COMMAND_BASIC_H #endif // CL_KHR_MUTABLE_COMMAND_BASIC_H

6
test_conformance/extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/procs.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _CL_KHR_COMMAND_BUFFER_MUTABLE_DISPATCH_PROCS_H #ifndef CL_KHR_COMMAND_BUFFER_MUTABLE_DISPATCH_PROCS_H
#define _CL_KHR_COMMAND_BUFFER_MUTABLE_DISPATCH_PROCS_H #define CL_KHR_COMMAND_BUFFER_MUTABLE_DISPATCH_PROCS_H
#include <CL/cl.h> #include <CL/cl.h>
@@ -59,4 +59,4 @@ extern int test_mutable_command_info_global_work_size(cl_device_id device,
cl_context context, cl_context context,
cl_command_queue queue, cl_command_queue queue,
int num_elements); int num_elements);
#endif /*_CL_KHR_COMMAND_BUFFER_MUTABLE_DISPATCH_PROCS_H*/ #endif // CL_KHR_COMMAND_BUFFER_MUTABLE_DISPATCH_PROCS_H

6
test_conformance/extensions/cl_khr_command_buffer/command_buffer_test_base.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifndef _CL_KHR_COMMAND_BUFFER_TEST_BASE_H #ifndef CL_KHR_COMMAND_BUFFER_TEST_BASE_H
#define _CL_KHR_COMMAND_BUFFER_TEST_BASE_H #define CL_KHR_COMMAND_BUFFER_TEST_BASE_H
#include <CL/cl_ext.h> #include <CL/cl_ext.h>
#include "harness/deviceInfo.h" #include "harness/deviceInfo.h"
@@ -174,4 +174,4 @@ public:
} }
#endif // _CL_KHR_COMMAND_BUFFER_TEST_BASE_H #endif // CL_KHR_COMMAND_BUFFER_TEST_BASE_H

6
test_conformance/extensions/cl_khr_command_buffer/procs.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _CL_KHR_COMMAND_BUFFER_PROCS_H #ifndef CL_KHR_COMMAND_BUFFER_PROCS_H
#define _CL_KHR_COMMAND_BUFFER_PROCS_H #define CL_KHR_COMMAND_BUFFER_PROCS_H
#include <CL/cl.h> #include <CL/cl.h>
@@ -131,4 +131,4 @@ extern int test_event_info_reference_count(cl_device_id device,
cl_command_queue queue, cl_command_queue queue,
int num_elements); int num_elements);
#endif /*_CL_KHR_COMMAND_BUFFER_PROCS_H*/ #endif // CL_KHR_COMMAND_BUFFER_PROCS_H

6
test_conformance/extensions/cl_khr_external_semaphore/procs.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _CL_KHR_EXTERNAL_SEMAPHORE_PROCS_H #ifndef CL_KHR_EXTERNAL_SEMAPHORE_PROCS_H
#define _CL_KHR_EXTERNAL_SEMAPHORE_PROCS_H #define CL_KHR_EXTERNAL_SEMAPHORE_PROCS_H
#include <CL/cl.h> #include <CL/cl.h>
@@ -79,4 +79,4 @@ extern int test_external_semaphores_invalid_command(cl_device_id deviceID,
cl_context context, cl_context context,
cl_command_queue queue, cl_command_queue queue,
int num_elements); int num_elements);
#endif /* CL_KHR_EXTERNAL_SEMAPHORE */ #endif // CL_KHR_EXTERNAL_SEMAPHORE_PROCS_H

6
test_conformance/images/kernel_read_write/test_cl_ext_image_buffer.hpp
View File

@@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef _TEST_CL_EXT_IMAGE_BUFFER #ifndef TEST_CL_EXT_IMAGE_BUFFER
#define _TEST_CL_EXT_IMAGE_BUFFER #define TEST_CL_EXT_IMAGE_BUFFER
#define TEST_IMAGE_SIZE 20 #define TEST_IMAGE_SIZE 20
@@ -121,4 +121,4 @@ static inline void image_desc_init(cl_image_desc* desc,
} }
} }
#endif /* _TEST_CL_EXT_IMAGE_BUFFER */ #endif // TEST_CL_EXT_IMAGE_BUFFER

7
test_conformance/non_uniform_work_group/TestNonUniformWorkGroup.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _TESTNONUNIFORMWORKGROUP_H #ifndef TESTNONUNIFORMWORKGROUP_H
#define _TESTNONUNIFORMWORKGROUP_H #define TESTNONUNIFORMWORKGROUP_H
#include "procs.h" #include "procs.h"
#include <vector> #include <vector>
@@ -147,5 +147,4 @@ private:
unsigned int _overallCounter; unsigned int _overallCounter;
}; };
#endif // _TESTNONUNIFORMWORKGROUP_H #endif // TESTNONUNIFORMWORKGROUP_H

6
test_conformance/non_uniform_work_group/tools.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _TOOLS_H #ifndef TOOLS_H
#define _TOOLS_H #define TOOLS_H
#include "procs.h" #include "procs.h"
#include <vector> #include <vector>
@@ -106,4 +106,4 @@ namespace Error {
}; };
} }
#endif // _TOOLS_H #endif // TOOLS_H

6
test_conformance/pipes/kernels.h
View File

@@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
// //
#ifndef _KERNELS_H_ #ifndef KERNELS_H_
#define _KERNELS_H_ #define KERNELS_H_
static const char* pipe_readwrite_struct_kernel_code = { static const char* pipe_readwrite_struct_kernel_code = {
"typedef struct{\n" "typedef struct{\n"
@@ -127,4 +127,4 @@ static const char* pipe_convenience_readwrite_struct_kernel_code = {
" read_pipe(in_pipe, &dst[gid]);\n" " read_pipe(in_pipe, &dst[gid]);\n"
"}\n" }; "}\n" };
#endif //_KERNELS_H_ #endif // KERNELS_H_

6
test_conformance/relationals/test_comparisons_fp.h
View File

@@ -14,8 +14,8 @@
// limitations under the License. // limitations under the License.
// //
#ifndef _TEST_COMPARISONS_FP_H #ifndef TEST_COMPARISONS_FP_H
#define _TEST_COMPARISONS_FP_H #define TEST_COMPARISONS_FP_H
#include <map> #include <map>
#include <memory> #include <memory>
@@ -225,4 +225,4 @@ int MakeAndRunTest(cl_device_id device, cl_context context,
return TEST_PASS; return TEST_PASS;
} }
#endif // _TEST_COMPARISONS_FP_H #endif // TEST_COMPARISONS_FP_H