From 40f50d77a3ce087fdf167d6fe4f58ffec6df3369 Mon Sep 17 00:00:00 2001
From: James Price <jrprice@google.com>
Date: Fri, 21 Feb 2020 12:34:31 -0500
Subject: [PATCH] Rename test .c sources to .cpp where necessary (#604)

Remove hacks to force language from CMake files.

Closes KhronosGroup/OpenCL-CTS#25
---
 test_conformance/CMakeCommon.txt              |  2 -
 test_conformance/api/CMakeLists.txt           | 18 ++--
 test_conformance/api/{main.c => main.cpp}     |  0
 ...est_api_min_max.c => test_api_min_max.cpp} |  0
 .../api/{test_bool.c => test_bool.cpp}        |  0
 ...eate_kernels.c => test_create_kernels.cpp} |  0
 ...el_arg_info.c => test_kernel_arg_info.cpp} |  0
 ...=> test_kernel_arg_info_compatibility.cpp} |  0
 .../api/{test_kernels.c => test_kernels.cpp}  |  0
 ..._buffer_arg.c => test_null_buffer_arg.cpp} |  0
 ...tain_program.c => test_retain_program.cpp} |  0
 test_conformance/atomics/CMakeLists.txt       |  4 +-
 test_conformance/atomics/{main.c => main.cpp} |  0
 ...indexed_cases.c => test_indexed_cases.cpp} |  0
 test_conformance/basic/CMakeLists.txt         | 92 +++++++++----------
 test_conformance/basic/{main.c => main.cpp}   |  0
 .../{test_arraycopy.c => test_arraycopy.cpp}  |  0
 ...rayimagecopy.c => test_arrayimagecopy.cpp} |  0
 ...magecopy3d.c => test_arrayimagecopy3d.cpp} |  0
 ...rayreadwrite.c => test_arrayreadwrite.cpp} |  0
 .../{test_barrier.c => test_barrier.cpp}      |  0
 ...types.c => test_basic_parameter_types.cpp} |  0
 ...iterect.c => test_bufferreadwriterect.cpp} |  0
 .../{test_constant.c => test_constant.cpp}    |  0
 ...gram.c => test_createkernelsinprogram.cpp} |  0
 ...al_size.c => test_enqueued_local_size.cpp} |  0
 .../{test_float2int.c => test_float2int.cpp}  |  0
 ...t_fpmath_float.c => test_fpmath_float.cpp} |  0
 ...fpmath_float2.c => test_fpmath_float2.cpp} |  0
 ...fpmath_float4.c => test_fpmath_float4.cpp} |  0
 ..._linear_id.c => test_global_linear_id.cpp} |  0
 .../basic/{test_hiloeo.c => test_hiloeo.cpp}  |  0
 .../{test_hostptr.c => test_hostptr.cpp}      |  0
 .../basic/{test_if.c => test_if.cpp}          |  0
 ...e_multipass.c => test_image_multipass.cpp} |  0
 ...est_image_param.c => test_image_param.cpp} |  0
 .../{test_image_r8.c => test_image_r8.cpp}    |  0
 ...agearraycopy.c => test_imagearraycopy.cpp} |  0
 ...rraycopy3d.c => test_imagearraycopy3d.cpp} |  0
 .../{test_imagecopy.c => test_imagecopy.cpp}  |  0
 ...est_imagecopy3d.c => test_imagecopy3d.cpp} |  0
 .../{test_imagedim.c => test_imagedim.cpp}    |  0
 .../{test_imagenpot.c => test_imagenpot.cpp}  |  0
 ...erandomcopy.c => test_imagerandomcopy.cpp} |  0
 ...agereadwrite.c => test_imagereadwrite.cpp} |  0
 ...eadwrite3d.c => test_imagereadwrite3d.cpp} |  0
 .../{test_int2float.c => test_int2float.cpp}  |  0
 ...est_intmath_int.c => test_intmath_int.cpp} |  0
 ...t_intmath_int2.c => test_intmath_int2.cpp} |  0
 ...t_intmath_int4.c => test_intmath_int4.cpp} |  0
 ...t_intmath_long.c => test_intmath_long.cpp} |  0
 ...intmath_long2.c => test_intmath_long2.cpp} |  0
 ...intmath_long4.c => test_intmath_long4.cpp} |  0
 .../basic/{test_local.c => test_local.cpp}    |  0
 ...l_linear_id.c => test_local_linear_id.cpp} |  0
 .../basic/{test_loop.c => test_loop.cpp}      |  0
 ...ifmt.c => test_multireadimagemultifmt.cpp} |  0
 ...onefmt.c => test_multireadimageonefmt.cpp} |  0
 ...est_pointercast.c => test_pointercast.cpp} |  0
 ...eue_priority.c => test_queue_priority.cpp} |  0
 .../{test_readimage.c => test_readimage.cpp}  |  0
 ...est_readimage3d.c => test_readimage3d.cpp} |  0
 ...age3d_fp32.c => test_readimage3d_fp32.cpp} |  0
 ...e3d_int16.c => test_readimage3d_int16.cpp} |  0
 ...adimage_fp32.c => test_readimage_fp32.cpp} |  0
 ...image_int16.c => test_readimage_int16.cpp} |  0
 ...r.c => test_rw_image_access_qualifier.cpp} |  0
 ...ge_pitch.c => test_simple_image_pitch.cpp} |  0
 .../basic/{test_sizeof.c => test_sizeof.cpp}  |  0
 ...vec_type_hint.c => test_vec_type_hint.cpp} |  0
 ...{test_vloadstore.c => test_vloadstore.cpp} |  0
 ...{test_wg_barrier.c => test_wg_barrier.cpp} |  0
 ...{test_writeimage.c => test_writeimage.cpp} |  0
 ...eimage_fp32.c => test_writeimage_fp32.cpp} |  0
 ...mage_int16.c => test_writeimage_int16.cpp} |  0
 test_conformance/buffers/CMakeLists.txt       | 20 ++--
 .../buffers/{array_info.c => array_info.cpp}  |  0
 test_conformance/buffers/{main.c => main.cpp} |  0
 ...est_buffer_copy.c => test_buffer_copy.cpp} |  0
 ...est_buffer_fill.c => test_buffer_fill.cpp} |  0
 ...{test_buffer_map.c => test_buffer_map.cpp} |  0
 ...{test_buffer_mem.c => test_buffer_mem.cpp} |  0
 ...ffer_migrate.c => test_buffer_migrate.cpp} |  0
 ...est_buffer_read.c => test_buffer_read.cpp} |  0
 ...t_buffer_write.c => test_buffer_write.cpp} |  0
 ...image_migrate.c => test_image_migrate.cpp} |  0
 test_conformance/commonfns/CMakeLists.txt     | 38 ++++----
 .../commonfns/{main.c => main.cpp}            |  0
 .../{test_binary_fn.c => test_binary_fn.cpp}  |  0
 .../{test_clamp.c => test_clamp.cpp}          |  0
 .../{test_degrees.c => test_degrees.cpp}      |  0
 .../commonfns/{test_fmax.c => test_fmax.cpp}  |  0
 .../{test_fmaxf.c => test_fmaxf.cpp}          |  0
 .../commonfns/{test_fmin.c => test_fmin.cpp}  |  0
 .../{test_fminf.c => test_fminf.cpp}          |  0
 .../commonfns/{test_max.c => test_max.cpp}    |  0
 .../commonfns/{test_maxf.c => test_maxf.cpp}  |  0
 .../commonfns/{test_min.c => test_min.cpp}    |  0
 .../commonfns/{test_minf.c => test_minf.cpp}  |  0
 .../commonfns/{test_mix.c => test_mix.cpp}    |  0
 .../{test_radians.c => test_radians.cpp}      |  0
 .../commonfns/{test_sign.c => test_sign.cpp}  |  0
 ...{test_smoothstep.c => test_smoothstep.cpp} |  0
 ...est_smoothstepf.c => test_smoothstepf.cpp} |  0
 .../commonfns/{test_step.c => test_step.cpp}  |  0
 .../{test_stepf.c => test_stepf.cpp}          |  0
 test_conformance/compiler/CMakeLists.txt      | 14 +--
 .../compiler/{main.c => main.cpp}             |  0
 ...est_async_build.c => test_async_build.cpp} |  0
 ...build_helpers.c => test_build_helpers.cpp} |  0
 .../{test_compile.c => test_compile.cpp}      |  0
 ...est_image_macro.c => test_image_macro.cpp} |  0
 ...pragma_unroll.c => test_pragma_unroll.cpp} |  0
 ...t_preprocessor.c => test_preprocessor.cpp} |  0
 test_conformance/computeinfo/CMakeLists.txt   |  2 +-
 .../computeinfo/{main.c => main.cpp}          |  0
 test_conformance/contractions/CMakeLists.txt  |  2 +-
 .../{contractions.c => contractions.cpp}      |  0
 test_conformance/conversions/CMakeLists.txt   | 12 +--
 .../conversions/{Sleep.c => Sleep.cpp}        |  0
 ...nversions.c => basic_test_conversions.cpp} |  0
 ...est_conversions.c => test_conversions.cpp} |  0
 .../device_execution/CMakeLists.txt           |  2 +-
 .../device_execution/{main.c => main.cpp}     |  0
 .../device_partition/CMakeLists.txt           |  2 +-
 .../device_partition/{main.c => main.cpp}     |  0
 test_conformance/device_timer/CMakeLists.txt  |  4 +-
 .../device_timer/{main.c => main.cpp}         |  0
 ...t_device_timer.c => test_device_timer.cpp} |  0
 test_conformance/events/CMakeLists.txt        |  2 +-
 test_conformance/events/{main.c => main.cpp}  |  0
 test_conformance/geometrics/CMakeLists.txt    |  2 +-
 .../geometrics/{main.c => main.cpp}           |  0
 test_conformance/half/CMakeLists.txt          |  8 +-
 .../{Test_roundTrip.c => Test_roundTrip.cpp}  |  0
 .../{Test_vLoadHalf.c => Test_vLoadHalf.cpp}  |  0
 ...{Test_vStoreHalf.c => Test_vStoreHalf.cpp} |  0
 .../half/{cl_utils.c => cl_utils.cpp}         |  0
 test_conformance/half/{main.c => main.cpp}    |  0
 test_conformance/integer_ops/CMakeLists.txt   | 14 +--
 .../integer_ops/{main.c => main.cpp}          |  0
 .../integer_ops/{test_abs.c => test_abs.cpp}  |  0
 .../{test_absdiff.c => test_absdiff.cpp}      |  0
 .../{test_add_sat.c => test_add_sat.cpp}      |  0
 ...int_basic_ops.c => test_int_basic_ops.cpp} |  0
 .../{test_intmad24.c => test_intmad24.cpp}    |  0
 .../{test_intmul24.c => test_intmul24.cpp}    |  0
 .../{test_popcount.c => test_popcount.cpp}    |  0
 .../{test_sub_sat.c => test_sub_sat.cpp}      |  0
 ...verification_and_generation_functions.cpp} |  0
 .../math_brute_force/CMakeLists.txt           | 64 ++++++-------
 .../{FunctionList.c => FunctionList.cpp}      |  0
 .../math_brute_force/{Sleep.c => Sleep.cpp}   |  0
 .../{Utility.c => Utility.cpp}                |  0
 .../math_brute_force/{binary.c => binary.cpp} |  0
 .../{binaryOperator.c => binaryOperator.cpp}  |  0
 .../{binary_i.c => binary_i.cpp}              |  0
 ...o_results_i.c => binary_two_results_i.cpp} |  0
 .../{i_unary.c => i_unary.cpp}                |  0
 .../{macro_binary.c => macro_binary.cpp}      |  0
 .../{macro_unary.c => macro_unary.cpp}        |  0
 .../math_brute_force/{mad.c => mad.cpp}       |  0
 .../math_brute_force/{main.c => main.cpp}     |  0
 .../{reference_math.c => reference_math.cpp}  |  0
 .../{ternary.c => ternary.cpp}                |  0
 .../math_brute_force/{unary.c => unary.cpp}   |  0
 ...ry_two_results.c => unary_two_results.cpp} |  0
 ...wo_results_i.c => unary_two_results_i.cpp} |  0
 .../{unary_u.c => unary_u.cpp}                |  0
 .../multiple_device_context/CMakeLists.txt    |  9 +-
 .../{main.c => main.cpp}                      |  0
 ..._contexts.c => test_multiple_contexts.cpp} |  0
 test_conformance/pipes/CMakeLists.txt         | 14 +--
 test_conformance/pipes/{main.c => main.cpp}   |  0
 .../{test_pipe_info.c => test_pipe_info.cpp}  |  0
 ...est_pipe_limits.c => test_pipe_limits.cpp} |  0
 ...ctions.c => test_pipe_query_functions.cpp} |  0
 ..._read_write.c => test_pipe_read_write.cpp} |  0
 ...rrors.c => test_pipe_readwrite_errors.cpp} |  0
 ...pe_subgroups.c => test_pipe_subgroups.cpp} |  0
 test_conformance/printf/CMakeLists.txt        |  4 +-
 .../printf/{test_printf.c => test_printf.cpp} |  0
 .../printf/{util_printf.c => util_printf.cpp} |  0
 test_conformance/profiling/CMakeLists.txt     | 16 ++--
 .../profiling/{copy.c => copy.cpp}            |  0
 .../profiling/{execute.c => execute.cpp}      |  0
 ...cute_multipass.c => execute_multipass.cpp} |  0
 .../profiling/{main.c => main.cpp}            |  0
 .../profiling/{readArray.c => readArray.cpp}  |  0
 .../profiling/{readImage.c => readImage.cpp}  |  0
 .../{writeArray.c => writeArray.cpp}          |  0
 .../{writeImage.c => writeImage.cpp}          |  0
 test_conformance/relationals/CMakeLists.txt   |  2 +-
 .../relationals/{main.c => main.cpp}          |  0
 test_conformance/select/CMakeLists.txt        |  4 +-
 .../select/{test_select.c => test_select.cpp} |  0
 .../select/{util_select.c => util_select.cpp} |  0
 test_conformance/spir/CMakeLists.txt          |  2 +-
 test_conformance/spirv_new/CMakeLists.txt     |  4 +-
 .../thread_dimensions/CMakeLists.txt          |  4 +-
 .../thread_dimensions/{main.c => main.cpp}    |  0
 ...imensions.c => test_thread_dimensions.cpp} |  0
 test_conformance/vec_align/CMakeLists.txt     | 10 +-
 .../vec_align/{globals.c => globals.cpp}      |  0
 .../vec_align/{main.c => main.cpp}            |  0
 .../vec_align/{structs.c => structs.cpp}      |  0
 .../{test_vec_align.c => test_vec_align.cpp}  |  0
 .../{type_replacer.c => type_replacer.cpp}    |  0
 test_conformance/vec_step/CMakeLists.txt      | 10 +-
 .../vec_step/{globals.c => globals.cpp}       |  0
 .../vec_step/{main.c => main.cpp}             |  0
 .../vec_step/{structs.c => structs.cpp}       |  0
 .../vec_step/{test_step.c => test_step.cpp}   |  0
 .../{type_replacer.c => type_replacer.cpp}    |  0
 test_conformance/workgroups/CMakeLists.txt    | 26 +++---
 .../workgroups/{main.c => main.cpp}           |  0
 .../{test_wg_all.c => test_wg_all.cpp}        |  0
 .../{test_wg_any.c => test_wg_any.cpp}        |  0
 ...t_wg_broadcast.c => test_wg_broadcast.cpp} |  0
 .../{test_wg_reduce.c => test_wg_reduce.cpp}  |  0
 ...wg_reduce_max.c => test_wg_reduce_max.cpp} |  0
 ...wg_reduce_min.c => test_wg_reduce_min.cpp} |  0
 ...e_add.c => test_wg_scan_exclusive_add.cpp} |  0
 ...e_max.c => test_wg_scan_exclusive_max.cpp} |  0
 ...e_min.c => test_wg_scan_exclusive_min.cpp} |  0
 ...e_add.c => test_wg_scan_inclusive_add.cpp} |  0
 ...e_max.c => test_wg_scan_inclusive_max.cpp} |  0
 ...e_min.c => test_wg_scan_inclusive_min.cpp} |  0
 228 files changed, 197 insertions(+), 210 deletions(-)
 rename test_conformance/api/{main.c => main.cpp} (100%)
 rename test_conformance/api/{test_api_min_max.c => test_api_min_max.cpp} (100%)
 rename test_conformance/api/{test_bool.c => test_bool.cpp} (100%)
 rename test_conformance/api/{test_create_kernels.c => test_create_kernels.cpp} (100%)
 rename test_conformance/api/{test_kernel_arg_info.c => test_kernel_arg_info.cpp} (100%)
 rename test_conformance/api/{test_kernel_arg_info_compatibility.c => test_kernel_arg_info_compatibility.cpp} (100%)
 rename test_conformance/api/{test_kernels.c => test_kernels.cpp} (100%)
 rename test_conformance/api/{test_null_buffer_arg.c => test_null_buffer_arg.cpp} (100%)
 rename test_conformance/api/{test_retain_program.c => test_retain_program.cpp} (100%)
 rename test_conformance/atomics/{main.c => main.cpp} (100%)
 rename test_conformance/atomics/{test_indexed_cases.c => test_indexed_cases.cpp} (100%)
 rename test_conformance/basic/{main.c => main.cpp} (100%)
 rename test_conformance/basic/{test_arraycopy.c => test_arraycopy.cpp} (100%)
 rename test_conformance/basic/{test_arrayimagecopy.c => test_arrayimagecopy.cpp} (100%)
 rename test_conformance/basic/{test_arrayimagecopy3d.c => test_arrayimagecopy3d.cpp} (100%)
 rename test_conformance/basic/{test_arrayreadwrite.c => test_arrayreadwrite.cpp} (100%)
 rename test_conformance/basic/{test_barrier.c => test_barrier.cpp} (100%)
 rename test_conformance/basic/{test_basic_parameter_types.c => test_basic_parameter_types.cpp} (100%)
 rename test_conformance/basic/{test_bufferreadwriterect.c => test_bufferreadwriterect.cpp} (100%)
 rename test_conformance/basic/{test_constant.c => test_constant.cpp} (100%)
 rename test_conformance/basic/{test_createkernelsinprogram.c => test_createkernelsinprogram.cpp} (100%)
 rename test_conformance/basic/{test_enqueued_local_size.c => test_enqueued_local_size.cpp} (100%)
 rename test_conformance/basic/{test_float2int.c => test_float2int.cpp} (100%)
 rename test_conformance/basic/{test_fpmath_float.c => test_fpmath_float.cpp} (100%)
 rename test_conformance/basic/{test_fpmath_float2.c => test_fpmath_float2.cpp} (100%)
 rename test_conformance/basic/{test_fpmath_float4.c => test_fpmath_float4.cpp} (100%)
 rename test_conformance/basic/{test_global_linear_id.c => test_global_linear_id.cpp} (100%)
 rename test_conformance/basic/{test_hiloeo.c => test_hiloeo.cpp} (100%)
 rename test_conformance/basic/{test_hostptr.c => test_hostptr.cpp} (100%)
 rename test_conformance/basic/{test_if.c => test_if.cpp} (100%)
 rename test_conformance/basic/{test_image_multipass.c => test_image_multipass.cpp} (100%)
 rename test_conformance/basic/{test_image_param.c => test_image_param.cpp} (100%)
 rename test_conformance/basic/{test_image_r8.c => test_image_r8.cpp} (100%)
 rename test_conformance/basic/{test_imagearraycopy.c => test_imagearraycopy.cpp} (100%)
 rename test_conformance/basic/{test_imagearraycopy3d.c => test_imagearraycopy3d.cpp} (100%)
 rename test_conformance/basic/{test_imagecopy.c => test_imagecopy.cpp} (100%)
 rename test_conformance/basic/{test_imagecopy3d.c => test_imagecopy3d.cpp} (100%)
 rename test_conformance/basic/{test_imagedim.c => test_imagedim.cpp} (100%)
 rename test_conformance/basic/{test_imagenpot.c => test_imagenpot.cpp} (100%)
 rename test_conformance/basic/{test_imagerandomcopy.c => test_imagerandomcopy.cpp} (100%)
 rename test_conformance/basic/{test_imagereadwrite.c => test_imagereadwrite.cpp} (100%)
 rename test_conformance/basic/{test_imagereadwrite3d.c => test_imagereadwrite3d.cpp} (100%)
 rename test_conformance/basic/{test_int2float.c => test_int2float.cpp} (100%)
 rename test_conformance/basic/{test_intmath_int.c => test_intmath_int.cpp} (100%)
 rename test_conformance/basic/{test_intmath_int2.c => test_intmath_int2.cpp} (100%)
 rename test_conformance/basic/{test_intmath_int4.c => test_intmath_int4.cpp} (100%)
 rename test_conformance/basic/{test_intmath_long.c => test_intmath_long.cpp} (100%)
 rename test_conformance/basic/{test_intmath_long2.c => test_intmath_long2.cpp} (100%)
 rename test_conformance/basic/{test_intmath_long4.c => test_intmath_long4.cpp} (100%)
 rename test_conformance/basic/{test_local.c => test_local.cpp} (100%)
 rename test_conformance/basic/{test_local_linear_id.c => test_local_linear_id.cpp} (100%)
 rename test_conformance/basic/{test_loop.c => test_loop.cpp} (100%)
 rename test_conformance/basic/{test_multireadimagemultifmt.c => test_multireadimagemultifmt.cpp} (100%)
 rename test_conformance/basic/{test_multireadimageonefmt.c => test_multireadimageonefmt.cpp} (100%)
 rename test_conformance/basic/{test_pointercast.c => test_pointercast.cpp} (100%)
 rename test_conformance/basic/{test_queue_priority.c => test_queue_priority.cpp} (100%)
 rename test_conformance/basic/{test_readimage.c => test_readimage.cpp} (100%)
 rename test_conformance/basic/{test_readimage3d.c => test_readimage3d.cpp} (100%)
 rename test_conformance/basic/{test_readimage3d_fp32.c => test_readimage3d_fp32.cpp} (100%)
 rename test_conformance/basic/{test_readimage3d_int16.c => test_readimage3d_int16.cpp} (100%)
 rename test_conformance/basic/{test_readimage_fp32.c => test_readimage_fp32.cpp} (100%)
 rename test_conformance/basic/{test_readimage_int16.c => test_readimage_int16.cpp} (100%)
 rename test_conformance/basic/{test_rw_image_access_qualifier.c => test_rw_image_access_qualifier.cpp} (100%)
 rename test_conformance/basic/{test_simple_image_pitch.c => test_simple_image_pitch.cpp} (100%)
 rename test_conformance/basic/{test_sizeof.c => test_sizeof.cpp} (100%)
 rename test_conformance/basic/{test_vec_type_hint.c => test_vec_type_hint.cpp} (100%)
 rename test_conformance/basic/{test_vloadstore.c => test_vloadstore.cpp} (100%)
 rename test_conformance/basic/{test_wg_barrier.c => test_wg_barrier.cpp} (100%)
 rename test_conformance/basic/{test_writeimage.c => test_writeimage.cpp} (100%)
 rename test_conformance/basic/{test_writeimage_fp32.c => test_writeimage_fp32.cpp} (100%)
 rename test_conformance/basic/{test_writeimage_int16.c => test_writeimage_int16.cpp} (100%)
 rename test_conformance/buffers/{array_info.c => array_info.cpp} (100%)
 rename test_conformance/buffers/{main.c => main.cpp} (100%)
 rename test_conformance/buffers/{test_buffer_copy.c => test_buffer_copy.cpp} (100%)
 rename test_conformance/buffers/{test_buffer_fill.c => test_buffer_fill.cpp} (100%)
 rename test_conformance/buffers/{test_buffer_map.c => test_buffer_map.cpp} (100%)
 rename test_conformance/buffers/{test_buffer_mem.c => test_buffer_mem.cpp} (100%)
 rename test_conformance/buffers/{test_buffer_migrate.c => test_buffer_migrate.cpp} (100%)
 rename test_conformance/buffers/{test_buffer_read.c => test_buffer_read.cpp} (100%)
 rename test_conformance/buffers/{test_buffer_write.c => test_buffer_write.cpp} (100%)
 rename test_conformance/buffers/{test_image_migrate.c => test_image_migrate.cpp} (100%)
 rename test_conformance/commonfns/{main.c => main.cpp} (100%)
 rename test_conformance/commonfns/{test_binary_fn.c => test_binary_fn.cpp} (100%)
 rename test_conformance/commonfns/{test_clamp.c => test_clamp.cpp} (100%)
 rename test_conformance/commonfns/{test_degrees.c => test_degrees.cpp} (100%)
 rename test_conformance/commonfns/{test_fmax.c => test_fmax.cpp} (100%)
 rename test_conformance/commonfns/{test_fmaxf.c => test_fmaxf.cpp} (100%)
 rename test_conformance/commonfns/{test_fmin.c => test_fmin.cpp} (100%)
 rename test_conformance/commonfns/{test_fminf.c => test_fminf.cpp} (100%)
 rename test_conformance/commonfns/{test_max.c => test_max.cpp} (100%)
 rename test_conformance/commonfns/{test_maxf.c => test_maxf.cpp} (100%)
 rename test_conformance/commonfns/{test_min.c => test_min.cpp} (100%)
 rename test_conformance/commonfns/{test_minf.c => test_minf.cpp} (100%)
 rename test_conformance/commonfns/{test_mix.c => test_mix.cpp} (100%)
 rename test_conformance/commonfns/{test_radians.c => test_radians.cpp} (100%)
 rename test_conformance/commonfns/{test_sign.c => test_sign.cpp} (100%)
 rename test_conformance/commonfns/{test_smoothstep.c => test_smoothstep.cpp} (100%)
 rename test_conformance/commonfns/{test_smoothstepf.c => test_smoothstepf.cpp} (100%)
 rename test_conformance/commonfns/{test_step.c => test_step.cpp} (100%)
 rename test_conformance/commonfns/{test_stepf.c => test_stepf.cpp} (100%)
 rename test_conformance/compiler/{main.c => main.cpp} (100%)
 rename test_conformance/compiler/{test_async_build.c => test_async_build.cpp} (100%)
 rename test_conformance/compiler/{test_build_helpers.c => test_build_helpers.cpp} (100%)
 rename test_conformance/compiler/{test_compile.c => test_compile.cpp} (100%)
 rename test_conformance/compiler/{test_image_macro.c => test_image_macro.cpp} (100%)
 rename test_conformance/compiler/{test_pragma_unroll.c => test_pragma_unroll.cpp} (100%)
 rename test_conformance/compiler/{test_preprocessor.c => test_preprocessor.cpp} (100%)
 rename test_conformance/computeinfo/{main.c => main.cpp} (100%)
 rename test_conformance/contractions/{contractions.c => contractions.cpp} (100%)
 rename test_conformance/conversions/{Sleep.c => Sleep.cpp} (100%)
 rename test_conformance/conversions/{basic_test_conversions.c => basic_test_conversions.cpp} (100%)
 rename test_conformance/conversions/{test_conversions.c => test_conversions.cpp} (100%)
 rename test_conformance/device_execution/{main.c => main.cpp} (100%)
 rename test_conformance/device_partition/{main.c => main.cpp} (100%)
 rename test_conformance/device_timer/{main.c => main.cpp} (100%)
 rename test_conformance/device_timer/{test_device_timer.c => test_device_timer.cpp} (100%)
 rename test_conformance/events/{main.c => main.cpp} (100%)
 rename test_conformance/geometrics/{main.c => main.cpp} (100%)
 rename test_conformance/half/{Test_roundTrip.c => Test_roundTrip.cpp} (100%)
 rename test_conformance/half/{Test_vLoadHalf.c => Test_vLoadHalf.cpp} (100%)
 rename test_conformance/half/{Test_vStoreHalf.c => Test_vStoreHalf.cpp} (100%)
 rename test_conformance/half/{cl_utils.c => cl_utils.cpp} (100%)
 rename test_conformance/half/{main.c => main.cpp} (100%)
 rename test_conformance/integer_ops/{main.c => main.cpp} (100%)
 rename test_conformance/integer_ops/{test_abs.c => test_abs.cpp} (100%)
 rename test_conformance/integer_ops/{test_absdiff.c => test_absdiff.cpp} (100%)
 rename test_conformance/integer_ops/{test_add_sat.c => test_add_sat.cpp} (100%)
 rename test_conformance/integer_ops/{test_int_basic_ops.c => test_int_basic_ops.cpp} (100%)
 rename test_conformance/integer_ops/{test_intmad24.c => test_intmad24.cpp} (100%)
 rename test_conformance/integer_ops/{test_intmul24.c => test_intmul24.cpp} (100%)
 rename test_conformance/integer_ops/{test_popcount.c => test_popcount.cpp} (100%)
 rename test_conformance/integer_ops/{test_sub_sat.c => test_sub_sat.cpp} (100%)
 rename test_conformance/integer_ops/{verification_and_generation_functions.c => verification_and_generation_functions.cpp} (100%)
 rename test_conformance/math_brute_force/{FunctionList.c => FunctionList.cpp} (100%)
 rename test_conformance/math_brute_force/{Sleep.c => Sleep.cpp} (100%)
 rename test_conformance/math_brute_force/{Utility.c => Utility.cpp} (100%)
 rename test_conformance/math_brute_force/{binary.c => binary.cpp} (100%)
 rename test_conformance/math_brute_force/{binaryOperator.c => binaryOperator.cpp} (100%)
 rename test_conformance/math_brute_force/{binary_i.c => binary_i.cpp} (100%)
 rename test_conformance/math_brute_force/{binary_two_results_i.c => binary_two_results_i.cpp} (100%)
 rename test_conformance/math_brute_force/{i_unary.c => i_unary.cpp} (100%)
 rename test_conformance/math_brute_force/{macro_binary.c => macro_binary.cpp} (100%)
 rename test_conformance/math_brute_force/{macro_unary.c => macro_unary.cpp} (100%)
 rename test_conformance/math_brute_force/{mad.c => mad.cpp} (100%)
 rename test_conformance/math_brute_force/{main.c => main.cpp} (100%)
 rename test_conformance/math_brute_force/{reference_math.c => reference_math.cpp} (100%)
 rename test_conformance/math_brute_force/{ternary.c => ternary.cpp} (100%)
 rename test_conformance/math_brute_force/{unary.c => unary.cpp} (100%)
 rename test_conformance/math_brute_force/{unary_two_results.c => unary_two_results.cpp} (100%)
 rename test_conformance/math_brute_force/{unary_two_results_i.c => unary_two_results_i.cpp} (100%)
 rename test_conformance/math_brute_force/{unary_u.c => unary_u.cpp} (100%)
 rename test_conformance/multiple_device_context/{main.c => main.cpp} (100%)
 rename test_conformance/multiple_device_context/{test_multiple_contexts.c => test_multiple_contexts.cpp} (100%)
 rename test_conformance/pipes/{main.c => main.cpp} (100%)
 rename test_conformance/pipes/{test_pipe_info.c => test_pipe_info.cpp} (100%)
 rename test_conformance/pipes/{test_pipe_limits.c => test_pipe_limits.cpp} (100%)
 rename test_conformance/pipes/{test_pipe_query_functions.c => test_pipe_query_functions.cpp} (100%)
 rename test_conformance/pipes/{test_pipe_read_write.c => test_pipe_read_write.cpp} (100%)
 rename test_conformance/pipes/{test_pipe_readwrite_errors.c => test_pipe_readwrite_errors.cpp} (100%)
 rename test_conformance/pipes/{test_pipe_subgroups.c => test_pipe_subgroups.cpp} (100%)
 rename test_conformance/printf/{test_printf.c => test_printf.cpp} (100%)
 rename test_conformance/printf/{util_printf.c => util_printf.cpp} (100%)
 rename test_conformance/profiling/{copy.c => copy.cpp} (100%)
 rename test_conformance/profiling/{execute.c => execute.cpp} (100%)
 rename test_conformance/profiling/{execute_multipass.c => execute_multipass.cpp} (100%)
 rename test_conformance/profiling/{main.c => main.cpp} (100%)
 rename test_conformance/profiling/{readArray.c => readArray.cpp} (100%)
 rename test_conformance/profiling/{readImage.c => readImage.cpp} (100%)
 rename test_conformance/profiling/{writeArray.c => writeArray.cpp} (100%)
 rename test_conformance/profiling/{writeImage.c => writeImage.cpp} (100%)
 rename test_conformance/relationals/{main.c => main.cpp} (100%)
 rename test_conformance/select/{test_select.c => test_select.cpp} (100%)
 rename test_conformance/select/{util_select.c => util_select.cpp} (100%)
 rename test_conformance/thread_dimensions/{main.c => main.cpp} (100%)
 rename test_conformance/thread_dimensions/{test_thread_dimensions.c => test_thread_dimensions.cpp} (100%)
 rename test_conformance/vec_align/{globals.c => globals.cpp} (100%)
 rename test_conformance/vec_align/{main.c => main.cpp} (100%)
 rename test_conformance/vec_align/{structs.c => structs.cpp} (100%)
 rename test_conformance/vec_align/{test_vec_align.c => test_vec_align.cpp} (100%)
 rename test_conformance/vec_align/{type_replacer.c => type_replacer.cpp} (100%)
 rename test_conformance/vec_step/{globals.c => globals.cpp} (100%)
 rename test_conformance/vec_step/{main.c => main.cpp} (100%)
 rename test_conformance/vec_step/{structs.c => structs.cpp} (100%)
 rename test_conformance/vec_step/{test_step.c => test_step.cpp} (100%)
 rename test_conformance/vec_step/{type_replacer.c => type_replacer.cpp} (100%)
 rename test_conformance/workgroups/{main.c => main.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_all.c => test_wg_all.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_any.c => test_wg_any.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_broadcast.c => test_wg_broadcast.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_reduce.c => test_wg_reduce.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_reduce_max.c => test_wg_reduce_max.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_reduce_min.c => test_wg_reduce_min.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_scan_exclusive_add.c => test_wg_scan_exclusive_add.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_scan_exclusive_max.c => test_wg_scan_exclusive_max.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_scan_exclusive_min.c => test_wg_scan_exclusive_min.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_scan_inclusive_add.c => test_wg_scan_inclusive_add.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_scan_inclusive_max.c => test_wg_scan_inclusive_max.cpp} (100%)
 rename test_conformance/workgroups/{test_wg_scan_inclusive_min.c => test_wg_scan_inclusive_min.cpp} (100%)

diff --git a/test_conformance/CMakeCommon.txt b/test_conformance/CMakeCommon.txt
index ef445f20..3dc40e2e 100644
--- a/test_conformance/CMakeCommon.txt
+++ b/test_conformance/CMakeCommon.txt
@@ -6,8 +6,6 @@ set(${MODULE_NAME}_OUT ${CONFORMANCE_PREFIX}${MODULE_NAME_LOWER}${CONFORMANCE_SU
 
 add_executable(${${MODULE_NAME}_OUT} ${${MODULE_NAME}_SOURCES})
 
-set_source_files_properties(${${MODULE_NAME}_SOURCES} PROPERTIES LANGUAGE CXX)
-
 set_property(TARGET ${${MODULE_NAME}_OUT} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}")
 
 TARGET_LINK_LIBRARIES(${${MODULE_NAME}_OUT} ${HARNESS_LIB} ${CLConform_LIBRARIES})
diff --git a/test_conformance/api/CMakeLists.txt b/test_conformance/api/CMakeLists.txt
index 9856baef..d330b4b1 100644
--- a/test_conformance/api/CMakeLists.txt
+++ b/test_conformance/api/CMakeLists.txt
@@ -1,15 +1,15 @@
 set(MODULE_NAME API)
 
 set(${MODULE_NAME}_SOURCES
-         main.c
-         test_bool.c
+         main.cpp
+         test_bool.cpp
          test_retain.cpp
-         test_retain_program.c
+         test_retain_program.cpp
          test_queries.cpp
          test_queries_compatibility.cpp
-         test_create_kernels.c
-         test_kernels.c
-         test_api_min_max.c
+         test_create_kernels.cpp
+         test_kernels.cpp
+         test_api_min_max.cpp
          test_kernel_arg_changes.cpp
          test_kernel_arg_multi_setup.cpp
          test_binary.cpp
@@ -18,9 +18,9 @@ set(${MODULE_NAME}_SOURCES
          test_create_context_from_type.cpp
          test_device_min_data_type_align_size_alignment.cpp
          test_platform.cpp
-         test_kernel_arg_info.c
-         test_kernel_arg_info_compatibility.c
-         test_null_buffer_arg.c
+         test_kernel_arg_info.cpp
+         test_kernel_arg_info_compatibility.cpp
+         test_null_buffer_arg.cpp
          test_mem_object_info.cpp
          test_queue_hint.cpp
          test_queue_properties.cpp
diff --git a/test_conformance/api/main.c b/test_conformance/api/main.cpp
similarity index 100%
rename from test_conformance/api/main.c
rename to test_conformance/api/main.cpp
diff --git a/test_conformance/api/test_api_min_max.c b/test_conformance/api/test_api_min_max.cpp
similarity index 100%
rename from test_conformance/api/test_api_min_max.c
rename to test_conformance/api/test_api_min_max.cpp
diff --git a/test_conformance/api/test_bool.c b/test_conformance/api/test_bool.cpp
similarity index 100%
rename from test_conformance/api/test_bool.c
rename to test_conformance/api/test_bool.cpp
diff --git a/test_conformance/api/test_create_kernels.c b/test_conformance/api/test_create_kernels.cpp
similarity index 100%
rename from test_conformance/api/test_create_kernels.c
rename to test_conformance/api/test_create_kernels.cpp
diff --git a/test_conformance/api/test_kernel_arg_info.c b/test_conformance/api/test_kernel_arg_info.cpp
similarity index 100%
rename from test_conformance/api/test_kernel_arg_info.c
rename to test_conformance/api/test_kernel_arg_info.cpp
diff --git a/test_conformance/api/test_kernel_arg_info_compatibility.c b/test_conformance/api/test_kernel_arg_info_compatibility.cpp
similarity index 100%
rename from test_conformance/api/test_kernel_arg_info_compatibility.c
rename to test_conformance/api/test_kernel_arg_info_compatibility.cpp
diff --git a/test_conformance/api/test_kernels.c b/test_conformance/api/test_kernels.cpp
similarity index 100%
rename from test_conformance/api/test_kernels.c
rename to test_conformance/api/test_kernels.cpp
diff --git a/test_conformance/api/test_null_buffer_arg.c b/test_conformance/api/test_null_buffer_arg.cpp
similarity index 100%
rename from test_conformance/api/test_null_buffer_arg.c
rename to test_conformance/api/test_null_buffer_arg.cpp
diff --git a/test_conformance/api/test_retain_program.c b/test_conformance/api/test_retain_program.cpp
similarity index 100%
rename from test_conformance/api/test_retain_program.c
rename to test_conformance/api/test_retain_program.cpp
diff --git a/test_conformance/atomics/CMakeLists.txt b/test_conformance/atomics/CMakeLists.txt
index 7d810c96..53c28725 100644
--- a/test_conformance/atomics/CMakeLists.txt
+++ b/test_conformance/atomics/CMakeLists.txt
@@ -1,9 +1,9 @@
 set(MODULE_NAME ATOMICS)
 
 set(${MODULE_NAME}_SOURCES
-        main.c
+        main.cpp
         test_atomics.cpp
-        test_indexed_cases.c
+        test_indexed_cases.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/atomics/main.c b/test_conformance/atomics/main.cpp
similarity index 100%
rename from test_conformance/atomics/main.c
rename to test_conformance/atomics/main.cpp
diff --git a/test_conformance/atomics/test_indexed_cases.c b/test_conformance/atomics/test_indexed_cases.cpp
similarity index 100%
rename from test_conformance/atomics/test_indexed_cases.c
rename to test_conformance/atomics/test_indexed_cases.cpp
diff --git a/test_conformance/basic/CMakeLists.txt b/test_conformance/basic/CMakeLists.txt
index ba7a7dfd..3f84d7a4 100644
--- a/test_conformance/basic/CMakeLists.txt
+++ b/test_conformance/basic/CMakeLists.txt
@@ -1,49 +1,49 @@
 set(MODULE_NAME BASIC)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_fpmath_float.c test_fpmath_float2.c test_fpmath_float4.c
-    test_intmath_int.c test_intmath_int2.c test_intmath_int4.c
-    test_intmath_long.c test_intmath_long2.c test_intmath_long4.c
-    test_hiloeo.c test_local.c test_pointercast.c
-    test_if.c test_loop.c
-    test_readimage.c test_readimage_int16.c test_readimage_fp32.c
-    test_readimage3d.c test_readimage3d_int16.c test_readimage3d_fp32.c
-    test_writeimage.c test_writeimage_int16.c test_writeimage_fp32.c
-    test_multireadimageonefmt.c test_multireadimagemultifmt.c
-    test_imagedim.c
-    test_vloadstore.c
-    test_int2float.c test_float2int.c
-    test_createkernelsinprogram.c
-    test_hostptr.c
+    main.cpp
+    test_fpmath_float.cpp test_fpmath_float2.cpp test_fpmath_float4.cpp
+    test_intmath_int.cpp test_intmath_int2.cpp test_intmath_int4.cpp
+    test_intmath_long.cpp test_intmath_long2.cpp test_intmath_long4.cpp
+    test_hiloeo.cpp test_local.cpp test_pointercast.cpp
+    test_if.cpp test_loop.cpp
+    test_readimage.cpp test_readimage_int16.cpp test_readimage_fp32.cpp
+    test_readimage3d.cpp test_readimage3d_int16.cpp test_readimage3d_fp32.cpp
+    test_writeimage.cpp test_writeimage_int16.cpp test_writeimage_fp32.cpp
+    test_multireadimageonefmt.cpp test_multireadimagemultifmt.cpp
+    test_imagedim.cpp
+    test_vloadstore.cpp
+    test_int2float.cpp test_float2int.cpp
+    test_createkernelsinprogram.cpp
+    test_hostptr.cpp
     test_explicit_s2v.cpp
-    test_constant.c
-    test_image_multipass.c
-    test_imagereadwrite.c test_imagereadwrite3d.c
-    test_image_param.c
-    test_imagenpot.c
-    test_image_r8.c
-    test_barrier.c
-    test_basic_parameter_types.c
-    test_arrayreadwrite.c
-    test_arraycopy.c
-    test_imagearraycopy.c
-    test_imagearraycopy3d.c
-    test_imagecopy.c
-    test_imagerandomcopy.c
-    test_arrayimagecopy.c
-    test_arrayimagecopy3d.c
-    test_imagecopy3d.c
+    test_constant.cpp
+    test_image_multipass.cpp
+    test_imagereadwrite.cpp test_imagereadwrite3d.cpp
+    test_image_param.cpp
+    test_imagenpot.cpp
+    test_image_r8.cpp
+    test_barrier.cpp
+    test_basic_parameter_types.cpp
+    test_arrayreadwrite.cpp
+    test_arraycopy.cpp
+    test_imagearraycopy.cpp
+    test_imagearraycopy3d.cpp
+    test_imagecopy.cpp
+    test_imagerandomcopy.cpp
+    test_arrayimagecopy.cpp
+    test_arrayimagecopy3d.cpp
+    test_imagecopy3d.cpp
     test_enqueue_map.cpp
     test_work_item_functions.cpp
     test_astype.cpp
     test_async_copy.cpp
-    test_sizeof.c
+    test_sizeof.cpp
     test_vector_creation.cpp
-    test_vec_type_hint.c
+    test_vec_type_hint.cpp
     test_numeric_constants.cpp
     test_constant_source.cpp
-    test_bufferreadwriterect.c
+    test_bufferreadwriterect.cpp
     test_async_strided_copy.cpp
     test_preprocessors.cpp
     test_kernel_memory_alignment.cpp
@@ -51,22 +51,22 @@ set(${MODULE_NAME}_SOURCES
     test_kernel_call_kernel_function.cpp
     test_local_kernel_scope.cpp
     test_progvar.cpp
-    test_wg_barrier.c
-    test_global_linear_id.c
-    test_local_linear_id.c
-    test_enqueued_local_size.c
-    test_simple_image_pitch.c
+    test_wg_barrier.cpp
+    test_global_linear_id.cpp
+    test_local_linear_id.cpp
+    test_enqueued_local_size.cpp
+    test_simple_image_pitch.cpp
     test_get_linear_ids.cpp
-    test_rw_image_access_qualifier.c
-    test_wg_barrier.c
-    test_enqueued_local_size.c
-    test_global_linear_id.c
-    test_local_linear_id.c
+    test_rw_image_access_qualifier.cpp
+    test_wg_barrier.cpp
+    test_enqueued_local_size.cpp
+    test_global_linear_id.cpp
+    test_local_linear_id.cpp
     test_progvar.cpp
 )
 
 if(APPLE)
-    list(APPEND ${MODULE_NAME}_SOURCES test_queue_priority.c)
+    list(APPEND ${MODULE_NAME}_SOURCES test_queue_priority.cpp)
 endif(APPLE)
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/basic/main.c b/test_conformance/basic/main.cpp
similarity index 100%
rename from test_conformance/basic/main.c
rename to test_conformance/basic/main.cpp
diff --git a/test_conformance/basic/test_arraycopy.c b/test_conformance/basic/test_arraycopy.cpp
similarity index 100%
rename from test_conformance/basic/test_arraycopy.c
rename to test_conformance/basic/test_arraycopy.cpp
diff --git a/test_conformance/basic/test_arrayimagecopy.c b/test_conformance/basic/test_arrayimagecopy.cpp
similarity index 100%
rename from test_conformance/basic/test_arrayimagecopy.c
rename to test_conformance/basic/test_arrayimagecopy.cpp
diff --git a/test_conformance/basic/test_arrayimagecopy3d.c b/test_conformance/basic/test_arrayimagecopy3d.cpp
similarity index 100%
rename from test_conformance/basic/test_arrayimagecopy3d.c
rename to test_conformance/basic/test_arrayimagecopy3d.cpp
diff --git a/test_conformance/basic/test_arrayreadwrite.c b/test_conformance/basic/test_arrayreadwrite.cpp
similarity index 100%
rename from test_conformance/basic/test_arrayreadwrite.c
rename to test_conformance/basic/test_arrayreadwrite.cpp
diff --git a/test_conformance/basic/test_barrier.c b/test_conformance/basic/test_barrier.cpp
similarity index 100%
rename from test_conformance/basic/test_barrier.c
rename to test_conformance/basic/test_barrier.cpp
diff --git a/test_conformance/basic/test_basic_parameter_types.c b/test_conformance/basic/test_basic_parameter_types.cpp
similarity index 100%
rename from test_conformance/basic/test_basic_parameter_types.c
rename to test_conformance/basic/test_basic_parameter_types.cpp
diff --git a/test_conformance/basic/test_bufferreadwriterect.c b/test_conformance/basic/test_bufferreadwriterect.cpp
similarity index 100%
rename from test_conformance/basic/test_bufferreadwriterect.c
rename to test_conformance/basic/test_bufferreadwriterect.cpp
diff --git a/test_conformance/basic/test_constant.c b/test_conformance/basic/test_constant.cpp
similarity index 100%
rename from test_conformance/basic/test_constant.c
rename to test_conformance/basic/test_constant.cpp
diff --git a/test_conformance/basic/test_createkernelsinprogram.c b/test_conformance/basic/test_createkernelsinprogram.cpp
similarity index 100%
rename from test_conformance/basic/test_createkernelsinprogram.c
rename to test_conformance/basic/test_createkernelsinprogram.cpp
diff --git a/test_conformance/basic/test_enqueued_local_size.c b/test_conformance/basic/test_enqueued_local_size.cpp
similarity index 100%
rename from test_conformance/basic/test_enqueued_local_size.c
rename to test_conformance/basic/test_enqueued_local_size.cpp
diff --git a/test_conformance/basic/test_float2int.c b/test_conformance/basic/test_float2int.cpp
similarity index 100%
rename from test_conformance/basic/test_float2int.c
rename to test_conformance/basic/test_float2int.cpp
diff --git a/test_conformance/basic/test_fpmath_float.c b/test_conformance/basic/test_fpmath_float.cpp
similarity index 100%
rename from test_conformance/basic/test_fpmath_float.c
rename to test_conformance/basic/test_fpmath_float.cpp
diff --git a/test_conformance/basic/test_fpmath_float2.c b/test_conformance/basic/test_fpmath_float2.cpp
similarity index 100%
rename from test_conformance/basic/test_fpmath_float2.c
rename to test_conformance/basic/test_fpmath_float2.cpp
diff --git a/test_conformance/basic/test_fpmath_float4.c b/test_conformance/basic/test_fpmath_float4.cpp
similarity index 100%
rename from test_conformance/basic/test_fpmath_float4.c
rename to test_conformance/basic/test_fpmath_float4.cpp
diff --git a/test_conformance/basic/test_global_linear_id.c b/test_conformance/basic/test_global_linear_id.cpp
similarity index 100%
rename from test_conformance/basic/test_global_linear_id.c
rename to test_conformance/basic/test_global_linear_id.cpp
diff --git a/test_conformance/basic/test_hiloeo.c b/test_conformance/basic/test_hiloeo.cpp
similarity index 100%
rename from test_conformance/basic/test_hiloeo.c
rename to test_conformance/basic/test_hiloeo.cpp
diff --git a/test_conformance/basic/test_hostptr.c b/test_conformance/basic/test_hostptr.cpp
similarity index 100%
rename from test_conformance/basic/test_hostptr.c
rename to test_conformance/basic/test_hostptr.cpp
diff --git a/test_conformance/basic/test_if.c b/test_conformance/basic/test_if.cpp
similarity index 100%
rename from test_conformance/basic/test_if.c
rename to test_conformance/basic/test_if.cpp
diff --git a/test_conformance/basic/test_image_multipass.c b/test_conformance/basic/test_image_multipass.cpp
similarity index 100%
rename from test_conformance/basic/test_image_multipass.c
rename to test_conformance/basic/test_image_multipass.cpp
diff --git a/test_conformance/basic/test_image_param.c b/test_conformance/basic/test_image_param.cpp
similarity index 100%
rename from test_conformance/basic/test_image_param.c
rename to test_conformance/basic/test_image_param.cpp
diff --git a/test_conformance/basic/test_image_r8.c b/test_conformance/basic/test_image_r8.cpp
similarity index 100%
rename from test_conformance/basic/test_image_r8.c
rename to test_conformance/basic/test_image_r8.cpp
diff --git a/test_conformance/basic/test_imagearraycopy.c b/test_conformance/basic/test_imagearraycopy.cpp
similarity index 100%
rename from test_conformance/basic/test_imagearraycopy.c
rename to test_conformance/basic/test_imagearraycopy.cpp
diff --git a/test_conformance/basic/test_imagearraycopy3d.c b/test_conformance/basic/test_imagearraycopy3d.cpp
similarity index 100%
rename from test_conformance/basic/test_imagearraycopy3d.c
rename to test_conformance/basic/test_imagearraycopy3d.cpp
diff --git a/test_conformance/basic/test_imagecopy.c b/test_conformance/basic/test_imagecopy.cpp
similarity index 100%
rename from test_conformance/basic/test_imagecopy.c
rename to test_conformance/basic/test_imagecopy.cpp
diff --git a/test_conformance/basic/test_imagecopy3d.c b/test_conformance/basic/test_imagecopy3d.cpp
similarity index 100%
rename from test_conformance/basic/test_imagecopy3d.c
rename to test_conformance/basic/test_imagecopy3d.cpp
diff --git a/test_conformance/basic/test_imagedim.c b/test_conformance/basic/test_imagedim.cpp
similarity index 100%
rename from test_conformance/basic/test_imagedim.c
rename to test_conformance/basic/test_imagedim.cpp
diff --git a/test_conformance/basic/test_imagenpot.c b/test_conformance/basic/test_imagenpot.cpp
similarity index 100%
rename from test_conformance/basic/test_imagenpot.c
rename to test_conformance/basic/test_imagenpot.cpp
diff --git a/test_conformance/basic/test_imagerandomcopy.c b/test_conformance/basic/test_imagerandomcopy.cpp
similarity index 100%
rename from test_conformance/basic/test_imagerandomcopy.c
rename to test_conformance/basic/test_imagerandomcopy.cpp
diff --git a/test_conformance/basic/test_imagereadwrite.c b/test_conformance/basic/test_imagereadwrite.cpp
similarity index 100%
rename from test_conformance/basic/test_imagereadwrite.c
rename to test_conformance/basic/test_imagereadwrite.cpp
diff --git a/test_conformance/basic/test_imagereadwrite3d.c b/test_conformance/basic/test_imagereadwrite3d.cpp
similarity index 100%
rename from test_conformance/basic/test_imagereadwrite3d.c
rename to test_conformance/basic/test_imagereadwrite3d.cpp
diff --git a/test_conformance/basic/test_int2float.c b/test_conformance/basic/test_int2float.cpp
similarity index 100%
rename from test_conformance/basic/test_int2float.c
rename to test_conformance/basic/test_int2float.cpp
diff --git a/test_conformance/basic/test_intmath_int.c b/test_conformance/basic/test_intmath_int.cpp
similarity index 100%
rename from test_conformance/basic/test_intmath_int.c
rename to test_conformance/basic/test_intmath_int.cpp
diff --git a/test_conformance/basic/test_intmath_int2.c b/test_conformance/basic/test_intmath_int2.cpp
similarity index 100%
rename from test_conformance/basic/test_intmath_int2.c
rename to test_conformance/basic/test_intmath_int2.cpp
diff --git a/test_conformance/basic/test_intmath_int4.c b/test_conformance/basic/test_intmath_int4.cpp
similarity index 100%
rename from test_conformance/basic/test_intmath_int4.c
rename to test_conformance/basic/test_intmath_int4.cpp
diff --git a/test_conformance/basic/test_intmath_long.c b/test_conformance/basic/test_intmath_long.cpp
similarity index 100%
rename from test_conformance/basic/test_intmath_long.c
rename to test_conformance/basic/test_intmath_long.cpp
diff --git a/test_conformance/basic/test_intmath_long2.c b/test_conformance/basic/test_intmath_long2.cpp
similarity index 100%
rename from test_conformance/basic/test_intmath_long2.c
rename to test_conformance/basic/test_intmath_long2.cpp
diff --git a/test_conformance/basic/test_intmath_long4.c b/test_conformance/basic/test_intmath_long4.cpp
similarity index 100%
rename from test_conformance/basic/test_intmath_long4.c
rename to test_conformance/basic/test_intmath_long4.cpp
diff --git a/test_conformance/basic/test_local.c b/test_conformance/basic/test_local.cpp
similarity index 100%
rename from test_conformance/basic/test_local.c
rename to test_conformance/basic/test_local.cpp
diff --git a/test_conformance/basic/test_local_linear_id.c b/test_conformance/basic/test_local_linear_id.cpp
similarity index 100%
rename from test_conformance/basic/test_local_linear_id.c
rename to test_conformance/basic/test_local_linear_id.cpp
diff --git a/test_conformance/basic/test_loop.c b/test_conformance/basic/test_loop.cpp
similarity index 100%
rename from test_conformance/basic/test_loop.c
rename to test_conformance/basic/test_loop.cpp
diff --git a/test_conformance/basic/test_multireadimagemultifmt.c b/test_conformance/basic/test_multireadimagemultifmt.cpp
similarity index 100%
rename from test_conformance/basic/test_multireadimagemultifmt.c
rename to test_conformance/basic/test_multireadimagemultifmt.cpp
diff --git a/test_conformance/basic/test_multireadimageonefmt.c b/test_conformance/basic/test_multireadimageonefmt.cpp
similarity index 100%
rename from test_conformance/basic/test_multireadimageonefmt.c
rename to test_conformance/basic/test_multireadimageonefmt.cpp
diff --git a/test_conformance/basic/test_pointercast.c b/test_conformance/basic/test_pointercast.cpp
similarity index 100%
rename from test_conformance/basic/test_pointercast.c
rename to test_conformance/basic/test_pointercast.cpp
diff --git a/test_conformance/basic/test_queue_priority.c b/test_conformance/basic/test_queue_priority.cpp
similarity index 100%
rename from test_conformance/basic/test_queue_priority.c
rename to test_conformance/basic/test_queue_priority.cpp
diff --git a/test_conformance/basic/test_readimage.c b/test_conformance/basic/test_readimage.cpp
similarity index 100%
rename from test_conformance/basic/test_readimage.c
rename to test_conformance/basic/test_readimage.cpp
diff --git a/test_conformance/basic/test_readimage3d.c b/test_conformance/basic/test_readimage3d.cpp
similarity index 100%
rename from test_conformance/basic/test_readimage3d.c
rename to test_conformance/basic/test_readimage3d.cpp
diff --git a/test_conformance/basic/test_readimage3d_fp32.c b/test_conformance/basic/test_readimage3d_fp32.cpp
similarity index 100%
rename from test_conformance/basic/test_readimage3d_fp32.c
rename to test_conformance/basic/test_readimage3d_fp32.cpp
diff --git a/test_conformance/basic/test_readimage3d_int16.c b/test_conformance/basic/test_readimage3d_int16.cpp
similarity index 100%
rename from test_conformance/basic/test_readimage3d_int16.c
rename to test_conformance/basic/test_readimage3d_int16.cpp
diff --git a/test_conformance/basic/test_readimage_fp32.c b/test_conformance/basic/test_readimage_fp32.cpp
similarity index 100%
rename from test_conformance/basic/test_readimage_fp32.c
rename to test_conformance/basic/test_readimage_fp32.cpp
diff --git a/test_conformance/basic/test_readimage_int16.c b/test_conformance/basic/test_readimage_int16.cpp
similarity index 100%
rename from test_conformance/basic/test_readimage_int16.c
rename to test_conformance/basic/test_readimage_int16.cpp
diff --git a/test_conformance/basic/test_rw_image_access_qualifier.c b/test_conformance/basic/test_rw_image_access_qualifier.cpp
similarity index 100%
rename from test_conformance/basic/test_rw_image_access_qualifier.c
rename to test_conformance/basic/test_rw_image_access_qualifier.cpp
diff --git a/test_conformance/basic/test_simple_image_pitch.c b/test_conformance/basic/test_simple_image_pitch.cpp
similarity index 100%
rename from test_conformance/basic/test_simple_image_pitch.c
rename to test_conformance/basic/test_simple_image_pitch.cpp
diff --git a/test_conformance/basic/test_sizeof.c b/test_conformance/basic/test_sizeof.cpp
similarity index 100%
rename from test_conformance/basic/test_sizeof.c
rename to test_conformance/basic/test_sizeof.cpp
diff --git a/test_conformance/basic/test_vec_type_hint.c b/test_conformance/basic/test_vec_type_hint.cpp
similarity index 100%
rename from test_conformance/basic/test_vec_type_hint.c
rename to test_conformance/basic/test_vec_type_hint.cpp
diff --git a/test_conformance/basic/test_vloadstore.c b/test_conformance/basic/test_vloadstore.cpp
similarity index 100%
rename from test_conformance/basic/test_vloadstore.c
rename to test_conformance/basic/test_vloadstore.cpp
diff --git a/test_conformance/basic/test_wg_barrier.c b/test_conformance/basic/test_wg_barrier.cpp
similarity index 100%
rename from test_conformance/basic/test_wg_barrier.c
rename to test_conformance/basic/test_wg_barrier.cpp
diff --git a/test_conformance/basic/test_writeimage.c b/test_conformance/basic/test_writeimage.cpp
similarity index 100%
rename from test_conformance/basic/test_writeimage.c
rename to test_conformance/basic/test_writeimage.cpp
diff --git a/test_conformance/basic/test_writeimage_fp32.c b/test_conformance/basic/test_writeimage_fp32.cpp
similarity index 100%
rename from test_conformance/basic/test_writeimage_fp32.c
rename to test_conformance/basic/test_writeimage_fp32.cpp
diff --git a/test_conformance/basic/test_writeimage_int16.c b/test_conformance/basic/test_writeimage_int16.cpp
similarity index 100%
rename from test_conformance/basic/test_writeimage_int16.c
rename to test_conformance/basic/test_writeimage_int16.cpp
diff --git a/test_conformance/buffers/CMakeLists.txt b/test_conformance/buffers/CMakeLists.txt
index 329c63b6..4b1ad285 100644
--- a/test_conformance/buffers/CMakeLists.txt
+++ b/test_conformance/buffers/CMakeLists.txt
@@ -1,17 +1,17 @@
 set(MODULE_NAME BUFFERS)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_buffer_copy.c
-    test_buffer_read.c
-    test_buffer_write.c
-    test_buffer_mem.c
-    array_info.c
-    test_buffer_map.c
+    main.cpp
+    test_buffer_copy.cpp
+    test_buffer_read.cpp
+    test_buffer_write.cpp
+    test_buffer_mem.cpp
+    array_info.cpp
+    test_buffer_map.cpp
     test_sub_buffers.cpp
-    test_buffer_fill.c
-    test_buffer_migrate.c
-    test_image_migrate.c
+    test_buffer_fill.cpp
+    test_buffer_migrate.cpp
+    test_image_migrate.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/buffers/array_info.c b/test_conformance/buffers/array_info.cpp
similarity index 100%
rename from test_conformance/buffers/array_info.c
rename to test_conformance/buffers/array_info.cpp
diff --git a/test_conformance/buffers/main.c b/test_conformance/buffers/main.cpp
similarity index 100%
rename from test_conformance/buffers/main.c
rename to test_conformance/buffers/main.cpp
diff --git a/test_conformance/buffers/test_buffer_copy.c b/test_conformance/buffers/test_buffer_copy.cpp
similarity index 100%
rename from test_conformance/buffers/test_buffer_copy.c
rename to test_conformance/buffers/test_buffer_copy.cpp
diff --git a/test_conformance/buffers/test_buffer_fill.c b/test_conformance/buffers/test_buffer_fill.cpp
similarity index 100%
rename from test_conformance/buffers/test_buffer_fill.c
rename to test_conformance/buffers/test_buffer_fill.cpp
diff --git a/test_conformance/buffers/test_buffer_map.c b/test_conformance/buffers/test_buffer_map.cpp
similarity index 100%
rename from test_conformance/buffers/test_buffer_map.c
rename to test_conformance/buffers/test_buffer_map.cpp
diff --git a/test_conformance/buffers/test_buffer_mem.c b/test_conformance/buffers/test_buffer_mem.cpp
similarity index 100%
rename from test_conformance/buffers/test_buffer_mem.c
rename to test_conformance/buffers/test_buffer_mem.cpp
diff --git a/test_conformance/buffers/test_buffer_migrate.c b/test_conformance/buffers/test_buffer_migrate.cpp
similarity index 100%
rename from test_conformance/buffers/test_buffer_migrate.c
rename to test_conformance/buffers/test_buffer_migrate.cpp
diff --git a/test_conformance/buffers/test_buffer_read.c b/test_conformance/buffers/test_buffer_read.cpp
similarity index 100%
rename from test_conformance/buffers/test_buffer_read.c
rename to test_conformance/buffers/test_buffer_read.cpp
diff --git a/test_conformance/buffers/test_buffer_write.c b/test_conformance/buffers/test_buffer_write.cpp
similarity index 100%
rename from test_conformance/buffers/test_buffer_write.c
rename to test_conformance/buffers/test_buffer_write.cpp
diff --git a/test_conformance/buffers/test_image_migrate.c b/test_conformance/buffers/test_image_migrate.cpp
similarity index 100%
rename from test_conformance/buffers/test_image_migrate.c
rename to test_conformance/buffers/test_image_migrate.cpp
diff --git a/test_conformance/commonfns/CMakeLists.txt b/test_conformance/commonfns/CMakeLists.txt
index 9fa76be2..5aa29250 100644
--- a/test_conformance/commonfns/CMakeLists.txt
+++ b/test_conformance/commonfns/CMakeLists.txt
@@ -1,25 +1,25 @@
 set(MODULE_NAME COMMONFNS)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_clamp.c
-    test_degrees.c
-    test_max.c
-    test_maxf.c
-    test_min.c
-    test_minf.c
-    test_mix.c
-    test_radians.c
-    test_step.c
-    test_stepf.c
-    test_smoothstep.c
-    test_smoothstepf.c
-    test_sign.c
-    test_fmax.c
-    test_fmin.c
-    test_fmaxf.c
-    test_fminf.c
-    test_binary_fn.c
+    main.cpp
+    test_clamp.cpp
+    test_degrees.cpp
+    test_max.cpp
+    test_maxf.cpp
+    test_min.cpp
+    test_minf.cpp
+    test_mix.cpp
+    test_radians.cpp
+    test_step.cpp
+    test_stepf.cpp
+    test_smoothstep.cpp
+    test_smoothstepf.cpp
+    test_sign.cpp
+    test_fmax.cpp
+    test_fmin.cpp
+    test_fmaxf.cpp
+    test_fminf.cpp
+    test_binary_fn.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/commonfns/main.c b/test_conformance/commonfns/main.cpp
similarity index 100%
rename from test_conformance/commonfns/main.c
rename to test_conformance/commonfns/main.cpp
diff --git a/test_conformance/commonfns/test_binary_fn.c b/test_conformance/commonfns/test_binary_fn.cpp
similarity index 100%
rename from test_conformance/commonfns/test_binary_fn.c
rename to test_conformance/commonfns/test_binary_fn.cpp
diff --git a/test_conformance/commonfns/test_clamp.c b/test_conformance/commonfns/test_clamp.cpp
similarity index 100%
rename from test_conformance/commonfns/test_clamp.c
rename to test_conformance/commonfns/test_clamp.cpp
diff --git a/test_conformance/commonfns/test_degrees.c b/test_conformance/commonfns/test_degrees.cpp
similarity index 100%
rename from test_conformance/commonfns/test_degrees.c
rename to test_conformance/commonfns/test_degrees.cpp
diff --git a/test_conformance/commonfns/test_fmax.c b/test_conformance/commonfns/test_fmax.cpp
similarity index 100%
rename from test_conformance/commonfns/test_fmax.c
rename to test_conformance/commonfns/test_fmax.cpp
diff --git a/test_conformance/commonfns/test_fmaxf.c b/test_conformance/commonfns/test_fmaxf.cpp
similarity index 100%
rename from test_conformance/commonfns/test_fmaxf.c
rename to test_conformance/commonfns/test_fmaxf.cpp
diff --git a/test_conformance/commonfns/test_fmin.c b/test_conformance/commonfns/test_fmin.cpp
similarity index 100%
rename from test_conformance/commonfns/test_fmin.c
rename to test_conformance/commonfns/test_fmin.cpp
diff --git a/test_conformance/commonfns/test_fminf.c b/test_conformance/commonfns/test_fminf.cpp
similarity index 100%
rename from test_conformance/commonfns/test_fminf.c
rename to test_conformance/commonfns/test_fminf.cpp
diff --git a/test_conformance/commonfns/test_max.c b/test_conformance/commonfns/test_max.cpp
similarity index 100%
rename from test_conformance/commonfns/test_max.c
rename to test_conformance/commonfns/test_max.cpp
diff --git a/test_conformance/commonfns/test_maxf.c b/test_conformance/commonfns/test_maxf.cpp
similarity index 100%
rename from test_conformance/commonfns/test_maxf.c
rename to test_conformance/commonfns/test_maxf.cpp
diff --git a/test_conformance/commonfns/test_min.c b/test_conformance/commonfns/test_min.cpp
similarity index 100%
rename from test_conformance/commonfns/test_min.c
rename to test_conformance/commonfns/test_min.cpp
diff --git a/test_conformance/commonfns/test_minf.c b/test_conformance/commonfns/test_minf.cpp
similarity index 100%
rename from test_conformance/commonfns/test_minf.c
rename to test_conformance/commonfns/test_minf.cpp
diff --git a/test_conformance/commonfns/test_mix.c b/test_conformance/commonfns/test_mix.cpp
similarity index 100%
rename from test_conformance/commonfns/test_mix.c
rename to test_conformance/commonfns/test_mix.cpp
diff --git a/test_conformance/commonfns/test_radians.c b/test_conformance/commonfns/test_radians.cpp
similarity index 100%
rename from test_conformance/commonfns/test_radians.c
rename to test_conformance/commonfns/test_radians.cpp
diff --git a/test_conformance/commonfns/test_sign.c b/test_conformance/commonfns/test_sign.cpp
similarity index 100%
rename from test_conformance/commonfns/test_sign.c
rename to test_conformance/commonfns/test_sign.cpp
diff --git a/test_conformance/commonfns/test_smoothstep.c b/test_conformance/commonfns/test_smoothstep.cpp
similarity index 100%
rename from test_conformance/commonfns/test_smoothstep.c
rename to test_conformance/commonfns/test_smoothstep.cpp
diff --git a/test_conformance/commonfns/test_smoothstepf.c b/test_conformance/commonfns/test_smoothstepf.cpp
similarity index 100%
rename from test_conformance/commonfns/test_smoothstepf.c
rename to test_conformance/commonfns/test_smoothstepf.cpp
diff --git a/test_conformance/commonfns/test_step.c b/test_conformance/commonfns/test_step.cpp
similarity index 100%
rename from test_conformance/commonfns/test_step.c
rename to test_conformance/commonfns/test_step.cpp
diff --git a/test_conformance/commonfns/test_stepf.c b/test_conformance/commonfns/test_stepf.cpp
similarity index 100%
rename from test_conformance/commonfns/test_stepf.c
rename to test_conformance/commonfns/test_stepf.cpp
diff --git a/test_conformance/compiler/CMakeLists.txt b/test_conformance/compiler/CMakeLists.txt
index 1e991aa4..69ad51c6 100644
--- a/test_conformance/compiler/CMakeLists.txt
+++ b/test_conformance/compiler/CMakeLists.txt
@@ -1,15 +1,15 @@
 set(MODULE_NAME COMPILER)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_build_helpers.c
-    test_compile.c
-    test_async_build.c
+    main.cpp
+    test_build_helpers.cpp
+    test_compile.cpp
+    test_async_build.cpp
     test_build_options.cpp
-    test_preprocessor.c
-    test_image_macro.c
+    test_preprocessor.cpp
+    test_image_macro.cpp
     test_compiler_defines_for_extensions.cpp
-    test_pragma_unroll.c
+    test_pragma_unroll.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/compiler/main.c b/test_conformance/compiler/main.cpp
similarity index 100%
rename from test_conformance/compiler/main.c
rename to test_conformance/compiler/main.cpp
diff --git a/test_conformance/compiler/test_async_build.c b/test_conformance/compiler/test_async_build.cpp
similarity index 100%
rename from test_conformance/compiler/test_async_build.c
rename to test_conformance/compiler/test_async_build.cpp
diff --git a/test_conformance/compiler/test_build_helpers.c b/test_conformance/compiler/test_build_helpers.cpp
similarity index 100%
rename from test_conformance/compiler/test_build_helpers.c
rename to test_conformance/compiler/test_build_helpers.cpp
diff --git a/test_conformance/compiler/test_compile.c b/test_conformance/compiler/test_compile.cpp
similarity index 100%
rename from test_conformance/compiler/test_compile.c
rename to test_conformance/compiler/test_compile.cpp
diff --git a/test_conformance/compiler/test_image_macro.c b/test_conformance/compiler/test_image_macro.cpp
similarity index 100%
rename from test_conformance/compiler/test_image_macro.c
rename to test_conformance/compiler/test_image_macro.cpp
diff --git a/test_conformance/compiler/test_pragma_unroll.c b/test_conformance/compiler/test_pragma_unroll.cpp
similarity index 100%
rename from test_conformance/compiler/test_pragma_unroll.c
rename to test_conformance/compiler/test_pragma_unroll.cpp
diff --git a/test_conformance/compiler/test_preprocessor.c b/test_conformance/compiler/test_preprocessor.cpp
similarity index 100%
rename from test_conformance/compiler/test_preprocessor.c
rename to test_conformance/compiler/test_preprocessor.cpp
diff --git a/test_conformance/computeinfo/CMakeLists.txt b/test_conformance/computeinfo/CMakeLists.txt
index 2c00a4a6..c952b170 100644
--- a/test_conformance/computeinfo/CMakeLists.txt
+++ b/test_conformance/computeinfo/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(MODULE_NAME computeinfo)
 
 set(${MODULE_NAME}_SOURCES
-        main.c
+        main.cpp
         extended_versioning.cpp
 )
 
diff --git a/test_conformance/computeinfo/main.c b/test_conformance/computeinfo/main.cpp
similarity index 100%
rename from test_conformance/computeinfo/main.c
rename to test_conformance/computeinfo/main.cpp
diff --git a/test_conformance/contractions/CMakeLists.txt b/test_conformance/contractions/CMakeLists.txt
index 927c035d..7439f25a 100644
--- a/test_conformance/contractions/CMakeLists.txt
+++ b/test_conformance/contractions/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(MODULE_NAME CONTRACTIONS)
 
 set(${MODULE_NAME}_SOURCES
-        contractions.c
+        contractions.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/contractions/contractions.c b/test_conformance/contractions/contractions.cpp
similarity index 100%
rename from test_conformance/contractions/contractions.c
rename to test_conformance/contractions/contractions.cpp
diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt
index ac24d45a..3423aeb5 100644
--- a/test_conformance/conversions/CMakeLists.txt
+++ b/test_conformance/conversions/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(MODULE_NAME CONVERSIONS)
 
-# VS2005 AMD64 WAR (basic_test_conversions.c causes internal compiler error)
+# VS2005 AMD64 WAR (basic_test_conversions.cpp causes internal compiler error)
 if(MSVC)
 set(CMAKE_C_FLAGS_RELEASE "/Od /Ob0")
 set(CMAKE_CXX_FLAGS_RELEASE "/Od /Ob0")
@@ -10,19 +10,13 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O0")
 endif(MSVC)
 
 set (${MODULE_NAME}_SOURCES
-      Sleep.c test_conversions.c basic_test_conversions.c
+      Sleep.cpp test_conversions.cpp basic_test_conversions.cpp
 )
 
 if(ANDROID)
     list(APPEND CONVERSIONS_SOURCES fplib.c)
 endif(ANDROID)
 
-if(WIN32)
-set_source_files_properties(
-    ${MODULE_NAME}_SOURCES
-        PROPERTIES LANGUAGE CXX)
-endif(WIN32)
-
 if(NOT CMAKE_CL_64 AND NOT MSVC AND NOT ANDROID)
 # -march is needed for CPU atomics, default arch on gcc is i386
 # that does not support atomics.
@@ -33,7 +27,7 @@ endif(NOT CMAKE_CL_64 AND NOT MSVC AND NOT ANDROID)
 
 if(NOT ANDROID)
 set_source_files_properties(
-        Sleep.c test_conversions.c basic_test_conversions.c
+        Sleep.cpp test_conversions.cpp basic_test_conversions.cpp
         COMPILE_FLAGS -msse2)
 endif(NOT ANDROID)
 
diff --git a/test_conformance/conversions/Sleep.c b/test_conformance/conversions/Sleep.cpp
similarity index 100%
rename from test_conformance/conversions/Sleep.c
rename to test_conformance/conversions/Sleep.cpp
diff --git a/test_conformance/conversions/basic_test_conversions.c b/test_conformance/conversions/basic_test_conversions.cpp
similarity index 100%
rename from test_conformance/conversions/basic_test_conversions.c
rename to test_conformance/conversions/basic_test_conversions.cpp
diff --git a/test_conformance/conversions/test_conversions.c b/test_conformance/conversions/test_conversions.cpp
similarity index 100%
rename from test_conformance/conversions/test_conversions.c
rename to test_conformance/conversions/test_conversions.cpp
diff --git a/test_conformance/device_execution/CMakeLists.txt b/test_conformance/device_execution/CMakeLists.txt
index fe7a7d03..d99ba217 100644
--- a/test_conformance/device_execution/CMakeLists.txt
+++ b/test_conformance/device_execution/CMakeLists.txt
@@ -11,7 +11,7 @@ set(DEVICE_EXECUTION_SOURCES
     execute_block.cpp
     host_multi_queue.cpp
     host_queue_order.cpp
-    main.c
+    main.cpp
     nested_blocks.cpp
     utils.cpp
 )
diff --git a/test_conformance/device_execution/main.c b/test_conformance/device_execution/main.cpp
similarity index 100%
rename from test_conformance/device_execution/main.c
rename to test_conformance/device_execution/main.cpp
diff --git a/test_conformance/device_partition/CMakeLists.txt b/test_conformance/device_partition/CMakeLists.txt
index 32952d4d..920c1609 100644
--- a/test_conformance/device_partition/CMakeLists.txt
+++ b/test_conformance/device_partition/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(MODULE_NAME DEVICE_PARTITION)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
+    main.cpp
     test_device_partition.cpp
 )
 include(../CMakeCommon.txt)
diff --git a/test_conformance/device_partition/main.c b/test_conformance/device_partition/main.cpp
similarity index 100%
rename from test_conformance/device_partition/main.c
rename to test_conformance/device_partition/main.cpp
diff --git a/test_conformance/device_timer/CMakeLists.txt b/test_conformance/device_timer/CMakeLists.txt
index ab6fbef0..4af7c7f7 100644
--- a/test_conformance/device_timer/CMakeLists.txt
+++ b/test_conformance/device_timer/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(MODULE_NAME DEVICE_TIMER)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_device_timer.c
+    main.cpp
+    test_device_timer.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/device_timer/main.c b/test_conformance/device_timer/main.cpp
similarity index 100%
rename from test_conformance/device_timer/main.c
rename to test_conformance/device_timer/main.cpp
diff --git a/test_conformance/device_timer/test_device_timer.c b/test_conformance/device_timer/test_device_timer.cpp
similarity index 100%
rename from test_conformance/device_timer/test_device_timer.c
rename to test_conformance/device_timer/test_device_timer.cpp
diff --git a/test_conformance/events/CMakeLists.txt b/test_conformance/events/CMakeLists.txt
index e11055c5..d6a5a2fd 100644
--- a/test_conformance/events/CMakeLists.txt
+++ b/test_conformance/events/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(MODULE_NAME EVENTS)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
+    main.cpp
     test_events.cpp
     test_event_dependencies.cpp
     test_waitlists.cpp
diff --git a/test_conformance/events/main.c b/test_conformance/events/main.cpp
similarity index 100%
rename from test_conformance/events/main.c
rename to test_conformance/events/main.cpp
diff --git a/test_conformance/geometrics/CMakeLists.txt b/test_conformance/geometrics/CMakeLists.txt
index 30a6c8ea..a461fa42 100644
--- a/test_conformance/geometrics/CMakeLists.txt
+++ b/test_conformance/geometrics/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(MODULE_NAME GEOMETRICS)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
+    main.cpp
     test_geometrics_double.cpp
     test_geometrics.cpp
 )
diff --git a/test_conformance/geometrics/main.c b/test_conformance/geometrics/main.cpp
similarity index 100%
rename from test_conformance/geometrics/main.c
rename to test_conformance/geometrics/main.cpp
diff --git a/test_conformance/half/CMakeLists.txt b/test_conformance/half/CMakeLists.txt
index cf8894f4..494b4eb8 100644
--- a/test_conformance/half/CMakeLists.txt
+++ b/test_conformance/half/CMakeLists.txt
@@ -1,10 +1,10 @@
 set(MODULE_NAME HALF)
 
 set(${MODULE_NAME}_SOURCES
-        cl_utils.c
-        Test_vLoadHalf.c
-        Test_roundTrip.c
-        Test_vStoreHalf.c main.c
+        cl_utils.cpp
+        Test_vLoadHalf.cpp
+        Test_roundTrip.cpp
+        Test_vStoreHalf.cpp main.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/half/Test_roundTrip.c b/test_conformance/half/Test_roundTrip.cpp
similarity index 100%
rename from test_conformance/half/Test_roundTrip.c
rename to test_conformance/half/Test_roundTrip.cpp
diff --git a/test_conformance/half/Test_vLoadHalf.c b/test_conformance/half/Test_vLoadHalf.cpp
similarity index 100%
rename from test_conformance/half/Test_vLoadHalf.c
rename to test_conformance/half/Test_vLoadHalf.cpp
diff --git a/test_conformance/half/Test_vStoreHalf.c b/test_conformance/half/Test_vStoreHalf.cpp
similarity index 100%
rename from test_conformance/half/Test_vStoreHalf.c
rename to test_conformance/half/Test_vStoreHalf.cpp
diff --git a/test_conformance/half/cl_utils.c b/test_conformance/half/cl_utils.cpp
similarity index 100%
rename from test_conformance/half/cl_utils.c
rename to test_conformance/half/cl_utils.cpp
diff --git a/test_conformance/half/main.c b/test_conformance/half/main.cpp
similarity index 100%
rename from test_conformance/half/main.c
rename to test_conformance/half/main.cpp
diff --git a/test_conformance/integer_ops/CMakeLists.txt b/test_conformance/integer_ops/CMakeLists.txt
index 77e155f0..a045ef81 100644
--- a/test_conformance/integer_ops/CMakeLists.txt
+++ b/test_conformance/integer_ops/CMakeLists.txt
@@ -1,16 +1,16 @@
 set(MODULE_NAME INTEGER_OPS)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_int_basic_ops.c
+    main.cpp
+    test_int_basic_ops.cpp
     test_integers.cpp
     test_upsample.cpp
-    test_intmul24.c test_intmad24.c
-    test_sub_sat.c test_add_sat.c
-    test_abs.c test_absdiff.c
+    test_intmul24.cpp test_intmad24.cpp
+    test_sub_sat.cpp test_add_sat.cpp
+    test_abs.cpp test_absdiff.cpp
     test_unary_ops.cpp
-    verification_and_generation_functions.c
-    test_popcount.c
+    verification_and_generation_functions.cpp
+    test_popcount.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/integer_ops/main.c b/test_conformance/integer_ops/main.cpp
similarity index 100%
rename from test_conformance/integer_ops/main.c
rename to test_conformance/integer_ops/main.cpp
diff --git a/test_conformance/integer_ops/test_abs.c b/test_conformance/integer_ops/test_abs.cpp
similarity index 100%
rename from test_conformance/integer_ops/test_abs.c
rename to test_conformance/integer_ops/test_abs.cpp
diff --git a/test_conformance/integer_ops/test_absdiff.c b/test_conformance/integer_ops/test_absdiff.cpp
similarity index 100%
rename from test_conformance/integer_ops/test_absdiff.c
rename to test_conformance/integer_ops/test_absdiff.cpp
diff --git a/test_conformance/integer_ops/test_add_sat.c b/test_conformance/integer_ops/test_add_sat.cpp
similarity index 100%
rename from test_conformance/integer_ops/test_add_sat.c
rename to test_conformance/integer_ops/test_add_sat.cpp
diff --git a/test_conformance/integer_ops/test_int_basic_ops.c b/test_conformance/integer_ops/test_int_basic_ops.cpp
similarity index 100%
rename from test_conformance/integer_ops/test_int_basic_ops.c
rename to test_conformance/integer_ops/test_int_basic_ops.cpp
diff --git a/test_conformance/integer_ops/test_intmad24.c b/test_conformance/integer_ops/test_intmad24.cpp
similarity index 100%
rename from test_conformance/integer_ops/test_intmad24.c
rename to test_conformance/integer_ops/test_intmad24.cpp
diff --git a/test_conformance/integer_ops/test_intmul24.c b/test_conformance/integer_ops/test_intmul24.cpp
similarity index 100%
rename from test_conformance/integer_ops/test_intmul24.c
rename to test_conformance/integer_ops/test_intmul24.cpp
diff --git a/test_conformance/integer_ops/test_popcount.c b/test_conformance/integer_ops/test_popcount.cpp
similarity index 100%
rename from test_conformance/integer_ops/test_popcount.c
rename to test_conformance/integer_ops/test_popcount.cpp
diff --git a/test_conformance/integer_ops/test_sub_sat.c b/test_conformance/integer_ops/test_sub_sat.cpp
similarity index 100%
rename from test_conformance/integer_ops/test_sub_sat.c
rename to test_conformance/integer_ops/test_sub_sat.cpp
diff --git a/test_conformance/integer_ops/verification_and_generation_functions.c b/test_conformance/integer_ops/verification_and_generation_functions.cpp
similarity index 100%
rename from test_conformance/integer_ops/verification_and_generation_functions.c
rename to test_conformance/integer_ops/verification_and_generation_functions.cpp
diff --git a/test_conformance/math_brute_force/CMakeLists.txt b/test_conformance/math_brute_force/CMakeLists.txt
index c510ea1c..d0bcc575 100644
--- a/test_conformance/math_brute_force/CMakeLists.txt
+++ b/test_conformance/math_brute_force/CMakeLists.txt
@@ -1,43 +1,43 @@
 set(MODULE_NAME BRUTEFORCE)
 
 set(${MODULE_NAME}_SOURCES
-    FunctionList.c
-    Sleep.c
-    binary.c
-    binaryOperator.c
-    Utility.c
-    binary_i.c
-    binary_two_results_i.c
-    i_unary.c
-    macro_binary.c
-    macro_unary.c
-    mad.c
-    main.c
-    reference_math.c
-    ternary.c
-    unary.c
-    unary_two_results.c
-    unary_two_results_i.c
-    unary_u.c
+    FunctionList.cpp
+    Sleep.cpp
+    binary.cpp
+    binaryOperator.cpp
+    Utility.cpp
+    binary_i.cpp
+    binary_two_results_i.cpp
+    i_unary.cpp
+    macro_binary.cpp
+    macro_unary.cpp
+    mad.cpp
+    main.cpp
+    reference_math.cpp
+    ternary.cpp
+    unary.cpp
+    unary_two_results.cpp
+    unary_two_results_i.cpp
+    unary_u.cpp
 )
 
 
 if (NOT ANDROID)
 set_source_files_properties(
-    FunctionList.c
-    Sleep.c
-    binary.c
-    binaryOperator.c
-    Utility.c
-    binary_i.c
-    binary_two_results_i.c
-    i_unary.c
-    macro_binary.c
-    macro_unary.c
-    mad.c
-    main.c     reference_math.c
-    ternary.c     unary.c     unary_two_results.c
-    unary_two_results_i.c unary_u.c
+    FunctionList.cpp
+    Sleep.cpp
+    binary.cpp
+    binaryOperator.cpp
+    Utility.cpp
+    binary_i.cpp
+    binary_two_results_i.cpp
+    i_unary.cpp
+    macro_binary.cpp
+    macro_unary.cpp
+    mad.cpp
+    main.cpp     reference_math.cpp
+    ternary.cpp     unary.cpp     unary_two_results.cpp
+    unary_two_results_i.cpp unary_u.cpp
     COMPILE_FLAGS -msse2    )
 endif(NOT ANDROID)
 
diff --git a/test_conformance/math_brute_force/FunctionList.c b/test_conformance/math_brute_force/FunctionList.cpp
similarity index 100%
rename from test_conformance/math_brute_force/FunctionList.c
rename to test_conformance/math_brute_force/FunctionList.cpp
diff --git a/test_conformance/math_brute_force/Sleep.c b/test_conformance/math_brute_force/Sleep.cpp
similarity index 100%
rename from test_conformance/math_brute_force/Sleep.c
rename to test_conformance/math_brute_force/Sleep.cpp
diff --git a/test_conformance/math_brute_force/Utility.c b/test_conformance/math_brute_force/Utility.cpp
similarity index 100%
rename from test_conformance/math_brute_force/Utility.c
rename to test_conformance/math_brute_force/Utility.cpp
diff --git a/test_conformance/math_brute_force/binary.c b/test_conformance/math_brute_force/binary.cpp
similarity index 100%
rename from test_conformance/math_brute_force/binary.c
rename to test_conformance/math_brute_force/binary.cpp
diff --git a/test_conformance/math_brute_force/binaryOperator.c b/test_conformance/math_brute_force/binaryOperator.cpp
similarity index 100%
rename from test_conformance/math_brute_force/binaryOperator.c
rename to test_conformance/math_brute_force/binaryOperator.cpp
diff --git a/test_conformance/math_brute_force/binary_i.c b/test_conformance/math_brute_force/binary_i.cpp
similarity index 100%
rename from test_conformance/math_brute_force/binary_i.c
rename to test_conformance/math_brute_force/binary_i.cpp
diff --git a/test_conformance/math_brute_force/binary_two_results_i.c b/test_conformance/math_brute_force/binary_two_results_i.cpp
similarity index 100%
rename from test_conformance/math_brute_force/binary_two_results_i.c
rename to test_conformance/math_brute_force/binary_two_results_i.cpp
diff --git a/test_conformance/math_brute_force/i_unary.c b/test_conformance/math_brute_force/i_unary.cpp
similarity index 100%
rename from test_conformance/math_brute_force/i_unary.c
rename to test_conformance/math_brute_force/i_unary.cpp
diff --git a/test_conformance/math_brute_force/macro_binary.c b/test_conformance/math_brute_force/macro_binary.cpp
similarity index 100%
rename from test_conformance/math_brute_force/macro_binary.c
rename to test_conformance/math_brute_force/macro_binary.cpp
diff --git a/test_conformance/math_brute_force/macro_unary.c b/test_conformance/math_brute_force/macro_unary.cpp
similarity index 100%
rename from test_conformance/math_brute_force/macro_unary.c
rename to test_conformance/math_brute_force/macro_unary.cpp
diff --git a/test_conformance/math_brute_force/mad.c b/test_conformance/math_brute_force/mad.cpp
similarity index 100%
rename from test_conformance/math_brute_force/mad.c
rename to test_conformance/math_brute_force/mad.cpp
diff --git a/test_conformance/math_brute_force/main.c b/test_conformance/math_brute_force/main.cpp
similarity index 100%
rename from test_conformance/math_brute_force/main.c
rename to test_conformance/math_brute_force/main.cpp
diff --git a/test_conformance/math_brute_force/reference_math.c b/test_conformance/math_brute_force/reference_math.cpp
similarity index 100%
rename from test_conformance/math_brute_force/reference_math.c
rename to test_conformance/math_brute_force/reference_math.cpp
diff --git a/test_conformance/math_brute_force/ternary.c b/test_conformance/math_brute_force/ternary.cpp
similarity index 100%
rename from test_conformance/math_brute_force/ternary.c
rename to test_conformance/math_brute_force/ternary.cpp
diff --git a/test_conformance/math_brute_force/unary.c b/test_conformance/math_brute_force/unary.cpp
similarity index 100%
rename from test_conformance/math_brute_force/unary.c
rename to test_conformance/math_brute_force/unary.cpp
diff --git a/test_conformance/math_brute_force/unary_two_results.c b/test_conformance/math_brute_force/unary_two_results.cpp
similarity index 100%
rename from test_conformance/math_brute_force/unary_two_results.c
rename to test_conformance/math_brute_force/unary_two_results.cpp
diff --git a/test_conformance/math_brute_force/unary_two_results_i.c b/test_conformance/math_brute_force/unary_two_results_i.cpp
similarity index 100%
rename from test_conformance/math_brute_force/unary_two_results_i.c
rename to test_conformance/math_brute_force/unary_two_results_i.cpp
diff --git a/test_conformance/math_brute_force/unary_u.c b/test_conformance/math_brute_force/unary_u.cpp
similarity index 100%
rename from test_conformance/math_brute_force/unary_u.c
rename to test_conformance/math_brute_force/unary_u.cpp
diff --git a/test_conformance/multiple_device_context/CMakeLists.txt b/test_conformance/multiple_device_context/CMakeLists.txt
index b8f124a2..a20521a5 100644
--- a/test_conformance/multiple_device_context/CMakeLists.txt
+++ b/test_conformance/multiple_device_context/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(MODULE_NAME multiples)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_multiple_contexts.c
+    main.cpp
+    test_multiple_contexts.cpp
     test_multiple_devices.cpp
 )
 
@@ -10,9 +10,4 @@ set(${MODULE_NAME}_SOURCES
 set_source_files_properties(
         COMPILE_FLAGS -msse2)
 
-set_source_files_properties(
-    main.c
-    test_multiple_contexts.c
-        PROPERTIES LANGUAGE CXX)
-
 include(../CMakeCommon.txt)
diff --git a/test_conformance/multiple_device_context/main.c b/test_conformance/multiple_device_context/main.cpp
similarity index 100%
rename from test_conformance/multiple_device_context/main.c
rename to test_conformance/multiple_device_context/main.cpp
diff --git a/test_conformance/multiple_device_context/test_multiple_contexts.c b/test_conformance/multiple_device_context/test_multiple_contexts.cpp
similarity index 100%
rename from test_conformance/multiple_device_context/test_multiple_contexts.c
rename to test_conformance/multiple_device_context/test_multiple_contexts.cpp
diff --git a/test_conformance/pipes/CMakeLists.txt b/test_conformance/pipes/CMakeLists.txt
index 5b4d803a..00246269 100644
--- a/test_conformance/pipes/CMakeLists.txt
+++ b/test_conformance/pipes/CMakeLists.txt
@@ -1,13 +1,13 @@
 set(MODULE_NAME pipes)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_pipe_read_write.c
-    test_pipe_info.c
-    test_pipe_limits.c
-    test_pipe_query_functions.c
-    test_pipe_readwrite_errors.c
-    test_pipe_subgroups.c
+    main.cpp
+    test_pipe_read_write.cpp
+    test_pipe_info.cpp
+    test_pipe_limits.cpp
+    test_pipe_query_functions.cpp
+    test_pipe_readwrite_errors.cpp
+    test_pipe_subgroups.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/pipes/main.c b/test_conformance/pipes/main.cpp
similarity index 100%
rename from test_conformance/pipes/main.c
rename to test_conformance/pipes/main.cpp
diff --git a/test_conformance/pipes/test_pipe_info.c b/test_conformance/pipes/test_pipe_info.cpp
similarity index 100%
rename from test_conformance/pipes/test_pipe_info.c
rename to test_conformance/pipes/test_pipe_info.cpp
diff --git a/test_conformance/pipes/test_pipe_limits.c b/test_conformance/pipes/test_pipe_limits.cpp
similarity index 100%
rename from test_conformance/pipes/test_pipe_limits.c
rename to test_conformance/pipes/test_pipe_limits.cpp
diff --git a/test_conformance/pipes/test_pipe_query_functions.c b/test_conformance/pipes/test_pipe_query_functions.cpp
similarity index 100%
rename from test_conformance/pipes/test_pipe_query_functions.c
rename to test_conformance/pipes/test_pipe_query_functions.cpp
diff --git a/test_conformance/pipes/test_pipe_read_write.c b/test_conformance/pipes/test_pipe_read_write.cpp
similarity index 100%
rename from test_conformance/pipes/test_pipe_read_write.c
rename to test_conformance/pipes/test_pipe_read_write.cpp
diff --git a/test_conformance/pipes/test_pipe_readwrite_errors.c b/test_conformance/pipes/test_pipe_readwrite_errors.cpp
similarity index 100%
rename from test_conformance/pipes/test_pipe_readwrite_errors.c
rename to test_conformance/pipes/test_pipe_readwrite_errors.cpp
diff --git a/test_conformance/pipes/test_pipe_subgroups.c b/test_conformance/pipes/test_pipe_subgroups.cpp
similarity index 100%
rename from test_conformance/pipes/test_pipe_subgroups.c
rename to test_conformance/pipes/test_pipe_subgroups.cpp
diff --git a/test_conformance/printf/CMakeLists.txt b/test_conformance/printf/CMakeLists.txt
index 84b988db..8f03dca9 100644
--- a/test_conformance/printf/CMakeLists.txt
+++ b/test_conformance/printf/CMakeLists.txt
@@ -3,8 +3,8 @@ set(MODULE_NAME PRINTF)
 set(CMAKE_CXX_STANDARD 11)
 
 set(${MODULE_NAME}_SOURCES
-         test_printf.c
-         util_printf.c
+         test_printf.cpp
+         util_printf.cpp
          )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/printf/test_printf.c b/test_conformance/printf/test_printf.cpp
similarity index 100%
rename from test_conformance/printf/test_printf.c
rename to test_conformance/printf/test_printf.cpp
diff --git a/test_conformance/printf/util_printf.c b/test_conformance/printf/util_printf.cpp
similarity index 100%
rename from test_conformance/printf/util_printf.c
rename to test_conformance/printf/util_printf.cpp
diff --git a/test_conformance/profiling/CMakeLists.txt b/test_conformance/profiling/CMakeLists.txt
index 310163fa..036de05b 100644
--- a/test_conformance/profiling/CMakeLists.txt
+++ b/test_conformance/profiling/CMakeLists.txt
@@ -1,14 +1,14 @@
 set(MODULE_NAME PROFILING)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    readArray.c
-    writeArray.c
-    readImage.c
-    writeImage.c
-    copy.c
-    execute.c
-    execute_multipass.c
+    main.cpp
+    readArray.cpp
+    writeArray.cpp
+    readImage.cpp
+    writeImage.cpp
+    copy.cpp
+    execute.cpp
+    execute_multipass.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/profiling/copy.c b/test_conformance/profiling/copy.cpp
similarity index 100%
rename from test_conformance/profiling/copy.c
rename to test_conformance/profiling/copy.cpp
diff --git a/test_conformance/profiling/execute.c b/test_conformance/profiling/execute.cpp
similarity index 100%
rename from test_conformance/profiling/execute.c
rename to test_conformance/profiling/execute.cpp
diff --git a/test_conformance/profiling/execute_multipass.c b/test_conformance/profiling/execute_multipass.cpp
similarity index 100%
rename from test_conformance/profiling/execute_multipass.c
rename to test_conformance/profiling/execute_multipass.cpp
diff --git a/test_conformance/profiling/main.c b/test_conformance/profiling/main.cpp
similarity index 100%
rename from test_conformance/profiling/main.c
rename to test_conformance/profiling/main.cpp
diff --git a/test_conformance/profiling/readArray.c b/test_conformance/profiling/readArray.cpp
similarity index 100%
rename from test_conformance/profiling/readArray.c
rename to test_conformance/profiling/readArray.cpp
diff --git a/test_conformance/profiling/readImage.c b/test_conformance/profiling/readImage.cpp
similarity index 100%
rename from test_conformance/profiling/readImage.c
rename to test_conformance/profiling/readImage.cpp
diff --git a/test_conformance/profiling/writeArray.c b/test_conformance/profiling/writeArray.cpp
similarity index 100%
rename from test_conformance/profiling/writeArray.c
rename to test_conformance/profiling/writeArray.cpp
diff --git a/test_conformance/profiling/writeImage.c b/test_conformance/profiling/writeImage.cpp
similarity index 100%
rename from test_conformance/profiling/writeImage.c
rename to test_conformance/profiling/writeImage.cpp
diff --git a/test_conformance/relationals/CMakeLists.txt b/test_conformance/relationals/CMakeLists.txt
index 997c759b..ecaa056c 100644
--- a/test_conformance/relationals/CMakeLists.txt
+++ b/test_conformance/relationals/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(MODULE_NAME RELATIONALS)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
+    main.cpp
     test_relationals.cpp
     test_comparisons_float.cpp
     test_comparisons_double.cpp
diff --git a/test_conformance/relationals/main.c b/test_conformance/relationals/main.cpp
similarity index 100%
rename from test_conformance/relationals/main.c
rename to test_conformance/relationals/main.cpp
diff --git a/test_conformance/select/CMakeLists.txt b/test_conformance/select/CMakeLists.txt
index 8d2c25bd..285bd59e 100644
--- a/test_conformance/select/CMakeLists.txt
+++ b/test_conformance/select/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(MODULE_NAME SELECT)
 
 set(${MODULE_NAME}_SOURCES
-        test_select.c
-        util_select.c
+        test_select.cpp
+        util_select.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/select/test_select.c b/test_conformance/select/test_select.cpp
similarity index 100%
rename from test_conformance/select/test_select.c
rename to test_conformance/select/test_select.cpp
diff --git a/test_conformance/select/util_select.c b/test_conformance/select/util_select.cpp
similarity index 100%
rename from test_conformance/select/util_select.c
rename to test_conformance/select/util_select.cpp
diff --git a/test_conformance/spir/CMakeLists.txt b/test_conformance/spir/CMakeLists.txt
index 9e0b15e4..5f50622e 100644
--- a/test_conformance/spir/CMakeLists.txt
+++ b/test_conformance/spir/CMakeLists.txt
@@ -9,7 +9,7 @@ set (SPIR_SOURCES
     run_build_test.cpp
     run_services.cpp
     kernelargs.cpp
-    ../math_brute_force/FunctionList.c
+    ../math_brute_force/FunctionList.cpp
 )
 
 add_executable(${SPIR_OUT}
diff --git a/test_conformance/spirv_new/CMakeLists.txt b/test_conformance/spirv_new/CMakeLists.txt
index 7e7daf18..614d5a79 100644
--- a/test_conformance/spirv_new/CMakeLists.txt
+++ b/test_conformance/spirv_new/CMakeLists.txt
@@ -17,8 +17,8 @@ set(CMAKE_CXX_STANDARD 11)
 file(GLOB SPIRV_NEW_SOURCES "*.cpp")
 
 set(TEST_HARNESS_SOURCES
-  ../../test_conformance/math_brute_force/reference_math.c
-  ../../test_conformance/math_brute_force/Utility.c
+  ../../test_conformance/math_brute_force/reference_math.cpp
+  ../../test_conformance/math_brute_force/Utility.cpp
   )
 
 set(${MODULE_NAME}_SOURCES ${SPIRV_NEW_SOURCES} ${TEST_HARNESS_SOURCES})
diff --git a/test_conformance/thread_dimensions/CMakeLists.txt b/test_conformance/thread_dimensions/CMakeLists.txt
index 28f27bf1..07e56776 100644
--- a/test_conformance/thread_dimensions/CMakeLists.txt
+++ b/test_conformance/thread_dimensions/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(MODULE_NAME THREAD_DIMENSIONS)
 
 set(${MODULE_NAME}_SOURCES
-        main.c
-    test_thread_dimensions.c
+        main.cpp
+    test_thread_dimensions.cpp
 )
 
 set_source_files_properties(
diff --git a/test_conformance/thread_dimensions/main.c b/test_conformance/thread_dimensions/main.cpp
similarity index 100%
rename from test_conformance/thread_dimensions/main.c
rename to test_conformance/thread_dimensions/main.cpp
diff --git a/test_conformance/thread_dimensions/test_thread_dimensions.c b/test_conformance/thread_dimensions/test_thread_dimensions.cpp
similarity index 100%
rename from test_conformance/thread_dimensions/test_thread_dimensions.c
rename to test_conformance/thread_dimensions/test_thread_dimensions.cpp
diff --git a/test_conformance/vec_align/CMakeLists.txt b/test_conformance/vec_align/CMakeLists.txt
index 059468da..3f252e7f 100644
--- a/test_conformance/vec_align/CMakeLists.txt
+++ b/test_conformance/vec_align/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(MODULE_NAME VECALIGN)
 
 set(${MODULE_NAME}_SOURCES
-    globals.c
-        main.c
-        structs.c
-        test_vec_align.c
-        type_replacer.c
+    globals.cpp
+        main.cpp
+        structs.cpp
+        test_vec_align.cpp
+        type_replacer.cpp
 )
 
 set_source_files_properties(
diff --git a/test_conformance/vec_align/globals.c b/test_conformance/vec_align/globals.cpp
similarity index 100%
rename from test_conformance/vec_align/globals.c
rename to test_conformance/vec_align/globals.cpp
diff --git a/test_conformance/vec_align/main.c b/test_conformance/vec_align/main.cpp
similarity index 100%
rename from test_conformance/vec_align/main.c
rename to test_conformance/vec_align/main.cpp
diff --git a/test_conformance/vec_align/structs.c b/test_conformance/vec_align/structs.cpp
similarity index 100%
rename from test_conformance/vec_align/structs.c
rename to test_conformance/vec_align/structs.cpp
diff --git a/test_conformance/vec_align/test_vec_align.c b/test_conformance/vec_align/test_vec_align.cpp
similarity index 100%
rename from test_conformance/vec_align/test_vec_align.c
rename to test_conformance/vec_align/test_vec_align.cpp
diff --git a/test_conformance/vec_align/type_replacer.c b/test_conformance/vec_align/type_replacer.cpp
similarity index 100%
rename from test_conformance/vec_align/type_replacer.c
rename to test_conformance/vec_align/type_replacer.cpp
diff --git a/test_conformance/vec_step/CMakeLists.txt b/test_conformance/vec_step/CMakeLists.txt
index 85a253c9..b805c9b9 100644
--- a/test_conformance/vec_step/CMakeLists.txt
+++ b/test_conformance/vec_step/CMakeLists.txt
@@ -1,11 +1,11 @@
 set(MODULE_NAME VECSTEP)
 
 set(${MODULE_NAME}_SOURCES
-    globals.c
-        test_step.c
-        main.c
-        structs.c
-        type_replacer.c
+    globals.cpp
+        test_step.cpp
+        main.cpp
+        structs.cpp
+        type_replacer.cpp
 )
 
 set_source_files_properties(
diff --git a/test_conformance/vec_step/globals.c b/test_conformance/vec_step/globals.cpp
similarity index 100%
rename from test_conformance/vec_step/globals.c
rename to test_conformance/vec_step/globals.cpp
diff --git a/test_conformance/vec_step/main.c b/test_conformance/vec_step/main.cpp
similarity index 100%
rename from test_conformance/vec_step/main.c
rename to test_conformance/vec_step/main.cpp
diff --git a/test_conformance/vec_step/structs.c b/test_conformance/vec_step/structs.cpp
similarity index 100%
rename from test_conformance/vec_step/structs.c
rename to test_conformance/vec_step/structs.cpp
diff --git a/test_conformance/vec_step/test_step.c b/test_conformance/vec_step/test_step.cpp
similarity index 100%
rename from test_conformance/vec_step/test_step.c
rename to test_conformance/vec_step/test_step.cpp
diff --git a/test_conformance/vec_step/type_replacer.c b/test_conformance/vec_step/type_replacer.cpp
similarity index 100%
rename from test_conformance/vec_step/type_replacer.c
rename to test_conformance/vec_step/type_replacer.cpp
diff --git a/test_conformance/workgroups/CMakeLists.txt b/test_conformance/workgroups/CMakeLists.txt
index ab0f28ec..08886086 100644
--- a/test_conformance/workgroups/CMakeLists.txt
+++ b/test_conformance/workgroups/CMakeLists.txt
@@ -1,19 +1,19 @@
 set(MODULE_NAME WORKGROUPS)
 
 set(${MODULE_NAME}_SOURCES
-    main.c
-    test_wg_all.c
-    test_wg_any.c
-    test_wg_broadcast.c
-    test_wg_reduce.c
-    test_wg_reduce_max.c
-    test_wg_reduce_min.c
-    test_wg_scan_exclusive_add.c
-    test_wg_scan_exclusive_min.c
-    test_wg_scan_exclusive_max.c
-    test_wg_scan_inclusive_add.c
-    test_wg_scan_inclusive_min.c
-    test_wg_scan_inclusive_max.c
+    main.cpp
+    test_wg_all.cpp
+    test_wg_any.cpp
+    test_wg_broadcast.cpp
+    test_wg_reduce.cpp
+    test_wg_reduce_max.cpp
+    test_wg_reduce_min.cpp
+    test_wg_scan_exclusive_add.cpp
+    test_wg_scan_exclusive_min.cpp
+    test_wg_scan_exclusive_max.cpp
+    test_wg_scan_inclusive_add.cpp
+    test_wg_scan_inclusive_min.cpp
+    test_wg_scan_inclusive_max.cpp
 )
 
 include(../CMakeCommon.txt)
diff --git a/test_conformance/workgroups/main.c b/test_conformance/workgroups/main.cpp
similarity index 100%
rename from test_conformance/workgroups/main.c
rename to test_conformance/workgroups/main.cpp
diff --git a/test_conformance/workgroups/test_wg_all.c b/test_conformance/workgroups/test_wg_all.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_all.c
rename to test_conformance/workgroups/test_wg_all.cpp
diff --git a/test_conformance/workgroups/test_wg_any.c b/test_conformance/workgroups/test_wg_any.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_any.c
rename to test_conformance/workgroups/test_wg_any.cpp
diff --git a/test_conformance/workgroups/test_wg_broadcast.c b/test_conformance/workgroups/test_wg_broadcast.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_broadcast.c
rename to test_conformance/workgroups/test_wg_broadcast.cpp
diff --git a/test_conformance/workgroups/test_wg_reduce.c b/test_conformance/workgroups/test_wg_reduce.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_reduce.c
rename to test_conformance/workgroups/test_wg_reduce.cpp
diff --git a/test_conformance/workgroups/test_wg_reduce_max.c b/test_conformance/workgroups/test_wg_reduce_max.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_reduce_max.c
rename to test_conformance/workgroups/test_wg_reduce_max.cpp
diff --git a/test_conformance/workgroups/test_wg_reduce_min.c b/test_conformance/workgroups/test_wg_reduce_min.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_reduce_min.c
rename to test_conformance/workgroups/test_wg_reduce_min.cpp
diff --git a/test_conformance/workgroups/test_wg_scan_exclusive_add.c b/test_conformance/workgroups/test_wg_scan_exclusive_add.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_scan_exclusive_add.c
rename to test_conformance/workgroups/test_wg_scan_exclusive_add.cpp
diff --git a/test_conformance/workgroups/test_wg_scan_exclusive_max.c b/test_conformance/workgroups/test_wg_scan_exclusive_max.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_scan_exclusive_max.c
rename to test_conformance/workgroups/test_wg_scan_exclusive_max.cpp
diff --git a/test_conformance/workgroups/test_wg_scan_exclusive_min.c b/test_conformance/workgroups/test_wg_scan_exclusive_min.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_scan_exclusive_min.c
rename to test_conformance/workgroups/test_wg_scan_exclusive_min.cpp
diff --git a/test_conformance/workgroups/test_wg_scan_inclusive_add.c b/test_conformance/workgroups/test_wg_scan_inclusive_add.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_scan_inclusive_add.c
rename to test_conformance/workgroups/test_wg_scan_inclusive_add.cpp
diff --git a/test_conformance/workgroups/test_wg_scan_inclusive_max.c b/test_conformance/workgroups/test_wg_scan_inclusive_max.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_scan_inclusive_max.c
rename to test_conformance/workgroups/test_wg_scan_inclusive_max.cpp
diff --git a/test_conformance/workgroups/test_wg_scan_inclusive_min.c b/test_conformance/workgroups/test_wg_scan_inclusive_min.cpp
similarity index 100%
rename from test_conformance/workgroups/test_wg_scan_inclusive_min.c
rename to test_conformance/workgroups/test_wg_scan_inclusive_min.cpp