From ce49e08a668a9ba6fe79f741d5cf7e3589a5eb2f Mon Sep 17 00:00:00 2001 From: Andrei Elovikov Date: Wed, 27 Jul 2022 13:17:57 -0700 Subject: [PATCH 1/6] [SYCL][ABI Break] Remove "cl" namespace As part of the change, also start using "inline namespace _V1" to allow possible future ABI-affecting changes. --- clang/lib/CodeGen/CGSYCLRuntime.cpp | 2 +- clang/lib/Sema/SemaDeclAttr.cpp | 2 +- clang/lib/Sema/SemaSYCL.cpp | 28 +- clang/test/CodeGenSYCL/Inputs/sycl.hpp | 6 +- .../accessor-readonly-invalid-lib.cpp | 6 +- clang/test/CodeGenSYCL/accessor-readonly.cpp | 22 +- .../test/CodeGenSYCL/accessor_inheritance.cpp | 14 +- .../accessor_no_alias_property.cpp | 24 +- .../anonymous_integration_footer.cpp | 88 +- .../anonymous_integration_footer2.cpp | 52 +- .../test/CodeGenSYCL/basic-kernel-wrapper.cpp | 8 +- clang/test/CodeGenSYCL/buffer_location.cpp | 32 +- .../check-direct-attribute-propagation.cpp | 2 +- clang/test/CodeGenSYCL/code_location.cpp | 40 +- clang/test/CodeGenSYCL/const-wg-init.cpp | 4 +- .../CodeGenSYCL/debug-info-srcpos-kernel.cpp | 2 +- clang/test/CodeGenSYCL/device_global.cpp | 20 +- .../device_global_int_footer_header.cpp | 10 +- .../device_globals_with_spec_ids.cpp | 31 +- clang/test/CodeGenSYCL/device_has.cpp | 18 +- .../CodeGenSYCL/disable_loop_pipelining.cpp | 2 +- .../CodeGenSYCL/esimd-accessor-ptr-md.cpp | 8 +- clang/test/CodeGenSYCL/image_accessor.cpp | 48 +- clang/test/CodeGenSYCL/inheritance.cpp | 4 +- .../test/CodeGenSYCL/initiation_interval.cpp | 2 +- .../int-header-empty-signatures.cpp | 2 +- clang/test/CodeGenSYCL/int_header1.cpp | 4 +- .../int_header_enum_type_alias.cpp | 4 +- clang/test/CodeGenSYCL/int_header_esimd.cpp | 2 +- .../CodeGenSYCL/int_header_kernelobjsize.cpp | 2 +- .../CodeGenSYCL/int_header_spec_const.cpp | 26 +- .../int_header_sycl2020_spec_const.cpp | 2 +- .../int_header_without_kernels.cpp | 8 +- clang/test/CodeGenSYCL/integration_footer.cpp | 32 +- clang/test/CodeGenSYCL/integration_header.cpp | 18 +- .../integration_header_ppmacros.cpp | 2 +- .../intel-fpga-no-global-work-offset.cpp | 2 +- .../test/CodeGenSYCL/intel-fpga-nofusion.cpp | 2 +- .../CodeGenSYCL/intel-max-global-work-dim.cpp | 2 +- .../CodeGenSYCL/intel-max-work-group-size.cpp | 2 +- .../CodeGenSYCL/invoke-function-addrspace.cpp | 2 +- clang/test/CodeGenSYCL/kernel-annotation.cpp | 10 +- .../kernel-arg-accessor-pointer.cpp | 2 +- .../test/CodeGenSYCL/kernel-by-reference.cpp | 2 +- .../CodeGenSYCL/kernel-device-space-arg.cpp | 2 +- clang/test/CodeGenSYCL/kernel-handler.cpp | 6 +- clang/test/CodeGenSYCL/kernel-metadata.cpp | 4 +- clang/test/CodeGenSYCL/kernel-name.cpp | 2 +- .../CodeGenSYCL/kernel-param-acc-array-ih.cpp | 6 +- .../CodeGenSYCL/kernel-param-acc-array.cpp | 14 +- .../kernel-param-member-acc-array-ih.cpp | 6 +- .../kernel-param-member-acc-array.cpp | 14 +- .../CodeGenSYCL/kernel-param-pod-array-ih.cpp | 6 +- .../CodeGenSYCL/kernel-param-pod-array.cpp | 2 +- .../kernel-simple-instrumentation.cpp | 4 +- clang/test/CodeGenSYCL/kernel_functor.cpp | 42 +- clang/test/CodeGenSYCL/kernelname-enum.cpp | 24 +- clang/test/CodeGenSYCL/loop_fuse_device.cpp | 2 +- .../test/CodeGenSYCL/loop_fuse_ind_device.cpp | 2 +- clang/test/CodeGenSYCL/max-concurrency.cpp | 8 +- .../no_opaque_accessor_inheritance.cpp | 22 +- .../no_opaque_basic-kernel-wrapper.cpp | 34 +- ...que_check-direct-attribute-propagation.cpp | 2 +- .../CodeGenSYCL/no_opaque_const-wg-init.cpp | 4 +- .../CodeGenSYCL/no_opaque_device_global.cpp | 24 +- .../no_opaque_esimd-accessor-ptr-md.cpp | 10 +- .../CodeGenSYCL/no_opaque_image_accessor.cpp | 60 +- .../CodeGenSYCL/no_opaque_inheritance.cpp | 4 +- .../no_opaque_invoke-function-addrspace.cpp | 2 +- .../no_opaque_kernel-arg-accessor-pointer.cpp | 32 +- .../no_opaque_kernel-device-space-arg.cpp | 2 +- .../CodeGenSYCL/no_opaque_kernel-handler.cpp | 10 +- .../no_opaque_kernel-param-acc-array.cpp | 54 +- ...o_opaque_kernel-param-member-acc-array.cpp | 54 +- .../no_opaque_kernel-param-pod-array.cpp | 2 +- .../CodeGenSYCL/no_opaque_max-concurrency.cpp | 8 +- .../no_opaque_non-standard-layout.cpp | 4 +- .../no_opaque_nontrivial_device_copyable.cpp | 2 +- .../no_opaque_pointers-in-structs.cpp | 4 +- clang/test/CodeGenSYCL/no_opaque_sampler.cpp | 8 +- .../no_opaque_stall_enable_device.cpp | 2 +- clang/test/CodeGenSYCL/no_opaque_stream.cpp | 14 +- .../no_opaque_union-kernel-param.cpp | 2 +- .../no_opaque_unique-stable-id.cpp | 2 +- .../test/CodeGenSYCL/non-standard-layout.cpp | 4 +- .../nontrivial_device_copyable.cpp | 2 +- .../test/CodeGenSYCL/num-simd-work-items.cpp | 2 +- clang/test/CodeGenSYCL/nvptx-printf.cpp | 2 +- .../test/CodeGenSYCL/pointers-in-structs.cpp | 4 +- .../test/CodeGenSYCL/pointers-int-header.cpp | 2 +- .../reqd-sub-group-size-spirv-intrin.cpp | 2 +- .../test/CodeGenSYCL/reqd-sub-group-size.cpp | 2 +- .../test/CodeGenSYCL/reqd-work-group-size.cpp | 2 +- clang/test/CodeGenSYCL/sampler.cpp | 4 +- clang/test/CodeGenSYCL/save-user-names.cpp | 14 +- .../CodeGenSYCL/scheduler-target-fmax-mhz.cpp | 2 +- .../test/CodeGenSYCL/stall_enable_device.cpp | 2 +- .../CodeGenSYCL/static-var-address-space.cpp | 2 +- .../CodeGenSYCL/static-vars-in-host-code.cpp | 4 +- clang/test/CodeGenSYCL/stream.cpp | 12 +- .../test/CodeGenSYCL/struct_kernel_param.cpp | 4 +- clang/test/CodeGenSYCL/sub-group-size.cpp | 2 +- .../CodeGenSYCL/sycl-multi-kernel-attr.cpp | 2 +- .../template-template-parameter.cpp | 2 +- .../CodeGenSYCL/union-kernel-param-ih.cpp | 4 +- clang/test/CodeGenSYCL/unique-stable-id.cpp | 2 +- clang/test/CodeGenSYCL/uses_aspects.cpp | 22 +- clang/test/CodeGenSYCL/wrapped-accessor.cpp | 6 +- clang/test/SemaSYCL/Inputs/sycl.hpp | 6 +- .../Inputs/sycl/detail/defines_elementary.hpp | 6 +- .../Inputs/sycl/detail/kernel_desc.hpp | 12 +- .../SemaSYCL/accessor-type-diagnostics.cpp | 2 +- clang/test/SemaSYCL/args-size-overflow.cpp | 4 +- clang/test/SemaSYCL/attr-syclglobalvar.cpp | 4 +- clang/test/SemaSYCL/buffer_location.cpp | 70 +- clang/test/SemaSYCL/device_global.cpp | 4 +- clang/test/SemaSYCL/device_has.cpp | 8 +- clang/test/SemaSYCL/device_has_ast.cpp | 22 +- clang/test/SemaSYCL/esimd-special-class.cpp | 6 +- clang/test/SemaSYCL/extern_cpp_decl.cpp | 2 +- clang/test/SemaSYCL/fake-accessors.cpp | 6 +- clang/test/SemaSYCL/implicit_kernel_type.cpp | 2 +- clang/test/SemaSYCL/inheritance.cpp | 4 +- .../intel-fpga-no-global-work-offset-ast.cpp | 2 +- clang/test/SemaSYCL/intel-fpga-nofusion.cpp | 2 +- .../test/SemaSYCL/intel-fpga-pipeline-ast.cpp | 2 +- .../intel-max-global-work-dim-device-ast.cpp | 2 +- .../intel-max-global-work-dim-device.cpp | 2 +- .../intel-max-work-group-size-ast.cpp | 2 +- .../intel-reqd-work-group-size-ast-device.cpp | 2 +- .../intel-reqd-work-group-size-device.cpp | 2 +- .../SemaSYCL/invalid-kernel-arguments.cpp | 2 +- clang/test/SemaSYCL/kernel-arg-opt-report.cpp | 12 +- clang/test/SemaSYCL/kernel-handler.cpp | 2 +- clang/test/SemaSYCL/kernelname-enum.cpp | 12 +- .../SemaSYCL/lambda_implicit_capture_this.cpp | 2 +- clang/test/SemaSYCL/loop_fusion_ast.cpp | 2 +- clang/test/SemaSYCL/mangle-unnamed-kernel.cpp | 10 +- clang/test/SemaSYCL/max-concurrency-ast.cpp | 2 +- .../test/SemaSYCL/nested-anon-and-std-ns.cpp | 8 +- .../non-fwd-declarable-kernel-name.cpp | 2 +- clang/test/SemaSYCL/num_simd_work_items.cpp | 2 +- .../test/SemaSYCL/num_simd_work_items_ast.cpp | 2 +- clang/test/SemaSYCL/pointer-to-vla.cpp | 2 +- .../test/SemaSYCL/reqd-sub-group-size-ast.cpp | 2 +- clang/test/SemaSYCL/reqd-sub-group-size.cpp | 2 +- ...eqd-work-group-size-device-direct-prop.cpp | 2 +- .../SemaSYCL/reqd-work-group-size-device.cpp | 2 +- .../spec-const-value-dependent-crash.cpp | 6 +- .../SemaSYCL/spec_const_and_accesor_crash.cpp | 8 +- clang/test/SemaSYCL/stall_enable_device.cpp | 2 +- clang/test/SemaSYCL/stdtypes_kernel_type.cpp | 2 +- .../SemaSYCL/sycl-device-template-diag.cpp | 2 +- .../test/SemaSYCL/union-kernel-param-neg.cpp | 6 +- clang/test/SemaSYCL/unnamed-kernel.cpp | 48 +- clang/test/SemaSYCL/uses_aspects.cpp | 8 +- clang/test/SemaSYCL/uses_aspects_ast.cpp | 20 +- llvm-spirv/lib/SPIRV/SPIRVUtil.cpp | 4 +- llvm/lib/SYCLLowerIR/ESIMD/ESIMDVerifier.cpp | 56 +- llvm/lib/SYCLLowerIR/ESIMD/LowerESIMD.cpp | 17 +- sycl/.clang-format | 2 +- sycl/CMakeLists.txt | 2 +- .../SYCL2020-SpecializationConstants.md | 6 +- sycl/doc/doxygen.cfg.in | 2 +- sycl/gdb/libsycl.so-gdb.py | 30 +- sycl/include/CL/__spirv/spirv_types.hpp | 4 +- sycl/include/CL/sycl.hpp | 5 + sycl/include/sycl/access/access.hpp | 10 +- sycl/include/sycl/accessor.hpp | 4 +- sycl/include/sycl/aliases.hpp | 8 +- sycl/include/sycl/aspects.hpp | 4 +- sycl/include/sycl/atomic.hpp | 12 +- sycl/include/sycl/atomic_fence.hpp | 4 +- sycl/include/sycl/atomic_ref.hpp | 4 +- sycl/include/sycl/backend.hpp | 4 +- sycl/include/sycl/backend/opencl.hpp | 4 +- sycl/include/sycl/backend_types.hpp | 4 +- sycl/include/sycl/bit_cast.hpp | 4 +- sycl/include/sycl/buffer.hpp | 4 +- sycl/include/sycl/builtins.hpp | 4 +- sycl/include/sycl/builtins_esimd.hpp | 4 +- sycl/include/sycl/context.hpp | 4 +- sycl/include/sycl/detail/accessor_impl.hpp | 4 +- .../include/sycl/detail/aligned_allocator.hpp | 4 +- sycl/include/sycl/detail/array.hpp | 4 +- sycl/include/sycl/detail/assert_happened.hpp | 4 +- sycl/include/sycl/detail/backend_traits.hpp | 4 +- .../sycl/detail/backend_traits_cuda.hpp | 4 +- .../sycl/detail/backend_traits_hip.hpp | 4 +- .../sycl/detail/backend_traits_level_zero.hpp | 4 +- .../sycl/detail/backend_traits_opencl.hpp | 4 +- sycl/include/sycl/detail/boolean.hpp | 4 +- sycl/include/sycl/detail/buffer_impl.hpp | 4 +- sycl/include/sycl/detail/builtins.hpp | 3 +- sycl/include/sycl/detail/cg.hpp | 4 +- sycl/include/sycl/detail/cg_types.hpp | 4 +- sycl/include/sycl/detail/common.hpp | 12 +- sycl/include/sycl/detail/common_info.hpp | 4 +- .../sycl/detail/defines_elementary.hpp | 2 + .../sycl/detail/device_binary_image.hpp | 4 +- sycl/include/sycl/detail/device_filter.hpp | 4 +- .../include/sycl/detail/device_global_map.hpp | 4 +- .../sycl/detail/generic_type_lists.hpp | 8 +- .../sycl/detail/generic_type_traits.hpp | 4 +- sycl/include/sycl/detail/group_sort_impl.hpp | 6 +- sycl/include/sycl/detail/handler_proxy.hpp | 4 +- sycl/include/sycl/detail/helpers.hpp | 4 +- .../sycl/detail/host_profiling_info.hpp | 4 +- .../sycl/detail/image_accessor_util.hpp | 4 +- sycl/include/sycl/detail/image_impl.hpp | 4 +- sycl/include/sycl/detail/image_ocl_types.hpp | 8 +- sycl/include/sycl/detail/item_base.hpp | 4 +- sycl/include/sycl/detail/kernel_desc.hpp | 4 +- sycl/include/sycl/detail/locked.hpp | 4 +- sycl/include/sycl/detail/memory_manager.hpp | 4 +- sycl/include/sycl/detail/os_util.hpp | 4 +- sycl/include/sycl/detail/pi.hpp | 4 +- sycl/include/sycl/detail/property_helper.hpp | 4 +- .../sycl/detail/property_list_base.hpp | 4 +- .../sycl/detail/service_kernel_names.hpp | 4 +- .../sycl/detail/spec_const_integration.hpp | 4 +- sycl/include/sycl/detail/spinlock.hpp | 4 +- sycl/include/sycl/detail/spirv.hpp | 4 +- sycl/include/sycl/detail/stl_type_traits.hpp | 4 +- .../sycl/detail/sycl_mem_obj_allocator.hpp | 4 +- sycl/include/sycl/detail/sycl_mem_obj_i.hpp | 4 +- sycl/include/sycl/detail/sycl_mem_obj_t.hpp | 4 +- sycl/include/sycl/detail/tuple.hpp | 4 +- sycl/include/sycl/detail/type_list.hpp | 4 +- sycl/include/sycl/detail/type_traits.hpp | 4 +- sycl/include/sycl/detail/usm_impl.hpp | 4 +- sycl/include/sycl/detail/util.hpp | 4 +- sycl/include/sycl/device.hpp | 4 +- sycl/include/sycl/device_event.hpp | 4 +- sycl/include/sycl/device_selector.hpp | 4 +- sycl/include/sycl/event.hpp | 4 +- sycl/include/sycl/exception.hpp | 4 +- sycl/include/sycl/exception_list.hpp | 4 +- sycl/include/sycl/ext/intel/esimd/alt_ui.hpp | 11 +- sycl/include/sycl/ext/intel/esimd/common.hpp | 10 +- .../intel/esimd/detail/elem_type_traits.hpp | 10 +- .../sycl/ext/intel/esimd/detail/host_util.hpp | 14 +- .../sycl/ext/intel/esimd/detail/intrin.hpp | 10 +- .../ext/intel/esimd/detail/math_intrin.hpp | 10 +- .../ext/intel/esimd/detail/memory_intrin.hpp | 10 +- .../sycl/ext/intel/esimd/detail/operators.hpp | 10 +- .../sycl/ext/intel/esimd/detail/region.hpp | 4 +- .../ext/intel/esimd/detail/simd_mask_impl.hpp | 10 +- .../ext/intel/esimd/detail/simd_obj_impl.hpp | 10 +- .../ext/intel/esimd/detail/simd_view_impl.hpp | 10 +- .../sycl/ext/intel/esimd/detail/sycl_util.hpp | 4 +- .../ext/intel/esimd/detail/test_proxy.hpp | 10 +- .../ext/intel/esimd/detail/type_format.hpp | 10 +- .../sycl/ext/intel/esimd/detail/types.hpp | 10 +- .../sycl/ext/intel/esimd/detail/util.hpp | 10 +- .../esimd_emulator_device_interface.hpp | 4 +- sycl/include/sycl/ext/intel/esimd/math.hpp | 10 +- sycl/include/sycl/ext/intel/esimd/memory.hpp | 10 +- sycl/include/sycl/ext/intel/esimd/simd.hpp | 10 +- .../sycl/ext/intel/esimd/simd_view.hpp | 10 +- .../ext/intel/experimental/esimd/common.hpp | 10 +- .../intel/experimental/esimd/detail/util.hpp | 10 +- .../experimental/esimd/kernel_properties.hpp | 10 +- .../ext/intel/experimental/esimd/math.hpp | 10 +- .../ext/intel/experimental/esimd/memory.hpp | 10 +- .../sycl/ext/intel/experimental/fpga_lsu.hpp | 4 +- .../ext/intel/experimental/fpga_utils.hpp | 10 +- .../intel/experimental/online_compiler.hpp | 8 +- .../sycl/ext/intel/experimental/pipes.hpp | 4 +- .../ext/intel/experimental/usm_properties.hpp | 4 +- .../sycl/ext/intel/fpga_device_selector.hpp | 4 +- .../sycl/ext/intel/fpga_dsp_control.hpp | 4 +- .../include/sycl/ext/intel/fpga_loop_fuse.hpp | 4 +- sycl/include/sycl/ext/intel/fpga_lsu.hpp | 4 +- sycl/include/sycl/ext/intel/fpga_reg.hpp | 4 +- sycl/include/sycl/ext/intel/fpga_utils.hpp | 4 +- sycl/include/sycl/ext/intel/pipes.hpp | 4 +- .../sycl/ext/oneapi/__function_pointer.hpp | 4 +- .../ext/oneapi/accessor_property_list.hpp | 4 +- .../sycl/ext/oneapi/atomic_accessor.hpp | 4 +- sycl/include/sycl/ext/oneapi/atomic_enums.hpp | 4 +- sycl/include/sycl/ext/oneapi/atomic_fence.hpp | 4 +- sycl/include/sycl/ext/oneapi/atomic_ref.hpp | 4 +- .../sycl/ext/oneapi/backend/level_zero.hpp | 6 +- .../oneapi/backend/level_zero_ownership.hpp | 4 +- .../sycl/ext/oneapi/bf16_storage_builtins.hpp | 4 +- .../oneapi/device_global/device_global.hpp | 4 +- .../ext/oneapi/device_global/properties.hpp | 4 +- sycl/include/sycl/ext/oneapi/dot_product.hpp | 4 +- .../backend/backend_traits_cuda.hpp | 4 +- .../ext/oneapi/experimental/backend/cuda.hpp | 4 +- .../sycl/ext/oneapi/experimental/bfloat16.hpp | 4 +- .../sycl/ext/oneapi/experimental/builtins.hpp | 4 +- .../ext/oneapi/experimental/cuda/barrier.hpp | 4 +- .../experimental/group_helpers_sorters.hpp | 4 +- .../ext/oneapi/experimental/group_sort.hpp | 14 +- .../ext/oneapi/experimental/invoke_simd.hpp | 3 + .../ext/oneapi/experimental/spec_constant.hpp | 4 +- .../ext/oneapi/experimental/sycl_complex.hpp | 4 +- .../sycl/ext/oneapi/experimental/uniform.hpp | 6 +- .../sycl/ext/oneapi/filter_selector.hpp | 22 +- sycl/include/sycl/ext/oneapi/functional.hpp | 4 +- .../sycl/ext/oneapi/group_algorithm.hpp | 4 +- .../sycl/ext/oneapi/group_local_memory.hpp | 6 +- .../ext/oneapi/latency_control/properties.hpp | 16 +- .../sycl/ext/oneapi/matrix/matrix-aot-amx.hpp | 4 +- .../sycl/ext/oneapi/matrix/matrix-jit.hpp | 4 +- .../ext/oneapi/matrix/matrix-tensorcore.hpp | 4 +- .../sycl/ext/oneapi/matrix/static-query.hpp | 4 +- .../sycl/ext/oneapi/properties/properties.hpp | 4 +- .../sycl/ext/oneapi/properties/property.hpp | 4 +- .../ext/oneapi/properties/property_utils.hpp | 4 +- .../ext/oneapi/properties/property_value.hpp | 4 +- sycl/include/sycl/ext/oneapi/reduction.hpp | 11 +- sycl/include/sycl/ext/oneapi/sub_group.hpp | 4 +- .../sycl/ext/oneapi/sub_group_mask.hpp | 4 +- sycl/include/sycl/feature_test.hpp.in | 4 +- sycl/include/sycl/functional.hpp | 4 +- sycl/include/sycl/group.hpp | 4 +- sycl/include/sycl/group_algorithm.hpp | 4 +- sycl/include/sycl/group_local_memory.hpp | 4 +- sycl/include/sycl/h_item.hpp | 4 +- sycl/include/sycl/half_type.hpp | 4 +- sycl/include/sycl/handler.hpp | 4 +- sycl/include/sycl/id.hpp | 4 +- sycl/include/sycl/image.hpp | 4 +- sycl/include/sycl/info/info_desc.hpp | 4 +- sycl/include/sycl/interop_handle.hpp | 4 +- sycl/include/sycl/interop_handler.hpp | 4 +- sycl/include/sycl/item.hpp | 4 +- sycl/include/sycl/kernel.hpp | 4 +- sycl/include/sycl/kernel_bundle.hpp | 4 +- sycl/include/sycl/kernel_bundle_enums.hpp | 4 +- sycl/include/sycl/kernel_handler.hpp | 4 +- sycl/include/sycl/known_identity.hpp | 4 +- sycl/include/sycl/marray.hpp | 4 +- sycl/include/sycl/memory_enums.hpp | 4 +- sycl/include/sycl/multi_ptr.hpp | 4 +- sycl/include/sycl/nd_item.hpp | 4 +- sycl/include/sycl/nd_range.hpp | 4 +- sycl/include/sycl/pipes.hpp | 4 +- sycl/include/sycl/platform.hpp | 4 +- sycl/include/sycl/pointers.hpp | 4 +- sycl/include/sycl/program.hpp | 4 +- .../sycl/properties/accessor_properties.hpp | 4 +- .../sycl/properties/buffer_properties.hpp | 4 +- .../sycl/properties/context_properties.hpp | 4 +- .../sycl/properties/image_properties.hpp | 4 +- .../sycl/properties/property_traits.hpp | 4 +- .../sycl/properties/queue_properties.hpp | 4 +- .../sycl/properties/reduction_properties.hpp | 4 +- sycl/include/sycl/property_list.hpp | 4 +- .../include/sycl/property_list_conversion.hpp | 4 +- sycl/include/sycl/queue.hpp | 4 +- sycl/include/sycl/range.hpp | 4 +- sycl/include/sycl/reduction.hpp | 4 +- sycl/include/sycl/sampler.hpp | 4 +- sycl/include/sycl/specialization_id.hpp | 4 +- sycl/include/sycl/stl.hpp | 4 +- sycl/include/sycl/stream.hpp | 4 +- sycl/include/sycl/sub_group.hpp | 4 +- sycl/include/sycl/sycl_span.hpp | 4 +- sycl/include/sycl/types.hpp | 8 +- sycl/include/sycl/usm.hpp | 4 +- sycl/include/sycl/usm/usm_allocator.hpp | 4 +- sycl/include/sycl/usm/usm_enums.hpp | 4 +- sycl/plugins/cuda/pi_cuda.cpp | 4 +- sycl/plugins/hip/pi_hip.cpp | 4 +- sycl/source/abi_replacements_linux.txt | 12 - sycl/source/abi_replacements_windows.cpp | 51 - sycl/source/accessor.cpp | 4 +- sycl/source/backend.cpp | 4 +- sycl/source/backend/level_zero.cpp | 4 +- sycl/source/backend/opencl.cpp | 4 +- sycl/source/context.cpp | 4 +- sycl/source/detail/accessor_impl.cpp | 4 +- sycl/source/detail/allowlist.cpp | 4 +- sycl/source/detail/allowlist.hpp | 4 +- sycl/source/detail/backend_impl.hpp | 4 +- sycl/source/detail/buffer_impl.cpp | 4 +- sycl/source/detail/builtins_common.cpp | 3 +- sycl/source/detail/builtins_geometric.cpp | 3 +- sycl/source/detail/builtins_helper.hpp | 3 +- sycl/source/detail/builtins_integer.cpp | 3 +- sycl/source/detail/builtins_math.cpp | 3 +- sycl/source/detail/builtins_relational.cpp | 3 +- sycl/source/detail/circular_buffer.hpp | 4 +- sycl/source/detail/common.cpp | 4 +- sycl/source/detail/config.cpp | 4 +- sycl/source/detail/config.hpp | 4 +- sycl/source/detail/context_impl.cpp | 4 +- sycl/source/detail/context_impl.hpp | 4 +- sycl/source/detail/context_info.hpp | 4 +- sycl/source/detail/device_binary_image.cpp | 4 +- sycl/source/detail/device_filter.cpp | 4 +- sycl/source/detail/device_global_map.cpp | 4 +- .../source/detail/device_global_map_entry.hpp | 4 +- sycl/source/detail/device_image_impl.hpp | 4 +- sycl/source/detail/device_impl.cpp | 4 +- sycl/source/detail/device_impl.hpp | 4 +- sycl/source/detail/device_info.hpp | 4 +- .../detail/error_handling/enqueue_kernel.cpp | 4 +- .../detail/error_handling/error_handling.hpp | 4 +- sycl/source/detail/event_impl.cpp | 4 +- sycl/source/detail/event_impl.hpp | 4 +- sycl/source/detail/event_info.hpp | 4 +- sycl/source/detail/filter_selector_impl.cpp | 6 +- sycl/source/detail/filter_selector_impl.hpp | 6 +- sycl/source/detail/force_device.cpp | 4 +- sycl/source/detail/force_device.hpp | 4 +- sycl/source/detail/global_handler.cpp | 4 +- sycl/source/detail/global_handler.hpp | 4 +- sycl/source/detail/handler_impl.hpp | 4 +- sycl/source/detail/handler_proxy.cpp | 4 +- sycl/source/detail/helpers.cpp | 4 +- sycl/source/detail/image_accessor_util.cpp | 4 +- sycl/source/detail/image_impl.cpp | 4 +- sycl/source/detail/kernel_bundle_impl.hpp | 4 +- sycl/source/detail/kernel_id_impl.hpp | 4 +- sycl/source/detail/kernel_impl.cpp | 5 +- sycl/source/detail/kernel_impl.hpp | 4 +- sycl/source/detail/kernel_info.hpp | 4 +- sycl/source/detail/kernel_program_cache.cpp | 8 +- sycl/source/detail/kernel_program_cache.hpp | 10 +- sycl/source/detail/mem_alloc_helper.hpp | 4 +- sycl/source/detail/memory_manager.cpp | 4 +- .../online_compiler/online_compiler.cpp | 12 +- sycl/source/detail/os_util.cpp | 8 +- .../detail/persistent_device_code_cache.cpp | 4 +- .../detail/persistent_device_code_cache.hpp | 4 +- sycl/source/detail/pi.cpp | 9 +- sycl/source/detail/platform_impl.cpp | 4 +- sycl/source/detail/platform_impl.hpp | 4 +- sycl/source/detail/platform_info.hpp | 4 +- sycl/source/detail/platform_util.cpp | 8 +- sycl/source/detail/platform_util.hpp | 4 +- sycl/source/detail/plugin.hpp | 4 +- sycl/source/detail/plugin_printers.hpp | 4 +- sycl/source/detail/posix_pi.cpp | 4 +- sycl/source/detail/program_impl.cpp | 4 +- sycl/source/detail/program_impl.hpp | 4 +- .../program_manager/program_manager.cpp | 4 +- .../program_manager/program_manager.hpp | 4 +- sycl/source/detail/queue_impl.cpp | 4 +- sycl/source/detail/queue_impl.hpp | 4 +- sycl/source/detail/reduction.cpp | 4 +- sycl/source/detail/sampler_impl.cpp | 4 +- sycl/source/detail/sampler_impl.hpp | 4 +- sycl/source/detail/scheduler/commands.cpp | 6 +- sycl/source/detail/scheduler/commands.hpp | 4 +- .../source/detail/scheduler/graph_builder.cpp | 4 +- .../detail/scheduler/graph_processor.cpp | 4 +- .../detail/scheduler/leaves_collection.cpp | 4 +- .../detail/scheduler/leaves_collection.hpp | 20 +- sycl/source/detail/scheduler/scheduler.cpp | 4 +- sycl/source/detail/scheduler/scheduler.hpp | 4 +- .../detail/scheduler/scheduler_helpers.cpp | 4 +- .../detail/scheduler/scheduler_helpers.hpp | 4 +- sycl/source/detail/spec_constant_impl.cpp | 4 +- sycl/source/detail/spec_constant_impl.hpp | 4 +- sycl/source/detail/stream_impl.cpp | 5 +- sycl/source/detail/stream_impl.hpp | 5 +- sycl/source/detail/sycl_mem_obj_t.cpp | 4 +- sycl/source/detail/thread_pool.hpp | 4 +- sycl/source/detail/usm/usm_impl.cpp | 4 +- sycl/source/detail/util.cpp | 4 +- sycl/source/detail/windows_pi.cpp | 4 +- sycl/source/detail/xpti_registry.cpp | 4 +- sycl/source/detail/xpti_registry.hpp | 4 +- sycl/source/device.cpp | 4 +- sycl/source/device_selector.cpp | 26 +- .../esimd_emulator_device_interface.cpp | 4 +- sycl/source/event.cpp | 4 +- sycl/source/exception.cpp | 4 +- sycl/source/exception_list.cpp | 12 +- sycl/source/function_pointer.cpp | 4 +- sycl/source/half_type.cpp | 4 +- sycl/source/handler.cpp | 4 +- sycl/source/interop_handle.cpp | 4 +- sycl/source/interop_handler.cpp | 4 +- sycl/source/kernel.cpp | 4 +- sycl/source/kernel_bundle.cpp | 4 +- sycl/source/ld-version-script.txt | 18 +- sycl/source/platform.cpp | 4 +- sycl/source/program.cpp | 4 +- sycl/source/queue.cpp | 5 +- sycl/source/sampler.cpp | 4 +- sycl/source/stream.cpp | 5 +- sycl/test/abi/sycl_symbols_linux.dump | 8958 ++++++++-------- sycl/test/abi/sycl_symbols_windows.dump | 9419 ++++++++--------- sycl/test/abi/user_mangling.cpp | 64 +- .../basic_tests/parallel_for_type_check.cpp | 2 +- .../buffer_location_codegen.cpp | 2 +- .../check_device_code/kernel_arguments_as.cpp | 8 +- sycl/test/check_device_code/no_offset.cpp | 4 +- sycl/test/esimd/esimd_verify.cpp | 4 +- sycl/test/extensions/sub_group_as.cpp | 12 +- .../xpti_helpers/pi_arguments_handler.hpp | 13 +- sycl/unittests/SYCL2020/KernelBundle.cpp | 4 +- sycl/unittests/SYCL2020/KernelID.cpp | 4 +- .../SYCL2020/SpecializationConstant.cpp | 4 +- sycl/unittests/assert/assert.cpp | 4 +- sycl/unittests/helpers/PiImage.hpp | 6 +- sycl/unittests/helpers/PiMock.hpp | 4 +- sycl/unittests/helpers/ScopedEnvVar.hpp | 11 +- sycl/unittests/helpers/TestKernel.hpp | 4 +- sycl/unittests/kernel-and-program/Cache.cpp | 4 +- sycl/unittests/misc/KernelBuildOptions.cpp | 4 +- .../program_manager/EliminatedArgMask.cpp | 4 +- .../passing_link_and_compile_options.cpp | 6 +- sycl/unittests/queue/GetProfilingInfo.cpp | 6 +- .../scheduler/SchedulerTestUtils.hpp | 4 +- 512 files changed, 10958 insertions(+), 10965 deletions(-) diff --git a/clang/lib/CodeGen/CGSYCLRuntime.cpp b/clang/lib/CodeGen/CGSYCLRuntime.cpp index d2b499de9ec00..bdad6867182f9 100644 --- a/clang/lib/CodeGen/CGSYCLRuntime.cpp +++ b/clang/lib/CodeGen/CGSYCLRuntime.cpp @@ -44,8 +44,8 @@ static bool isPFWI(const FunctionDecl &FD) { if (!MD) return false; static std::array Scopes = { - Util::DeclContextDesc{clang::Decl::Kind::Namespace, "cl"}, Util::DeclContextDesc{clang::Decl::Kind::Namespace, "sycl"}, + Util::DeclContextDesc{clang::Decl::Kind::Namespace, "_V1"}, Util::DeclContextDesc{Decl::Kind::ClassTemplateSpecialization, "group"}}; if (!Util::matchQualifiedTypeName(MD->getParent(), Scopes)) return false; diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index 03536b7decc18..0baba68ba1747 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -10426,8 +10426,8 @@ bool isDeviceAspectType(const QualType Ty) { return false; std::array, 3> Scopes = { - MakeDeclContextDesc(Decl::Kind::Namespace, "cl"), MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"), + MakeDeclContextDesc(Decl::Kind::Namespace, "_V1"), MakeDeclContextDesc(Decl::Kind::Enum, "aspect")}; const auto *Ctx = cast(ET->getDecl()); diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp index 5dbaed297dd69..e6a8b976de883 100644 --- a/clang/lib/Sema/SemaSYCL.cpp +++ b/clang/lib/Sema/SemaSYCL.cpp @@ -925,13 +925,13 @@ class MarkWIScopeFnVisitor : public RecursiveASTVisitor { return true; QualType Ty = Ctx.getRecordType(Call->getRecordDecl()); if (!Util::isSyclType(Ty, "group", true /*Tmpl*/)) - // not a member of cl::sycl::group - continue search + // not a member of sycl::group - continue search return true; auto Name = Callee->getName(); if (((Name != "parallel_for_work_item") && (Name != "wait_for")) || Callee->hasAttr()) return true; - // it is a call to cl::sycl::group::parallel_for_work_item/wait_for - + // it is a call to sycl::group::parallel_for_work_item/wait_for - // mark the callee Callee->addAttr( SYCLScopeAttr::CreateImplicit(Ctx, SYCLScopeAttr::Level::WorkItem)); @@ -4215,7 +4215,7 @@ static const char *paramKind2Str(KernelParamKind K) { // VB, // std::array& VC, int param, T2 ... varargs) { // ... -// deviceQueue.submit([&](cl::sycl::handler& cgh) { +// deviceQueue.submit([&](sycl::handler& cgh) { // ... // cgh.parallel_for>(...) // ... @@ -4650,8 +4650,8 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) { FwdDeclEmitter.Visit(K.NameType); O << "\n"; - O << "__SYCL_INLINE_NAMESPACE(cl) {\n"; O << "namespace sycl {\n"; + O << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n"; O << "namespace detail {\n"; // Generate declaration of variable of type __sycl_device_global_registration @@ -4795,8 +4795,8 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) { } O << "\n"; O << "} // namespace detail\n"; + O << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n"; O << "} // namespace sycl\n"; - O << "} // __SYCL_INLINE_NAMESPACE(cl)\n"; O << "\n"; } @@ -5076,8 +5076,8 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) { DeviceGlobOS << "\");\n"; } else { EmittedFirstSpecConstant = true; - OS << "__SYCL_INLINE_NAMESPACE(cl) {\n"; OS << "namespace sycl {\n"; + OS << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n"; OS << "namespace detail {\n"; OS << "template<>\n"; OS << "inline const char *get_spec_constant_symbolic_ID_impl<"; @@ -5095,8 +5095,8 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) { OS << "\";\n"; OS << "}\n"; OS << "} // namespace detail\n"; + OS << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n"; OS << "} // namespace sycl\n"; - OS << "} // __SYCL_INLINE_NAMESPACE(cl)\n"; } } @@ -5132,8 +5132,8 @@ bool Util::isSyclSpecialType(const QualType Ty) { bool Util::isSyclSpecConstantType(QualType Ty) { std::array Scopes = { - Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"), + Util::MakeDeclContextDesc(Decl::Kind::Namespace, "_V1"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ext"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "oneapi"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "experimental"), @@ -5144,8 +5144,8 @@ bool Util::isSyclSpecConstantType(QualType Ty) { bool Util::isSyclSpecIdType(QualType Ty) { std::array Scopes = { - Util::MakeDeclContextDesc(clang::Decl::Kind::Namespace, "cl"), Util::MakeDeclContextDesc(clang::Decl::Kind::Namespace, "sycl"), + Util::MakeDeclContextDesc(Decl::Kind::Namespace, "_V1"), Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization, "specialization_id")}; return matchQualifiedTypeName(Ty, Scopes); @@ -5153,16 +5153,16 @@ bool Util::isSyclSpecIdType(QualType Ty) { bool Util::isSyclKernelHandlerType(QualType Ty) { std::array Scopes = { - Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"), + Util::MakeDeclContextDesc(Decl::Kind::Namespace, "_V1"), Util::MakeDeclContextDesc(Decl::Kind::CXXRecord, "kernel_handler")}; return matchQualifiedTypeName(Ty, Scopes); } bool Util::isSyclAccessorNoAliasPropertyType(QualType Ty) { std::array Scopes = { - Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"), + Util::MakeDeclContextDesc(Decl::Kind::Namespace, "_V1"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ext"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "oneapi"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "property"), @@ -5174,8 +5174,8 @@ bool Util::isSyclAccessorNoAliasPropertyType(QualType Ty) { bool Util::isSyclBufferLocationType(QualType Ty) { std::array Scopes = { - Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"), + Util::MakeDeclContextDesc(Decl::Kind::Namespace, "_V1"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ext"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "intel"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "property"), @@ -5189,16 +5189,16 @@ bool Util::isSyclType(QualType Ty, StringRef Name, bool Tmpl) { Decl::Kind ClassDeclKind = Tmpl ? Decl::Kind::ClassTemplateSpecialization : Decl::Kind::CXXRecord; std::array Scopes = { - Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"), + Util::MakeDeclContextDesc(Decl::Kind::Namespace, "_V1"), Util::MakeDeclContextDesc(ClassDeclKind, Name)}; return matchQualifiedTypeName(Ty, Scopes); } bool Util::isAccessorPropertyListType(QualType Ty) { std::array Scopes = { - Util::MakeDeclContextDesc(Decl::Kind::Namespace, "cl"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "sycl"), + Util::MakeDeclContextDesc(Decl::Kind::Namespace, "_V1"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "ext"), Util::MakeDeclContextDesc(Decl::Kind::Namespace, "oneapi"), Util::MakeDeclContextDesc(Decl::Kind::ClassTemplateSpecialization, diff --git a/clang/test/CodeGenSYCL/Inputs/sycl.hpp b/clang/test/CodeGenSYCL/Inputs/sycl.hpp index 6ecbd802387cf..f9ca128301f39 100644 --- a/clang/test/CodeGenSYCL/Inputs/sycl.hpp +++ b/clang/test/CodeGenSYCL/Inputs/sycl.hpp @@ -10,8 +10,8 @@ __spirv_ControlBarrier(int, int, int) noexcept; #endif // Dummy runtime classes to model SYCL API. -inline namespace cl { namespace sycl { +inline namespace _V1 { struct sampler_impl { #ifdef __SYCL_DEVICE_ONLY__ __ocl_sampler_t m_Sampler; @@ -491,7 +491,7 @@ class __attribute__((sycl_special_class)) stream { void __finalize() {} private: - cl::sycl::accessor Acc; + sycl::accessor Acc; int FlushBufferSize; }; @@ -621,5 +621,5 @@ class image { } }; +} // inline namespace _V1 } // namespace sycl -} // namespace cl diff --git a/clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp b/clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp index ba334aaad8abe..2ca60450d5c56 100644 --- a/clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp +++ b/clang/test/CodeGenSYCL/accessor-readonly-invalid-lib.cpp @@ -3,8 +3,8 @@ // Test which verifies that readonly attribute is generated for unexpected access mode value. // Dummy library with unexpected access::mode enum value. -namespace cl { namespace sycl { +inline namespace _V1 { namespace access { @@ -71,8 +71,8 @@ class __attribute__((sycl_special_class)) accessor { range MemRange, id Offset) {} }; +} // inline namespace _V1 } // namespace sycl -} // namespace cl template __attribute__((sycl_kernel)) void kernel_single_task(const Func &kernelFunc) { @@ -80,7 +80,7 @@ __attribute__((sycl_kernel)) void kernel_single_task(const Func &kernelFunc) { } int main() { - cl::sycl::accessor Acc; + sycl::accessor Acc; // CHECK: spir_kernel{{.*}}fake_kernel // CHECK-SAME: readonly kernel_single_task([=]() { diff --git a/clang/test/CodeGenSYCL/accessor-readonly.cpp b/clang/test/CodeGenSYCL/accessor-readonly.cpp index 72dc914e4ebe5..235d2f71a5bf7 100644 --- a/clang/test/CodeGenSYCL/accessor-readonly.cpp +++ b/clang/test/CodeGenSYCL/accessor-readonly.cpp @@ -5,9 +5,9 @@ #include "Inputs/sycl.hpp" // CHECK-NOT: spir_kernel{{.*}}f0_kernel{{.*}}readonly -void f0(cl::sycl::queue &myQueue, cl::sycl::buffer &in_buf, cl::sycl::buffer &out_buf) { - myQueue.submit([&](cl::sycl::handler &cgh) { - auto write_acc = out_buf.get_access(cgh); +void f0(sycl::queue &myQueue, sycl::buffer &in_buf, sycl::buffer &out_buf) { + myQueue.submit([&](sycl::handler &cgh) { + auto write_acc = out_buf.get_access(cgh); cgh.single_task([write_acc] {}); }); } @@ -16,10 +16,10 @@ void f0(cl::sycl::queue &myQueue, cl::sycl::buffer &in_buf, cl::sycl::bu // CHECK-NOT: readonly // CHECK-SAME: %_arg_write_acc{{.*}}%_arg_write_acc1{{.*}}%_arg_write_acc2{{.*}}%_arg_write_acc3 // CHECK-SAME: readonly align 4 %_arg_read_acc -void f1(cl::sycl::queue &myQueue, cl::sycl::buffer &in_buf, cl::sycl::buffer &out_buf) { - myQueue.submit([&](cl::sycl::handler &cgh) { - auto write_acc = out_buf.get_access(cgh); - auto read_acc = in_buf.get_access(cgh); +void f1(sycl::queue &myQueue, sycl::buffer &in_buf, sycl::buffer &out_buf) { + myQueue.submit([&](sycl::handler &cgh) { + auto write_acc = out_buf.get_access(cgh); + auto read_acc = in_buf.get_access(cgh); cgh.single_task([write_acc, read_acc] {}); }); } @@ -28,10 +28,10 @@ void f1(cl::sycl::queue &myQueue, cl::sycl::buffer &in_buf, cl::sycl::bu // CHECK-SAME: readonly align 4 %_arg_read_acc // CHECK-NOT: readonly // CHECK-SAME: %_arg_write_acc -void f2(cl::sycl::queue &myQueue, cl::sycl::buffer &in_buf, cl::sycl::buffer &out_buf) { - myQueue.submit([&](cl::sycl::handler &cgh) { - auto read_acc = in_buf.get_access(cgh); - auto write_acc = out_buf.get_access(cgh); +void f2(sycl::queue &myQueue, sycl::buffer &in_buf, sycl::buffer &out_buf) { + myQueue.submit([&](sycl::handler &cgh) { + auto read_acc = in_buf.get_access(cgh); + auto write_acc = out_buf.get_access(cgh); cgh.single_task([read_acc, write_acc] {}); }); } diff --git a/clang/test/CodeGenSYCL/accessor_inheritance.cpp b/clang/test/CodeGenSYCL/accessor_inheritance.cpp index 9f9995f5c21d3..732ee2cb5e6a7 100644 --- a/clang/test/CodeGenSYCL/accessor_inheritance.cpp +++ b/clang/test/CodeGenSYCL/accessor_inheritance.cpp @@ -3,17 +3,17 @@ struct Base { int A, B; - cl::sycl::accessor AccField; + sycl::accessor AccField; }; struct Captured : Base, - cl::sycl::accessor { + sycl::accessor { int C; }; int main() { Captured Obj; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { Obj.use(); }); @@ -21,8 +21,8 @@ int main() { } // Check kernel parameters -// CHECK: %[[RANGE_TYPE:"struct.*cl::sycl::range"]] -// CHECK: %[[ID_TYPE:"struct.*cl::sycl::id"]] +// CHECK: %[[RANGE_TYPE:"struct.*sycl::_V1::range"]] +// CHECK: %[[ID_TYPE:"struct.*sycl::_V1::id"]] // CHECK: define {{.*}}spir_kernel void @_ZTSZ4mainE6kernel // CHECK-SAME: i32 noundef [[ARG_A:%[a-zA-Z0-9_]+]], // CHECK-SAME: i32 noundef [[ARG_B:%[a-zA-Z0-9_]+]], @@ -71,10 +71,10 @@ int main() { // Check accessors initialization // CHECK: [[ACC_FIELD:%[a-zA-Z0-9_]+]] = getelementptr inbounds %struct{{.*}}Base, ptr addrspace(4) [[GEP]], i32 0, i32 2 // Default constructor call -// CHECK: call spir_func void @_ZN2cl4sycl8accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC1Ev(ptr addrspace(4) {{[^,]*}} [[ACC_FIELD]]) +// CHECK: call spir_func void @_ZN4sycl3_V18accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC1Ev(ptr addrspace(4) {{[^,]*}} [[ACC_FIELD]]) // CHECK: [[GEP1:%[a-zA-Z0-9_]+]] = getelementptr inbounds i8, ptr addrspace(4) [[GEP]], i64 20 // Default constructor call -// CHECK: call spir_func void @_ZN2cl4sycl8accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC2Ev(ptr addrspace(4) {{[^,]*}} [[GEP1]]) +// CHECK: call spir_func void @_ZN4sycl3_V18accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC2Ev(ptr addrspace(4) {{[^,]*}} [[GEP1]]) // CHECK C field initialization // CHECK: [[FIELD_C:%[a-zA-Z0-9_]+]] = getelementptr inbounds %struct{{.*}}Captured, ptr addrspace(4) [[GEP]], i32 0, i32 2 diff --git a/clang/test/CodeGenSYCL/accessor_no_alias_property.cpp b/clang/test/CodeGenSYCL/accessor_no_alias_property.cpp index e514c8e3237fe..2d57a0f2f618e 100644 --- a/clang/test/CodeGenSYCL/accessor_no_alias_property.cpp +++ b/clang/test/CodeGenSYCL/accessor_no_alias_property.cpp @@ -5,23 +5,23 @@ #include "Inputs/sycl.hpp" int main() { - cl::sycl::accessor>> + sycl::accessor>> accessorA; - cl::sycl::accessor>> + sycl::accessor>> accessorB; // Check that noalias parameter attribute is emitted when no_alias accessor property is used // CHECK: define {{.*}}spir_kernel void @_ZTSZ4mainE16kernel_function1({{.*}} noalias {{.*}} %_arg_accessorA, {{.*}}) - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { accessorA.use(); }); @@ -30,7 +30,7 @@ int main() { // CHECK: define {{.*}}spir_kernel void @_ZTSZ4mainE16kernel_function2 // CHECK-NOT: noalias // CHECK-SAME: { - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { accessorB.use(); }); diff --git a/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp b/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp index 989c2c785bf5e..58df81ea12207 100644 --- a/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp +++ b/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp @@ -6,61 +6,59 @@ #include "Inputs/sycl.hpp" int main() { - cl::sycl::kernel_single_task([]() {}); + sycl::kernel_single_task([]() {}); } // CHECK: #include -using namespace cl; - // Example ways in which the application can declare a "specialization_id" // variable. struct S1 { static constexpr sycl::specialization_id a{1}; - // CHECK: __SYCL_INLINE_NAMESPACE(cl) { - // CHECK-NEXT: namespace sycl { + // CHECK: namespace sycl { + // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::S1::a>() { // CHECK-NEXT: return "_ZN2S11aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail + // CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl - // CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) }; constexpr sycl::specialization_id b{2}; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::b>() { // CHECK-NEXT: return "____ZL1b"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) inline constexpr sycl::specialization_id c{3}; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::c>() { // CHECK-NEXT: return "_Z1c"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) static constexpr sycl::specialization_id d{4}; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::d>() { // CHECK-NEXT: return "____ZL1d"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace { struct S2 { @@ -72,16 +70,16 @@ struct S2 { // CHECK-NEXT: } // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace - // CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { + // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_12S21aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail + // CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl - // CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) }; } // namespace @@ -90,52 +88,52 @@ struct S3 { static constexpr sycl::specialization_id a{Val}; }; template class S3<1>; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::S3<1>::a>() { // CHECK-NEXT: return "_ZN2S3ILi1EE1aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) template class S3<2>; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::S3<2>::a>() { // CHECK-NEXT: return "_ZN2S3ILi2EE1aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace inner { constexpr sycl::specialization_id same_name{5}; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::inner::same_name>() { // CHECK-NEXT: return "____ZN5innerL9same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } constexpr sycl::specialization_id same_name{6}; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::same_name>() { // CHECK-NEXT: return "____ZL9same_name"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace { constexpr sycl::specialization_id same_name{7}; // CHECK-NEXT: namespace { @@ -145,16 +143,16 @@ constexpr sycl::specialization_id same_name{7}; // CHECK-NEXT: } // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_19same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } namespace { namespace inner { @@ -166,16 +164,16 @@ constexpr sycl::specialization_id same_name{8}; // CHECK-NEXT: } // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_15inner9same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } } // namespace namespace inner { @@ -190,31 +188,31 @@ constexpr sycl::specialization_id same_name{9}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace inner -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::inner::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN5inner12_GLOBAL__N_19same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } } // namespace inner namespace outer { constexpr sycl::specialization_id same_name{10}; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::same_name>() { // CHECK-NEXT: return "____ZN5outerL9same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace { constexpr sycl::specialization_id same_name{11}; // CHECK-NEXT: namespace outer { @@ -226,16 +224,16 @@ constexpr sycl::specialization_id same_name{11}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN5outer12_GLOBAL__N_19same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace inner { constexpr sycl::specialization_id same_name{12}; @@ -248,16 +246,16 @@ constexpr sycl::specialization_id same_name{12}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN5outer12_GLOBAL__N_15inner9same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace { // This has multiple anonymous namespaces in its declaration context, we need to @@ -286,16 +284,16 @@ constexpr sycl::specialization_id same_name{13}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM_ID_2]]()>() { // CHECK-NEXT: return "____ZN5outer12_GLOBAL__N_15inner12_GLOBAL__N_19same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } } // namespace inner } // namespace @@ -311,16 +309,16 @@ constexpr sycl::specialization_id same_name{14}; // CHECK-NEXT: } // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_15outer9same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace { constexpr sycl::specialization_id same_name{15}; // CHECK-NEXT: namespace { @@ -341,16 +339,16 @@ constexpr sycl::specialization_id same_name{15}; // CHECK-NEXT: } // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID2]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_15outer12_GLOBAL__N_19same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace inner { constexpr sycl::specialization_id same_name{16}; // CHECK-NEXT: namespace { @@ -371,16 +369,16 @@ constexpr sycl::specialization_id same_name{16}; // CHECK-NEXT: } // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID2]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_15outer12_GLOBAL__N_15inner9same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } } // namespace } // namespace outer @@ -389,16 +387,16 @@ constexpr sycl::specialization_id same_name{16}; namespace outer { namespace inner { constexpr sycl::specialization_id same_name{17}; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::inner::same_name>() { // CHECK-NEXT: return "____ZN5outer5innerL9same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } } // namespace outer diff --git a/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp b/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp index 4840cc0ceeb89..86259b10544b1 100644 --- a/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp +++ b/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp @@ -6,85 +6,83 @@ #include "Inputs/sycl.hpp" int main() { - cl::sycl::kernel_single_task([]() {}); + sycl::kernel_single_task([]() {}); } // CHECK: #include -using namespace cl; - struct S1 { static constexpr sycl::specialization_id a{1}; }; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::S1::a>() { // CHECK-NEXT: return "_ZN2S11aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) constexpr sycl::specialization_id b{202}; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::b>() { // CHECK-NEXT: return "____ZL1b"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) inline constexpr sycl::specialization_id c{3}; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::c>() { // CHECK-NEXT: return "_Z1c"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) static constexpr sycl::specialization_id d{205}; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::d>() { // CHECK-NEXT: return "____ZL1d"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace inner { constexpr sycl::specialization_id same_name{5}; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::inner::same_name>() { // CHECK-NEXT: return "____ZN5innerL9same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } constexpr sycl::specialization_id same_name{6}; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::same_name>() { // CHECK-NEXT: return "____ZL9same_name"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace { constexpr sycl::specialization_id same_name{207}; // CHECK: namespace { @@ -94,16 +92,16 @@ constexpr sycl::specialization_id same_name{207}; // CHECK-NEXT: } // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_19same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } namespace { namespace inner { @@ -115,16 +113,16 @@ constexpr sycl::specialization_id same_name{208}; // CHECK-NEXT: } // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_15inner9same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } } // namespace @@ -142,16 +140,16 @@ constexpr sycl::specialization_id same_name{209}; // CHECK-NEXT: } // namespace // CHECK-NEXT: } // inline namespace inner // CHECK-NEXT: } // namespace outer -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::inner::__sycl_detail::__shim_[[SHIM_ID]]()>() { // CHECK-NEXT: return "____ZN5outer5inner12_GLOBAL__N_19same_nameE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) } } diff --git a/clang/test/CodeGenSYCL/basic-kernel-wrapper.cpp b/clang/test/CodeGenSYCL/basic-kernel-wrapper.cpp index 41b9eb43b686f..801af7de09965 100644 --- a/clang/test/CodeGenSYCL/basic-kernel-wrapper.cpp +++ b/clang/test/CodeGenSYCL/basic-kernel-wrapper.cpp @@ -11,7 +11,7 @@ __attribute__((sycl_kernel)) void kernel(const Func &kernelFunc) { } int main() { - cl::sycl::accessor accessorA; + sycl::accessor accessorA; kernel( [=]() { accessorA.use(); @@ -29,9 +29,9 @@ int main() { // Check lambda object alloca // CHECK: [[ANONALLOCA:%[a-zA-Z0-9_]+]] = alloca %class.anon // Check allocas for ranges -// CHECK: [[ARANGEA:%agg.tmp.*]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MRANGEA:%agg.tmp.*]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OIDA:%agg.tmp.*]] = alloca %"struct.cl::sycl::id" +// CHECK: [[ARANGEA:%agg.tmp.*]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MRANGEA:%agg.tmp.*]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OIDA:%agg.tmp.*]] = alloca %"struct.sycl::_V1::id" // CHECK: [[ANON:%[a-zA-Z0-9_.]+]] = addrspacecast ptr [[ANONALLOCA]] to ptr addrspace(4) // CHECK: [[ARANGET:%agg.tmp.*]] = addrspacecast ptr [[ARANGEA]] to ptr addrspace(4) // CHECK: [[MRANGET:%agg.tmp.*]] = addrspacecast ptr [[MRANGEA]] to ptr addrspace(4) diff --git a/clang/test/CodeGenSYCL/buffer_location.cpp b/clang/test/CodeGenSYCL/buffer_location.cpp index bda093f80da45..154562113cba7 100644 --- a/clang/test/CodeGenSYCL/buffer_location.cpp +++ b/clang/test/CodeGenSYCL/buffer_location.cpp @@ -7,32 +7,32 @@ struct Base { int A, B; - cl::sycl::accessor>> + sycl::accessor>> AccField; }; struct Captured : Base, - cl::sycl::accessor>> { + sycl::accessor>> { int C; }; int main() { Captured Obj; - cl::sycl::accessor>> + sycl::accessor>> accessorA; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { accessorA.use(); Obj.use(); diff --git a/clang/test/CodeGenSYCL/check-direct-attribute-propagation.cpp b/clang/test/CodeGenSYCL/check-direct-attribute-propagation.cpp index e813e7bcb7b1d..327caa1db18ef 100644 --- a/clang/test/CodeGenSYCL/check-direct-attribute-propagation.cpp +++ b/clang/test/CodeGenSYCL/check-direct-attribute-propagation.cpp @@ -7,7 +7,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Foo { diff --git a/clang/test/CodeGenSYCL/code_location.cpp b/clang/test/CodeGenSYCL/code_location.cpp index 9cb9bcda33ccc..2a95ee34e31dc 100644 --- a/clang/test/CodeGenSYCL/code_location.cpp +++ b/clang/test/CodeGenSYCL/code_location.cpp @@ -7,12 +7,12 @@ // Check that meaningful information is returned when NDEBUG is not defined // and empty strings and 0s are emitted when it is. int test1() { - cl::sycl::queue q; - q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { h.single_task([]() {}); }); + sycl::queue q; + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); + q.submit([&](sycl::handler &h) { h.single_task([]() {}); }); return 0; } -// CHECK: template <> struct KernelInfoData<'_', 'Z', 'T', 'S', 'Z', 'Z', '5', 't', 'e', 's', 't', '1', 'v', 'E', 'N', 'K', 'U', 'l', 'R', 'N', '2', 'c', 'l', '4', 's', 'y', 'c', 'l', '7', 'h', 'a', 'n', 'd', 'l', 'e', 'r', 'E', 'E', '_', 'c', 'l', 'E', 'S', '2', '_', 'E', 'U', 'l', 'v', 'E', '_'> { +// CHECK: template <> struct KernelInfoData<'_', 'Z', 'T', 'S', 'Z', 'Z', '5', 't', 'e', 's', 't', '1', 'v', 'E', 'N', 'K', 'U', 'l', 'R', 'N', '4', 's', 'y', 'c', 'l', '3', '_', 'V', '1', '7', 'h', 'a', 'n', 'd', 'l', 'e', 'r', 'E', 'E', '_', 'c', 'l', 'E', 'S', '2', '_', 'E', 'U', 'l', 'v', 'E', '_'> { // CHECK: static constexpr const char* getFileName() { // CHECK: #ifndef NDEBUG // CHECK: return "code_location.cpp"; @@ -36,7 +36,7 @@ int test1() { // CHECK: } // CHECK: static constexpr unsigned getColumnNumber() { // CHECK: #ifndef NDEBUG -// CHECK: return 54; +// CHECK: return 50; // CHECK: #else // CHECK: return 0; // CHECK: #endif @@ -70,7 +70,7 @@ int test1() { // CHECK: __SYCL_DLL_LOCAL // CHECK: static constexpr unsigned getColumnNumber() { // CHECK: #ifndef NDEBUG -// CHECK: return 72; +// CHECK: return 68; // CHECK: #else // CHECK: return 0; // CHECK: #endif @@ -81,8 +81,8 @@ int test1() { // lambda and kernel name are defined on different lines class KernelName2; int test2() { - cl::sycl::queue q; - q.submit([&](cl::sycl::handler &h) { h.single_task( + sycl::queue q; + q.submit([&](sycl::handler &h) { h.single_task( [] { int i = 2; }); }); return 0; } @@ -120,8 +120,8 @@ int test2() { // Check that fully qualified name is returned template class KernelName3; int test3() { - cl::sycl::queue q; - q.submit([&](cl::sycl::handler &h) { h.single_task>( + sycl::queue q; + q.submit([&](sycl::handler &h) { h.single_task>( [] { int i = 3; }); }); return 0; } @@ -159,8 +159,8 @@ int test3() { // Check that the location information returned is that of l4 auto l4 = []() { return 4; }; int test4() { - cl::sycl::queue q; - q.submit([=](cl::sycl::handler &h) { h.single_task(l4); }); + sycl::queue q; + q.submit([=](sycl::handler &h) { h.single_task(l4); }); return 0; } // CHECK: template <> struct KernelInfo { @@ -198,13 +198,13 @@ int test4() { // kernel is enclosed in a namespace namespace NS { int test5() { - cl::sycl::queue q; - q.submit([=](cl::sycl::handler &h) { h.single_task([] {}); }); - q.submit([=](cl::sycl::handler &h) { h.single_task([] {}); }); + sycl::queue q; + q.submit([=](sycl::handler &h) { h.single_task([] {}); }); + q.submit([=](sycl::handler &h) { h.single_task([] {}); }); return 0; } } // namespace NS -// CHECK: template <> struct KernelInfoData<'_', 'Z', 'T', 'S', 'Z', 'Z', 'N', '2', 'N', 'S', '5', 't', 'e', 's', 't', '5', 'E', 'v', 'E', 'N', 'K', 'U', 'l', 'R', 'N', '2', 'c', 'l', '4', 's', 'y', 'c', 'l', '7', 'h', 'a', 'n', 'd', 'l', 'e', 'r', 'E', 'E', '_', 'c', 'l', 'E', 'S', '3', '_', 'E', 'U', 'l', 'v', 'E', '_'> { +// CHECK: template <> struct KernelInfoData<'_', 'Z', 'T', 'S', 'Z', 'Z', 'N', '2', 'N', 'S', '5', 't', 'e', 's', 't', '5', 'E', 'v', 'E', 'N', 'K', 'U', 'l', 'R', 'N', '4', 's', 'y', 'c', 'l', '3', '_', 'V', '1', '7', 'h', 'a', 'n', 'd', 'l', 'e', 'r', 'E', 'E', '_', 'c', 'l', 'E', 'S', '3', '_', 'E', 'U', 'l', 'v', 'E', '_'> { // CHECK: static constexpr const char* getFileName() { // CHECK: #ifndef NDEBUG // CHECK: return "code_location.cpp"; @@ -228,7 +228,7 @@ int test5() { // CHECK: } // CHECK: static constexpr unsigned getColumnNumber() { // CHECK: #ifndef NDEBUG -// CHECK: return 54; +// CHECK: return 50; // CHECK: #else // CHECK: return 0; // CHECK: #endif @@ -258,7 +258,7 @@ int test5() { // CHECK: } // CHECK: static constexpr unsigned getColumnNumber() { // CHECK: #ifndef NDEBUG -// CHECK: return 73; +// CHECK: return 69; // CHECK: #else // CHECK: return 0; // CHECK: #endif @@ -272,8 +272,8 @@ struct Functor { }; int test6() { Functor F; - cl::sycl::queue q; - q.submit([=](cl::sycl::handler &h) { h.single_task(F); }); + sycl::queue q; + q.submit([=](sycl::handler &h) { h.single_task(F); }); return 0; } // CHECK: template <> struct KernelInfo { diff --git a/clang/test/CodeGenSYCL/const-wg-init.cpp b/clang/test/CodeGenSYCL/const-wg-init.cpp index cbd632917d7fd..5f145a7267be8 100644 --- a/clang/test/CodeGenSYCL/const-wg-init.cpp +++ b/clang/test/CodeGenSYCL/const-wg-init.cpp @@ -5,13 +5,13 @@ template __attribute__((sycl_kernel)) void kernel_parallel_for_work_group(const KernelType &KernelFunc) { - cl::sycl::group<1> G; + sycl::group<1> G; KernelFunc(G); } int main() { - kernel_parallel_for_work_group([=](cl::sycl::group<1> G) { + kernel_parallel_for_work_group([=](sycl::group<1> G) { const int WG_CONST = 10; }); // CHECK: store i32 10, ptr addrspace(4) addrspacecast (ptr addrspace(3) @{{.*}}WG_CONST{{.*}} to ptr addrspace(4)) diff --git a/clang/test/CodeGenSYCL/debug-info-srcpos-kernel.cpp b/clang/test/CodeGenSYCL/debug-info-srcpos-kernel.cpp index b75326e57aa8d..d66a69002dace 100644 --- a/clang/test/CodeGenSYCL/debug-info-srcpos-kernel.cpp +++ b/clang/test/CodeGenSYCL/debug-info-srcpos-kernel.cpp @@ -17,7 +17,7 @@ __attribute__((sycl_kernel)) void kernel(const Func &kernelFunc) { } int main() { - cl::sycl::sampler Sampler; + sycl::sampler Sampler; kernel([=]() { Sampler.use(); }); diff --git a/clang/test/CodeGenSYCL/device_global.cpp b/clang/test/CodeGenSYCL/device_global.cpp index 71d5756f2f15e..862d9737cc28a 100644 --- a/clang/test/CodeGenSYCL/device_global.cpp +++ b/clang/test/CodeGenSYCL/device_global.cpp @@ -6,7 +6,7 @@ // unique string is generated. using namespace sycl::ext::oneapi; -using namespace cl::sycl; +using namespace sycl; queue q; device_global A; @@ -16,16 +16,16 @@ struct Foo { static device_global C; }; device_global Foo::C; -// CHECK: @A = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[A_ATTRS:[0-9]+]] -// CHECK: @_ZL1B = internal addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[B_ATTRS:[0-9]+]] -// CHECK: @_ZN3Foo1CE = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[C_ATTRS:[0-9]+]] +// CHECK: @A = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[A_ATTRS:[0-9]+]] +// CHECK: @_ZL1B = internal addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[B_ATTRS:[0-9]+]] +// CHECK: @_ZN3Foo1CE = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[C_ATTRS:[0-9]+]] device_global same_name; namespace NS { device_global same_name; } -// CHECK: @same_name = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_ATTRS:[0-9]+]] -// CHECK: @_ZN2NS9same_nameE = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_NS_ATTRS:[0-9]+]] +// CHECK: @same_name = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_ATTRS:[0-9]+]] +// CHECK: @_ZN2NS9same_nameE = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_NS_ATTRS:[0-9]+]] // decorated with only global_variable_allowed attribute template @@ -47,18 +47,18 @@ only_global_var_allowed no_device_global; inline namespace Bar { device_global InlineNS; } -// CHECK: @_ZN3Bar8InlineNSE = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global.0" zeroinitializer, align 8 #[[BAR_INLINENS_ATTRS:[0-9]+]] +// CHECK: @_ZN3Bar8InlineNSE = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global.0" zeroinitializer, align 8 #[[BAR_INLINENS_ATTRS:[0-9]+]] template struct TS { public: static device_global d; }; template <> device_global TS::d{}; -// CHECK: @_ZN2TSIiE1dE = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[TEMPLATED_WRAPPER_ATTRS:[0-9]+]] +// CHECK: @_ZN2TSIiE1dE = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[TEMPLATED_WRAPPER_ATTRS:[0-9]+]] template device_global templ_dev_global; -// CHECK: @[[TEMPL_DEV_GLOB:[a-zA-Z0-9_]+]] = linkonce_odr addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, comdat, align 8 #[[TEMPL_DEV_GLOB_ATTRS:[0-9]+]] +// CHECK: @[[TEMPL_DEV_GLOB:[a-zA-Z0-9_]+]] = linkonce_odr addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, comdat, align 8 #[[TEMPL_DEV_GLOB_ATTRS:[0-9]+]] void foo() { q.submit([&](handler &h) { @@ -79,7 +79,7 @@ void foo() { namespace { device_global same_name; } -// CHECK: @_ZN12_GLOBAL__N_19same_nameE = internal addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_ANON_NS_ATTRS:[0-9]+]] +// CHECK: @_ZN12_GLOBAL__N_19same_nameE = internal addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_ANON_NS_ATTRS:[0-9]+]] namespace { void bar() { diff --git a/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp b/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp index fd5d42d095c9a..dd5564b7f42e7 100644 --- a/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp +++ b/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp @@ -7,14 +7,14 @@ #include "sycl.hpp" -using namespace cl::sycl::ext::oneapi; +using namespace sycl::ext::oneapi; int main() { - cl::sycl::kernel_single_task([]() {}); + sycl::kernel_single_task([]() {}); } -// CHECK-HEADER: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-HEADER-NEXT: namespace sycl { +// CHECK-HEADER: namespace sycl { +// CHECK-HEADER-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-HEADER-NEXT: namespace detail { // CHECK-HEADER-NEXT: namespace { // CHECK-HEADER-NEXT: class __sycl_device_global_registration { @@ -24,8 +24,8 @@ int main() { // CHECK-HEADER-NEXT: __sycl_device_global_registration __sycl_device_global_registrar; // CHECK-HEADER-NEXT: } // namespace // CHECK-HEADER: } // namespace detail +// CHECK-HEADER: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-HEADER: } // namespace sycl -// CHECK-HEADER: } // __SYCL_INLINE_NAMESPACE(cl) // CHECK-FOOTER: #include diff --git a/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp b/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp index f24f8d80a8385..8eb773ead6b3c 100644 --- a/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp +++ b/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp @@ -6,39 +6,38 @@ #include "sycl.hpp" -using namespace cl; int main() { - cl::sycl::kernel_single_task([]() {}); + sycl::kernel_single_task([]() {}); } // CHECK: #include constexpr sycl::specialization_id a{2}; -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::a>() { // CHECK-NEXT: return "____ZL1a"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) sycl::ext::oneapi::device_global b; struct Wrapper { static constexpr sycl::specialization_id a{18}; static sycl::ext::oneapi::device_global b; }; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Wrapper::a>() { // CHECK-NEXT: return "_ZN7Wrapper1aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) template struct TemplateWrapper { @@ -47,16 +46,16 @@ struct TemplateWrapper { }; template class TemplateWrapper; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::TemplateWrapper::a>() { // CHECK-NEXT: return "_ZN15TemplateWrapperIfE1aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) namespace { constexpr sycl::specialization_id a{2}; @@ -71,16 +70,16 @@ sycl::ext::oneapi::device_global b; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM0]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_11aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) // CHECK: namespace { // CHECK-NEXT: namespace __sycl_detail { @@ -117,16 +116,16 @@ constexpr sycl::specialization_id a{2}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM3]]()>() { // CHECK-NEXT: return "____ZN5outer12_GLOBAL__N_15inner12_GLOBAL__N_11aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) sycl::ext::oneapi::device_global b; // CHECK: namespace outer { // CHECK-NEXT: namespace { @@ -177,16 +176,16 @@ struct Wrapper { // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::outer::__sycl_detail::__shim_[[SHIM7]]()>() { // CHECK-NEXT: return "____ZN5outer12_GLOBAL__N_15inner12_GLOBAL__N_17Wrapper1aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) // CHECK-NEXT: namespace outer { // CHECK-NEXT: namespace { diff --git a/clang/test/CodeGenSYCL/device_has.cpp b/clang/test/CodeGenSYCL/device_has.cpp index 054648d1d4ffb..bc3d3ec2effee 100644 --- a/clang/test/CodeGenSYCL/device_has.cpp +++ b/clang/test/CodeGenSYCL/device_has.cpp @@ -3,39 +3,39 @@ // Tests for IR of device_has(aspect, ...) attribute #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // CHECK: define dso_local spir_kernel void @{{.*}}kernel_name_1{{.*}} !intel_declared_aspects ![[ASPECTS1:[0-9]+]] // CHECK: define dso_local spir_func void @{{.*}}func1{{.*}} !intel_declared_aspects ![[ASPECTS1]] { -[[sycl::device_has(cl::sycl::aspect::cpu)]] void func1() {} +[[sycl::device_has(sycl::aspect::cpu)]] void func1() {} // CHECK: define dso_local spir_func void @{{.*}}func2{{.*}} !intel_declared_aspects ![[ASPECTS2:[0-9]+]] { -[[sycl::device_has(cl::sycl::aspect::fp16, cl::sycl::aspect::gpu)]] void func2() {} +[[sycl::device_has(sycl::aspect::fp16, sycl::aspect::gpu)]] void func2() {} // CHECK: define dso_local spir_func void @{{.*}}func3{{.*}} !intel_declared_aspects ![[EMPTYASPECTS:[0-9]+]] { [[sycl::device_has()]] void func3() {} // CHECK: define linkonce_odr spir_func void @{{.*}}func4{{.*}} !intel_declared_aspects ![[ASPECTS3:[0-9]+]] { -template +template [[sycl::device_has(Aspect)]] void func4() {} // CHECK: define dso_local spir_func void @{{.*}}func5{{.*}} !intel_declared_aspects ![[ASPECTS1]] { -[[sycl::device_has(cl::sycl::aspect::cpu)]] void func5(); +[[sycl::device_has(sycl::aspect::cpu)]] void func5(); void func5() {} -constexpr cl::sycl::aspect getAspect() { return cl::sycl::aspect::cpu; } +constexpr sycl::aspect getAspect() { return sycl::aspect::cpu; } // CHECK: define dso_local spir_func void @{{.*}}func6{{.*}} !intel_declared_aspects ![[ASPECTS1]] { [[sycl::device_has(getAspect())]] void func6() {} class KernelFunctor { public: - [[sycl::device_has(cl::sycl::aspect::cpu)]] void operator()() const { + [[sycl::device_has(sycl::aspect::cpu)]] void operator()() const { func1(); func2(); func3(); - func4(); + func4(); func5(); func6(); } @@ -46,7 +46,7 @@ void foo() { KernelFunctor f1; h.single_task(f1); // CHECK: define dso_local spir_kernel void @{{.*}}kernel_name_2{{.*}} !intel_declared_aspects ![[ASPECTS4:[0-9]+]] - h.single_task([]() [[sycl::device_has(cl::sycl::aspect::gpu)]] {}); + h.single_task([]() [[sycl::device_has(sycl::aspect::gpu)]] {}); }); } diff --git a/clang/test/CodeGenSYCL/disable_loop_pipelining.cpp b/clang/test/CodeGenSYCL/disable_loop_pipelining.cpp index 97ce88d108175..049aa4ed76baf 100644 --- a/clang/test/CodeGenSYCL/disable_loop_pipelining.cpp +++ b/clang/test/CodeGenSYCL/disable_loop_pipelining.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Foo { diff --git a/clang/test/CodeGenSYCL/esimd-accessor-ptr-md.cpp b/clang/test/CodeGenSYCL/esimd-accessor-ptr-md.cpp index 0dc02b9a72845..7dc95577950a1 100644 --- a/clang/test/CodeGenSYCL/esimd-accessor-ptr-md.cpp +++ b/clang/test/CodeGenSYCL/esimd-accessor-ptr-md.cpp @@ -10,13 +10,13 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; void test(int val) { queue q; q.submit([&](handler &h) { - cl::sycl::accessor accessorA; - cl::sycl::accessor accessorB; + sycl::accessor accessorA; + sycl::accessor accessorB; h.single_task( [=]() __attribute__((sycl_explicit_simd)) { @@ -26,7 +26,7 @@ void test(int val) { }); // --- Name - // CHECK-LABEL: define {{.*}}spir_kernel void @_ZTSZZ4testiENKUlRN2cl4sycl7handlerEE_clES2_E12esimd_kernel( + // CHECK-LABEL: define {{.*}}spir_kernel void @_ZTSZZ4testiENKUlRN4sycl3_V17handlerEE_clES2_E12esimd_kernel( // --- Attributes // CHECK: {{.*}} !kernel_arg_accessor_ptr ![[ACC_PTR_ATTR:[0-9]+]] !sycl_explicit_simd !{{[0-9]+}} {{.*}}{ // --- init_esimd call is expected instead of __init: diff --git a/clang/test/CodeGenSYCL/image_accessor.cpp b/clang/test/CodeGenSYCL/image_accessor.cpp index 6297ee62fea79..c697407c72059 100644 --- a/clang/test/CodeGenSYCL/image_accessor.cpp +++ b/clang/test/CodeGenSYCL/image_accessor.cpp @@ -30,10 +30,10 @@ int main() { { - cl::sycl::image<1> MyImage1d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<1>(3)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage1d.get_access(cgh); + sycl::image<1> MyImage1d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<1>(3)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage1d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -42,10 +42,10 @@ int main() { } { - cl::sycl::image<2> MyImage2d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<2>(3, 2)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage2d.get_access(cgh); + sycl::image<2> MyImage2d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<2>(3, 2)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage2d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -54,10 +54,10 @@ int main() { } { - cl::sycl::image<3> MyImage3d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<3>(3, 2, 4)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage3d.get_access(cgh); + sycl::image<3> MyImage3d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<3>(3, 2, 4)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage3d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -66,10 +66,10 @@ int main() { } { - cl::sycl::image<1> MyImage1d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<1>(3)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage1d.get_access(cgh); + sycl::image<1> MyImage1d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<1>(3)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage1d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -78,10 +78,10 @@ int main() { } { - cl::sycl::image<2> MyImage2d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<2>(3, 2)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage2d.get_access(cgh); + sycl::image<2> MyImage2d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<2>(3, 2)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage2d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -90,10 +90,10 @@ int main() { } { - cl::sycl::image<3> MyImage3d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<3>(3, 2, 4)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage3d.get_access(cgh); + sycl::image<3> MyImage3d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<3>(3, 2, 4)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage3d.get_access(cgh); cgh.single_task([=]() { Acc.use(); diff --git a/clang/test/CodeGenSYCL/inheritance.cpp b/clang/test/CodeGenSYCL/inheritance.cpp index 87fd122d43dac..dc46231dac670 100644 --- a/clang/test/CodeGenSYCL/inheritance.cpp +++ b/clang/test/CodeGenSYCL/inheritance.cpp @@ -29,9 +29,9 @@ struct derived : base, second_base { }; int main() { - cl::sycl::queue q; + sycl::queue q; - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { derived f{}; cgh.single_task(f); }); diff --git a/clang/test/CodeGenSYCL/initiation_interval.cpp b/clang/test/CodeGenSYCL/initiation_interval.cpp index fa4ec3a96d70d..113cdf78836f5 100644 --- a/clang/test/CodeGenSYCL/initiation_interval.cpp +++ b/clang/test/CodeGenSYCL/initiation_interval.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Foo { diff --git a/clang/test/CodeGenSYCL/int-header-empty-signatures.cpp b/clang/test/CodeGenSYCL/int-header-empty-signatures.cpp index 959da60717300..dee7e2345dc78 100644 --- a/clang/test/CodeGenSYCL/int-header-empty-signatures.cpp +++ b/clang/test/CodeGenSYCL/int-header-empty-signatures.cpp @@ -18,7 +18,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; int main() { // captureless kernel lambda results in no fields. diff --git a/clang/test/CodeGenSYCL/int_header1.cpp b/clang/test/CodeGenSYCL/int_header1.cpp index 89c6a362e6025..e72fbdb9d1dc1 100644 --- a/clang/test/CodeGenSYCL/int_header1.cpp +++ b/clang/test/CodeGenSYCL/int_header1.cpp @@ -83,7 +83,7 @@ struct MyWrapper { int test() { - cl::sycl::accessor acc; + sycl::accessor acc; // Acronyms used to designate a test combination: // Declaration levels: 'T'-translation unit, 'L'-local scope, @@ -171,7 +171,7 @@ struct MyWrapper { }; #ifndef __SYCL_DEVICE_ONLY__ -using namespace cl::sycl::detail; +using namespace sycl::detail; #endif // __SYCL_DEVICE_ONLY__ int main() { diff --git a/clang/test/CodeGenSYCL/int_header_enum_type_alias.cpp b/clang/test/CodeGenSYCL/int_header_enum_type_alias.cpp index 2ba7bf100f1f3..eb40c73b2f5a9 100644 --- a/clang/test/CodeGenSYCL/int_header_enum_type_alias.cpp +++ b/clang/test/CodeGenSYCL/int_header_enum_type_alias.cpp @@ -9,10 +9,10 @@ // print the actual name, not the alias name. // CHECK: Forward declarations of templated kernel function types: -// CHECK-NEXT: inline namespace cl { namespace sycl { namespace access { +// CHECK-NEXT: namespace sycl { inline namespace _V1 { namespace access { // CHECK-NEXT: enum class mode : int; // CHECK-NEXT: }}} -// CHECK-NEXT: inline namespace cl { namespace sycl { namespace access { +// CHECK-NEXT: namespace sycl { inline namespace _V1 { namespace access { // CHECK-NEXT: enum class target : int; // CHECK-NEXT: }}} // This is the important line, we make sure we look through the type alias. diff --git a/clang/test/CodeGenSYCL/int_header_esimd.cpp b/clang/test/CodeGenSYCL/int_header_esimd.cpp index 9f07b716d99d1..50ec436348d84 100644 --- a/clang/test/CodeGenSYCL/int_header_esimd.cpp +++ b/clang/test/CodeGenSYCL/int_header_esimd.cpp @@ -9,7 +9,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; // -- ESIMD Lambda kernel. diff --git a/clang/test/CodeGenSYCL/int_header_kernelobjsize.cpp b/clang/test/CodeGenSYCL/int_header_kernelobjsize.cpp index a055d26b7062e..021a71752bb01 100644 --- a/clang/test/CodeGenSYCL/int_header_kernelobjsize.cpp +++ b/clang/test/CodeGenSYCL/int_header_kernelobjsize.cpp @@ -7,7 +7,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; void testA() { queue q; diff --git a/clang/test/CodeGenSYCL/int_header_spec_const.cpp b/clang/test/CodeGenSYCL/int_header_spec_const.cpp index a1f10b441aa36..48e062389dea5 100644 --- a/clang/test/CodeGenSYCL/int_header_spec_const.cpp +++ b/clang/test/CodeGenSYCL/int_header_spec_const.cpp @@ -24,22 +24,22 @@ class MySpecConstantWithinANamespace; int main() { // Create specialization constants. - cl::sycl::ext::oneapi::experimental::spec_constant i1(false); - cl::sycl::ext::oneapi::experimental::spec_constant i8(0); - cl::sycl::ext::oneapi::experimental::spec_constant ui8(0); - cl::sycl::ext::oneapi::experimental::spec_constant i16(0); - cl::sycl::ext::oneapi::experimental::spec_constant ui16(0); - cl::sycl::ext::oneapi::experimental::spec_constant i32(0); + sycl::ext::oneapi::experimental::spec_constant i1(false); + sycl::ext::oneapi::experimental::spec_constant i8(0); + sycl::ext::oneapi::experimental::spec_constant ui8(0); + sycl::ext::oneapi::experimental::spec_constant i16(0); + sycl::ext::oneapi::experimental::spec_constant ui16(0); + sycl::ext::oneapi::experimental::spec_constant i32(0); // Constant used twice, but there must be single entry in the int header, // otherwise compilation error would be issued. - cl::sycl::ext::oneapi::experimental::spec_constant i32_1(0); - cl::sycl::ext::oneapi::experimental::spec_constant ui32(0); - cl::sycl::ext::oneapi::experimental::spec_constant f32(0); - cl::sycl::ext::oneapi::experimental::spec_constant f64(0); + sycl::ext::oneapi::experimental::spec_constant i32_1(0); + sycl::ext::oneapi::experimental::spec_constant ui32(0); + sycl::ext::oneapi::experimental::spec_constant f32(0); + sycl::ext::oneapi::experimental::spec_constant f64(0); // Kernel name can be used as a spec constant name - cl::sycl::ext::oneapi::experimental::spec_constant spec1(0); + sycl::ext::oneapi::experimental::spec_constant spec1(0); // Spec constant name can be declared within a namespace - cl::sycl::ext::oneapi::experimental::spec_constant spec2(0); + sycl::ext::oneapi::experimental::spec_constant spec2(0); double val; double *ptr = &val; // to avoid "unused" warnings @@ -58,7 +58,7 @@ int main() { // CHECK: class MySpecConstantWithinANamespace; // CHECK: } - cl::sycl::kernel_single_task([=]() { + sycl::kernel_single_task([=]() { *ptr = i1.get() + // CHECK-DAG: template <> struct sycl::detail::SpecConstantInfo<::MyBoolConst> { // CHECK-DAG-NEXT: static constexpr const char* getName() { diff --git a/clang/test/CodeGenSYCL/int_header_sycl2020_spec_const.cpp b/clang/test/CodeGenSYCL/int_header_sycl2020_spec_const.cpp index 73ba8dbda6cf2..ef8d19a75a434 100644 --- a/clang/test/CodeGenSYCL/int_header_sycl2020_spec_const.cpp +++ b/clang/test/CodeGenSYCL/int_header_sycl2020_spec_const.cpp @@ -20,7 +20,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; int main() { diff --git a/clang/test/CodeGenSYCL/int_header_without_kernels.cpp b/clang/test/CodeGenSYCL/int_header_without_kernels.cpp index 854cae63aede3..7533255770b9a 100644 --- a/clang/test/CodeGenSYCL/int_header_without_kernels.cpp +++ b/clang/test/CodeGenSYCL/int_header_without_kernels.cpp @@ -7,10 +7,10 @@ #include "sycl.hpp" -using namespace cl::sycl::ext::oneapi; +using namespace sycl::ext::oneapi; -// CHECK-HEADER: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-HEADER-NEXT: namespace sycl { +// CHECK-HEADER: namespace sycl { +// CHECK-HEADER-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-HEADER-NEXT: namespace detail { // CHECK-HEADER-NEXT: namespace { // CHECK-HEADER-NEXT: class __sycl_device_global_registration { @@ -20,8 +20,8 @@ using namespace cl::sycl::ext::oneapi; // CHECK-HEADER-NEXT: __sycl_device_global_registration __sycl_device_global_registrar; // CHECK-HEADER-NEXT: } // namespace // CHECK-HEADER: } // namespace detail +// CHECK-HEADER: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-HEADER: } // namespace sycl -// CHECK-HEADER: } // __SYCL_INLINE_NAMESPACE(cl) // CHECK-FOOTER: #include diff --git a/clang/test/CodeGenSYCL/integration_footer.cpp b/clang/test/CodeGenSYCL/integration_footer.cpp index f824fbd7aa432..85d7717ecbddf 100644 --- a/clang/test/CodeGenSYCL/integration_footer.cpp +++ b/clang/test/CodeGenSYCL/integration_footer.cpp @@ -4,32 +4,36 @@ #include "Inputs/sycl.hpp" int main() { - cl::sycl::kernel_single_task([]() {}); + sycl::kernel_single_task([]() {}); } // CHECK: #include -using namespace cl::sycl; +using namespace sycl; -cl::sycl::specialization_id GlobalSpecID; +sycl::specialization_id GlobalSpecID; // CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::GlobalSpecID>() { // CHECK-NEXT: return "_Z12GlobalSpecID"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl struct Wrapper { static specialization_id WrapperSpecID; // CHECK: namespace sycl { + // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Wrapper::WrapperSpecID>() { // CHECK-NEXT: return "_ZN7Wrapper13WrapperSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail + // CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl }; @@ -39,62 +43,74 @@ struct WrapperTemplate { }; template class WrapperTemplate; // CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::WrapperTemplate::WrapperSpecID>() { // CHECK-NEXT: return "_ZN15WrapperTemplateIiE13WrapperSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl template class WrapperTemplate; // CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::WrapperTemplate::WrapperSpecID>() { // CHECK-NEXT: return "_ZN15WrapperTemplateIdE13WrapperSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl namespace Foo { specialization_id NSSpecID; // CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::NSSpecID>() { // CHECK-NEXT: return "_ZN3Foo8NSSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl inline namespace Bar { specialization_id InlineNSSpecID; // CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::InlineNSSpecID>() { // CHECK-NEXT: return "_ZN3Foo3Bar14InlineNSSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl specialization_id NSSpecID; // CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::Bar::NSSpecID>() { // CHECK-NEXT: return "_ZN3Foo3Bar8NSSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl struct Wrapper { static specialization_id WrapperSpecID; // CHECK: namespace sycl { + // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::Wrapper::WrapperSpecID>() { // CHECK-NEXT: return "_ZN3Foo3Bar7Wrapper13WrapperSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail + // CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl }; @@ -104,21 +120,25 @@ struct WrapperTemplate { }; template class WrapperTemplate; // CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::WrapperTemplate::WrapperSpecID>() { // CHECK-NEXT: return "_ZN3Foo3Bar15WrapperTemplateIiE13WrapperSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl template class WrapperTemplate; // CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::WrapperTemplate::WrapperSpecID>() { // CHECK-NEXT: return "_ZN3Foo3Bar15WrapperTemplateIdE13WrapperSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl } // namespace Bar namespace { @@ -135,12 +155,14 @@ specialization_id AnonNSSpecID; // CHECK-NEXT: } // namespace Foo // CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::Foo::__sycl_detail::__shim_[[SHIM0]]()>() { // CHECK-NEXT: return "____ZN3Foo12_GLOBAL__N_112AnonNSSpecIDE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl } // namespace @@ -179,16 +201,16 @@ auto x = HasVarTemplate::VarTempl.getDefaultValue(); // CHECK-NEXT: } // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace -// CHECK-NEXT: __SYCL_INLINE_NAMESPACE(cl) { // CHECK-NEXT: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK-NEXT: template<> // CHECK-NEXT: inline const char *get_spec_constant_symbolic_ID_impl<::__sycl_detail::__shim_[[SHIM1]]()>() { // CHECK-NEXT: return "____ZN12_GLOBAL__N_114HasVarTemplate8VarTemplIiLi2EEE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail +// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) // CHECK-NEXT: } // namespace sycl -// CHECK-NEXT: } // __SYCL_INLINE_NAMESPACE(cl) template struct GlobalWrapper { template static constexpr specialization_id sc{Value}; diff --git a/clang/test/CodeGenSYCL/integration_header.cpp b/clang/test/CodeGenSYCL/integration_header.cpp index b919191d1b574..24499bd019fb7 100644 --- a/clang/test/CodeGenSYCL/integration_header.cpp +++ b/clang/test/CodeGenSYCL/integration_header.cpp @@ -86,17 +86,17 @@ struct other_base { }; struct base { int i, j; - cl::sycl::accessor acc; + sycl::accessor acc; }; struct base2 : other_base, - cl::sycl::accessor { + sycl::accessor { int i; - cl::sycl::accessor acc; + sycl::accessor acc; }; struct captured : base, base2 { - cl::sycl::accessor acc; + sycl::accessor acc; void use() const {} }; @@ -104,13 +104,13 @@ struct captured : base, base2 { int main() { - cl::sycl::accessor acc1; - cl::sycl::accessor + sycl::accessor acc1; + sycl::accessor acc2; int i = 13; - cl::sycl::sampler smplr; + sycl::sampler smplr; struct { char c; int i; diff --git a/clang/test/CodeGenSYCL/integration_header_ppmacros.cpp b/clang/test/CodeGenSYCL/integration_header_ppmacros.cpp index 797ce54b0dbe0..0cd39fd53fee2 100644 --- a/clang/test/CodeGenSYCL/integration_header_ppmacros.cpp +++ b/clang/test/CodeGenSYCL/integration_header_ppmacros.cpp @@ -14,7 +14,7 @@ #include "Inputs/sycl.hpp" int main() { - cl::sycl::kernel_single_task([]() {}); + sycl::kernel_single_task([]() {}); } // CHECK-SYCL2020: #ifndef SYCL_LANGUAGE_VERSION // CHECK-SYCL2020-NEXT: #define SYCL_LANGUAGE_VERSION 202001 diff --git a/clang/test/CodeGenSYCL/intel-fpga-no-global-work-offset.cpp b/clang/test/CodeGenSYCL/intel-fpga-no-global-work-offset.cpp index e1a4e4f8987e1..17a9d764b08dc 100644 --- a/clang/test/CodeGenSYCL/intel-fpga-no-global-work-offset.cpp +++ b/clang/test/CodeGenSYCL/intel-fpga-no-global-work-offset.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Foo { diff --git a/clang/test/CodeGenSYCL/intel-fpga-nofusion.cpp b/clang/test/CodeGenSYCL/intel-fpga-nofusion.cpp index d7dadb49550f8..6ff75e30fcd8d 100644 --- a/clang/test/CodeGenSYCL/intel-fpga-nofusion.cpp +++ b/clang/test/CodeGenSYCL/intel-fpga-nofusion.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; void nofusion() { diff --git a/clang/test/CodeGenSYCL/intel-max-global-work-dim.cpp b/clang/test/CodeGenSYCL/intel-max-global-work-dim.cpp index 6911951235f44..c6f7baf270541 100644 --- a/clang/test/CodeGenSYCL/intel-max-global-work-dim.cpp +++ b/clang/test/CodeGenSYCL/intel-max-global-work-dim.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Foo { diff --git a/clang/test/CodeGenSYCL/intel-max-work-group-size.cpp b/clang/test/CodeGenSYCL/intel-max-work-group-size.cpp index 40b87e96e1386..97ab187974653 100644 --- a/clang/test/CodeGenSYCL/intel-max-work-group-size.cpp +++ b/clang/test/CodeGenSYCL/intel-max-work-group-size.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Foo { diff --git a/clang/test/CodeGenSYCL/invoke-function-addrspace.cpp b/clang/test/CodeGenSYCL/invoke-function-addrspace.cpp index 62ca4467f4d4a..fe9938475c7f2 100644 --- a/clang/test/CodeGenSYCL/invoke-function-addrspace.cpp +++ b/clang/test/CodeGenSYCL/invoke-function-addrspace.cpp @@ -5,7 +5,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // CHECK: define dso_local spir_func noundef i32 @{{.*}}bar10{{.*}}() diff --git a/clang/test/CodeGenSYCL/kernel-annotation.cpp b/clang/test/CodeGenSYCL/kernel-annotation.cpp index 878713796f522..1ccc6302ebe95 100644 --- a/clang/test/CodeGenSYCL/kernel-annotation.cpp +++ b/clang/test/CodeGenSYCL/kernel-annotation.cpp @@ -26,11 +26,11 @@ class Functor { // CHECK-NVPTX: nvvm.annotations = !{[[FIRST:![0-9]]], [[SECOND:![0-9]]]} // CHECK-NVPTX: [[FIRST]] = !{ptr @_ZTS7Functor, !"kernel", i32 1} -// CHECK-NVPTX: [[SECOND]] = !{ptr @_ZTSZZ4mainENKUlRN2cl4sycl7handlerEE0_clES2_E5foo_2, !"kernel", i32 1} +// CHECK-NVPTX: [[SECOND]] = !{ptr @_ZTSZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_E5foo_2, !"kernel", i32 1} // CHECK-AMDGCN: amdgcn.annotations = !{[[FIRST:![0-9]]], [[SECOND:![0-9]]]} // CHECK-AMDGCN: [[FIRST]] = !{ptr @_ZTS7Functor, !"kernel", i32 1} -// CHECK-AMDGCN: [[SECOND]] = !{ptr @_ZTSZZ4mainENKUlRN2cl4sycl7handlerEE0_clES2_E5foo_2, !"kernel", i32 1} +// CHECK-AMDGCN: [[SECOND]] = !{ptr @_ZTSZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_E5foo_2, !"kernel", i32 1} int main() { sycl::queue q; @@ -39,9 +39,9 @@ int main() { cgh.single_task(foo); }); - q.submit([&](cl::sycl::handler &cgh) { - cgh.parallel_for(cl::sycl::range<1>(1), - [=](cl::sycl::item<1> item) { + q.submit([&](sycl::handler &cgh) { + cgh.parallel_for(sycl::range<1>(1), + [=](sycl::item<1> item) { }); }); return 0; diff --git a/clang/test/CodeGenSYCL/kernel-arg-accessor-pointer.cpp b/clang/test/CodeGenSYCL/kernel-arg-accessor-pointer.cpp index 1b7aeb55f3feb..749b04705e11a 100644 --- a/clang/test/CodeGenSYCL/kernel-arg-accessor-pointer.cpp +++ b/clang/test/CodeGenSYCL/kernel-arg-accessor-pointer.cpp @@ -5,7 +5,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; diff --git a/clang/test/CodeGenSYCL/kernel-by-reference.cpp b/clang/test/CodeGenSYCL/kernel-by-reference.cpp index 4e97a12feb025..cfc2cd61c4907 100644 --- a/clang/test/CodeGenSYCL/kernel-by-reference.cpp +++ b/clang/test/CodeGenSYCL/kernel-by-reference.cpp @@ -5,7 +5,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; int simple_add(int i) { return i + 1; diff --git a/clang/test/CodeGenSYCL/kernel-device-space-arg.cpp b/clang/test/CodeGenSYCL/kernel-device-space-arg.cpp index afe0b1258aea8..a6773282220d7 100644 --- a/clang/test/CodeGenSYCL/kernel-device-space-arg.cpp +++ b/clang/test/CodeGenSYCL/kernel-device-space-arg.cpp @@ -7,7 +7,7 @@ int main() { __attribute__((opencl_global_device)) int *GLOBDEV = nullptr; __attribute__((opencl_global_host)) int *GLOBHOST = nullptr; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { __attribute__((opencl_global_device)) int *DevPtr = GLOBDEV; __attribute__((opencl_global_host)) int *HostPtr = GLOBHOST; diff --git a/clang/test/CodeGenSYCL/kernel-handler.cpp b/clang/test/CodeGenSYCL/kernel-handler.cpp index ed05c1d8a0e08..e0b0349864d05 100644 --- a/clang/test/CodeGenSYCL/kernel-handler.cpp +++ b/clang/test/CodeGenSYCL/kernel-handler.cpp @@ -7,7 +7,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; void test(int val) { queue q; @@ -24,7 +24,7 @@ void test(int val) { // ALL: define dso_local{{ spir_kernel | }}void @{{.*}}test_kernel_handler{{[^(]*}} // ALL-SAME: (i32 noundef %_arg_a, ptr addrspace(1) noundef align 1 %_arg__specialization_constants_buffer) -// ALL: %kh = alloca %"class.cl::sycl::kernel_handler", align 1 +// ALL: %kh = alloca %"class.sycl::_V1::kernel_handler", align 1 // NONATIVESUPPORT: %[[KH:[0-9]+]] = load ptr addrspace(1), ptr %_arg__specialization_constants_buffer.addr, align 8 // NONATIVESUPPORT: %[[ADDRSPACECAST:[0-9]+]] = addrspacecast ptr addrspace(1) %[[KH]] to ptr @@ -35,4 +35,4 @@ void test(int val) { // NATIVESUPPORT-NOT: call void @{{.*}}__init_specialization_constants_buffer{{.*}}(ptr noundef align 4 nonnull align 1 dereferenceable(1) %kh, ptr noundef align 4 %{{[0-9]+}}) // ALL: call{{ spir_func | }}void @{{[a-zA-Z0-9_$]+}}kernel_handler{{[a-zA-Z0-9_$]+}} -// ALL-SAME: noundef byval(%"class.cl::sycl::kernel_handler") +// ALL-SAME: noundef byval(%"class.sycl::_V1::kernel_handler") diff --git a/clang/test/CodeGenSYCL/kernel-metadata.cpp b/clang/test/CodeGenSYCL/kernel-metadata.cpp index cfe288f4ab2f4..e14aa10ebc10b 100644 --- a/clang/test/CodeGenSYCL/kernel-metadata.cpp +++ b/clang/test/CodeGenSYCL/kernel-metadata.cpp @@ -5,8 +5,8 @@ #include "Inputs/sycl.hpp" int main() { - cl::sycl::accessor accessorA; - cl::sycl::kernel_single_task( + sycl::accessor accessorA; + sycl::kernel_single_task( [=]() { accessorA.use(); }); diff --git a/clang/test/CodeGenSYCL/kernel-name.cpp b/clang/test/CodeGenSYCL/kernel-name.cpp index 1a371314a3620..446bdf2e412e2 100644 --- a/clang/test/CodeGenSYCL/kernel-name.cpp +++ b/clang/test/CodeGenSYCL/kernel-name.cpp @@ -6,7 +6,7 @@ inline namespace cl { } } -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void kernel_single_task(const Func &kernelFunc) { diff --git a/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp index 19ad226941654..4d6cf68f8a7df 100644 --- a/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp @@ -8,8 +8,8 @@ // CHECK: class kernel_A; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK: static constexpr @@ -30,7 +30,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void a_kernel(const Func &kernelFunc) { diff --git a/clang/test/CodeGenSYCL/kernel-param-acc-array.cpp b/clang/test/CodeGenSYCL/kernel-param-acc-array.cpp index 06f10212a5d61..ebe9e383e0e3e 100644 --- a/clang/test/CodeGenSYCL/kernel-param-acc-array.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-acc-array.cpp @@ -4,7 +4,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void a_kernel(const Func &kernelFunc) { @@ -42,12 +42,12 @@ int main() { // CHECK: [[LOCAL_OBJECTA:%__SYCLKernel]] = alloca %class.anon, align 4 // CHECK allocas for ranges -// CHECK: [[ACC_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MEM_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OFFSET1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::id" -// CHECK: [[ACC_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MEM_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OFFSET2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::id" +// CHECK: [[ACC_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MEM_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OFFSET1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::id" +// CHECK: [[ACC_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MEM_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OFFSET2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::id" // CHECK lambda object addrspacecast // CHECK: [[LOCAL_OBJECT:%.*]] = addrspacecast ptr [[LOCAL_OBJECTA]] to ptr addrspace(4) diff --git a/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp index 9540af6dd74f3..2d77af1a0280b 100644 --- a/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp @@ -8,8 +8,8 @@ // CHECK: class kernel_C; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK: static constexpr @@ -30,7 +30,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void a_kernel(const Func &kernelFunc) { diff --git a/clang/test/CodeGenSYCL/kernel-param-member-acc-array.cpp b/clang/test/CodeGenSYCL/kernel-param-member-acc-array.cpp index 212f916b26166..13f1d28daba5d 100644 --- a/clang/test/CodeGenSYCL/kernel-param-member-acc-array.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-member-acc-array.cpp @@ -4,7 +4,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void a_kernel(const Func &kernelFunc) { @@ -45,12 +45,12 @@ int main() { // CHECK: [[LOCAL_OBJECTA:%__SYCLKernel]] = alloca %class{{.*}}.anon, align 4 // Check allocas for ranges -// CHECK: [[ACC_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MEM_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OFFSET1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::id" -// CHECK: [[ACC_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MEM_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OFFSET2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::id" +// CHECK: [[ACC_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MEM_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OFFSET1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::id" +// CHECK: [[ACC_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MEM_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OFFSET2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::id" // Check lambda object addrspacecast // CHECK: [[LOCAL_OBJECT:%.*]] = addrspacecast ptr %__SYCLKernel to ptr addrspace(4) diff --git a/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp index 9bd433b831e4b..cbd207c3d9223 100644 --- a/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp @@ -7,8 +7,8 @@ // CHECK: class kernel_B; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK: static constexpr @@ -38,7 +38,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void a_kernel(const Func &kernelFunc) { diff --git a/clang/test/CodeGenSYCL/kernel-param-pod-array.cpp b/clang/test/CodeGenSYCL/kernel-param-pod-array.cpp index 767a5fd7f0198..f3d387430a2da 100644 --- a/clang/test/CodeGenSYCL/kernel-param-pod-array.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-pod-array.cpp @@ -4,7 +4,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void a_kernel(const Func &kernelFunc) { diff --git a/clang/test/CodeGenSYCL/kernel-simple-instrumentation.cpp b/clang/test/CodeGenSYCL/kernel-simple-instrumentation.cpp index 1aad5fdfe9623..20e95c1c1046b 100644 --- a/clang/test/CodeGenSYCL/kernel-simple-instrumentation.cpp +++ b/clang/test/CodeGenSYCL/kernel-simple-instrumentation.cpp @@ -13,8 +13,8 @@ #include "Inputs/sycl.hpp" int main() { - cl::sycl::accessor accessorA; - cl::sycl::kernel_single_task( + sycl::accessor accessorA; + sycl::kernel_single_task( [=]() { accessorA.use(); }); diff --git a/clang/test/CodeGenSYCL/kernel_functor.cpp b/clang/test/CodeGenSYCL/kernel_functor.cpp index fe97549019508..2d7859b6dcbec 100644 --- a/clang/test/CodeGenSYCL/kernel_functor.cpp +++ b/clang/test/CodeGenSYCL/kernel_functor.cpp @@ -7,8 +7,8 @@ #include "Inputs/sycl.hpp" -constexpr auto sycl_read_write = cl::sycl::access::mode::read_write; -constexpr auto sycl_global_buffer = cl::sycl::access::target::global_buffer; +constexpr auto sycl_read_write = sycl::access::mode::read_write; +constexpr auto sycl_global_buffer = sycl::access::target::global_buffer; // Case 1: // - functor class is defined in a namespace @@ -17,7 +17,7 @@ constexpr auto sycl_global_buffer = cl::sycl::access::target::global_buffer; namespace ns { class Functor2 { public: - Functor2(int X_, cl::sycl::accessor &Acc_) : + Functor2(int X_, sycl::accessor &Acc_) : X(X_), Acc(Acc_) {} @@ -27,43 +27,43 @@ namespace ns { private: int X; - cl::sycl::accessor Acc; + sycl::accessor Acc; }; } // Case 2: // - functor class is templated and defined in the translation unit scope // - the '()' operator: -// * has a parameter of type cl::sycl::id<1> (to be used in 'parallel_for'). +// * has a parameter of type sycl::id<1> (to be used in 'parallel_for'). template class TmplConstFunctor { public: - TmplConstFunctor(T X_, cl::sycl::accessor &Acc_) : + TmplConstFunctor(T X_, sycl::accessor &Acc_) : X(X_), Acc(Acc_) {} - void operator()(cl::sycl::id<1> id) const { + void operator()(sycl::id<1> id) const { Acc.use(id, X); } private: T X; - cl::sycl::accessor Acc; + sycl::accessor Acc; }; // Exercise non-templated functors in 'single_task'. int foo(int X) { int A[] = { 10 }; { - cl::sycl::queue Q; - cl::sycl::buffer Buf(A, 1); + sycl::queue Q; + sycl::buffer Buf(A, 1); - Q.submit([&](cl::sycl::handler& cgh) { + Q.submit([&](sycl::handler& cgh) { auto Acc = Buf.get_access(cgh); ns::Functor2 F(X, Acc); cgh.single_task(F); }); - Q.submit([&](cl::sycl::handler& cgh) { + Q.submit([&](sycl::handler& cgh) { auto Acc = Buf.get_access(cgh); ns::Functor2 F(X, Acc); @@ -79,20 +79,20 @@ int foo(int X) { template T bar(T X) { T A[] = { (T)10, (T)10 }; { - cl::sycl::queue Q; - cl::sycl::buffer Buf(A, ARR_LEN(A)); + sycl::queue Q; + sycl::buffer Buf(A, ARR_LEN(A)); // Spice with lambdas to make sure functors and lambdas work together. - Q.submit([&](cl::sycl::handler& cgh) { + Q.submit([&](sycl::handler& cgh) { auto Acc = Buf.template get_access(cgh); cgh.parallel_for( - cl::sycl::range<1>(ARR_LEN(A)), - [=](cl::sycl::id<1> id) { Acc.use(id, X); }); + sycl::range<1>(ARR_LEN(A)), + [=](sycl::id<1> id) { Acc.use(id, X); }); }); - Q.submit([&](cl::sycl::handler& cgh) { + Q.submit([&](sycl::handler& cgh) { auto Acc = Buf.template get_access(cgh); TmplConstFunctor F(X, Acc); - cgh.parallel_for(cl::sycl::range<1>(ARR_LEN(A)), F); + cgh.parallel_for(sycl::range<1>(ARR_LEN(A)), F); }); } T res = (T)0; @@ -110,11 +110,11 @@ int main() { const int Gold2 = 80; #ifndef __SYCL_DEVICE_ONLY__ - cl::sycl::detail::KernelInfo::getName(); + sycl::detail::KernelInfo::getName(); // NUL: KernelInfo<::ns::Functor2> // UL: KernelInfoData<'_', 'Z', 'T', 'S', 'N', '2', 'n', 's', '8', 'F', 'u', 'n', 'c', 't', 'o', 'r', '2', 'E'> // CHECK: getName() { return "_ZTSN2ns8Functor2E"; } - cl::sycl::detail::KernelInfo>::getName(); + sycl::detail::KernelInfo>::getName(); // NUL: KernelInfo<::TmplConstFunctor> // UL: KernelInfoData<'_', 'Z', 'T', 'S', '1', '6', 'T', 'm', 'p', 'l', 'C', 'o', 'n', 's', 't', 'F', 'u', 'n', 'c', 't', 'o', 'r', 'I', 'i', 'E'> // CHECK: getName() { return "_ZTS16TmplConstFunctorIiE"; } diff --git a/clang/test/CodeGenSYCL/kernelname-enum.cpp b/clang/test/CodeGenSYCL/kernelname-enum.cpp index 10181e8df947f..0321c54236195 100644 --- a/clang/test/CodeGenSYCL/kernelname-enum.cpp +++ b/clang/test/CodeGenSYCL/kernelname-enum.cpp @@ -122,49 +122,49 @@ int main() { dummy_functor_7 f8; dummy_functor_8 f9; - cl::sycl::queue q; + sycl::queue q; - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f1); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f2); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f3); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f4); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f5); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f6); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f7); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f8); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task>>([=]() {}); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task>>([=]() {}); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f9); }); diff --git a/clang/test/CodeGenSYCL/loop_fuse_device.cpp b/clang/test/CodeGenSYCL/loop_fuse_device.cpp index 6533312fdb2f6..cfac3e72e0e8c 100644 --- a/clang/test/CodeGenSYCL/loop_fuse_device.cpp +++ b/clang/test/CodeGenSYCL/loop_fuse_device.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; [[intel::loop_fuse(5)]] void foo() {} diff --git a/clang/test/CodeGenSYCL/loop_fuse_ind_device.cpp b/clang/test/CodeGenSYCL/loop_fuse_ind_device.cpp index 2ee0ab124abe2..54e312f406797 100644 --- a/clang/test/CodeGenSYCL/loop_fuse_ind_device.cpp +++ b/clang/test/CodeGenSYCL/loop_fuse_ind_device.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; [[intel::loop_fuse_independent(5)]] void foo() {} diff --git a/clang/test/CodeGenSYCL/max-concurrency.cpp b/clang/test/CodeGenSYCL/max-concurrency.cpp index a7fcc9ec18ab9..333c75f4c170d 100644 --- a/clang/test/CodeGenSYCL/max-concurrency.cpp +++ b/clang/test/CodeGenSYCL/max-concurrency.cpp @@ -45,16 +45,16 @@ // CHECK: %this1 = load ptr addrspace(4), ptr addrspace(4) [[ADDR1_CAST]], align 8 // CHECK: ret void -// CHECK: define dso_local spir_kernel void @_ZTSZZ4mainENKUlRN2cl4sycl7handlerEE_clES2_E12kernel_name5() +// CHECK: define dso_local spir_kernel void @_ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E12kernel_name5() // CHECK: entry: // CHECK: [[H1:%.*]] = alloca [[H:%.*]], align 1 // CHECK: [[H2:%.*]] = addrspacecast ptr [[H1]] to ptr addrspace(4) // CHECK: call void @llvm.lifetime.start.p0(i64 1, ptr [[H1]]) -// CHECK: call spir_func void @_ZZZ4mainENKUlRN2cl4sycl7handlerEE_clES2_ENKUlvE_clEv(ptr addrspace(4) noundef align 1 dereferenceable_or_null(1) [[H2]]) +// CHECK: call spir_func void @_ZZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_ENKUlvE_clEv(ptr addrspace(4) noundef align 1 dereferenceable_or_null(1) [[H2]]) // CHECK: call void @llvm.lifetime.end.p0(i64 1, ptr [[H1]]) // CHECK: ret void -// CHECK: define {{.*}}spir_func void @_ZZZ4mainENKUlRN2cl4sycl7handlerEE_clES2_ENKUlvE_clEv +// CHECK: define {{.*}}spir_func void @_ZZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_ENKUlvE_clEv // CHECK: entry: // CHECK: [[ADDR_1:%.*]] = alloca ptr addrspace(4), align 8 // CHECK: [[ADDR1_CAST:%.*]] = addrspacecast ptr [[ADDR_1]] to ptr addrspace(4) @@ -84,7 +84,7 @@ __attribute__((sycl_kernel)) void kernel_single_task_1(const Func &kernelFunc) { kernelFunc(); } -using namespace cl::sycl; +using namespace sycl; class Functor1 { public: diff --git a/clang/test/CodeGenSYCL/no_opaque_accessor_inheritance.cpp b/clang/test/CodeGenSYCL/no_opaque_accessor_inheritance.cpp index e9021767ee715..96f36f11c727a 100644 --- a/clang/test/CodeGenSYCL/no_opaque_accessor_inheritance.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_accessor_inheritance.cpp @@ -3,17 +3,17 @@ struct Base { int A, B; - cl::sycl::accessor AccField; + sycl::accessor AccField; }; struct Captured : Base, - cl::sycl::accessor { + sycl::accessor { int C; }; int main() { Captured Obj; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { Obj.use(); }); @@ -21,8 +21,8 @@ int main() { } // Check kernel parameters -// CHECK: %[[RANGE_TYPE:"struct.*cl::sycl::range"]] -// CHECK: %[[ID_TYPE:"struct.*cl::sycl::id"]] +// CHECK: %[[RANGE_TYPE:"struct.sycl::_V1::range"]] +// CHECK: %[[ID_TYPE:"struct.sycl::_V1::id"]] // CHECK: define {{.*}}spir_kernel void @_ZTSZ4mainE6kernel // CHECK-SAME: i32 noundef [[ARG_A:%[a-zA-Z0-9_]+]], // CHECK-SAME: i32 noundef [[ARG_B:%[a-zA-Z0-9_]+]], @@ -72,12 +72,12 @@ int main() { // Check accessors initialization // CHECK: [[ACC_FIELD:%[a-zA-Z0-9_]+]] = getelementptr inbounds %struct{{.*}}Base, %struct{{.*}}Base addrspace(4)* [[BITCAST]], i32 0, i32 2 // Default constructor call -// CHECK: call spir_func void @_ZN2cl4sycl8accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC1Ev(%"class{{.*}}cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[ACC_FIELD]]) +// CHECK: call spir_func void @_ZN4sycl3_V18accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC1Ev(%"class.sycl::_V1::accessor" addrspace(4)* {{[^,]*}} [[ACC_FIELD]]) // CHECK: [[BITCAST1:%[a-zA-Z0-9_]+]] = bitcast %struct{{.*}}Captured addrspace(4)* [[GEP]] to i8 addrspace(4)* // CHECK: [[GEP1:%[a-zA-Z0-9_]+]] = getelementptr inbounds i8, i8 addrspace(4)* [[BITCAST1]], i64 20 -// CHECK: [[BITCAST2:%[a-zA-Z0-9_]+]] = bitcast i8 addrspace(4)* [[GEP1]] to %"class{{.*}}cl::sycl::accessor" addrspace(4)* +// CHECK: [[BITCAST2:%[a-zA-Z0-9_]+]] = bitcast i8 addrspace(4)* [[GEP1]] to %"class.sycl::_V1::accessor" addrspace(4)* // Default constructor call -// CHECK: call spir_func void @_ZN2cl4sycl8accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC2Ev(%"class{{.*}}cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[BITCAST2]]) +// CHECK: call spir_func void @_ZN4sycl3_V18accessorIcLi1ELNS0_6access4modeE1024ELNS2_6targetE2014ELNS2_11placeholderE0ENS0_3ext6oneapi22accessor_property_listIJEEEEC2Ev(%"class.sycl::_V1::accessor" addrspace(4)* {{[^,]*}} [[BITCAST2]]) // CHECK C field initialization // CHECK: [[FIELD_C:%[a-zA-Z0-9_]+]] = getelementptr inbounds %struct{{.*}}Captured, %struct{{.*}}Captured addrspace(4)* [[GEP]], i32 0, i32 2 @@ -89,9 +89,9 @@ int main() { // CHECK: [[BITCAST3:%[a-zA-Z0-9_]+]] = bitcast %struct{{.*}}Captured addrspace(4)* [[GEP2]] to %struct{{.*}}Base addrspace(4)* // CHECK: [[ACC1_FIELD:%[a-zA-Z0-9_]+]] = getelementptr inbounds %struct{{.*}}Base, %struct{{.*}}Base addrspace(4)* [[BITCAST3]], i32 0, i32 2 // CHECK: [[ACC1_DATA_LOAD:%[a-zA-Z0-9_]+]] = load i8 addrspace(1)*, i8 addrspace(1)* addrspace(4)* [[ACC1_DATA]].addr.ascast -// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class{{.*}}cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[ACC1_FIELD]], i8 addrspace(1)* noundef [[ACC1_DATA_LOAD]] +// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class.sycl::_V1::accessor" addrspace(4)* {{[^,]*}} [[ACC1_FIELD]], i8 addrspace(1)* noundef [[ACC1_DATA_LOAD]] // // CHECK: [[GEP3:%[a-zA-Z0-9_]+]] = getelementptr inbounds %class{{.*}}.anon, %class{{.*}}.anon addrspace(4)* [[KERNEL_OBJ]], i32 0, i32 0 // CHECK: [[ACC2_DATA_LOAD:%[a-zA-Z0-9_]+]] = load i8 addrspace(1)*, i8 addrspace(1)* addrspace(4)* [[ACC2_DATA]].addr.ascast -// CHECK: [[BITCAST4:%[a-zA-Z0-9_]+]] = bitcast %struct{{.*}}Captured addrspace(4)* [[GEP3]] to %"class{{.*}}cl::sycl::accessor" addrspace(4)* -// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class{{.*}}cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[BITCAST4]], i8 addrspace(1)* noundef [[ACC2_DATA_LOAD]] +// CHECK: [[BITCAST4:%[a-zA-Z0-9_]+]] = bitcast %struct{{.*}}Captured addrspace(4)* [[GEP3]] to %"class.sycl::_V1::accessor" addrspace(4)* +// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class.sycl::_V1::accessor" addrspace(4)* {{[^,]*}} [[BITCAST4]], i8 addrspace(1)* noundef [[ACC2_DATA_LOAD]] diff --git a/clang/test/CodeGenSYCL/no_opaque_basic-kernel-wrapper.cpp b/clang/test/CodeGenSYCL/no_opaque_basic-kernel-wrapper.cpp index 290c15f2a8887..d207aebfe86b8 100644 --- a/clang/test/CodeGenSYCL/no_opaque_basic-kernel-wrapper.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_basic-kernel-wrapper.cpp @@ -11,7 +11,7 @@ __attribute__((sycl_kernel)) void kernel(const Func &kernelFunc) { } int main() { - cl::sycl::accessor accessorA; + sycl::accessor accessorA; kernel( [=]() { accessorA.use(); @@ -21,21 +21,21 @@ int main() { // CHECK: define {{.*}}spir_kernel void @{{.*}}kernel_function // CHECK-SAME: i32 addrspace(1)* noundef align 4 [[MEM_ARG:%[a-zA-Z0-9_]+]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[ACC_RANGE:%[a-zA-Z0-9_]+1]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[MEM_RANGE:%[a-zA-Z0-9_]+2]], -// CHECK-SAME: %"struct.cl::sycl::id"* noundef byval{{.*}}align 4 [[OFFSET:%[a-zA-Z0-9_]+]]) +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[ACC_RANGE:%[a-zA-Z0-9_]+1]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[MEM_RANGE:%[a-zA-Z0-9_]+2]], +// CHECK-SAME: %"struct.sycl::_V1::id"* noundef byval{{.*}}align 4 [[OFFSET:%[a-zA-Z0-9_]+]]) // Check alloca for pointer argument // CHECK: [[MEM_ARG]].addr = alloca i32 addrspace(1)* // Check lambda object alloca // CHECK: [[ANONALLOCA:%[a-zA-Z0-9_]+]] = alloca %class.anon // Check allocas for ranges -// CHECK: [[ARANGEA:%agg.tmp.*]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MRANGEA:%agg.tmp.*]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OIDA:%agg.tmp.*]] = alloca %"struct.cl::sycl::id" +// CHECK: [[ARANGEA:%agg.tmp.*]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MRANGEA:%agg.tmp.*]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OIDA:%agg.tmp.*]] = alloca %"struct.sycl::_V1::id" // CHECK: [[ANON:%[a-zA-Z0-9_.]+]] = addrspacecast %class.anon* [[ANONALLOCA]] to %class.anon addrspace(4)* -// CHECK: [[ARANGET:%agg.tmp.*]] = addrspacecast %"struct.cl::sycl::range"* [[ARANGEA]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[MRANGET:%agg.tmp.*]] = addrspacecast %"struct.cl::sycl::range"* [[MRANGEA]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[OIDT:%agg.tmp.*]] = addrspacecast %"struct.cl::sycl::id"* [[OIDA]] to %"struct.cl::sycl::id" addrspace(4)* +// CHECK: [[ARANGET:%agg.tmp.*]] = addrspacecast %"struct.sycl::_V1::range"* [[ARANGEA]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[MRANGET:%agg.tmp.*]] = addrspacecast %"struct.sycl::_V1::range"* [[MRANGEA]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[OIDT:%agg.tmp.*]] = addrspacecast %"struct.sycl::_V1::id"* [[OIDA]] to %"struct.sycl::_V1::id" addrspace(4)* // // Check store of kernel pointer argument to alloca // CHECK: store i32 addrspace(1)* [[MEM_ARG]], i32 addrspace(1)* addrspace(4)* [[MEM_ARG]].addr.ascast, align 8 @@ -50,14 +50,14 @@ int main() { // CHECK: [[MEM_LOAD:%[a-zA-Z0-9_]+]] = load i32 addrspace(1)*, i32 addrspace(1)* addrspace(4)* [[MEM_ARG]].addr.ascast // Check accessor __init method call -// CHECK: [[ARANGE:%agg.tmp.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[ARANGET]] to %"struct.cl::sycl::range"* -// CHECK: [[MRANGE:%agg.tmp.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[MRANGET]] to %"struct.cl::sycl::range"* -// CHECK: [[OID:%agg.tmp.*]] = addrspacecast %"struct.cl::sycl::id" addrspace(4)* [[OIDT]] to %"struct.cl::sycl::id"* -// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class.cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[ACCESSOR]], +// CHECK: [[ARANGE:%agg.tmp.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[ARANGET]] to %"struct.sycl::_V1::range"* +// CHECK: [[MRANGE:%agg.tmp.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[MRANGET]] to %"struct.sycl::_V1::range"* +// CHECK: [[OID:%agg.tmp.*]] = addrspacecast %"struct.sycl::_V1::id" addrspace(4)* [[OIDT]] to %"struct.sycl::_V1::id"* +// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class.sycl::_V1::accessor" addrspace(4)* {{[^,]*}} [[ACCESSOR]], // CHECK-SAME: i32 addrspace(1)* noundef [[MEM_LOAD]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval({{.*}}) align 4 [[ARANGE]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval({{.*}}) align 4 [[MRANGE]], -// CHECK-SAME: %"struct.cl::sycl::id"* noundef byval({{.*}}) align 4 [[OID]]) +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[ARANGE]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[MRANGE]], +// CHECK-SAME: %"struct.sycl::_V1::id"* noundef byval({{.*}}) align 4 [[OID]]) // Check lambda "()" operator call // CHECK: call spir_func void @{{.*}}(%class.anon addrspace(4)* {{[^,]*}}) diff --git a/clang/test/CodeGenSYCL/no_opaque_check-direct-attribute-propagation.cpp b/clang/test/CodeGenSYCL/no_opaque_check-direct-attribute-propagation.cpp index ce2b1fa81c1d2..5790ff5f7a9f2 100644 --- a/clang/test/CodeGenSYCL/no_opaque_check-direct-attribute-propagation.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_check-direct-attribute-propagation.cpp @@ -7,7 +7,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Foo { diff --git a/clang/test/CodeGenSYCL/no_opaque_const-wg-init.cpp b/clang/test/CodeGenSYCL/no_opaque_const-wg-init.cpp index 5af3be6aa9979..b222876cc835c 100644 --- a/clang/test/CodeGenSYCL/no_opaque_const-wg-init.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_const-wg-init.cpp @@ -5,13 +5,13 @@ template __attribute__((sycl_kernel)) void kernel_parallel_for_work_group(const KernelType &KernelFunc) { - cl::sycl::group<1> G; + sycl::group<1> G; KernelFunc(G); } int main() { - kernel_parallel_for_work_group([=](cl::sycl::group<1> G) { + kernel_parallel_for_work_group([=](sycl::group<1> G) { const int WG_CONST = 10; }); // CHECK: store i32 10, i32 addrspace(4)* addrspacecast (i32 addrspace(3)* @{{.*}}WG_CONST{{.*}} to i32 addrspace(4)*) diff --git a/clang/test/CodeGenSYCL/no_opaque_device_global.cpp b/clang/test/CodeGenSYCL/no_opaque_device_global.cpp index da7fa9c1d4470..2407e6bd95343 100644 --- a/clang/test/CodeGenSYCL/no_opaque_device_global.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_device_global.cpp @@ -6,7 +6,7 @@ // unique string is generated. using namespace sycl::ext::oneapi; -using namespace cl::sycl; +using namespace sycl; queue q; device_global A; @@ -16,16 +16,16 @@ struct Foo { static device_global C; }; device_global Foo::C; -// CHECK: @A = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[A_ATTRS:[0-9]+]] -// CHECK: @_ZL1B = internal addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[B_ATTRS:[0-9]+]] -// CHECK: @_ZN3Foo1CE = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[C_ATTRS:[0-9]+]] +// CHECK: @A = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[A_ATTRS:[0-9]+]] +// CHECK: @_ZL1B = internal addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[B_ATTRS:[0-9]+]] +// CHECK: @_ZN3Foo1CE = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[C_ATTRS:[0-9]+]] device_global same_name; namespace NS { device_global same_name; } -// CHECK: @same_name = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_ATTRS:[0-9]+]] -// CHECK: @_ZN2NS9same_nameE = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_NS_ATTRS:[0-9]+]] +// CHECK: @same_name = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_ATTRS:[0-9]+]] +// CHECK: @_ZN2NS9same_nameE = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_NS_ATTRS:[0-9]+]] // decorated with only global_variable_allowed attribute template @@ -47,18 +47,18 @@ only_global_var_allowed no_device_global; inline namespace Bar { device_global InlineNS; } -// CHECK: @_ZN3Bar8InlineNSE = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global.0" zeroinitializer, align 8 #[[BAR_INLINENS_ATTRS:[0-9]+]] +// CHECK: @_ZN3Bar8InlineNSE = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global.0" zeroinitializer, align 8 #[[BAR_INLINENS_ATTRS:[0-9]+]] template struct TS { public: static device_global d; }; template <> device_global TS::d{}; -// CHECK: @_ZN2TSIiE1dE = addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[TEMPLATED_WRAPPER_ATTRS:[0-9]+]] +// CHECK: @_ZN2TSIiE1dE = addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[TEMPLATED_WRAPPER_ATTRS:[0-9]+]] template device_global templ_dev_global; -// CHECK: @[[TEMPL_DEV_GLOB:[a-zA-Z0-9_]+]] = linkonce_odr addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, comdat, align 8 #[[TEMPL_DEV_GLOB_ATTRS:[0-9]+]] +// CHECK: @[[TEMPL_DEV_GLOB:[a-zA-Z0-9_]+]] = linkonce_odr addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, comdat, align 8 #[[TEMPL_DEV_GLOB_ATTRS:[0-9]+]] void foo() { q.submit([&](handler &h) { @@ -79,7 +79,7 @@ void foo() { namespace { device_global same_name; } -// CHECK: @_ZN12_GLOBAL__N_19same_nameE = internal addrspace(1) global %"class.cl::sycl::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_ANON_NS_ATTRS:[0-9]+]] +// CHECK: @_ZN12_GLOBAL__N_19same_nameE = internal addrspace(1) global %"class.sycl::_V1::ext::oneapi::device_global" zeroinitializer, align 8 #[[SAME_NAME_ANON_NS_ATTRS:[0-9]+]] namespace { void bar() { @@ -89,8 +89,8 @@ void bar() { } } // namespace -// CHECK: @llvm.global_ctors = appending global [2 x { i32, void ()*, i8 addrspace(4)* }] [{ i32, void ()*, i8 addrspace(4)* } { i32 65535, void ()* @__cxx_global_var_init{{.*}}, i8 addrspace(4)* addrspacecast (i8 addrspace(1)* bitcast (%"class.cl::sycl::ext::oneapi::device_global" addrspace(1)* @[[TEMPL_DEV_GLOB]] to i8 addrspace(1)*) to i8 addrspace(4)*) }, { i32, void ()*, i8 addrspace(4)* } { i32 65535, void ()* @_GLOBAL__sub_I_no_opaque_device_global.cpp, i8 addrspace(4)* null }] -// CHECK: @llvm.used = appending global [1 x i8 addrspace(4)*] [i8 addrspace(4)* addrspacecast (i8 addrspace(1)* bitcast (%"class.cl::sycl::ext::oneapi::device_global" addrspace(1)* @[[TEMPL_DEV_GLOB]] to i8 addrspace(1)*) to i8 addrspace(4)*)], section "llvm.metadata" +// CHECK: @llvm.global_ctors = appending global [2 x { i32, void ()*, i8 addrspace(4)* }] [{ i32, void ()*, i8 addrspace(4)* } { i32 65535, void ()* @__cxx_global_var_init{{.*}}, i8 addrspace(4)* addrspacecast (i8 addrspace(1)* bitcast (%"class.sycl::_V1::ext::oneapi::device_global" addrspace(1)* @[[TEMPL_DEV_GLOB]] to i8 addrspace(1)*) to i8 addrspace(4)*) }, { i32, void ()*, i8 addrspace(4)* } { i32 65535, void ()* @_GLOBAL__sub_I_no_opaque_device_global.cpp, i8 addrspace(4)* null }] +// CHECK: @llvm.used = appending global [1 x i8 addrspace(4)*] [i8 addrspace(4)* addrspacecast (i8 addrspace(1)* bitcast (%"class.sycl::_V1::ext::oneapi::device_global" addrspace(1)* @[[TEMPL_DEV_GLOB]] to i8 addrspace(1)*) to i8 addrspace(4)*)], section "llvm.metadata" // CHECK: attributes #[[A_ATTRS]] = { "sycl-unique-id"="_Z1A" } // CHECK: attributes #[[B_ATTRS]] = { "sycl-unique-id"="THE_PREFIX____ZL1B" } diff --git a/clang/test/CodeGenSYCL/no_opaque_esimd-accessor-ptr-md.cpp b/clang/test/CodeGenSYCL/no_opaque_esimd-accessor-ptr-md.cpp index bb7b8203fa9ab..00b8efde4be55 100644 --- a/clang/test/CodeGenSYCL/no_opaque_esimd-accessor-ptr-md.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_esimd-accessor-ptr-md.cpp @@ -10,13 +10,13 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; void test(int val) { queue q; q.submit([&](handler &h) { - cl::sycl::accessor accessorA; - cl::sycl::accessor accessorB; + sycl::accessor accessorA; + sycl::accessor accessorB; h.single_task( [=]() __attribute__((sycl_explicit_simd)) { @@ -26,11 +26,11 @@ void test(int val) { }); // --- Name - // CHECK-LABEL: define {{.*}}spir_kernel void @_ZTSZZ4testiENKUlRN2cl4sycl7handlerEE_clES2_E12esimd_kernel( + // CHECK-LABEL: define {{.*}}spir_kernel void @_ZTSZZ4testiENKUlRN4sycl3_V17handlerEE_clES2_E12esimd_kernel( // --- Attributes // CHECK: {{.*}} !kernel_arg_accessor_ptr ![[ACC_PTR_ATTR:[0-9]+]] !sycl_explicit_simd !{{[0-9]+}} {{.*}}{ // --- init_esimd call is expected instead of __init: - // CHECK: call spir_func void @{{.*}}__init_esimd{{.*}}(%"{{.*}}sycl::accessor" addrspace(4)* {{[^,]*}} %{{[a-zA-Z0-9_]+}}, i32 addrspace(1)* noundef %{{[0-9]+}}) + // CHECK: call spir_func void @{{.*}}__init_esimd{{.*}}(%"{{.*}}sycl::_V1::accessor" addrspace(4)* {{[^,]*}} %{{[a-zA-Z0-9_]+}}, i32 addrspace(1)* noundef %{{[0-9]+}}) // CHECK-LABEL: } // CHECK: ![[ACC_PTR_ATTR]] = !{i1 true, i1 false, i1 true} } diff --git a/clang/test/CodeGenSYCL/no_opaque_image_accessor.cpp b/clang/test/CodeGenSYCL/no_opaque_image_accessor.cpp index 48e3d79f62120..b181703395863 100644 --- a/clang/test/CodeGenSYCL/no_opaque_image_accessor.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_image_accessor.cpp @@ -8,27 +8,27 @@ // // CHECK-1DRO: %opencl.image1d_ro_t = type opaque // CHECK-1DRO: define {{.*}}spir_kernel void @{{.*}}(%opencl.image1d_ro_t addrspace(1)* [[IMAGE_ARG:%[a-zA-Z0-9_]+]]) -// CHECK-1DRO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}cl::sycl::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image1d_ro_t addrspace(1)* %{{[0-9]+}}) +// CHECK-1DRO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}sycl::_V1::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image1d_ro_t addrspace(1)* %{{[0-9]+}}) // // CHECK-2DRO: %opencl.image2d_ro_t = type opaque // CHECK-2DRO: define {{.*}}spir_kernel void @{{.*}}(%opencl.image2d_ro_t addrspace(1)* [[IMAGE_ARG:%[a-zA-Z0-9_]+]]) -// CHECK-2DRO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}cl::sycl::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image2d_ro_t addrspace(1)* %{{[0-9]+}}) +// CHECK-2DRO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}sycl::_V1::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image2d_ro_t addrspace(1)* %{{[0-9]+}}) // // CHECK-3DRO: %opencl.image3d_ro_t = type opaque // CHECK-3DRO: define {{.*}}spir_kernel void @{{.*}}(%opencl.image3d_ro_t addrspace(1)* [[IMAGE_ARG:%[a-zA-Z0-9_]+]]) -// CHECK-3DRO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}cl::sycl::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image3d_ro_t addrspace(1)* %{{[0-9]+}}) +// CHECK-3DRO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}sycl::_V1::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image3d_ro_t addrspace(1)* %{{[0-9]+}}) // // CHECK-1DWO: %opencl.image1d_wo_t = type opaque // CHECK-1DWO: define {{.*}}spir_kernel void @{{.*}}(%opencl.image1d_wo_t addrspace(1)* [[IMAGE_ARG:%[a-zA-Z0-9_]+]]) -// CHECK-1DWO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}cl::sycl::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image1d_wo_t addrspace(1)* %{{[0-9]+}}) +// CHECK-1DWO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}sycl::_V1::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image1d_wo_t addrspace(1)* %{{[0-9]+}}) // // CHECK-2DWO: %opencl.image2d_wo_t = type opaque // CHECK-2DWO: define {{.*}}spir_kernel void @{{.*}}(%opencl.image2d_wo_t addrspace(1)* [[IMAGE_ARG:%[a-zA-Z0-9_]+]]) -// CHECK-2DWO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}cl::sycl::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image2d_wo_t addrspace(1)* %{{[0-9]+}}) +// CHECK-2DWO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}sycl::_V1::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image2d_wo_t addrspace(1)* %{{[0-9]+}}) // // CHECK-3DWO: %opencl.image3d_wo_t = type opaque // CHECK-3DWO: define {{.*}}spir_kernel void @{{.*}}(%opencl.image3d_wo_t addrspace(1)* [[IMAGE_ARG:%[a-zA-Z0-9_]+]]) -// CHECK-3DWO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}cl::sycl::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image3d_wo_t addrspace(1)* %{{[0-9]+}}) +// CHECK-3DWO: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}sycl::_V1::accessor{{.*}} %{{[a-zA-Z]+}}, %opencl.image3d_wo_t addrspace(1)* %{{[0-9]+}}) // // TODO: Add tests for the image_array opencl datatype support. #include "Inputs/sycl.hpp" @@ -36,10 +36,10 @@ int main() { { - cl::sycl::image<1> MyImage1d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<1>(3)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage1d.get_access(cgh); + sycl::image<1> MyImage1d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<1>(3)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage1d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -48,10 +48,10 @@ int main() { } { - cl::sycl::image<2> MyImage2d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<2>(3, 2)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage2d.get_access(cgh); + sycl::image<2> MyImage2d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<2>(3, 2)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage2d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -60,10 +60,10 @@ int main() { } { - cl::sycl::image<3> MyImage3d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<3>(3, 2, 4)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage3d.get_access(cgh); + sycl::image<3> MyImage3d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<3>(3, 2, 4)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage3d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -72,10 +72,10 @@ int main() { } { - cl::sycl::image<1> MyImage1d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<1>(3)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage1d.get_access(cgh); + sycl::image<1> MyImage1d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<1>(3)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage1d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -84,10 +84,10 @@ int main() { } { - cl::sycl::image<2> MyImage2d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<2>(3, 2)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage2d.get_access(cgh); + sycl::image<2> MyImage2d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<2>(3, 2)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage2d.get_access(cgh); cgh.single_task([=]() { Acc.use(); @@ -96,10 +96,10 @@ int main() { } { - cl::sycl::image<3> MyImage3d(cl::sycl::image_channel_order::rgbx, cl::sycl::image_channel_type::unorm_short_565, cl::sycl::range<3>(3, 2, 4)); - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &cgh) { - auto Acc = MyImage3d.get_access(cgh); + sycl::image<3> MyImage3d(sycl::image_channel_order::rgbx, sycl::image_channel_type::unorm_short_565, sycl::range<3>(3, 2, 4)); + sycl::queue Q; + Q.submit([&](sycl::handler &cgh) { + auto Acc = MyImage3d.get_access(cgh); cgh.single_task([=]() { Acc.use(); diff --git a/clang/test/CodeGenSYCL/no_opaque_inheritance.cpp b/clang/test/CodeGenSYCL/no_opaque_inheritance.cpp index 3245c68aeb705..a513da161b878 100644 --- a/clang/test/CodeGenSYCL/no_opaque_inheritance.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_inheritance.cpp @@ -29,9 +29,9 @@ struct derived : base, second_base { }; int main() { - cl::sycl::queue q; + sycl::queue q; - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { derived f{}; cgh.single_task(f); }); diff --git a/clang/test/CodeGenSYCL/no_opaque_invoke-function-addrspace.cpp b/clang/test/CodeGenSYCL/no_opaque_invoke-function-addrspace.cpp index 732aa93c0cdc9..0aa779c769efd 100644 --- a/clang/test/CodeGenSYCL/no_opaque_invoke-function-addrspace.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_invoke-function-addrspace.cpp @@ -5,7 +5,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // CHECK: define dso_local spir_func noundef i32 @{{.*}}bar10{{.*}}() diff --git a/clang/test/CodeGenSYCL/no_opaque_kernel-arg-accessor-pointer.cpp b/clang/test/CodeGenSYCL/no_opaque_kernel-arg-accessor-pointer.cpp index 434a6499ba586..74959c2eddfcc 100644 --- a/clang/test/CodeGenSYCL/no_opaque_kernel-arg-accessor-pointer.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_kernel-arg-accessor-pointer.cpp @@ -5,7 +5,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; @@ -93,21 +93,21 @@ int main() { // Check kernel_A parameters // CHECK: define {{.*}}spir_kernel void @{{.*}}kernel_A // CHECK-SAME: i32 addrspace(1)* noundef align 4 [[MEM_ARG1:%[a-zA-Z0-9_]+]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], -// CHECK-SAME: %"struct.cl::sycl::id"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], +// CHECK-SAME: %"struct.sycl::_V1::id"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]], // CHECK-SAME: i32 addrspace(1)* noundef align 4 [[MEM_ARG2:%[a-zA-Z0-9_]+4]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[ACC_RANGE2:%[a-zA-Z0-9_]+6]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[MEM_RANGE2:%[a-zA-Z0-9_]+7]], -// CHECK-SAME: %"struct.cl::sycl::id"* noundef byval{{.*}}align 4 [[OFFSET2:%[a-zA-Z0-9_]+8]]) +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[ACC_RANGE2:%[a-zA-Z0-9_]+6]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[MEM_RANGE2:%[a-zA-Z0-9_]+7]], +// CHECK-SAME: %"struct.sycl::_V1::id"* noundef byval{{.*}}align 4 [[OFFSET2:%[a-zA-Z0-9_]+8]]) // CHECK-SAME: !kernel_arg_runtime_aligned ![[#RTALIGNED1:]] // Check kernel_readOnlyAcc parameters // CHECK: define {{.*}}spir_kernel void @{{.*}}kernel_readOnlyAcc // CHECK-SAME: i32 addrspace(1)* noundef readonly align 4 [[MEM_ARG1:%[a-zA-Z0-9_]+]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], -// CHECK-SAME: %"struct.cl::sycl::id"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]] +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], +// CHECK-SAME: %"struct.sycl::_V1::id"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]] // CHECK-SAME: !kernel_arg_runtime_aligned ![[#RTALIGNED2:]] // Check kernel_B parameters @@ -127,17 +127,17 @@ int main() { // CHECK: define {{.*}}spir_kernel void @{{.*}}localAccessor // CHECK-SAME: float addrspace(1)* noundef align 4 [[MEM_ARG1:%[a-zA-Z0-9_]+]], -// CHECK-SAME: %"struct.cl::sycl::range.5"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], -// CHECK-SAME: %"struct.cl::sycl::range.5"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], -// CHECK-SAME: %"struct.cl::sycl::id.6"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]] +// CHECK-SAME: %"struct.sycl::_V1::range.5"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], +// CHECK-SAME: %"struct.sycl::_V1::range.5"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], +// CHECK-SAME: %"struct.sycl::_V1::id.6"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]] // CHECK-SAME: !kernel_arg_runtime_aligned ![[#RTALIGNED2]] // Check kernel_acc_raw_ptr parameters // CHECK: define {{.*}}spir_kernel void @{{.*}}kernel_acc_raw_ptr // CHECK-SAME: i32 addrspace(1)* noundef readonly align 4 [[MEM_ARG1:%[a-zA-Z0-9_]+]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], -// CHECK-SAME: %"struct.cl::sycl::id"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]] +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], +// CHECK-SAME: %"struct.sycl::_V1::id"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]] // CHECK-SAME: i32 addrspace(1)* noundef align 4 [[MEM_ARG1:%[a-zA-Z0-9_]+]] // CHECK-SAME: !kernel_arg_runtime_aligned ![[#RTALIGNED3:]] diff --git a/clang/test/CodeGenSYCL/no_opaque_kernel-device-space-arg.cpp b/clang/test/CodeGenSYCL/no_opaque_kernel-device-space-arg.cpp index 1e702a56a0607..1c95b3f55ebec 100644 --- a/clang/test/CodeGenSYCL/no_opaque_kernel-device-space-arg.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_kernel-device-space-arg.cpp @@ -7,7 +7,7 @@ int main() { __attribute__((opencl_global_device)) int *GLOBDEV = nullptr; __attribute__((opencl_global_host)) int *GLOBHOST = nullptr; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { __attribute__((opencl_global_device)) int *DevPtr = GLOBDEV; __attribute__((opencl_global_host)) int *HostPtr = GLOBHOST; diff --git a/clang/test/CodeGenSYCL/no_opaque_kernel-handler.cpp b/clang/test/CodeGenSYCL/no_opaque_kernel-handler.cpp index b54eb252aab8f..97828a7d8e2fc 100644 --- a/clang/test/CodeGenSYCL/no_opaque_kernel-handler.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_kernel-handler.cpp @@ -7,7 +7,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; void test(int val) { queue q; @@ -24,15 +24,15 @@ void test(int val) { // ALL: define dso_local{{ spir_kernel | }}void @{{.*}}test_kernel_handler{{[^(]*}} // ALL-SAME: (i32 noundef %_arg_a, i8 addrspace(1)* noundef align 1 %_arg__specialization_constants_buffer) -// ALL: %kh = alloca %"class.cl::sycl::kernel_handler", align 1 +// ALL: %kh = alloca %"class.sycl::_V1::kernel_handler", align 1 // NONATIVESUPPORT: %[[KH:[0-9]+]] = load i8 addrspace(1)*, i8 addrspace(1)** %_arg__specialization_constants_buffer.addr, align 8 // NONATIVESUPPORT: %[[ADDRSPACECAST:[0-9]+]] = addrspacecast i8 addrspace(1)* %[[KH]] to i8* -// NONATIVESUPPORT: call void @{{.*}}__init_specialization_constants_buffer{{.*}}(%"class.cl::sycl::kernel_handler"* noundef nonnull align 1 dereferenceable(1) %kh, i8* noundef %[[ADDRSPACECAST]]) +// NONATIVESUPPORT: call void @{{.*}}__init_specialization_constants_buffer{{.*}}(%"class.sycl::_V1::kernel_handler"* noundef nonnull align 1 dereferenceable(1) %kh, i8* noundef %[[ADDRSPACECAST]]) // NATIVESUPPORT-NOT: load i8 addrspace(1)*, i8 addrspace(1)** %_arg__specialization_constants_buffer.addr, align 8 // NATIVESUPPORT-NOT: addrspacecast i8 addrspace(1)* %{{[0-9]+}} to i8* -// NATIVESUPPORT-NOT: call void @{{.*}}__init_specialization_constants_buffer{{.*}}(%"class.cl::sycl::kernel_handler"* noundef align 4 nonnull align 1 dereferenceable(1) %kh, i8* noundef align 4 %{{[0-9]+}}) +// NATIVESUPPORT-NOT: call void @{{.*}}__init_specialization_constants_buffer{{.*}}(%"class.sycl::_V1::kernel_handler"* noundef align 4 nonnull align 1 dereferenceable(1) %kh, i8* noundef align 4 %{{[0-9]+}}) // ALL: call{{ spir_func | }}void @{{[a-zA-Z0-9_$]+}}kernel_handler{{[a-zA-Z0-9_$]+}} -// ALL-SAME: noundef byval(%"class.cl::sycl::kernel_handler") +// ALL-SAME: noundef byval(%"class.sycl::_V1::kernel_handler") diff --git a/clang/test/CodeGenSYCL/no_opaque_kernel-param-acc-array.cpp b/clang/test/CodeGenSYCL/no_opaque_kernel-param-acc-array.cpp index 37f57c2429ed9..10ed0a1f268f7 100644 --- a/clang/test/CodeGenSYCL/no_opaque_kernel-param-acc-array.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_kernel-param-acc-array.cpp @@ -4,7 +4,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void a_kernel(const Func &kernelFunc) { @@ -26,13 +26,13 @@ int main() { // Check kernel_A parameters // CHECK: define {{.*}}spir_kernel void @{{.*}}kernel_A // CHECK-SAME: i32 addrspace(1)* noundef align 4 [[MEM_ARG1:%[a-zA-Z0-9_]+]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], -// CHECK-SAME: %"struct.cl::sycl::id"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], +// CHECK-SAME: %"struct.sycl::_V1::id"* noundef byval{{.*}}align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]], // CHECK-SAME: i32 addrspace(1)* noundef align 4 [[MEM_ARG2:%[a-zA-Z0-9_]+4]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[ACC_RANGE2:%[a-zA-Z0-9_]+6]], -// CHECK-SAME: %"struct.cl::sycl::range"* noundef byval{{.*}}align 4 [[MEM_RANGE2:%[a-zA-Z0-9_]+7]], -// CHECK-SAME: %"struct.cl::sycl::id"* noundef byval{{.*}}align 4 [[OFFSET2:%[a-zA-Z0-9_]+8]]) +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[ACC_RANGE2:%[a-zA-Z0-9_]+6]], +// CHECK-SAME: %"struct.sycl::_V1::range"* noundef byval{{.*}}align 4 [[MEM_RANGE2:%[a-zA-Z0-9_]+7]], +// CHECK-SAME: %"struct.sycl::_V1::id"* noundef byval{{.*}}align 4 [[OFFSET2:%[a-zA-Z0-9_]+8]]) // CHECK alloca for pointer arguments // CHECK: [[MEM_ARG1:%[a-zA-Z0-9_.]+]] = alloca i32 addrspace(1)*, align 8 @@ -42,23 +42,23 @@ int main() { // CHECK: [[LOCAL_OBJECTA:%__SYCLKernel]] = alloca %class.anon, align 4 // CHECK allocas for ranges -// CHECK: [[ACC_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MEM_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OFFSET1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::id" -// CHECK: [[ACC_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MEM_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OFFSET2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::id" +// CHECK: [[ACC_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MEM_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OFFSET1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::id" +// CHECK: [[ACC_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MEM_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OFFSET2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::id" // CHECK lambda object addrspacecast // CHECK: [[LOCAL_OBJECT:%.*]] = addrspacecast %class.anon* [[LOCAL_OBJECTA]] to %class.anon addrspace(4)* // CHECK addrspacecasts for ranges -// CHECK: [[ACC_RANGE1AS:%.*]] = addrspacecast %"struct.cl::sycl::range"* [[ACC_RANGE1A]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[MEM_RANGE1AS:%.*]] = addrspacecast %"struct.cl::sycl::range"* [[MEM_RANGE1A]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[OFFSET1AS:%.*]] = addrspacecast %"struct.cl::sycl::id"* [[OFFSET1A]] to %"struct.cl::sycl::id" addrspace(4)* -// CHECK: [[ACC_RANGE2AS:%.*]] = addrspacecast %"struct.cl::sycl::range"* [[ACC_RANGE2A]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[MEM_RANGE2AS:%.*]] = addrspacecast %"struct.cl::sycl::range"* [[MEM_RANGE2A]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[OFFSET2AS:%.*]] = addrspacecast %"struct.cl::sycl::id"* [[OFFSET2A]] to %"struct.cl::sycl::id" addrspace(4)* +// CHECK: [[ACC_RANGE1AS:%.*]] = addrspacecast %"struct.sycl::_V1::range"* [[ACC_RANGE1A]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[MEM_RANGE1AS:%.*]] = addrspacecast %"struct.sycl::_V1::range"* [[MEM_RANGE1A]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[OFFSET1AS:%.*]] = addrspacecast %"struct.sycl::_V1::id"* [[OFFSET1A]] to %"struct.sycl::_V1::id" addrspace(4)* +// CHECK: [[ACC_RANGE2AS:%.*]] = addrspacecast %"struct.sycl::_V1::range"* [[ACC_RANGE2A]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[MEM_RANGE2AS:%.*]] = addrspacecast %"struct.sycl::_V1::range"* [[MEM_RANGE2A]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[OFFSET2AS:%.*]] = addrspacecast %"struct.sycl::_V1::id"* [[OFFSET2A]] to %"struct.sycl::_V1::id" addrspace(4)* // CHECK accessor array default inits // CHECK: [[ACCESSOR_ARRAY1:%[a-zA-Z0-9_]+]] = getelementptr inbounds %class.anon, %class.anon addrspace(4)* [[LOCAL_OBJECT]], i32 0, i32 0 // CHECK: [[BEGIN:%[a-zA-Z0-9._]*]] = getelementptr inbounds [2 x [[ACCESSOR:.*]]], [2 x [[ACCESSOR]]] addrspace(4)* [[ACCESSOR_ARRAY1]], i64 0, i64 0 @@ -74,17 +74,17 @@ int main() { // CHECK: [[INDEX1:%[a-zA-Z0-9._]*]] = getelementptr inbounds [2 x [[ACCESSOR]]], [2 x [[ACCESSOR]]] addrspace(4)* [[ACCESSOR_ARRAY1]], i64 0, i64 0 // CHECK load from kernel pointer argument alloca // CHECK: [[MEM_LOAD1:%[a-zA-Z0-9_]+]] = load i32 addrspace(1)*, i32 addrspace(1)* addrspace(4)* [[MEM_ARG1]] -// CHECK: [[ACC_RANGE1:%.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[ACC_RANGE1AS]] to %"struct.cl::sycl::range"* -// CHECK: [[MEM_RANGE1:%.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[MEM_RANGE1AS]] to %"struct.cl::sycl::range"* -// CHECK: [[OFFSET1:%.*]] = addrspacecast %"struct.cl::sycl::id" addrspace(4)* [[OFFSET1AS]] to %"struct.cl::sycl::id"* -// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class.cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[INDEX1]], i32 addrspace(1)* noundef [[MEM_LOAD1]], %"struct.cl::sycl::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE1]], %"struct.cl::sycl::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE1]], %"struct.cl::sycl::id"* noundef byval({{.*}}) align 4 [[OFFSET1]]) +// CHECK: [[ACC_RANGE1:%.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[ACC_RANGE1AS]] to %"struct.sycl::_V1::range"* +// CHECK: [[MEM_RANGE1:%.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[MEM_RANGE1AS]] to %"struct.sycl::_V1::range"* +// CHECK: [[OFFSET1:%.*]] = addrspacecast %"struct.sycl::_V1::id" addrspace(4)* [[OFFSET1AS]] to %"struct.sycl::_V1::id"* +// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class.sycl::_V1::accessor" addrspace(4)* {{[^,]*}} [[INDEX1]], i32 addrspace(1)* noundef [[MEM_LOAD1]], %"struct.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE1]], %"struct.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE1]], %"struct.sycl::_V1::id"* noundef byval({{.*}}) align 4 [[OFFSET1]]) // CHECK acc[1] __init method call // CHECK: [[ACCESSOR_ARRAY2:%[a-zA-Z0-9_]+]] = getelementptr inbounds %class.anon, %class.anon addrspace(4)* [[LOCAL_OBJECT]], i32 0, i32 0 // CHECK: [[INDEX2:%[a-zA-Z0-9._]*]] = getelementptr inbounds [2 x [[ACCESSOR]]], [2 x [[ACCESSOR]]] addrspace(4)* [[ACCESSOR_ARRAY2]], i64 0, i64 1 // CHECK load from kernel pointer argument alloca // CHECK: [[MEM_LOAD2:%[a-zA-Z0-9_]+]] = load i32 addrspace(1)*, i32 addrspace(1)* addrspace(4)* [[MEM_ARG2]] -// CHECK: [[ACC_RANGE2:%.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[ACC_RANGE2AS]] to %"struct.cl::sycl::range"* -// CHECK: [[MEM_RANGE2:%.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[MEM_RANGE2AS]] to %"struct.cl::sycl::range"* -// CHECK: [[OFFSET2:%.*]] = addrspacecast %"struct.cl::sycl::id" addrspace(4)* [[OFFSET2AS]] to %"struct.cl::sycl::id"* -// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class.cl::sycl::accessor" addrspace(4)* {{[^,]*}} [[INDEX2]], i32 addrspace(1)* noundef [[MEM_LOAD2]], %"struct.cl::sycl::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE2]], %"struct.cl::sycl::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE2]], %"struct.cl::sycl::id"* noundef byval({{.*}}) align 4 [[OFFSET2]]) +// CHECK: [[ACC_RANGE2:%.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[ACC_RANGE2AS]] to %"struct.sycl::_V1::range"* +// CHECK: [[MEM_RANGE2:%.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[MEM_RANGE2AS]] to %"struct.sycl::_V1::range"* +// CHECK: [[OFFSET2:%.*]] = addrspacecast %"struct.sycl::_V1::id" addrspace(4)* [[OFFSET2AS]] to %"struct.sycl::_V1::id"* +// CHECK: call spir_func void @{{.*}}__init{{.*}}(%"class.sycl::_V1::accessor" addrspace(4)* {{[^,]*}} [[INDEX2]], i32 addrspace(1)* noundef [[MEM_LOAD2]], %"struct.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE2]], %"struct.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE2]], %"struct.sycl::_V1::id"* noundef byval({{.*}}) align 4 [[OFFSET2]]) diff --git a/clang/test/CodeGenSYCL/no_opaque_kernel-param-member-acc-array.cpp b/clang/test/CodeGenSYCL/no_opaque_kernel-param-member-acc-array.cpp index 39b87d42bd168..3d4041aae186d 100644 --- a/clang/test/CodeGenSYCL/no_opaque_kernel-param-member-acc-array.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_kernel-param-member-acc-array.cpp @@ -4,7 +4,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void a_kernel(const Func &kernelFunc) { @@ -29,13 +29,13 @@ int main() { // CHECK kernel_C parameters // CHECK: define {{.*}}spir_kernel void @{{.*}}kernel_C // CHECK-SAME: i32 addrspace(1)* noundef align 4 [[MEM_ARG1:%[a-zA-Z0-9_]+]], -// CHECK-SAME: %"struct{{.*}}.cl::sycl::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], -// CHECK-SAME: %"struct{{.*}}.cl::sycl::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], -// CHECK-SAME: %"struct{{.*}}.cl::sycl::id"* noundef byval({{.*}}) align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]], +// CHECK-SAME: %"struct{{.*}}.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE1:%[a-zA-Z0-9_]+1]], +// CHECK-SAME: %"struct{{.*}}.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE1:%[a-zA-Z0-9_]+2]], +// CHECK-SAME: %"struct{{.*}}.sycl::_V1::id"* noundef byval({{.*}}) align 4 [[OFFSET1:%[a-zA-Z0-9_]+3]], // CHECK-SAME: i32 addrspace(1)* noundef align 4 [[MEM_ARG2:%[a-zA-Z0-9_]+4]], -// CHECK-SAME: %"struct{{.*}}.cl::sycl::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE2:%[a-zA-Z0-9_]+6]], -// CHECK-SAME: %"struct{{.*}}.cl::sycl::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE2:%[a-zA-Z0-9_]+7]], -// CHECK-SAME: %"struct{{.*}}.cl::sycl::id"* noundef byval({{.*}}) align 4 [[OFFSET2:%[a-zA-Z0-9_]+8]]) +// CHECK-SAME: %"struct{{.*}}.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE2:%[a-zA-Z0-9_]+6]], +// CHECK-SAME: %"struct{{.*}}.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE2:%[a-zA-Z0-9_]+7]], +// CHECK-SAME: %"struct{{.*}}.sycl::_V1::id"* noundef byval({{.*}}) align 4 [[OFFSET2:%[a-zA-Z0-9_]+8]]) // Check alloca for pointer arguments // CHECK: [[MEM_ARG1]].addr{{[0-9]*}} = alloca i32 addrspace(1)*, align 8 @@ -45,23 +45,23 @@ int main() { // CHECK: [[LOCAL_OBJECTA:%__SYCLKernel]] = alloca %class{{.*}}.anon, align 4 // Check allocas for ranges -// CHECK: [[ACC_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MEM_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OFFSET1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::id" -// CHECK: [[ACC_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[MEM_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::range" -// CHECK: [[OFFSET2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.cl::sycl::id" +// CHECK: [[ACC_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MEM_RANGE1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OFFSET1A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::id" +// CHECK: [[ACC_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[MEM_RANGE2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::range" +// CHECK: [[OFFSET2A:%[a-zA-Z0-9_.]+]] = alloca %"struct.sycl::_V1::id" // Check lambda object addrspacecast // CHECK: [[LOCAL_OBJECT:%.*]] = addrspacecast %class{{.*}}.anon* %__SYCLKernel to %class{{.*}}.anon addrspace(4)* // Check addrspacecast for ranges -// CHECK: [[ACC_RANGE1AS:%.*]] = addrspacecast %"struct.cl::sycl::range"* [[ACC_RANGE1A]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[MEM_RANGE1AS:%.*]] = addrspacecast %"struct.cl::sycl::range"* [[MEM_RANGE1A]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[OFFSET1AS:%.*]] = addrspacecast %"struct.cl::sycl::id"* [[OFFSET1A]] to %"struct.cl::sycl::id" addrspace(4)* -// CHECK: [[ACC_RANGE2AS:%.*]] = addrspacecast %"struct.cl::sycl::range"* [[ACC_RANGE2A]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[MEM_RANGE2AS:%.*]] = addrspacecast %"struct.cl::sycl::range"* [[MEM_RANGE2A]] to %"struct.cl::sycl::range" addrspace(4)* -// CHECK: [[OFFSET2AS:%.*]] = addrspacecast %"struct.cl::sycl::id"* [[OFFSET2A]] to %"struct.cl::sycl::id" addrspace(4)* +// CHECK: [[ACC_RANGE1AS:%.*]] = addrspacecast %"struct.sycl::_V1::range"* [[ACC_RANGE1A]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[MEM_RANGE1AS:%.*]] = addrspacecast %"struct.sycl::_V1::range"* [[MEM_RANGE1A]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[OFFSET1AS:%.*]] = addrspacecast %"struct.sycl::_V1::id"* [[OFFSET1A]] to %"struct.sycl::_V1::id" addrspace(4)* +// CHECK: [[ACC_RANGE2AS:%.*]] = addrspacecast %"struct.sycl::_V1::range"* [[ACC_RANGE2A]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[MEM_RANGE2AS:%.*]] = addrspacecast %"struct.sycl::_V1::range"* [[MEM_RANGE2A]] to %"struct.sycl::_V1::range" addrspace(4)* +// CHECK: [[OFFSET2AS:%.*]] = addrspacecast %"struct.sycl::_V1::id"* [[OFFSET2A]] to %"struct.sycl::_V1::id" addrspace(4)* // CHECK accessor array default inits // CHECK: [[ACCESSOR_WRAPPER:%[a-zA-Z0-9_]+]] = getelementptr inbounds %class{{.*}}.anon, %class{{.*}}.anon addrspace(4)* [[LOCAL_OBJECT]], i32 0, i32 0 @@ -78,17 +78,17 @@ int main() { // CHECK: [[GEP_MEMBER_ACC1:%[a-zA-Z0-9_]+]] = getelementptr inbounds %struct{{.*}}.struct_acc_t, %struct{{.*}}.struct_acc_t addrspace(4)* [[GEP_LAMBDA1]], i32 0, i32 0 // CHECK: [[ARRAY_IDX1:%[a-zA-Z0-9._]*]] = getelementptr inbounds [2 x [[ACCESSOR]]], [2 x [[ACCESSOR]]] addrspace(4)* [[GEP_MEMBER_ACC1]], i64 0, i64 0 // CHECK: [[MEM_LOAD1:%[a-zA-Z0-9_]+]] = load i32 addrspace(1)*, i32 addrspace(1)* addrspace(4)* [[MEM_ARG1]].addr -// CHECK: [[ACC_RANGE1:%.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[ACC_RANGE1AS]] to %"struct.cl::sycl::range"* -// CHECK: [[MEM_RANGE1:%.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[MEM_RANGE1AS]] to %"struct.cl::sycl::range"* -// CHECK: [[OFFSET1:%.*]] = addrspacecast %"struct.cl::sycl::id" addrspace(4)* [[OFFSET1AS]] to %"struct.cl::sycl::id"* -// CHECK: call spir_func void @{{.*}}__init{{.*}}([[ACCESSOR]] addrspace(4)* {{[^,]*}} [[ARRAY_IDX1]], i32 addrspace(1)* noundef [[MEM_LOAD1]], %"struct{{.*}}.cl::sycl::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE1]], %"struct{{.*}}.cl::sycl::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE1]], %"struct{{.*}}.cl::sycl::id"* noundef byval({{.*}}) align 4 [[OFFSET1]]) +// CHECK: [[ACC_RANGE1:%.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[ACC_RANGE1AS]] to %"struct.sycl::_V1::range"* +// CHECK: [[MEM_RANGE1:%.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[MEM_RANGE1AS]] to %"struct.sycl::_V1::range"* +// CHECK: [[OFFSET1:%.*]] = addrspacecast %"struct.sycl::_V1::id" addrspace(4)* [[OFFSET1AS]] to %"struct.sycl::_V1::id"* +// CHECK: call spir_func void @{{.*}}__init{{.*}}([[ACCESSOR]] addrspace(4)* {{[^,]*}} [[ARRAY_IDX1]], i32 addrspace(1)* noundef [[MEM_LOAD1]], %"struct{{.*}}.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE1]], %"struct{{.*}}.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE1]], %"struct{{.*}}.sycl::_V1::id"* noundef byval({{.*}}) align 4 [[OFFSET1]]) // Check acc[1] __init method call // CHECK: [[GEP_LAMBDA2:%[a-zA-Z0-9_]+]] = getelementptr inbounds %class{{.*}}.anon, %class{{.*}}.anon addrspace(4)* [[LOCAL_OBJECT]], i32 0, i32 0 // CHECK: [[GEP_MEMBER_ACC2:%[a-zA-Z0-9_]+]] = getelementptr inbounds %struct{{.*}}.struct_acc_t, %struct{{.*}}.struct_acc_t addrspace(4)* [[GEP_LAMBDA2]], i32 0, i32 0 // CHECK: [[ARRAY_IDX2:%[a-zA-Z0-9_]*]] = getelementptr inbounds [2 x [[ACCESSOR]]], [2 x [[ACCESSOR]]] addrspace(4)* [[GEP_MEMBER_ACC2]], i64 0, i64 1 // CHECK: [[MEM_LOAD2:%[a-zA-Z0-9_]+]] = load i32 addrspace(1)*, i32 addrspace(1)* addrspace(4)* [[MEM_ARG1]].addr -// CHECK: [[ACC_RANGE2:%.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[ACC_RANGE2AS]] to %"struct.cl::sycl::range"* -// CHECK: [[MEM_RANGE2:%.*]] = addrspacecast %"struct.cl::sycl::range" addrspace(4)* [[MEM_RANGE2AS]] to %"struct.cl::sycl::range"* -// CHECK: [[OFFSET2:%.*]] = addrspacecast %"struct.cl::sycl::id" addrspace(4)* [[OFFSET2AS]] to %"struct.cl::sycl::id"* -// CHECK: call spir_func void @{{.*}}__init{{.*}}([[ACCESSOR]] addrspace(4)* {{[^,]*}} [[ARRAY_IDX2]], i32 addrspace(1)* noundef [[MEM_LOAD2]], %"struct{{.*}}.cl::sycl::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE2]], %"struct{{.*}}.cl::sycl::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE2]], %"struct{{.*}}.cl::sycl::id"* noundef byval({{.*}}) align 4 [[OFFSET2]]) +// CHECK: [[ACC_RANGE2:%.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[ACC_RANGE2AS]] to %"struct.sycl::_V1::range"* +// CHECK: [[MEM_RANGE2:%.*]] = addrspacecast %"struct.sycl::_V1::range" addrspace(4)* [[MEM_RANGE2AS]] to %"struct.sycl::_V1::range"* +// CHECK: [[OFFSET2:%.*]] = addrspacecast %"struct.sycl::_V1::id" addrspace(4)* [[OFFSET2AS]] to %"struct.sycl::_V1::id"* +// CHECK: call spir_func void @{{.*}}__init{{.*}}([[ACCESSOR]] addrspace(4)* {{[^,]*}} [[ARRAY_IDX2]], i32 addrspace(1)* noundef [[MEM_LOAD2]], %"struct{{.*}}.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[ACC_RANGE2]], %"struct{{.*}}.sycl::_V1::range"* noundef byval({{.*}}) align 4 [[MEM_RANGE2]], %"struct{{.*}}.sycl::_V1::id"* noundef byval({{.*}}) align 4 [[OFFSET2]]) diff --git a/clang/test/CodeGenSYCL/no_opaque_kernel-param-pod-array.cpp b/clang/test/CodeGenSYCL/no_opaque_kernel-param-pod-array.cpp index a026f813c67a7..7d010475e42a3 100644 --- a/clang/test/CodeGenSYCL/no_opaque_kernel-param-pod-array.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_kernel-param-pod-array.cpp @@ -4,7 +4,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template __attribute__((sycl_kernel)) void a_kernel(const Func &kernelFunc) { diff --git a/clang/test/CodeGenSYCL/no_opaque_max-concurrency.cpp b/clang/test/CodeGenSYCL/no_opaque_max-concurrency.cpp index cc09f499c57b0..b6e22eb3fdc39 100644 --- a/clang/test/CodeGenSYCL/no_opaque_max-concurrency.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_max-concurrency.cpp @@ -48,18 +48,18 @@ // CHECK: %this1 = load [[CLASS_F3]] addrspace(4)*, [[CLASS_F3]] addrspace(4)* addrspace(4)* [[ADDR1_CAST]], align 8 // CHECK: ret void -// CHECK: define dso_local spir_kernel void @_ZTSZZ4mainENKUlRN2cl4sycl7handlerEE_clES2_E12kernel_name5() +// CHECK: define dso_local spir_kernel void @_ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_E12kernel_name5() // CHECK: entry: // CHECK: [[H1:%.*]] = alloca [[H:%.*]], align 1 // CHECK: [[H2:%.*]] = addrspacecast [[H]]* [[H1]] to [[H]] addrspace(4)* // CHECK: [[H3:%.*]] = bitcast [[H]]* [[H1]] to i8* // CHECK: call void @llvm.lifetime.start.p0i8(i64 1, i8* [[H3]]) -// CHECK: call spir_func void @_ZZZ4mainENKUlRN2cl4sycl7handlerEE_clES2_ENKUlvE_clEv([[H]] addrspace(4)* noundef align 1 dereferenceable_or_null(1) [[H2]]) +// CHECK: call spir_func void @_ZZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_ENKUlvE_clEv([[H]] addrspace(4)* noundef align 1 dereferenceable_or_null(1) [[H2]]) // CHECK: [[TMP4:%.*]] = bitcast [[H]]* [[H1]] to i8* // CHECK: call void @llvm.lifetime.end.p0i8(i64 1, i8* [[TMP4]]) // CHECK: ret void -// CHECK: define {{.*}}spir_func void @_ZZZ4mainENKUlRN2cl4sycl7handlerEE_clES2_ENKUlvE_clEv +// CHECK: define {{.*}}spir_func void @_ZZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_ENKUlvE_clEv // CHECK: entry: // CHECK: [[ADDR_1:%.*]] = alloca [[HH:%.*]] addrspace(4)*, align 8 // CHECK: [[ADDR1_CAST:%.*]] = addrspacecast [[HH]] addrspace(4)** [[ADDR_1]] to [[HH]] addrspace(4)* addrspace(4)* @@ -89,7 +89,7 @@ __attribute__((sycl_kernel)) void kernel_single_task_1(const Func &kernelFunc) { kernelFunc(); } -using namespace cl::sycl; +using namespace sycl; class Functor1 { public: diff --git a/clang/test/CodeGenSYCL/no_opaque_non-standard-layout.cpp b/clang/test/CodeGenSYCL/no_opaque_non-standard-layout.cpp index a89ea1eaa047d..e2708557ba211 100644 --- a/clang/test/CodeGenSYCL/no_opaque_non-standard-layout.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_non-standard-layout.cpp @@ -11,8 +11,8 @@ struct F : F1, F2 { }; int main() { - cl::sycl::accessor accessorA; - cl::sycl::handler cgh; + sycl::accessor accessorA; + sycl::handler cgh; cgh.single_task( [=]() { accessorA.use(); diff --git a/clang/test/CodeGenSYCL/no_opaque_nontrivial_device_copyable.cpp b/clang/test/CodeGenSYCL/no_opaque_nontrivial_device_copyable.cpp index 64f2c9b324b45..cabc36a6a7587 100644 --- a/clang/test/CodeGenSYCL/no_opaque_nontrivial_device_copyable.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_nontrivial_device_copyable.cpp @@ -4,7 +4,7 @@ // passed by-valued. #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; struct NontriviallyCopyable { int I; diff --git a/clang/test/CodeGenSYCL/no_opaque_pointers-in-structs.cpp b/clang/test/CodeGenSYCL/no_opaque_pointers-in-structs.cpp index 4ce18fe8fe797..5ce576ce82184 100644 --- a/clang/test/CodeGenSYCL/no_opaque_pointers-in-structs.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_pointers-in-structs.cpp @@ -18,7 +18,7 @@ struct B { int main() { B Obj; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { (void)Obj; }); @@ -27,7 +27,7 @@ int main() { auto Lambda = [=]() { *Ptr += 1; }; - cl::sycl::kernel_single_task([=]() { + sycl::kernel_single_task([=]() { Lambda(); }); return 0; diff --git a/clang/test/CodeGenSYCL/no_opaque_sampler.cpp b/clang/test/CodeGenSYCL/no_opaque_sampler.cpp index d20a67ef6f831..0b99141677fdf 100644 --- a/clang/test/CodeGenSYCL/no_opaque_sampler.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_sampler.cpp @@ -9,7 +9,7 @@ // CHECK-NEXT: call void @llvm.lifetime.start.p0i8(i64 8, i8* [[BITCAST]]) #4 // CHECK-NEXT: [[GEP:%[a-zA-z0-9]+]] = getelementptr inbounds %class.anon, %class.anon addrspace(4)* [[ANONCAST]], i32 0, i32 0 // CHECK-NEXT: [[LOAD_SAMPLER_ARG:%[0-9]+]] = load %opencl.sampler_t addrspace(2)*, %opencl.sampler_t addrspace(2)* addrspace(4)* [[SAMPLER_ARG]].addr.ascast, align 8 -// CHECK-NEXT: call spir_func void @{{[a-zA-Z0-9_]+}}(%"class.cl::sycl::sampler" addrspace(4)* {{[^,]*}} [[GEP]], %opencl.sampler_t addrspace(2)* [[LOAD_SAMPLER_ARG]]) +// CHECK-NEXT: call spir_func void @{{[a-zA-Z0-9_]+}}(%"class.sycl::_V1::sampler" addrspace(4)* {{[^,]*}} [[GEP]], %opencl.sampler_t addrspace(2)* [[LOAD_SAMPLER_ARG]]) // // CHECK: define {{.*}}spir_kernel void @{{[a-zA-Z0-9_]+}}(%opencl.sampler_t addrspace(2)* [[SAMPLER_ARG_WRAPPED:%[a-zA-Z0-9_]+]], i32 noundef [[ARG_A:%[a-zA-Z0-9_]+]]) @@ -34,12 +34,12 @@ // CHECK: [[GEP_LAMBDA_0:%[a-zA-z0-9]+]] = getelementptr inbounds %class.anon.0, %class.anon.0 addrspace(4)* [[LAMBDA]], i32 0, i32 0 // CHECK: [[GEP_SMPL:%[a-zA-Z0-9]+]] = getelementptr inbounds %struct.sampler_wrapper, %struct.sampler_wrapper addrspace(4)* [[GEP_LAMBDA_0]], i32 0, i32 0 // CHECK: [[LOAD_SMPL:%[0-9]+]] = load %opencl.sampler_t addrspace(2)*, %opencl.sampler_t addrspace(2)* addrspace(4)* [[SAMPLER_ARG_WRAPPED]].addr.ascast, align 8 -// CHECK: call spir_func void @{{[a-zA-Z0-9_]+}}(%"class.cl::sycl::sampler" addrspace(4)* {{.*}}, %opencl.sampler_t addrspace(2)* [[LOAD_SMPL]]) +// CHECK: call spir_func void @{{[a-zA-Z0-9_]+}}(%"class.sycl::_V1::sampler" addrspace(4)* {{.*}}, %opencl.sampler_t addrspace(2)* [[LOAD_SMPL]]) // #include "Inputs/sycl.hpp" struct sampler_wrapper { - cl::sycl::sampler smpl; + sycl::sampler smpl; int a; }; @@ -49,7 +49,7 @@ __attribute__((sycl_kernel)) void kernel_single_task(const KernelType &kernelFun } int main() { - cl::sycl::sampler smplr; + sycl::sampler smplr; kernel_single_task([=]() { smplr.use(); }); diff --git a/clang/test/CodeGenSYCL/no_opaque_stall_enable_device.cpp b/clang/test/CodeGenSYCL/no_opaque_stall_enable_device.cpp index d99e15d047a59..c9d531cdf00f0 100644 --- a/clang/test/CodeGenSYCL/no_opaque_stall_enable_device.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_stall_enable_device.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; [[intel::use_stall_enable_clusters]] void func() {} diff --git a/clang/test/CodeGenSYCL/no_opaque_stream.cpp b/clang/test/CodeGenSYCL/no_opaque_stream.cpp index fe4f40d527bc9..4bd88c3d5fcfb 100644 --- a/clang/test/CodeGenSYCL/no_opaque_stream.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_stream.cpp @@ -1,8 +1,8 @@ // RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown -disable-llvm-passes -no-opaque-pointers -emit-llvm %s -o %t.ll // RUN: FileCheck < %t.ll --enable-var-scope %s // -// CHECK: %[[RANGE_TYPE:"struct.*cl::sycl::range"]] -// CHECK: %[[ID_TYPE:"struct.*cl::sycl::id"]] +// CHECK: %[[RANGE_TYPE:"struct.*sycl::_V1::range"]] +// CHECK: %[[ID_TYPE:"struct.*sycl::_V1::id"]] // CHECK: define dso_local spir_kernel void @{{.*}}StreamTester // CHECK-SAME: i8 addrspace(1)* noundef align 1 [[ACC_DATA:%[a-zA-Z0-9_]+]], @@ -17,15 +17,15 @@ // CHECK: [[ARG_LOAD:%[a-zA-Z0-9_]+]] = load i8 addrspace(1)*, i8 addrspace(1)* addrspace(4)* [[ARG]].addr.ascast, align 8, // Check __init and __finalize method calls -// CHECK: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}cl::sycl::stream" addrspace(4)* noundef align 4 dereferenceable_or_null(16) %{{[a-zA-Z0-9_]+}}, i8 addrspace(1)* noundef [[ARG_LOAD]], %[[RANGE_TYPE]]* noundef byval(%[[RANGE_TYPE]]) {{.*}}%{{.*}} -// CHECK: call spir_func void @_ZN2cl4sycl6stream10__finalizeEv(%{{.*}}cl::sycl::stream" addrspace(4)* noundef align 4 dereferenceable_or_null(16) %{{[a-zA-Z0-9_]+}}) +// CHECK: call spir_func void @{{.*}}__init{{.*}}(%{{.*}}sycl::_V1::stream" addrspace(4)* noundef align 4 dereferenceable_or_null(16) %{{[a-zA-Z0-9_]+}}, i8 addrspace(1)* noundef [[ARG_LOAD]], %[[RANGE_TYPE]]* noundef byval(%[[RANGE_TYPE]]) {{.*}}%{{.*}} +// CHECK: call spir_func void @_ZN4sycl3_V16stream10__finalizeEv(%{{.*}}sycl::_V1::stream" addrspace(4)* noundef align 4 dereferenceable_or_null(16) %{{[a-zA-Z0-9_]+}}) #include "Inputs/sycl.hpp" int main() { - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &CGH) { - cl::sycl::stream Stream(1024, 128, CGH); + sycl::queue Q; + Q.submit([&](sycl::handler &CGH) { + sycl::stream Stream(1024, 128, CGH); CGH.single_task([=]() { Stream << "one" << "two"; diff --git a/clang/test/CodeGenSYCL/no_opaque_union-kernel-param.cpp b/clang/test/CodeGenSYCL/no_opaque_union-kernel-param.cpp index cc1dac510f27a..772e3fce4a4bc 100644 --- a/clang/test/CodeGenSYCL/no_opaque_union-kernel-param.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_union-kernel-param.cpp @@ -4,7 +4,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; union MyUnion { int FldInt; diff --git a/clang/test/CodeGenSYCL/no_opaque_unique-stable-id.cpp b/clang/test/CodeGenSYCL/no_opaque_unique-stable-id.cpp index a927a9eb68984..632888709fac2 100644 --- a/clang/test/CodeGenSYCL/no_opaque_unique-stable-id.cpp +++ b/clang/test/CodeGenSYCL/no_opaque_unique-stable-id.cpp @@ -195,7 +195,7 @@ int main() { []() { static int LocalLambda2; auto Lambda = [](){}; - cl::sycl::kernel_single_task(Lambda); + sycl::kernel_single_task(Lambda); puts(__builtin_sycl_unique_stable_id(LocalLambda2)); // CHECK: call i32 @puts({{.+}} @[[LOCAL_LAMBDA_2]], }(); diff --git a/clang/test/CodeGenSYCL/non-standard-layout.cpp b/clang/test/CodeGenSYCL/non-standard-layout.cpp index 11b6cdacc4597..ae3bc592074dd 100644 --- a/clang/test/CodeGenSYCL/non-standard-layout.cpp +++ b/clang/test/CodeGenSYCL/non-standard-layout.cpp @@ -11,8 +11,8 @@ struct F : F1, F2 { }; int main() { - cl::sycl::accessor accessorA; - cl::sycl::handler cgh; + sycl::accessor accessorA; + sycl::handler cgh; cgh.single_task( [=]() { F f; // needed now to emit the type of F diff --git a/clang/test/CodeGenSYCL/nontrivial_device_copyable.cpp b/clang/test/CodeGenSYCL/nontrivial_device_copyable.cpp index 206a308b31491..1ea4b401e60f5 100644 --- a/clang/test/CodeGenSYCL/nontrivial_device_copyable.cpp +++ b/clang/test/CodeGenSYCL/nontrivial_device_copyable.cpp @@ -4,7 +4,7 @@ // passed by-valued. #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; struct NontriviallyCopyable { int I; diff --git a/clang/test/CodeGenSYCL/num-simd-work-items.cpp b/clang/test/CodeGenSYCL/num-simd-work-items.cpp index 8fd5d7a66dd19..aeba63e0ffeea 100644 --- a/clang/test/CodeGenSYCL/num-simd-work-items.cpp +++ b/clang/test/CodeGenSYCL/num-simd-work-items.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Foo { diff --git a/clang/test/CodeGenSYCL/nvptx-printf.cpp b/clang/test/CodeGenSYCL/nvptx-printf.cpp index 6f3e9f07da0ad..bc37f58c41bf0 100644 --- a/clang/test/CodeGenSYCL/nvptx-printf.cpp +++ b/clang/test/CodeGenSYCL/nvptx-printf.cpp @@ -8,5 +8,5 @@ int main() { // Make sure that device printf is dispatched to CUDA's vprintf syscall. // CHECK: alloca %printf_args // CHECK: call i32 @vprintf - cl::sycl::kernel_single_task([]() { cl::sycl::ext::oneapi::experimental::printf(format_2, 123, 1.23); }); + sycl::kernel_single_task([]() { sycl::ext::oneapi::experimental::printf(format_2, 123, 1.23); }); } diff --git a/clang/test/CodeGenSYCL/pointers-in-structs.cpp b/clang/test/CodeGenSYCL/pointers-in-structs.cpp index 24680231da548..c786cb7919725 100644 --- a/clang/test/CodeGenSYCL/pointers-in-structs.cpp +++ b/clang/test/CodeGenSYCL/pointers-in-structs.cpp @@ -18,7 +18,7 @@ struct B { int main() { B Obj; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { (void)Obj; }); @@ -27,7 +27,7 @@ int main() { auto Lambda = [=]() { *Ptr += 1; }; - cl::sycl::kernel_single_task([=]() { + sycl::kernel_single_task([=]() { Lambda(); }); return 0; diff --git a/clang/test/CodeGenSYCL/pointers-int-header.cpp b/clang/test/CodeGenSYCL/pointers-int-header.cpp index 9a83582e0e6f5..92d35bb334ee4 100644 --- a/clang/test/CodeGenSYCL/pointers-int-header.cpp +++ b/clang/test/CodeGenSYCL/pointers-int-header.cpp @@ -19,7 +19,7 @@ int main() { struct_with_pointer obj; obj.data_in_struct = 10; - cl::sycl::kernel_single_task([=]() { + sycl::kernel_single_task([=]() { *ptr = 50; int local = obj.data_in_struct; }); diff --git a/clang/test/CodeGenSYCL/reqd-sub-group-size-spirv-intrin.cpp b/clang/test/CodeGenSYCL/reqd-sub-group-size-spirv-intrin.cpp index 86f0cf44ebb6f..8b3c981c7f4b3 100644 --- a/clang/test/CodeGenSYCL/reqd-sub-group-size-spirv-intrin.cpp +++ b/clang/test/CodeGenSYCL/reqd-sub-group-size-spirv-intrin.cpp @@ -15,7 +15,7 @@ int main() { }; cgh.parallel_for_work_group( - cl::sycl::range<1>(), cl::sycl::range<1>(), kernel_); + sycl::range<1>(), sycl::range<1>(), kernel_); }); return 0; } diff --git a/clang/test/CodeGenSYCL/reqd-sub-group-size.cpp b/clang/test/CodeGenSYCL/reqd-sub-group-size.cpp index b353b9a0d1e04..6df63cea4dc01 100644 --- a/clang/test/CodeGenSYCL/reqd-sub-group-size.cpp +++ b/clang/test/CodeGenSYCL/reqd-sub-group-size.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Functor16 { diff --git a/clang/test/CodeGenSYCL/reqd-work-group-size.cpp b/clang/test/CodeGenSYCL/reqd-work-group-size.cpp index f1c928ce3eb28..02cbda31032fc 100644 --- a/clang/test/CodeGenSYCL/reqd-work-group-size.cpp +++ b/clang/test/CodeGenSYCL/reqd-work-group-size.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Functor32x16x16 { diff --git a/clang/test/CodeGenSYCL/sampler.cpp b/clang/test/CodeGenSYCL/sampler.cpp index 7c9b77ddaa962..600269324580a 100644 --- a/clang/test/CodeGenSYCL/sampler.cpp +++ b/clang/test/CodeGenSYCL/sampler.cpp @@ -38,7 +38,7 @@ #include "Inputs/sycl.hpp" struct sampler_wrapper { - cl::sycl::sampler smpl; + sycl::sampler smpl; int a; }; @@ -48,7 +48,7 @@ __attribute__((sycl_kernel)) void kernel_single_task(const KernelType &kernelFun } int main() { - cl::sycl::sampler smplr; + sycl::sampler smplr; kernel_single_task([=]() { smplr.use(); }); diff --git a/clang/test/CodeGenSYCL/save-user-names.cpp b/clang/test/CodeGenSYCL/save-user-names.cpp index 63c3bcb004292..546c90a634a57 100644 --- a/clang/test/CodeGenSYCL/save-user-names.cpp +++ b/clang/test/CodeGenSYCL/save-user-names.cpp @@ -11,31 +11,31 @@ struct NestedSimple { struct NestedComplex { int NestedComplexField; - cl::sycl::accessor NestedAccField; + sycl::accessor NestedAccField; }; struct KernelFunctor { int IntField; - cl::sycl::accessor AccField1; - cl::sycl::accessor AccField2; + sycl::accessor AccField1; + sycl::accessor AccField2; NestedSimple NestedSimpleObj; NestedComplex NestedComplexObj; void operator()() const {} }; int main() { - cl::sycl::queue q; + sycl::queue q; - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { KernelFunctor FunctorObj; cgh.single_task(FunctorObj); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { int Data; NestedSimple NestedSimpleObj; NestedComplex NestedComplexObj; - cl::sycl::accessor CapturedAcc1, CapturedAcc2; + sycl::accessor CapturedAcc1, CapturedAcc2; cgh.single_task([=]() { Data; CapturedAcc1; diff --git a/clang/test/CodeGenSYCL/scheduler-target-fmax-mhz.cpp b/clang/test/CodeGenSYCL/scheduler-target-fmax-mhz.cpp index e93dc131c08f3..5194b92f44586 100644 --- a/clang/test/CodeGenSYCL/scheduler-target-fmax-mhz.cpp +++ b/clang/test/CodeGenSYCL/scheduler-target-fmax-mhz.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Foo { diff --git a/clang/test/CodeGenSYCL/stall_enable_device.cpp b/clang/test/CodeGenSYCL/stall_enable_device.cpp index 4f22ac4dfe350..7e6183b397ba9 100644 --- a/clang/test/CodeGenSYCL/stall_enable_device.cpp +++ b/clang/test/CodeGenSYCL/stall_enable_device.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; [[intel::use_stall_enable_clusters]] void func() {} diff --git a/clang/test/CodeGenSYCL/static-var-address-space.cpp b/clang/test/CodeGenSYCL/static-var-address-space.cpp index 3dd135ae64469..1905a38e4294b 100644 --- a/clang/test/CodeGenSYCL/static-var-address-space.cpp +++ b/clang/test/CodeGenSYCL/static-var-address-space.cpp @@ -10,6 +10,6 @@ void test() { } int main() { - cl::sycl::kernel_single_task([]() { test(); }); + sycl::kernel_single_task([]() { test(); }); return 0; } diff --git a/clang/test/CodeGenSYCL/static-vars-in-host-code.cpp b/clang/test/CodeGenSYCL/static-vars-in-host-code.cpp index e4c56dedca0ed..e0a3323e8752c 100644 --- a/clang/test/CodeGenSYCL/static-vars-in-host-code.cpp +++ b/clang/test/CodeGenSYCL/static-vars-in-host-code.cpp @@ -5,12 +5,12 @@ #include "sycl.hpp" -// CHECK-NOT: class.cl::sycl::queue +// CHECK-NOT: {{class.sycl::.*queue}} // CHECK: @_ZZ4mainE3Loc = internal addrspace(1) constant i32 42, align 4 // CHECK: @_ZZ4mainE6Struct = internal addrspace(1) constant %struct.S { i32 38 }, align 4 // CHECK: @_ZL4Glob = internal addrspace(1) constant i64 100500, align 8 -// CHECK: @_ZZZZ4mainENKUlRN2cl4sycl7handlerEE_clES2_ENKUlvE_clEvE6InKern = internal addrspace(1) constant i32 2022, align 4 +// CHECK: @_ZZZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_ENKUlvE_clEvE6InKern = internal addrspace(1) constant i32 2022, align 4 // CHECK: @_ZN1SIiE6MemberE = available_externally addrspace(1) constant i32 1, align 4 // CHECK: @_ZZ3fooiE5InFoo = internal addrspace(1) constant i32 300, align 4 diff --git a/clang/test/CodeGenSYCL/stream.cpp b/clang/test/CodeGenSYCL/stream.cpp index 3c47ac4ba96e2..87682fa054f8e 100644 --- a/clang/test/CodeGenSYCL/stream.cpp +++ b/clang/test/CodeGenSYCL/stream.cpp @@ -1,8 +1,8 @@ // RUN: %clang_cc1 -fsycl-is-device -triple spir64-unknown-unknown -disable-llvm-passes -opaque-pointers -emit-llvm %s -o %t.ll // RUN: FileCheck < %t.ll --enable-var-scope %s // -// CHECK: %[[RANGE_TYPE:"struct.*cl::sycl::range"]] -// CHECK: %[[ID_TYPE:"struct.*cl::sycl::id"]] +// CHECK: %[[RANGE_TYPE:"struct.*sycl::_V1::range"]] +// CHECK: %[[ID_TYPE:"struct.*sycl::_V1::id"]] // CHECK: define dso_local spir_kernel void @{{.*}}StreamTester // CHECK-SAME: ptr addrspace(1) noundef align 1 [[ACC_DATA:%[a-zA-Z0-9_]+]], @@ -18,14 +18,14 @@ // Check __init and __finalize method calls // CHECK: call spir_func void @{{.*}}__init{{.*}}(ptr addrspace(4) noundef align 4 dereferenceable_or_null(16) %{{[a-zA-Z0-9_]+}}, ptr addrspace(1) noundef [[ARG_LOAD]], ptr noundef byval(%[[RANGE_TYPE]]) {{.*}}%{{.*}} -// CHECK: call spir_func void @_ZN2cl4sycl6stream10__finalizeEv(ptr addrspace(4) noundef align 4 dereferenceable_or_null(16) %{{[a-zA-Z0-9_]+}}) +// CHECK: call spir_func void @_ZN4sycl3_V16stream10__finalizeEv(ptr addrspace(4) noundef align 4 dereferenceable_or_null(16) %{{[a-zA-Z0-9_]+}}) #include "Inputs/sycl.hpp" int main() { - cl::sycl::queue Q; - Q.submit([&](cl::sycl::handler &CGH) { - cl::sycl::stream Stream(1024, 128, CGH); + sycl::queue Q; + Q.submit([&](sycl::handler &CGH) { + sycl::stream Stream(1024, 128, CGH); CGH.single_task([=]() { Stream << "one" << "two"; diff --git a/clang/test/CodeGenSYCL/struct_kernel_param.cpp b/clang/test/CodeGenSYCL/struct_kernel_param.cpp index c5e5df2d7ef2c..f245ba0627b4d 100644 --- a/clang/test/CodeGenSYCL/struct_kernel_param.cpp +++ b/clang/test/CodeGenSYCL/struct_kernel_param.cpp @@ -2,7 +2,7 @@ // RUN: FileCheck -input-file=%t.h %s // CHECK: const kernel_param_desc_t kernel_signatures[] = { -// CHECK-NEXT: //--- _ZTSZZ5test0vENKUlRN2cl4sycl7handlerEE_clES2_E8MyKernel +// CHECK-NEXT: //--- _ZTSZZ5test0vENKUlRN4sycl3_V17handlerEE_clES2_E8MyKernel // Accessor // CHECK-NEXT: { kernel_param_kind_t::kind_accessor, 4062, 0 }, // FldInt, offset to 16 because the float* causes the alignment of the structs @@ -21,7 +21,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; struct MyNestedStruct { int FldArr[1]; diff --git a/clang/test/CodeGenSYCL/sub-group-size.cpp b/clang/test/CodeGenSYCL/sub-group-size.cpp index 14236fb22f724..e06844a561d39 100644 --- a/clang/test/CodeGenSYCL/sub-group-size.cpp +++ b/clang/test/CodeGenSYCL/sub-group-size.cpp @@ -6,7 +6,7 @@ // on sycl-kernel and sycl-external functions. #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; [[intel::named_sub_group_size(primary)]] SYCL_EXTERNAL void external_primary() {} // ALL-DAG: define {{.*}}spir_func void @{{.*}}external_primary{{.*}}() #{{[0-9]+}} !intel_reqd_sub_group_size ![[PRIMARY:[0-9]+]] diff --git a/clang/test/CodeGenSYCL/sycl-multi-kernel-attr.cpp b/clang/test/CodeGenSYCL/sycl-multi-kernel-attr.cpp index ff5ea3ba4eff8..0e727251a1ce9 100644 --- a/clang/test/CodeGenSYCL/sycl-multi-kernel-attr.cpp +++ b/clang/test/CodeGenSYCL/sycl-multi-kernel-attr.cpp @@ -2,7 +2,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Functor { diff --git a/clang/test/CodeGenSYCL/template-template-parameter.cpp b/clang/test/CodeGenSYCL/template-template-parameter.cpp index 63f049976063f..f1e663e6eb255 100644 --- a/clang/test/CodeGenSYCL/template-template-parameter.cpp +++ b/clang/test/CodeGenSYCL/template-template-parameter.cpp @@ -3,7 +3,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; template class Foo1; // CHECK: template class Foo1; diff --git a/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp b/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp index fbb769786de6d..b00bac5bd23ab 100644 --- a/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp +++ b/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp @@ -8,8 +8,8 @@ // CHECK: class kernel_A; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK: static constexpr diff --git a/clang/test/CodeGenSYCL/unique-stable-id.cpp b/clang/test/CodeGenSYCL/unique-stable-id.cpp index 91d6b8cb455d3..b14d8acbbc795 100644 --- a/clang/test/CodeGenSYCL/unique-stable-id.cpp +++ b/clang/test/CodeGenSYCL/unique-stable-id.cpp @@ -195,7 +195,7 @@ int main() { []() { static int LocalLambda2; auto Lambda = [](){}; - cl::sycl::kernel_single_task(Lambda); + sycl::kernel_single_task(Lambda); puts(__builtin_sycl_unique_stable_id(LocalLambda2)); // CHECK: call i32 @puts({{.+}} @[[LOCAL_LAMBDA_2]]) }(); diff --git a/clang/test/CodeGenSYCL/uses_aspects.cpp b/clang/test/CodeGenSYCL/uses_aspects.cpp index ced2887e70083..feb9b9b746a63 100644 --- a/clang/test/CodeGenSYCL/uses_aspects.cpp +++ b/clang/test/CodeGenSYCL/uses_aspects.cpp @@ -3,38 +3,38 @@ // Tests for IR of __uses_aspects__(aspect, ...) attribute #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; -class [[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] Type1WithAspect{}; -class [[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::fp16, cl::sycl::aspect::cpu)]] Type2WithAspect{}; -class [[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::host)]] UnusedType3WithAspect{}; +class [[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] Type1WithAspect{}; +class [[__sycl_detail__::__uses_aspects__(sycl::aspect::fp16, sycl::aspect::cpu)]] Type2WithAspect{}; +class [[__sycl_detail__::__uses_aspects__(sycl::aspect::host)]] UnusedType3WithAspect{}; // CHECK: define dso_local spir_func void @{{.*}}func1{{.*}} !intel_used_aspects ![[ASPECTS1:[0-9]+]] { -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] void func1() {} +[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func1() {} // CHECK: define dso_local spir_func void @{{.*}}func2{{.*}} !intel_used_aspects ![[ASPECTS2:[0-9]+]] { -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::fp16, cl::sycl::aspect::gpu)]] void func2() {} +[[__sycl_detail__::__uses_aspects__(sycl::aspect::fp16, sycl::aspect::gpu)]] void func2() {} // CHECK: define dso_local spir_func void @{{.*}}func3{{.*}} !intel_used_aspects ![[EMPTYASPECTS:[0-9]+]] { [[__sycl_detail__::__uses_aspects__()]] void func3() {} // CHECK: define linkonce_odr spir_func void @{{.*}}func4{{.*}} !intel_used_aspects ![[ASPECTS3:[0-9]+]] { -template +template [[__sycl_detail__::__uses_aspects__(Aspect)]] void func4() {} // CHECK: define dso_local spir_func void @{{.*}}func5{{.*}} !intel_used_aspects ![[ASPECTS1]] { -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] void func5(); +[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func5(); void func5() {} -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] void func6(); +[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func6(); // CHECK: define dso_local spir_func void @{{.*}}func6{{.*}} !intel_used_aspects ![[ASPECTS1]] { void func6() { Type1WithAspect TestObj1; Type2WithAspect TestObj2; } -constexpr cl::sycl::aspect getAspect() { return cl::sycl::aspect::cpu; } +constexpr sycl::aspect getAspect() { return sycl::aspect::cpu; } // CHECK: define dso_local spir_func void @{{.*}}func7{{.*}} !intel_used_aspects ![[ASPECTS1]] { [[__sycl_detail__::__uses_aspects__(getAspect())]] void func7() {} @@ -44,7 +44,7 @@ class KernelFunctor { func1(); func2(); func3(); - func4(); + func4(); func5(); func6(); func7(); diff --git a/clang/test/CodeGenSYCL/wrapped-accessor.cpp b/clang/test/CodeGenSYCL/wrapped-accessor.cpp index 7152920731e5c..79f573ea8854a 100644 --- a/clang/test/CodeGenSYCL/wrapped-accessor.cpp +++ b/clang/test/CodeGenSYCL/wrapped-accessor.cpp @@ -5,8 +5,8 @@ // CHECK: class wrapped_access; -// CHECK: __SYCL_INLINE_NAMESPACE(cl) { -// CHECK-NEXT: namespace sycl { +// CHECK: namespace sycl { +// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { // CHECK-NEXT: namespace detail { // CHECK: static constexpr @@ -35,7 +35,7 @@ __attribute__((sycl_kernel)) void kernel(const Func &kernelFunc) { } int main() { - cl::sycl::accessor acc; + sycl::accessor acc; auto acc_wrapped = AccWrapper{acc}; kernel( [=]() { diff --git a/clang/test/SemaSYCL/Inputs/sycl.hpp b/clang/test/SemaSYCL/Inputs/sycl.hpp index abc4358d739ff..e1b3c19e5f70c 100644 --- a/clang/test/SemaSYCL/Inputs/sycl.hpp +++ b/clang/test/SemaSYCL/Inputs/sycl.hpp @@ -3,8 +3,8 @@ // Shared code for SYCL tests -inline namespace cl { namespace sycl { +inline namespace _V1 { namespace access { enum class target { @@ -338,7 +338,7 @@ class __attribute__((sycl_special_class)) stream { void __finalize() {} private: - cl::sycl::accessor Acc; + sycl::accessor Acc; int FlushBufferSize; }; @@ -384,7 +384,7 @@ class spec_constant { } // namespace experimental } // namespace oneapi } // namespace ext +} // inline namespace _V1 } // namespace sycl -} // namespace cl #endif diff --git a/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp b/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp index 00322e60ffc51..d21230727dcb8 100644 --- a/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp +++ b/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp @@ -1,8 +1,4 @@ #pragma once -#ifndef __SYCL_DISABLE_NAMESPACE_INLINE__ -#define __SYCL_INLINE_NAMESPACE(X) inline namespace X -#else -#define __SYCL_INLINE_NAMESPACE(X) namespace X -#endif // __SYCL_DISABLE_NAMESPACE_INLINE__ +#define __SYCL_INLINE_VER_NAMESPACE(X) inline namespace X #define __SYCL_DLL_LOCAL diff --git a/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp b/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp index 0ddbba218e000..11b23c00e21b1 100644 --- a/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp +++ b/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp @@ -2,9 +2,9 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { - namespace sycl { - namespace detail { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace detail { #ifndef __SYCL_DEVICE_ONLY__ #define _Bool bool @@ -56,6 +56,6 @@ __SYCL_INLINE_NAMESPACE(cl) { static constexpr bool isESIMD() { return 0; } static constexpr int64_t getKernelSize() { return 0; } }; - } // namespace detail - } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/clang/test/SemaSYCL/accessor-type-diagnostics.cpp b/clang/test/SemaSYCL/accessor-type-diagnostics.cpp index e400d5a114c02..e18a1880fcd9b 100644 --- a/clang/test/SemaSYCL/accessor-type-diagnostics.cpp +++ b/clang/test/SemaSYCL/accessor-type-diagnostics.cpp @@ -9,7 +9,7 @@ #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; //alias template template diff --git a/clang/test/SemaSYCL/args-size-overflow.cpp b/clang/test/SemaSYCL/args-size-overflow.cpp index d3d88d39ca4e0..476dc9cd6ee71 100644 --- a/clang/test/SemaSYCL/args-size-overflow.cpp +++ b/clang/test/SemaSYCL/args-size-overflow.cpp @@ -4,12 +4,12 @@ #include "sycl.hpp" class Foo; -using namespace cl::sycl; +using namespace sycl; queue q; using Accessor = - accessor; + accessor; #ifdef SPIR64 // expected-warning@#KernelSingleTask {{size of kernel arguments (7994 bytes) may exceed the supported maximum of 2048 bytes on some devices}} #elif SPIR32 diff --git a/clang/test/SemaSYCL/attr-syclglobalvar.cpp b/clang/test/SemaSYCL/attr-syclglobalvar.cpp index 968e556d5a72d..7ef52f23115c8 100644 --- a/clang/test/SemaSYCL/attr-syclglobalvar.cpp +++ b/clang/test/SemaSYCL/attr-syclglobalvar.cpp @@ -56,7 +56,7 @@ __attribute__((sycl_global_var)) void HppF( // expected-error@+1 {{attribute only applies to global variables}} __attribute__((sycl_global_var)) int Local; - cl::sycl::kernel_single_task([=] () { + sycl::kernel_single_task([=] () { (void)HppGlobalWithAttribute; // ok (void)HppExternGlobalWithAttribute; // ok (void)NS::HppNSGlobalWithAttribute; // ok @@ -127,7 +127,7 @@ __attribute__((sycl_global_var)) void F( // expected-error@+1 {{'sycl_global_var' attribute only applies to global variables}} __attribute__((sycl_global_var)) int Local; - cl::sycl::kernel_single_task([=] () { + sycl::kernel_single_task([=] () { (void)HppGlobalWithAttribute; // ok (void)CppGlobalWithAttribute; // expected-error {{SYCL kernel cannot use a non-const global variable}} (void)HppExternGlobalWithAttribute; // ok diff --git a/clang/test/SemaSYCL/buffer_location.cpp b/clang/test/SemaSYCL/buffer_location.cpp index 30f4a9ac5cd18..c733d8e7c8315 100644 --- a/clang/test/SemaSYCL/buffer_location.cpp +++ b/clang/test/SemaSYCL/buffer_location.cpp @@ -10,23 +10,23 @@ class another_property_list { }; template -using buffer_location = cl::sycl::ext::intel::property::buffer_location::instance; +using buffer_location = sycl::ext::intel::property::buffer_location::instance; struct Base { int A, B; - cl::sycl::accessor>> + sycl::accessor>> AccField; }; struct Captured : Base, - cl::sycl::accessor>> { + sycl::accessor>> { int C; }; @@ -34,28 +34,28 @@ int main() { #ifndef TRIGGER_ERROR // CHECK: SYCLIntelBufferLocationAttr {{.*}} Implicit 1 Captured Obj; - cl::sycl::accessor>> + sycl::accessor>> // CHECK: SYCLIntelBufferLocationAttr {{.*}} Implicit 2 accessorA; - cl::sycl::accessor>> // CHECK: SYCLIntelBufferLocationAttr {{.*}} Implicit 3 accessorB; - cl::sycl::accessor> accessorC; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { // expected-no-diagnostics Obj.use(); @@ -64,31 +64,31 @@ int main() { accessorC.use(); }); #else - cl::sycl::accessor>> + sycl::accessor>> accessorD; - cl::sycl::accessor> accessorE; - cl::sycl::accessor, buffer_location<2>>> accessorF; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { //expected-error@+1{{buffer_location template parameter must be a non-negative integer}} accessorD.use(); //expected-error@+1{{sixth template parameter of the accessor must be of accessor_property_list type}} accessorE.use(); }); - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { //expected-error@+1{{can't apply buffer_location property twice to the same accessor}} accessorF.use(); diff --git a/clang/test/SemaSYCL/device_global.cpp b/clang/test/SemaSYCL/device_global.cpp index 66296eaf923dd..1a03a6c44c3ef 100644 --- a/clang/test/SemaSYCL/device_global.cpp +++ b/clang/test/SemaSYCL/device_global.cpp @@ -44,7 +44,7 @@ device_global same_name; // OK union [[__sycl_detail__::device_global]] [[__sycl_detail__::global_variable_allowed]] a_union; int main() { - cl::sycl::kernel_single_task([=]() { + sycl::kernel_single_task([=]() { (void)glob; (void)static_glob; (void)inline_glob; @@ -52,7 +52,7 @@ int main() { (void)Foo::d; }); - cl::sycl::kernel_single_task([]() { + sycl::kernel_single_task([]() { // expected-error@+1{{'device_global' variables must be static or declared at namespace scope}} device_global non_static; diff --git a/clang/test/SemaSYCL/device_has.cpp b/clang/test/SemaSYCL/device_has.cpp index 8052caab60c69..ec3935799b93b 100644 --- a/clang/test/SemaSYCL/device_has.cpp +++ b/clang/test/SemaSYCL/device_has.cpp @@ -18,8 +18,8 @@ enum class aspect { [[sycl::device_has("123")]] void func1() {} // expected-error{{'device_has' attribute argument is invalid; argument must be device aspect of type sycl::aspect}} [[sycl::device_has(fake_cl::sycl::aspect::aspect1)]] void func2() {} // expected-error{{'device_has' attribute argument is invalid; argument must be device aspect of type sycl::aspect}} -[[sycl::device_has(cl::sycl::aspect::cpu)]] void func3(); // expected-note{{previous attribute is here}} -[[sycl::device_has(cl::sycl::aspect::gpu)]] void func3() {} // expected-warning{{attribute 'device_has' is already applied}} +[[sycl::device_has(sycl::aspect::cpu)]] void func3(); // expected-note{{previous attribute is here}} +[[sycl::device_has(sycl::aspect::gpu)]] void func3() {} // expected-warning{{attribute 'device_has' is already applied}} template [[sycl::device_has(Aspect)]] void func4() {} // expected-error 2{{'device_has' attribute argument is invalid; argument must be device aspect of type sycl::aspect}} @@ -33,6 +33,6 @@ void checkTemplate() { template [[sycl::device_has(Ty{})]] void func6() {} // expected-error{{'device_has' attribute argument is invalid; argument must be device aspect of type sycl::aspect}} -[[sycl::device_has(cl::sycl::aspect::cpu)]] // expected-note{{previous attribute is here}} -[[sycl::device_has(cl::sycl::aspect::gpu)]] void +[[sycl::device_has(sycl::aspect::cpu)]] // expected-note{{previous attribute is here}} +[[sycl::device_has(sycl::aspect::gpu)]] void func7() {} // expected-warning@-1{{attribute 'device_has' is already applied}} diff --git a/clang/test/SemaSYCL/device_has_ast.cpp b/clang/test/SemaSYCL/device_has_ast.cpp index a361265c4be46..74fd3814121dd 100644 --- a/clang/test/SemaSYCL/device_has_ast.cpp +++ b/clang/test/SemaSYCL/device_has_ast.cpp @@ -3,21 +3,21 @@ // Tests for AST of device_has(aspect, ...) attribute #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // CHECK: FunctionDecl {{.*}} func1 'void ()' // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLDeviceHasAttr // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'cpu' 'sycl::aspect' -[[sycl::device_has(cl::sycl::aspect::cpu)]] void func1() {} +[[sycl::device_has(sycl::aspect::cpu)]] void func1() {} // CHECK: FunctionDecl {{.*}} func2 'void ()' // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLDeviceHasAttr // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'fp16' 'sycl::aspect' // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'gpu' 'sycl::aspect' -[[sycl::device_has(cl::sycl::aspect::fp16, cl::sycl::aspect::gpu)]] void func2() {} +[[sycl::device_has(sycl::aspect::fp16, sycl::aspect::gpu)]] void func2() {} // CHECK: FunctionDecl {{.*}} func3 'void ()' // CHECK-NEXT: CompoundStmt @@ -29,10 +29,10 @@ queue q; // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLDeviceHasAttr // CHECK-NEXT: SubstNonTypeTemplateParmExpr {{.*}} 'sycl::aspect' -// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} referenced 'cl::sycl::aspect':'sycl::aspect' depth 0 index 0 Aspect +// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} referenced 'sycl::aspect':'sycl::aspect' depth 0 index 0 Aspect // CHECK-NEXT: CStyleCastExpr {{.*}} 'sycl::aspect' // CHECK-NEXT: IntegerLiteral {{.*}} 'int' 0 -template +template [[sycl::device_has(Aspect)]] void func4() {} // CHECK: FunctionDecl {{.*}} used func5 'void ()' @@ -42,20 +42,20 @@ template // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLDeviceHasAttr {{.*}} Inherited // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'cpu' 'sycl::aspect' -[[sycl::device_has(cl::sycl::aspect::cpu)]] void func5(); +[[sycl::device_has(sycl::aspect::cpu)]] void func5(); void func5() {} // CHECK: FunctionDecl {{.*}} used func6 'void ()' // CHECK-NEXT: SYCLDeviceHasAttr // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'cpu' 'sycl::aspect' -[[sycl::device_has(cl::sycl::aspect::cpu)]] void func6(); +[[sycl::device_has(sycl::aspect::cpu)]] void func6(); // CHECK: FunctionDecl {{.*}} used func6 'void ()' // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLDeviceHasAttr // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'gpu' 'sycl::aspect' // CHECK-NOT: SYCLDeviceHasAttr -[[sycl::device_has(cl::sycl::aspect::gpu)]] void func6() {} +[[sycl::device_has(sycl::aspect::gpu)]] void func6() {} // CHECK: CXXRecordDecl {{.*}} KernelFunctor class KernelFunctor { @@ -64,7 +64,7 @@ class KernelFunctor { func1(); func2(); func3(); - func4(); + func4(); func5(); func6(); } @@ -76,7 +76,7 @@ class KernelFunctorAttr { // CHECK: CXXMethodDecl {{.*}} used operator() 'void () const' // CHECK: SYCLDeviceHasAtt // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'cpu' 'sycl::aspect' - [[sycl::device_has(cl::sycl::aspect::cpu)]] void operator()() const {} + [[sycl::device_has(sycl::aspect::cpu)]] void operator()() const {} }; void foo() { @@ -98,6 +98,6 @@ void foo() { // CHECK: FunctionDecl {{.*}}kernel_name_3 // CHECK: SYCLDeviceHasAttr // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'gpu' 'sycl::aspect' - h.single_task([]() [[sycl::device_has(cl::sycl::aspect::gpu)]] {}); + h.single_task([]() [[sycl::device_has(sycl::aspect::gpu)]] {}); }); } diff --git a/clang/test/SemaSYCL/esimd-special-class.cpp b/clang/test/SemaSYCL/esimd-special-class.cpp index b58f1094f905a..51762539243d6 100644 --- a/clang/test/SemaSYCL/esimd-special-class.cpp +++ b/clang/test/SemaSYCL/esimd-special-class.cpp @@ -5,14 +5,14 @@ // supported in esimd. #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; void test() { queue q; q.submit([&](handler &h) { - cl::sycl::sampler Smplr; - cl::sycl::stream Stream(1024, 128, h); + sycl::sampler Smplr; + sycl::stream Stream(1024, 128, h); // expected-note@+1{{in instantiation of function template specialization}} h.single_task( // expected-error@+1{{type 'sampler' is not supported in ESIMD context}} diff --git a/clang/test/SemaSYCL/extern_cpp_decl.cpp b/clang/test/SemaSYCL/extern_cpp_decl.cpp index 8ac0332dce753..d34183dae3b3a 100644 --- a/clang/test/SemaSYCL/extern_cpp_decl.cpp +++ b/clang/test/SemaSYCL/extern_cpp_decl.cpp @@ -9,7 +9,7 @@ extern "C++" { #include "Inputs/sycl.hpp" } -using namespace cl::sycl; +using namespace sycl; int main() { accessor ok_acc; diff --git a/clang/test/SemaSYCL/fake-accessors.cpp b/clang/test/SemaSYCL/fake-accessors.cpp index d8919d0c4e307..9490bee359972 100644 --- a/clang/test/SemaSYCL/fake-accessors.cpp +++ b/clang/test/SemaSYCL/fake-accessors.cpp @@ -25,14 +25,14 @@ int main() { fake::cl::sycl::accessor FakeAccessor = {1}; accessor AccessorClass = {1}; - typedef sycl::accessor + typedef sycl::accessor MyAccessorTD; MyAccessorTD AccessorTypeDef; - using MyAccessorA = sycl::accessor; + using MyAccessorA = sycl::accessor; MyAccessorA AccessorAlias; - cl::sycl::accessor AccessorRegular; + sycl::accessor AccessorRegular; deviceQueue.submit([&](sycl::handler &h) { h.single_task( diff --git a/clang/test/SemaSYCL/implicit_kernel_type.cpp b/clang/test/SemaSYCL/implicit_kernel_type.cpp index 9dbf3564d7ac9..3343c9c6d7fd4 100644 --- a/clang/test/SemaSYCL/implicit_kernel_type.cpp +++ b/clang/test/SemaSYCL/implicit_kernel_type.cpp @@ -6,7 +6,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; // user-defined function void function() { diff --git a/clang/test/SemaSYCL/inheritance.cpp b/clang/test/SemaSYCL/inheritance.cpp index 60e99a7ee7bae..1b908dbeb3302 100644 --- a/clang/test/SemaSYCL/inheritance.cpp +++ b/clang/test/SemaSYCL/inheritance.cpp @@ -29,9 +29,9 @@ struct derived : base, second_base { }; int main() { - cl::sycl::queue q; + sycl::queue q; - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { derived f{}; cgh.single_task(f); }); diff --git a/clang/test/SemaSYCL/intel-fpga-no-global-work-offset-ast.cpp b/clang/test/SemaSYCL/intel-fpga-no-global-work-offset-ast.cpp index 19415343960ea..67343e725d8d8 100644 --- a/clang/test/SemaSYCL/intel-fpga-no-global-work-offset-ast.cpp +++ b/clang/test/SemaSYCL/intel-fpga-no-global-work-offset-ast.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; struct FuncObj { diff --git a/clang/test/SemaSYCL/intel-fpga-nofusion.cpp b/clang/test/SemaSYCL/intel-fpga-nofusion.cpp index 77fc997a6484b..0ab64ee407ab5 100644 --- a/clang/test/SemaSYCL/intel-fpga-nofusion.cpp +++ b/clang/test/SemaSYCL/intel-fpga-nofusion.cpp @@ -3,7 +3,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; void nofusion() { diff --git a/clang/test/SemaSYCL/intel-fpga-pipeline-ast.cpp b/clang/test/SemaSYCL/intel-fpga-pipeline-ast.cpp index e2fecd866891d..12787610f237a 100644 --- a/clang/test/SemaSYCL/intel-fpga-pipeline-ast.cpp +++ b/clang/test/SemaSYCL/intel-fpga-pipeline-ast.cpp @@ -5,7 +5,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; template diff --git a/clang/test/SemaSYCL/intel-max-global-work-dim-device-ast.cpp b/clang/test/SemaSYCL/intel-max-global-work-dim-device-ast.cpp index c3a19d0c65436..3269c051e5383 100644 --- a/clang/test/SemaSYCL/intel-max-global-work-dim-device-ast.cpp +++ b/clang/test/SemaSYCL/intel-max-global-work-dim-device-ast.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // No diagnostic is emitted because the arguments match. Duplicate attribute is silently ignored. diff --git a/clang/test/SemaSYCL/intel-max-global-work-dim-device.cpp b/clang/test/SemaSYCL/intel-max-global-work-dim-device.cpp index 7a0fb90b1b7b7..b453985c2ae79 100644 --- a/clang/test/SemaSYCL/intel-max-global-work-dim-device.cpp +++ b/clang/test/SemaSYCL/intel-max-global-work-dim-device.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; struct Func { diff --git a/clang/test/SemaSYCL/intel-max-work-group-size-ast.cpp b/clang/test/SemaSYCL/intel-max-work-group-size-ast.cpp index c40154bfc5e48..59f80bb24695f 100644 --- a/clang/test/SemaSYCL/intel-max-work-group-size-ast.cpp +++ b/clang/test/SemaSYCL/intel-max-work-group-size-ast.cpp @@ -3,7 +3,7 @@ // The test checks support and functionality of [[intel:::max_work_group_size()]] attribute. #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; [[intel::max_work_group_size(2, 2, 2)]] void func_do_not_ignore() {} diff --git a/clang/test/SemaSYCL/intel-reqd-work-group-size-ast-device.cpp b/clang/test/SemaSYCL/intel-reqd-work-group-size-ast-device.cpp index 171ba0d0c5faf..c13d06a49c219 100644 --- a/clang/test/SemaSYCL/intel-reqd-work-group-size-ast-device.cpp +++ b/clang/test/SemaSYCL/intel-reqd-work-group-size-ast-device.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // Test that checks template parameter support on member function of class template. diff --git a/clang/test/SemaSYCL/intel-reqd-work-group-size-device.cpp b/clang/test/SemaSYCL/intel-reqd-work-group-size-device.cpp index d93922352fe9b..57034edd78f82 100644 --- a/clang/test/SemaSYCL/intel-reqd-work-group-size-device.cpp +++ b/clang/test/SemaSYCL/intel-reqd-work-group-size-device.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; [[sycl::reqd_work_group_size(4)]] void f4x1x1() {} // expected-note {{conflicting attribute is here}} diff --git a/clang/test/SemaSYCL/invalid-kernel-arguments.cpp b/clang/test/SemaSYCL/invalid-kernel-arguments.cpp index dd0679ffef511..cf62e6117e47b 100644 --- a/clang/test/SemaSYCL/invalid-kernel-arguments.cpp +++ b/clang/test/SemaSYCL/invalid-kernel-arguments.cpp @@ -56,7 +56,7 @@ int main() { F Obj4{}; G Obj5{}; H Obj6{}; - cl::sycl::kernel_single_task( + sycl::kernel_single_task( [=]() { (void)Obj; (void)Obj1; diff --git a/clang/test/SemaSYCL/kernel-arg-opt-report.cpp b/clang/test/SemaSYCL/kernel-arg-opt-report.cpp index 8ad21ae93fbd8..df38453b5cb09 100644 --- a/clang/test/SemaSYCL/kernel-arg-opt-report.cpp +++ b/clang/test/SemaSYCL/kernel-arg-opt-report.cpp @@ -402,7 +402,7 @@ int main() { // SPIR: Name:{{.*}}Region // SPIR: DebugLoc:{{.*}} { File: '{{.*}}kernel-arg-opt-report.cpp', // SPIR-NEXT: Line: 53, Column: 9 } -// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN2cl4sycl7handlerEE0_clES2_E3XYZ +// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_E3XYZ // SPIR-NEXT: Args: // SPIR-NEXT: String: 'Arg ' // SPIR-NEXT: Argument: '0' @@ -423,7 +423,7 @@ int main() { // SPIR: Name:{{.*}}Region // SPIR: DebugLoc:{{.*}} { File: '{{.*}}kernel-arg-opt-report.cpp', // SPIR-NEXT: Line: 53, Column: 9 } -// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN2cl4sycl7handlerEE0_clES2_E3XYZ +// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_E3XYZ // SPIR-NEXT: Args: // SPIR-NEXT: String: 'Arg ' // SPIR-NEXT: Argument: '1' @@ -444,7 +444,7 @@ int main() { // SPIR: Name:{{.*}}Region // SPIR: DebugLoc:{{.*}} { File: '{{.*}}kernel-arg-opt-report.cpp', // SPIR-NEXT: Line: 53, Column: 9 } -// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN2cl4sycl7handlerEE0_clES2_E3XYZ +// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_E3XYZ // SPIR-NEXT: Args: // SPIR-NEXT: String: 'Arg ' // SPIR-NEXT: Argument: '2' @@ -465,7 +465,7 @@ int main() { // SPIR: Name:{{.*}}Region // SPIR: DebugLoc:{{.*}} { File: '{{.*}}kernel-arg-opt-report.cpp', // SPIR-NEXT: Line: 53, Column: 9 } -// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN2cl4sycl7handlerEE0_clES2_E3XYZ +// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_E3XYZ // SPIR-NEXT: Args: // SPIR-NEXT: String: 'Arg ' // SPIR-NEXT: Argument: '3' @@ -486,7 +486,7 @@ int main() { // SPIR: Name:{{.*}}Region // SPIR: DebugLoc:{{.*}} { File: '{{.*}}kernel-arg-opt-report.cpp', // SPIR-NEXT: Line: 53, Column: 9 } -// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN2cl4sycl7handlerEE0_clES2_E3XYZ +// SPIR-NEXT: Function: _ZTSZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_E3XYZ // SPIR-NEXT: Args: // SPIR-NEXT: String: 'Arg ' // SPIR-NEXT: Argument: '4' @@ -507,7 +507,7 @@ int main() { // NVPTX: Name:{{.*}}Region // NVPTX: DebugLoc:{{.*}} { File: '{{.*}}kernel-arg-opt-report.cpp', // NVPTX: Line: 53, Column: 9 } -// NVPTX-NEXT: Function: _ZTSZZ4mainENKUlRN2cl4sycl7handlerEE0_clES2_E3XYZ +// NVPTX-NEXT: Function: _ZTSZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_E3XYZ // NVPTX-NEXT: Args: // NVPTX-NEXT: String: 'Arg ' // NVPTX: Argument: '5' diff --git a/clang/test/SemaSYCL/kernel-handler.cpp b/clang/test/SemaSYCL/kernel-handler.cpp index b07373f6a19e4..4568d8405c20d 100644 --- a/clang/test/SemaSYCL/kernel-handler.cpp +++ b/clang/test/SemaSYCL/kernel-handler.cpp @@ -6,7 +6,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; int main() { diff --git a/clang/test/SemaSYCL/kernelname-enum.cpp b/clang/test/SemaSYCL/kernelname-enum.cpp index d1f513fe8e968..34c201cd7f1c2 100644 --- a/clang/test/SemaSYCL/kernelname-enum.cpp +++ b/clang/test/SemaSYCL/kernelname-enum.cpp @@ -62,29 +62,29 @@ int main() { dummy_functor_4 f4; templated_functor f5; - cl::sycl::queue q; + sycl::queue q; - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f1); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { // expected-error@#KernelSingleTask {{unscoped enum 'unscoped_enum_no_type_set' requires fixed underlying type}} // expected-note@+1{{in instantiation of function template specialization}} cgh.single_task(f2); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { // expected-error@#KernelSingleTask {{unscoped enum 'unscoped_enum_no_type_set' requires fixed underlying type}} // expected-note@+1{{in instantiation of function template specialization}} cgh.single_task(f5); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f3); }); - q.submit([&](cl::sycl::handler &cgh) { + q.submit([&](sycl::handler &cgh) { cgh.single_task(f4); }); diff --git a/clang/test/SemaSYCL/lambda_implicit_capture_this.cpp b/clang/test/SemaSYCL/lambda_implicit_capture_this.cpp index 8cba3549b5a9c..4e7d41b142815 100644 --- a/clang/test/SemaSYCL/lambda_implicit_capture_this.cpp +++ b/clang/test/SemaSYCL/lambda_implicit_capture_this.cpp @@ -4,7 +4,7 @@ // "this" pointer by lambdas passed to the device code (directly and indirectly) #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Class { diff --git a/clang/test/SemaSYCL/loop_fusion_ast.cpp b/clang/test/SemaSYCL/loop_fusion_ast.cpp index 1b2dc840cf28c..52829b05d669c 100644 --- a/clang/test/SemaSYCL/loop_fusion_ast.cpp +++ b/clang/test/SemaSYCL/loop_fusion_ast.cpp @@ -3,7 +3,7 @@ // Tests for AST of Intel FPGA loop fusion function attributes #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // CHECK: FunctionDecl {{.*}} func1 'void ()' diff --git a/clang/test/SemaSYCL/mangle-unnamed-kernel.cpp b/clang/test/SemaSYCL/mangle-unnamed-kernel.cpp index 6a62f98feff91..a4cfa78774bf3 100644 --- a/clang/test/SemaSYCL/mangle-unnamed-kernel.cpp +++ b/clang/test/SemaSYCL/mangle-unnamed-kernel.cpp @@ -2,11 +2,11 @@ #include "Inputs/sycl.hpp" int main() { - cl::sycl::queue q; - q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); }); + sycl::queue q; + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); return 0; } -// CHECK: _ZTSZZ4mainENKUlRN2cl4sycl7handlerEE_clES2_EUlvE_ -// CHECK: _ZTSZZ4mainENKUlRN2cl4sycl7handlerEE0_clES2_EUlvE_ +// CHECK: _ZTSZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_EUlvE_ +// CHECK: _ZTSZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_EUlvE_ diff --git a/clang/test/SemaSYCL/max-concurrency-ast.cpp b/clang/test/SemaSYCL/max-concurrency-ast.cpp index d2141217574cd..61f9f60d6a2f0 100644 --- a/clang/test/SemaSYCL/max-concurrency-ast.cpp +++ b/clang/test/SemaSYCL/max-concurrency-ast.cpp @@ -3,7 +3,7 @@ // Tests for AST of Intel FPGA max concurrency function attribute. #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // CHECK: FunctionDecl {{.*}} func1 'void ()' diff --git a/clang/test/SemaSYCL/nested-anon-and-std-ns.cpp b/clang/test/SemaSYCL/nested-anon-and-std-ns.cpp index 8b7264fbfdf2b..61dd955bdaa27 100644 --- a/clang/test/SemaSYCL/nested-anon-and-std-ns.cpp +++ b/clang/test/SemaSYCL/nested-anon-and-std-ns.cpp @@ -24,22 +24,22 @@ struct MyWrapper { public: void test() { - cl::sycl::queue q; + sycl::queue q; // expected-error@#KernelSingleTask {{'std::NestedInStd::NestedStruct' is an invalid kernel name, 'std::NestedInStd::NestedStruct' is declared in the 'std' namespace}} // expected-note@+2{{in instantiation of function template specialization}} - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); // no error for valid ns - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); // expected-error@#KernelSingleTask {{'ParentStruct::ChildStruct' is invalid; kernel name should be forward declarable at namespace scope}} // expected-note@+2{{in instantiation of function template specialization}} - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); } diff --git a/clang/test/SemaSYCL/non-fwd-declarable-kernel-name.cpp b/clang/test/SemaSYCL/non-fwd-declarable-kernel-name.cpp index 19e8c6a57bcfc..e3651e97597e6 100644 --- a/clang/test/SemaSYCL/non-fwd-declarable-kernel-name.cpp +++ b/clang/test/SemaSYCL/non-fwd-declarable-kernel-name.cpp @@ -11,7 +11,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; // user-defined function void function() { diff --git a/clang/test/SemaSYCL/num_simd_work_items.cpp b/clang/test/SemaSYCL/num_simd_work_items.cpp index 5f57a7e1b9b76..deb50f427d9b4 100644 --- a/clang/test/SemaSYCL/num_simd_work_items.cpp +++ b/clang/test/SemaSYCL/num_simd_work_items.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // expected-warning@+1 {{unknown attribute 'num_simd_work_items' ignored}} diff --git a/clang/test/SemaSYCL/num_simd_work_items_ast.cpp b/clang/test/SemaSYCL/num_simd_work_items_ast.cpp index 0e8bfd69816db..eeb1bee939792 100644 --- a/clang/test/SemaSYCL/num_simd_work_items_ast.cpp +++ b/clang/test/SemaSYCL/num_simd_work_items_ast.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // No diagnostic is emitted because the arguments match. Duplicate attribute is silently ignored. diff --git a/clang/test/SemaSYCL/pointer-to-vla.cpp b/clang/test/SemaSYCL/pointer-to-vla.cpp index ca65857b46e18..cd2d925f92dad 100644 --- a/clang/test/SemaSYCL/pointer-to-vla.cpp +++ b/clang/test/SemaSYCL/pointer-to-vla.cpp @@ -8,7 +8,7 @@ void foo(unsigned X) { using VLATy = float(*)[X]; VLATy PtrToVLA; - cl::sycl::kernel_single_task([=]() { + sycl::kernel_single_task([=]() { // expected-error@+1 {{variable length arrays are not supported for the current target}} (void)PtrToVLA; }); diff --git a/clang/test/SemaSYCL/reqd-sub-group-size-ast.cpp b/clang/test/SemaSYCL/reqd-sub-group-size-ast.cpp index e00f8aeed4279..dde7140595dd4 100644 --- a/clang/test/SemaSYCL/reqd-sub-group-size-ast.cpp +++ b/clang/test/SemaSYCL/reqd-sub-group-size-ast.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; [[intel::reqd_sub_group_size(4)]] void foo() {} diff --git a/clang/test/SemaSYCL/reqd-sub-group-size.cpp b/clang/test/SemaSYCL/reqd-sub-group-size.cpp index 6b6a51fcbc360..85afcf97388ff 100644 --- a/clang/test/SemaSYCL/reqd-sub-group-size.cpp +++ b/clang/test/SemaSYCL/reqd-sub-group-size.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; [[intel::reqd_sub_group_size(4)]] void foo() {} // expected-note {{conflicting attribute is here}} diff --git a/clang/test/SemaSYCL/reqd-work-group-size-device-direct-prop.cpp b/clang/test/SemaSYCL/reqd-work-group-size-device-direct-prop.cpp index 7fd80f5dfca6e..be82a1a08cd6d 100644 --- a/clang/test/SemaSYCL/reqd-work-group-size-device-direct-prop.cpp +++ b/clang/test/SemaSYCL/reqd-work-group-size-device-direct-prop.cpp @@ -4,7 +4,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; class Functor16x16x16 { diff --git a/clang/test/SemaSYCL/reqd-work-group-size-device.cpp b/clang/test/SemaSYCL/reqd-work-group-size-device.cpp index 8f0c02dcdd1f0..256f258184661 100644 --- a/clang/test/SemaSYCL/reqd-work-group-size-device.cpp +++ b/clang/test/SemaSYCL/reqd-work-group-size-device.cpp @@ -4,7 +4,7 @@ // Test for AST of reqd_work_group_size kernel attribute in SYCL 1.2.1. #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; [[sycl::reqd_work_group_size(4, 1, 1)]] void f4x1x1() {} // expected-note {{conflicting attribute is here}} diff --git a/clang/test/SemaSYCL/spec-const-value-dependent-crash.cpp b/clang/test/SemaSYCL/spec-const-value-dependent-crash.cpp index 7ddb5671add1f..c44ac3fccaf1e 100644 --- a/clang/test/SemaSYCL/spec-const-value-dependent-crash.cpp +++ b/clang/test/SemaSYCL/spec-const-value-dependent-crash.cpp @@ -7,12 +7,12 @@ sycl::queue myQueue; int main() { constexpr int default_val = 20; - cl::sycl::ext::oneapi::experimental::spec_constant SC(default_val); + sycl::ext::oneapi::experimental::spec_constant SC(default_val); myQueue.submit([&](sycl::handler &h) { h.single_task( [=] { - cl::sycl::ext::oneapi::experimental::spec_constant res = SC; + sycl::ext::oneapi::experimental::spec_constant res = SC; }); }); return 0; @@ -21,4 +21,4 @@ int main() { // CHECK: FunctionDecl {{.*}}kernel_sc{{.*}} 'void ()' // CHECK: VarDecl {{.*}}'(lambda at {{.*}}' // CHECK-NEXT: InitListExpr {{.*}}'(lambda at {{.*}}' -// CHECK-NEXT: CXXConstructExpr {{.*}}'cl::sycl::ext::oneapi::experimental::spec_constant':'sycl::ext::oneapi::experimental::spec_constant' 'void ()' +// CHECK-NEXT: CXXConstructExpr {{.*}}'sycl::ext::oneapi::experimental::spec_constant':'sycl::ext::oneapi::experimental::spec_constant' 'void ()' diff --git a/clang/test/SemaSYCL/spec_const_and_accesor_crash.cpp b/clang/test/SemaSYCL/spec_const_and_accesor_crash.cpp index f46de9ef9db29..26907dc4322cb 100644 --- a/clang/test/SemaSYCL/spec_const_and_accesor_crash.cpp +++ b/clang/test/SemaSYCL/spec_const_and_accesor_crash.cpp @@ -10,10 +10,10 @@ __attribute__((sycl_kernel)) void kernel(const Func &kernelFunc) { } int main() { - cl::sycl::ext::oneapi::experimental::spec_constant spec_const; - cl::sycl::accessor accessor; - // CHECK: FieldDecl {{.*}} implicit referenced spec_const 'cl::sycl::ext::oneapi::experimental::spec_constant' - // CHECK: FieldDecl {{.*}} implicit referenced accessor 'cl::sycl::accessor' + sycl::ext::oneapi::experimental::spec_constant spec_const; + sycl::accessor accessor; + // CHECK: FieldDecl {{.*}} implicit referenced spec_const 'sycl::ext::oneapi::experimental::spec_constant' + // CHECK: FieldDecl {{.*}} implicit referenced accessor 'sycl::accessor' kernel([spec_const, accessor]() {}); return 0; } diff --git a/clang/test/SemaSYCL/stall_enable_device.cpp b/clang/test/SemaSYCL/stall_enable_device.cpp index d09a3f875714f..b8682461fc9ba 100644 --- a/clang/test/SemaSYCL/stall_enable_device.cpp +++ b/clang/test/SemaSYCL/stall_enable_device.cpp @@ -5,7 +5,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // Test attribute is presented on function definition. diff --git a/clang/test/SemaSYCL/stdtypes_kernel_type.cpp b/clang/test/SemaSYCL/stdtypes_kernel_type.cpp index 9a777d15a530e..1543a19754bc1 100644 --- a/clang/test/SemaSYCL/stdtypes_kernel_type.cpp +++ b/clang/test/SemaSYCL/stdtypes_kernel_type.cpp @@ -22,7 +22,7 @@ struct Templated_kernel_name2; template class TemplParamPack; -using namespace cl::sycl; +using namespace sycl; queue q; int main() { diff --git a/clang/test/SemaSYCL/sycl-device-template-diag.cpp b/clang/test/SemaSYCL/sycl-device-template-diag.cpp index 01d02b288f875..f1a8942aed6d6 100644 --- a/clang/test/SemaSYCL/sycl-device-template-diag.cpp +++ b/clang/test/SemaSYCL/sycl-device-template-diag.cpp @@ -5,7 +5,7 @@ #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; int global_value = -1; diff --git a/clang/test/SemaSYCL/union-kernel-param-neg.cpp b/clang/test/SemaSYCL/union-kernel-param-neg.cpp index 28898e3316823..7a6d97effe9b7 100644 --- a/clang/test/SemaSYCL/union-kernel-param-neg.cpp +++ b/clang/test/SemaSYCL/union-kernel-param-neg.cpp @@ -4,11 +4,11 @@ // accessor/sampler as SYCL kernel parameter inside union. #include "Inputs/sycl.hpp" -using namespace cl::sycl; +using namespace sycl; union union_with_sampler { - cl::sycl::sampler smpl; - // expected-error@-1 {{'cl::sycl::sampler' cannot be used inside a union kernel parameter}} + sycl::sampler smpl; + // expected-error@-1 {{'sycl::sampler' cannot be used inside a union kernel parameter}} }; template diff --git a/clang/test/SemaSYCL/unnamed-kernel.cpp b/clang/test/SemaSYCL/unnamed-kernel.cpp index f206070b17f79..277d9ac5870b7 100644 --- a/clang/test/SemaSYCL/unnamed-kernel.cpp +++ b/clang/test/SemaSYCL/unnamed-kernel.cpp @@ -31,60 +31,60 @@ struct MyWrapper { public: void test() { - cl::sycl::queue q; + sycl::queue q; // expected-error@#KernelSingleTask {{'InvalidKernelName1' is invalid; kernel name should be forward declarable at namespace scope}} // expected-note@+3{{in instantiation of function template specialization}} class InvalidKernelName1 {}; - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); // expected-error@#KernelSingleTask {{'namespace1::KernelName' is invalid; kernel name should be forward declarable at namespace scope}} // expected-note@+3{{in instantiation of function template specialization}} class InvalidKernelName2 {}; - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task>([] {}); }); // expected-error@#KernelSingleTask {{'MyWrapper::InvalidKernelName0' is invalid; kernel name should be forward declarable at namespace scope}} // expected-note@+2{{in instantiation of function template specialization}} - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); // expected-error@#KernelSingleTask {{'namespace1::KernelName' is invalid; kernel name should be forward declarable at namespace scope}} // expected-note@+2{{in instantiation of function template specialization}} - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task>([] {}); }); using ValidAlias = MyWrapper; - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); // expected-error@#KernelSingleTask {{'std::max_align_t' is an invalid kernel name, 'std::(anonymous)' is declared in the 'std' namespace}} // expected-note@+2{{in instantiation of function template specialization}} - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); using InvalidAlias = InvalidKernelName4; // expected-error@#KernelSingleTask {{'MyWrapper::InvalidKernelName4' is invalid; kernel name should be forward declarable at namespace scope}} // expected-note@+2{{in instantiation of function template specialization}} - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); using InvalidAlias1 = InvalidKernelName5; // expected-error@#KernelSingleTask {{'namespace1::KernelName' is invalid; kernel name should be forward declarable at namespace scope}} // expected-note@+2{{in instantiation of function template specialization}} - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task>([] {}); }); // expected-error@#KernelSingleTask {{'Templated_kernel_name2>' is invalid; kernel name should be forward declarable at namespace scope}} // expected-note@+2{{in instantiation of function template specialization}} - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task>>([] {}); }); } @@ -93,44 +93,44 @@ struct MyWrapper { // Test unnamed kernels the same way. The above set should still be errors, // but this set is now fine. void test_unnamed() { - cl::sycl::queue q; - q.submit([&](cl::sycl::handler &h) { + sycl::queue q; + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); // This should have no problem, since the types match. - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { auto SomeLambda = []() {}; h.single_task(SomeLambda); }); @@ -139,7 +139,7 @@ struct MyWrapper { // so this is not the unnamed lambda situation. // expected-error@#KernelSingleTask {{unnamed type 'const}} // expected-note@+3{{in instantiation of function template specialization}} - q.submit([&](cl::sycl::handler &h) { + q.submit([&](sycl::handler &h) { auto SomeLambda = []() {}; h.single_task(SomeLambda); }); @@ -148,12 +148,12 @@ struct MyWrapper { }; int main() { - cl::sycl::queue q; + sycl::queue q; #ifndef __SYCL_UNNAMED_LAMBDA__ // expected-error-re@#KernelSingleTask {{unnamed type '(lambda at {{.*}}unnamed-kernel.cpp{{.*}}' is invalid; provide a kernel name, or use '-fsycl-unnamed-lambda' to enable unnamed kernel lambdas}} // expected-note@+2{{in instantiation of function template specialization}} #endif - q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); }); + q.submit([&](sycl::handler &h) { h.single_task([] {}); }); return 0; } diff --git a/clang/test/SemaSYCL/uses_aspects.cpp b/clang/test/SemaSYCL/uses_aspects.cpp index 91e47c9aa35bb..f337aed1a87ba 100644 --- a/clang/test/SemaSYCL/uses_aspects.cpp +++ b/clang/test/SemaSYCL/uses_aspects.cpp @@ -18,8 +18,8 @@ enum class aspect { [[__sycl_detail__::__uses_aspects__("123")]] void func1() {} // expected-error{{'__uses_aspects__' attribute argument is invalid; argument must be device aspect of type sycl::aspect}} [[__sycl_detail__::__uses_aspects__(fake_cl::sycl::aspect::aspect1)]] void func2() {} // expected-error{{'__uses_aspects__' attribute argument is invalid; argument must be device aspect of type sycl::aspect}} -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] void func3(); // expected-note{{previous attribute is here}} -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::gpu)]] void func3() {} // expected-warning{{attribute '__uses_aspects__' is already applied}} +[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func3(); // expected-note{{previous attribute is here}} +[[__sycl_detail__::__uses_aspects__(sycl::aspect::gpu)]] void func3() {} // expected-warning{{attribute '__uses_aspects__' is already applied}} template [[__sycl_detail__::__uses_aspects__(Aspect)]] void func4() {} // expected-error 2{{'__uses_aspects__' attribute argument is invalid; argument must be device aspect of type sycl::aspect}} @@ -33,6 +33,6 @@ void checkTemplate() { template [[__sycl_detail__::__uses_aspects__(Ty{})]] void func6() {} // expected-error{{'__uses_aspects__' attribute argument is invalid; argument must be device aspect of type sycl::aspect}} -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] // expected-note{{previous attribute is here}} -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::gpu)]] void +[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] // expected-note{{previous attribute is here}} +[[__sycl_detail__::__uses_aspects__(sycl::aspect::gpu)]] void func7() {} // expected-warning@-1{{attribute '__uses_aspects__' is already applied}} diff --git a/clang/test/SemaSYCL/uses_aspects_ast.cpp b/clang/test/SemaSYCL/uses_aspects_ast.cpp index 592e546eb2bd8..c5827c5b3179b 100644 --- a/clang/test/SemaSYCL/uses_aspects_ast.cpp +++ b/clang/test/SemaSYCL/uses_aspects_ast.cpp @@ -3,21 +3,21 @@ // Tests for AST of __uses_aspects__(aspect, ...) attribute #include "sycl.hpp" -using namespace cl::sycl; +using namespace sycl; queue q; // CHECK: FunctionDecl {{.*}} func1 'void ()' // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLUsesAspectsAttr // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'cpu' 'sycl::aspect' -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] void func1() {} +[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func1() {} // CHECK: FunctionDecl {{.*}} func2 'void ()' // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLUsesAspectsAttr // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'fp16' 'sycl::aspect' // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'gpu' 'sycl::aspect' -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::fp16, cl::sycl::aspect::gpu)]] void func2() {} +[[__sycl_detail__::__uses_aspects__(sycl::aspect::fp16, sycl::aspect::gpu)]] void func2() {} // CHECK: FunctionDecl {{.*}} func3 'void ()' // CHECK-NEXT: CompoundStmt @@ -29,10 +29,10 @@ queue q; // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLUsesAspectsAttr // CHECK-NEXT: SubstNonTypeTemplateParmExpr {{.*}} 'sycl::aspect' -// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} referenced 'cl::sycl::aspect':'sycl::aspect' depth 0 index 0 Aspect +// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} referenced 'sycl::aspect':'sycl::aspect' depth 0 index 0 Aspect // CHECK-NEXT: CStyleCastExpr {{.*}} 'sycl::aspect' // CHECK-NEXT: IntegerLiteral {{.*}} 'int' 0 -template +template [[__sycl_detail__::__uses_aspects__(Aspect)]] void func4() {} // CHECK: FunctionDecl {{.*}} used func5 'void ()' @@ -42,25 +42,25 @@ template // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLUsesAspectsAttr {{.*}} Inherited // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'cpu' 'sycl::aspect' -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] void func5(); +[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func5(); void func5() {} // CHECK: FunctionDecl {{.*}} used func6 'void ()' // CHECK-NEXT: SYCLUsesAspectsAttr // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'cpu' 'sycl::aspect' -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] void func6(); +[[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] void func6(); // CHECK: FunctionDecl {{.*}} used func6 'void ()' // CHECK-NEXT: CompoundStmt // CHECK-NEXT: SYCLUsesAspectsAttr // CHECK-NEXT: DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'gpu' 'sycl::aspect' // CHECK-NOT: SYCLUsesAspectsAttr -[[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::gpu)]] void func6() {} +[[__sycl_detail__::__uses_aspects__(sycl::aspect::gpu)]] void func6() {} // CHECK: CXXRecordDecl {{.*}} class TypeWithAspect definition // CHECK: SYCLUsesAspectsAttr // CHECK-NEXT:DeclRefExpr {{.*}} 'sycl::aspect' EnumConstant {{.*}} 'cpu' 'sycl::aspect' -class [[__sycl_detail__::__uses_aspects__(cl::sycl::aspect::cpu)]] TypeWithAspect{}; +class [[__sycl_detail__::__uses_aspects__(sycl::aspect::cpu)]] TypeWithAspect{}; class KernelFunctor { public: @@ -68,7 +68,7 @@ class KernelFunctor { func1(); func2(); func3(); - func4(); + func4(); func5(); func6(); } diff --git a/llvm-spirv/lib/SPIRV/SPIRVUtil.cpp b/llvm-spirv/lib/SPIRV/SPIRVUtil.cpp index 654b9992ff793..b943ab3002fe3 100644 --- a/llvm-spirv/lib/SPIRV/SPIRVUtil.cpp +++ b/llvm-spirv/lib/SPIRV/SPIRVUtil.cpp @@ -288,7 +288,7 @@ bool isSYCLHalfType(llvm::Type *Ty) { return false; StringRef Name = ST->getName(); Name.consume_front("class."); - if ((Name.startswith("cl::sycl::") || + if ((Name.startswith("cl::sycl::") || Name.startswith("sycl::") || Name.startswith("__sycl_internal::")) && Name.endswith("::half")) { return true; @@ -303,7 +303,7 @@ bool isSYCLBfloat16Type(llvm::Type *Ty) { return false; StringRef Name = ST->getName(); Name.consume_front("class."); - if ((Name.startswith("cl::sycl::") || + if ((Name.startswith("cl::sycl::") || Name.startswith("sycl::_V1::") || Name.startswith("__sycl_internal::")) && Name.endswith("::bfloat16")) { return true; diff --git a/llvm/lib/SYCLLowerIR/ESIMD/ESIMDVerifier.cpp b/llvm/lib/SYCLLowerIR/ESIMD/ESIMDVerifier.cpp index 73817cff5802f..5d08ba67d5c5e 100644 --- a/llvm/lib/SYCLLowerIR/ESIMD/ESIMDVerifier.cpp +++ b/llvm/lib/SYCLLowerIR/ESIMD/ESIMDVerifier.cpp @@ -30,32 +30,32 @@ namespace id = itanium_demangle; // A list of SYCL functions (regexps) allowed for use in ESIMD context. static const char *LegalSYCLFunctions[] = { - "^cl::sycl::accessor<.+>::accessor", - "^cl::sycl::accessor<.+>::~accessor", - "^cl::sycl::accessor<.+>::getNativeImageObj", - "^cl::sycl::accessor<.+>::__init_esimd", - "^cl::sycl::ext::oneapi::experimental::printf", - "^cl::sycl::id<.+>::.+", - "^cl::sycl::item<.+>::.+", - "^cl::sycl::nd_item<.+>::.+", - "^cl::sycl::group<.+>::.+", - "^cl::sycl::sub_group<.+>::.+", - "^cl::sycl::range<.+>::.+", - "^cl::sycl::kernel_handler::.+", - "^cl::sycl::cos<.+>", - "^cl::sycl::sin<.+>", - "^cl::sycl::log<.+>", - "^cl::sycl::exp<.+>", - "^cl::sycl::operator.+<.+>", - "^cl::sycl::ext::oneapi::sub_group::.+", - "^cl::sycl::ext::oneapi::experimental::spec_constant<.+>::.+", - "^cl::sycl::ext::oneapi::experimental::this_sub_group"}; + "^sycl::_V1::accessor<.+>::accessor", + "^sycl::_V1::accessor<.+>::~accessor", + "^sycl::_V1::accessor<.+>::getNativeImageObj", + "^sycl::_V1::accessor<.+>::__init_esimd", + "^sycl::_V1::ext::oneapi::experimental::printf", + "^sycl::_V1::id<.+>::.+", + "^sycl::_V1::item<.+>::.+", + "^sycl::_V1::nd_item<.+>::.+", + "^sycl::_V1::group<.+>::.+", + "^sycl::_V1::sub_group<.+>::.+", + "^sycl::_V1::range<.+>::.+", + "^sycl::_V1::kernel_handler::.+", + "^sycl::_V1::cos<.+>", + "^sycl::_V1::sin<.+>", + "^sycl::_V1::log<.+>", + "^sycl::_V1::exp<.+>", + "^sycl::_V1::operator.+<.+>", + "^sycl::_V1::ext::oneapi::sub_group::.+", + "^sycl::_V1::ext::oneapi::experimental::spec_constant<.+>::.+", + "^sycl::_V1::ext::oneapi::experimental::this_sub_group"}; static const char *LegalSYCLFunctionsInStatelessMode[] = { - "^cl::sycl::multi_ptr<.+>::get", "^cl::sycl::multi_ptr<.+>::multi_ptr", - "^cl::sycl::accessor<.+>::get_pointer.+", - "^cl::sycl::accessor<.+>::getPointerAdjusted", - "^cl::sycl::accessor<.+>::getQualifiedPtr"}; + "^sycl::_V1::multi_ptr<.+>::get", "^sycl::_V1::multi_ptr<.+>::multi_ptr", + "^sycl::_V1::accessor<.+>::get_pointer.+", + "^sycl::_V1::accessor<.+>::getPointerAdjusted", + "^sycl::_V1::accessor<.+>::getQualifiedPtr"}; namespace { @@ -145,10 +145,10 @@ class ESIMDVerifierImpl { // We are interested in functions defined in SYCL namespace, but // outside of ESIMD namespaces. - if (!Name.startswith("cl::sycl::") || - Name.startswith("cl::sycl::detail::") || - Name.startswith("cl::sycl::ext::intel::esimd::") || - Name.startswith("cl::sycl::ext::intel::experimental::esimd::")) + if (!Name.startswith("sycl::_V1::") || + Name.startswith("sycl::_V1::detail::") || + Name.startswith("sycl::_V1::ext::intel::esimd::") || + Name.startswith("sycl::_V1::ext::intel::experimental::esimd::")) continue; // Check if function name matches any allowed SYCL function name. diff --git a/llvm/lib/SYCLLowerIR/ESIMD/LowerESIMD.cpp b/llvm/lib/SYCLLowerIR/ESIMD/LowerESIMD.cpp index b3b337e0048aa..8ac058f90416f 100644 --- a/llvm/lib/SYCLLowerIR/ESIMD/LowerESIMD.cpp +++ b/llvm/lib/SYCLLowerIR/ESIMD/LowerESIMD.cpp @@ -1374,11 +1374,11 @@ static Function *createTestESIMDDeclaration(const ESIMDIntrinDesc &Desc, // // ### Source-level intrinsic: // -// sycl::ext::intel::experimental::esimd::__vector_type::type +// sycl::_V1::ext::intel::experimental::esimd::__vector_type::type // __esimd_flat_read( -// sycl::ext::intel::experimental::esimd::__vector_type::type, sycl::ext::intel::experimental::esimd::__vector_type::type) +// sycl::_V1::ext::intel::experimental::esimd::__vector_type::type, +// sycl::_V1::ext::intel::experimental::esimd::__vector_type::type) // // ### Itanium-mangled name: // @@ -1619,14 +1619,15 @@ SmallPtrSet collectGenXVolatileTypes(Module &M) { // TODO FIXME relying on type name in LLVM IR is fragile, needs rework if (!GTy || !GTy->getName() .rtrim(".0123456789") - .endswith("sycl::ext::intel::esimd::simd")) + .endswith("sycl::_V1::ext::intel::esimd::simd")) continue; assert(GTy->getNumContainedTypes() == 1); auto VTy = GTy->getContainedType(0); if ((GTy = dyn_cast(VTy))) { - assert(GTy->getName() - .rtrim(".0123456789") - .endswith("sycl::ext::intel::esimd::detail::simd_obj_impl")); + assert( + GTy->getName() + .rtrim(".0123456789") + .endswith("sycl::_V1::ext::intel::esimd::detail::simd_obj_impl")); VTy = GTy->getContainedType(0); } assert(VTy->isVectorTy()); diff --git a/sycl/.clang-format b/sycl/.clang-format index d9e54adc5d653..412e67480725c 100644 --- a/sycl/.clang-format +++ b/sycl/.clang-format @@ -1,2 +1,2 @@ BasedOnStyle: LLVM -NamespaceMacros: ['__SYCL_INLINE_NAMESPACE'] +NamespaceMacros: ['__SYCL_INLINE_NAMESPACE', '__SYCL_INLINE_VER_NAMESPACE'] diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt index 8ac357b0e17c2..7a08b84322f02 100644 --- a/sycl/CMakeLists.txt +++ b/sycl/CMakeLists.txt @@ -28,7 +28,7 @@ include(SYCLUtils) set(SYCL_MAJOR_VERSION 5) set(SYCL_MINOR_VERSION 7) set(SYCL_PATCH_VERSION 0) -set(SYCL_DEV_ABI_VERSION 2) +set(SYCL_DEV_ABI_VERSION 3) if (SYCL_ADD_DEV_VERSION_POSTFIX) set(SYCL_VERSION_POSTFIX "-${SYCL_DEV_ABI_VERSION}") endif() diff --git a/sycl/doc/design/SYCL2020-SpecializationConstants.md b/sycl/doc/design/SYCL2020-SpecializationConstants.md index 3e7d682942357..6a430001b9f46 100644 --- a/sycl/doc/design/SYCL2020-SpecializationConstants.md +++ b/sycl/doc/design/SYCL2020-SpecializationConstants.md @@ -784,8 +784,8 @@ constexpr inline specialization_id id_float; The integration footer will look like: ``` -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // Note: we do not declare `get_spec_constant_symbolic_ID` here and assume that // it is declared in some other header which was already included. @@ -814,8 +814,8 @@ inline const char *get_spec_constant_symbolic_ID() { } } // namespace detail -} //namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl // Detailed description of this header is provided below in corresponding RT section #include diff --git a/sycl/doc/doxygen.cfg.in b/sycl/doc/doxygen.cfg.in index 798fbf13f5183..abebc9ea52631 100644 --- a/sycl/doc/doxygen.cfg.in +++ b/sycl/doc/doxygen.cfg.in @@ -1118,7 +1118,7 @@ COLS_IN_ALPHA_INDEX = 4 # while generating the index headers. # This tag requires that the tag ALPHABETICAL_INDEX is set to YES. -IGNORE_PREFIX = cl::sycl:: cl::sycl::ext::intel::experimental::esimd +IGNORE_PREFIX = sycl::_V1:: sycl::_V1::ext::intel::experimental::esimd #--------------------------------------------------------------------------- # Configuration options related to the HTML output diff --git a/sycl/gdb/libsycl.so-gdb.py b/sycl/gdb/libsycl.so-gdb.py index 37b71e8c00e10..64d1962be7b13 100644 --- a/sycl/gdb/libsycl.so-gdb.py +++ b/sycl/gdb/libsycl.so-gdb.py @@ -104,7 +104,7 @@ def __init__(self, class_type, result_type, depth): self.depth = depth def get_arg_types(self): - return gdb.lookup_type("cl::sycl::id<%s>" % self.depth) + return gdb.lookup_type("sycl::_V1::id<%s>" % self.depth) def get_result_type(self, *args): return self.result_type @@ -140,18 +140,18 @@ class AccessorOpIndexItemTrue(AccessorOpIndex): """Introduces an extra overload for item wrapper""" def get_arg_types(self): - return gdb.lookup_type("cl::sycl::item<%s, true>" % self.depth) + return gdb.lookup_type("sycl::_V1::item<%s, true>" % self.depth) class AccessorOpIndexItemFalse(AccessorOpIndex): """Introduces an extra overload for item wrapper""" def get_arg_types(self): - return gdb.lookup_type("cl::sycl::item<%s, false>" % self.depth) + return gdb.lookup_type("sycl::_V1::item<%s, false>" % self.depth) class AccessorMatcher(gdb.xmethod.XMethodMatcher): - """Entry point for cl::sycl::accessor""" + """Entry point for sycl::_V1::accessor""" def __init__(self): gdb.xmethod.XMethodMatcher.__init__(self, "AccessorMatcher") @@ -160,7 +160,7 @@ def match(self, class_type, method_name): if method_name != "operator[]": return None - result = re.match("^cl::sycl::accessor<.+>$", class_type.tag) + result = re.match("^sycl::_V1::accessor<.+>$", class_type.tag) if result is None: return None @@ -189,13 +189,13 @@ class PrivateMemoryOpCall(gdb.xmethod.XMethodWorker): """Provides operator() overload for h_item argument""" class ItemBase: - """Wrapper for cl::sycl::detail::ItemBase which reimplements index calculation""" + """Wrapper for sycl::_V1::detail::ItemBase which reimplements index calculation""" def __init__( self, obj, ): - result = re.match("^cl::sycl::detail::ItemBase<(.+), (.+)>$", str(obj.type)) + result = re.match("^sycl::_V1::detail::ItemBase<(.+), (.+)>$", str(obj.type)) self.dim = int(result[1]) self.with_offset = result[2] == "true" self.obj = obj @@ -233,7 +233,7 @@ def __init__(self, result_type, dim): self.dim = dim def get_arg_types(self): - return gdb.lookup_type("cl::sycl::h_item<%s>" % self.dim) + return gdb.lookup_type("sycl::_V1::h_item<%s>" % self.dim) def get_result_type(self, *args): return self.result_type @@ -251,7 +251,7 @@ def __call__(self, obj, *args): class PrivateMemoryMatcher(gdb.xmethod.XMethodMatcher): - """Entry point for cl::sycl::private_memory""" + """Entry point for sycl::_V1::private_memory""" def __init__(self): gdb.xmethod.XMethodMatcher.__init__(self, "PrivateMemoryMatcher") @@ -261,7 +261,7 @@ def match(self, class_type, method_name): return None result = re.match( - "^cl::sycl::private_memory<((cl::)?(sycl::)?id<.+>), (.+)>$", class_type.tag + "^sycl::_V1::private_memory<((cl::)?(sycl::_V1::)?id<.+>), (.+)>$", class_type.tag ) if result is None: return None @@ -275,7 +275,7 @@ def match(self, class_type, method_name): class SyclArrayPrinter: - """Print an object deriving from cl::sycl::detail::array""" + """Print an object deriving from sycl::_V1::detail::array""" class ElementIterator: def __init__(self, data, size): @@ -330,7 +330,7 @@ def display_hint(self): class SyclBufferPrinter: - """Print a cl::sycl::buffer""" + """Print a sycl::_V1::buffer""" def __init__(self, value): self.value = value @@ -352,7 +352,7 @@ def to_string(self): sycl_printer = gdb.printing.RegexpCollectionPrettyPrinter("SYCL") -sycl_printer.add_printer("cl::sycl::id", "^cl::sycl::id<.*$", SyclArrayPrinter) -sycl_printer.add_printer("cl::sycl::range", "^cl::sycl::range<.*$", SyclArrayPrinter) -sycl_printer.add_printer("cl::sycl::buffer", "^cl::sycl::buffer<.*$", SyclBufferPrinter) +sycl_printer.add_printer("sycl::_V1::id", "^sycl::_V1::id<.*$", SyclArrayPrinter) +sycl_printer.add_printer("sycl::_V1::range", "^sycl::_V1::range<.*$", SyclArrayPrinter) +sycl_printer.add_printer("sycl::_V1::buffer", "^sycl::_V1::buffer<.*$", SyclBufferPrinter) gdb.printing.register_pretty_printer(None, sycl_printer, True) diff --git a/sycl/include/CL/__spirv/spirv_types.hpp b/sycl/include/CL/__spirv/spirv_types.hpp index 61cc20a0130be..b3ce746ff46e9 100644 --- a/sycl/include/CL/__spirv/spirv_types.hpp +++ b/sycl/include/CL/__spirv/spirv_types.hpp @@ -156,14 +156,14 @@ struct ConstantPipeStorage { int32_t _Capacity; }; -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // Arbitrary precision integer type template using ap_int = _ExtInt(Bits); } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #endif // __SYCL_DEVICE_ONLY__ // This class does not have definition, it is only predeclared here. diff --git a/sycl/include/CL/sycl.hpp b/sycl/include/CL/sycl.hpp index 1cdcfa32012be..9e73b1d2c3a64 100644 --- a/sycl/include/CL/sycl.hpp +++ b/sycl/include/CL/sycl.hpp @@ -9,3 +9,8 @@ #pragma once #include + +namespace __SYCL2020_DEPRECATED( + "cl::sycl is deprecated, use ::sycl instead.") cl { +namespace sycl = ::sycl; +} diff --git a/sycl/include/sycl/access/access.hpp b/sycl/include/sycl/access/access.hpp index 8efc8b55567dd..b83d7184d87fa 100644 --- a/sycl/include/sycl/access/access.hpp +++ b/sycl/include/sycl/access/access.hpp @@ -10,8 +10,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace access { enum class target { @@ -192,9 +192,9 @@ template struct DecoratedType { // Current implementation of address spaces handling leads to possibility // of emitting incorrect (in terms of OpenCL) address space casts from - // constant to generic (and vise-versa). So, global address space is used here - // instead of constant to avoid incorrect address space casts in the produced - // device code. + // constant to generic (and vise-versa). So, global address space is used + // here instead of constant to avoid incorrect address space casts in the + // produced device code. #if defined(RESTRICT_WRITE_ACCESS_TO_CONSTANT_PTR) using type = const __OPENCL_GLOBAL_AS__ ElementType; #else @@ -280,5 +280,5 @@ template struct deduce_AS<__OPENCL_CONSTANT_AS__ T> { #undef __OPENCL_PRIVATE_AS__ } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp index 9c5e42e8ca98b..7c650805b996b 100644 --- a/sycl/include/sycl/accessor.hpp +++ b/sycl/include/sycl/accessor.hpp @@ -202,8 +202,8 @@ /// accessor_common contains several helpers common for both accessor(1) and /// accessor(3) -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { class stream; namespace ext { namespace intel { @@ -2611,8 +2611,8 @@ host_accessor(buffer, Type1, Type2, Type3, Type4, #endif +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) namespace std { template #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { template class vec; namespace detail { namespace half_impl { class half; } // namespace half_impl } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #define __SYCL_MAKE_VECTOR_ALIAS(ALIAS, TYPE, N) \ using ALIAS##N = sycl::vec; @@ -64,8 +64,8 @@ class half; __SYCL_MAKE_VECTOR_ALIASES_FOR_OPENCL_TYPES(N) \ __SYCL_MAKE_VECTOR_ALIASES_FOR_SIGNED_AND_UNSIGNED_TYPES(N) -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { using byte __SYCL2020_DEPRECATED("use std::byte instead") = std::uint8_t; using schar = signed char; using uchar = unsigned char; @@ -93,8 +93,8 @@ __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(3) __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(4) __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(8) __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(16) +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #undef __SYCL_MAKE_VECTOR_ALIAS #undef __SYCL_MAKE_VECTOR_ALIASES_FOR_ARITHMETIC_TYPES diff --git a/sycl/include/sycl/aspects.hpp b/sycl/include/sycl/aspects.hpp index 94c6632707246..d71a903ac916b 100644 --- a/sycl/include/sycl/aspects.hpp +++ b/sycl/include/sycl/aspects.hpp @@ -9,8 +9,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { enum class aspect { host = 0, @@ -53,5 +53,5 @@ enum class aspect { ext_oneapi_bfloat16 = 35, }; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/atomic.hpp b/sycl/include/sycl/atomic.hpp index 8166ba043a23f..17bfbc5d18dbb 100644 --- a/sycl/include/sycl/atomic.hpp +++ b/sycl/include/sycl/atomic.hpp @@ -25,8 +25,8 @@ static_assert(!std::is_same::value, \ "SYCL atomic function not available for float type") -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // Forward declaration template @@ -68,13 +68,13 @@ template <> struct GetSpirvMemoryScope { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #ifndef __SYCL_DEVICE_ONLY__ // host implementation of SYCL atomics -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // Translate sycl::memory_order or __spv::MemorySemanticsMask::Flag // into std::memory_order @@ -84,8 +84,8 @@ getStdMemoryOrder(__spv::MemorySemanticsMask::Flag) { return std::memory_order_relaxed; } } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) // std::atomic version of atomic SPIR-V builtins @@ -165,8 +165,8 @@ extern T __spirv_AtomicMax(std::atomic *Ptr, __spv::Scope::Flag, #endif // !defined(__SYCL_DEVICE_ONLY__) -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { template @@ -394,7 +394,7 @@ T atomic_fetch_max(atomic Object, T Operand, return Object.fetch_max(Operand, MemoryOrder); } +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #undef __SYCL_STATIC_ASSERT_NOT_FLOAT diff --git a/sycl/include/sycl/atomic_fence.hpp b/sycl/include/sycl/atomic_fence.hpp index 5256c42715005..9e1a2f0dd53b7 100644 --- a/sycl/include/sycl/atomic_fence.hpp +++ b/sycl/include/sycl/atomic_fence.hpp @@ -16,8 +16,8 @@ #include #endif -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { static inline void atomic_fence(memory_order order, memory_scope scope) { #ifdef __SYCL_DEVICE_ONLY__ @@ -31,5 +31,5 @@ static inline void atomic_fence(memory_order order, memory_scope scope) { #endif } +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/atomic_ref.hpp b/sycl/include/sycl/atomic_ref.hpp index 792615ff2dce8..cc140efa3ae8f 100644 --- a/sycl/include/sycl/atomic_ref.hpp +++ b/sycl/include/sycl/atomic_ref.hpp @@ -22,8 +22,8 @@ #endif #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { using memory_order = sycl::memory_order; @@ -666,5 +666,5 @@ class atomic_ref : public detail::atomic_ref_impl::operator=; }; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/backend.hpp b/sycl/include/sycl/backend.hpp index 611c794c9a8f6..fda90be098e5c 100644 --- a/sycl/include/sycl/backend.hpp +++ b/sycl/include/sycl/backend.hpp @@ -43,8 +43,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // TODO each backend can have its own custom errc enumeration @@ -369,5 +369,5 @@ make_kernel_bundle(const typename backend_traits::template input_type< false, State, Backend); return detail::createSyclObjFromImpl>(KBImpl); } +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/backend/opencl.hpp b/sycl/include/sycl/backend/opencl.hpp index cd5268b3cb436..87edfdff2c215 100644 --- a/sycl/include/sycl/backend/opencl.hpp +++ b/sycl/include/sycl/backend/opencl.hpp @@ -11,8 +11,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace opencl { // Implementation of various "make" functions resides in SYCL RT because // creating SYCL objects requires knowing details not accessible here. @@ -73,5 +73,5 @@ T make(const context &Context, return make_queue(Context, detail::pi::cast(Interop)); } } // namespace opencl +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/backend_types.hpp b/sycl/include/sycl/backend_types.hpp index a88d2796b9f2e..2d59d21fa27c7 100644 --- a/sycl/include/sycl/backend_types.hpp +++ b/sycl/include/sycl/backend_types.hpp @@ -15,8 +15,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { enum class backend : char { host = 0, @@ -69,5 +69,5 @@ inline std::ostream &operator<<(std::ostream &Out, backend be) { return Out; } +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/bit_cast.hpp b/sycl/include/sycl/bit_cast.hpp index 6fe0b85dfe637..342281b1a5785 100644 --- a/sycl/include/sycl/bit_cast.hpp +++ b/sycl/include/sycl/bit_cast.hpp @@ -14,8 +14,8 @@ #include #endif -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // forward decl namespace detail { @@ -62,5 +62,5 @@ constexpr } } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp index b640834d41d58..12d5dffe1b963 100644 --- a/sycl/include/sycl/buffer.hpp +++ b/sycl/include/sycl/buffer.hpp @@ -16,8 +16,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { class handler; class queue; @@ -675,8 +675,8 @@ buffer(const T *, const range &, const property_list & = {}) -> buffer; #endif // __cpp_deduction_guides +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) namespace std { template diff --git a/sycl/include/sycl/builtins.hpp b/sycl/include/sycl/builtins.hpp index a52247215cee1..e0032a3343c8e 100644 --- a/sycl/include/sycl/builtins.hpp +++ b/sycl/include/sycl/builtins.hpp @@ -17,8 +17,8 @@ // TODO Decide whether to mark functions with this attribute. #define __NOEXC /*noexcept*/ -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { #ifdef __SYCL_DEVICE_ONLY__ #define __sycl_std #else @@ -1644,8 +1644,8 @@ detail::enable_if_t::value, T> tan(T x) __NOEXC { } #endif // __FAST_MATH__ +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #ifdef __SYCL_DEVICE_ONLY__ extern "C" { diff --git a/sycl/include/sycl/builtins_esimd.hpp b/sycl/include/sycl/builtins_esimd.hpp index dfb22b08b172a..1b97dc8a054fd 100644 --- a/sycl/include/sycl/builtins_esimd.hpp +++ b/sycl/include/sycl/builtins_esimd.hpp @@ -18,8 +18,8 @@ // TODO Decide whether to mark functions with this attribute. #define __NOEXC /*noexcept*/ -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // cos template @@ -65,7 +65,7 @@ log(__ESIMD_NS::simd x) __NOEXC { #endif // __SYCL_DEVICE_ONLY__ } +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #undef __NOEXC diff --git a/sycl/include/sycl/context.hpp b/sycl/include/sycl/context.hpp index 853dcc79769e7..3f76d31df5cc6 100644 --- a/sycl/include/sycl/context.hpp +++ b/sycl/include/sycl/context.hpp @@ -20,8 +20,8 @@ // 4.6.2 Context class -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // Forward declarations class device; class platform; @@ -240,8 +240,8 @@ class __SYCL_EXPORT context { friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj); }; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) namespace std { template <> struct hash { diff --git a/sycl/include/sycl/detail/accessor_impl.hpp b/sycl/include/sycl/detail/accessor_impl.hpp index 42a1c0c23d0a3..8dec9653035e1 100644 --- a/sycl/include/sycl/detail/accessor_impl.hpp +++ b/sycl/include/sycl/detail/accessor_impl.hpp @@ -15,8 +15,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { template class accessor; @@ -274,5 +274,5 @@ constexpr access::target deduceAccessTarget(access::target defaultTarget) { #endif } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/aligned_allocator.hpp b/sycl/include/sycl/detail/aligned_allocator.hpp index 6c16d68e8d215..e511e0bb9f39a 100644 --- a/sycl/include/sycl/detail/aligned_allocator.hpp +++ b/sycl/include/sycl/detail/aligned_allocator.hpp @@ -17,8 +17,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { template class aligned_allocator { public: @@ -79,5 +79,5 @@ template class aligned_allocator { size_t MAlignment = 128; }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/array.hpp b/sycl/include/sycl/detail/array.hpp index 80137c1a356aa..a61697a7e225d 100644 --- a/sycl/include/sycl/detail/array.hpp +++ b/sycl/include/sycl/detail/array.hpp @@ -12,8 +12,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { template class id; template class range; namespace detail { @@ -120,5 +120,5 @@ template class array { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/assert_happened.hpp b/sycl/include/sycl/detail/assert_happened.hpp index 4b2688952b21e..43403a5b8a823 100644 --- a/sycl/include/sycl/detail/assert_happened.hpp +++ b/sycl/include/sycl/detail/assert_happened.hpp @@ -18,8 +18,8 @@ SYCL_EXTERNAL __attribute__((weak)) extern "C" void __devicelib_assert_read(void *); #endif -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // NOTE Layout of this structure should be aligned with the one in // libdevice/include/assert-happened.hpp @@ -40,5 +40,5 @@ struct AssertHappened { uint64_t LID2 = 0; }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/backend_traits.hpp b/sycl/include/sycl/detail/backend_traits.hpp index e07c6f702a7ba..3317b5632dcb4 100644 --- a/sycl/include/sycl/detail/backend_traits.hpp +++ b/sycl/include/sycl/detail/backend_traits.hpp @@ -11,8 +11,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { template struct interop; @@ -31,5 +31,5 @@ template struct InteropFeatureSupportMap { static constexpr bool MakeKernel = false; }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/backend_traits_cuda.hpp b/sycl/include/sycl/detail/backend_traits_cuda.hpp index 5f676b0875348..9969e50e221c6 100644 --- a/sycl/include/sycl/detail/backend_traits_cuda.hpp +++ b/sycl/include/sycl/detail/backend_traits_cuda.hpp @@ -35,8 +35,8 @@ typedef unsigned long long CUdeviceptr; typedef unsigned int CUdeviceptr; #endif -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // TODO the interops for context, device, event, platform and program @@ -138,5 +138,5 @@ template <> struct BackendReturn { #endif } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/backend_traits_hip.hpp b/sycl/include/sycl/detail/backend_traits_hip.hpp index 4fabbc1700369..143536e251e0c 100644 --- a/sycl/include/sycl/detail/backend_traits_hip.hpp +++ b/sycl/include/sycl/detail/backend_traits_hip.hpp @@ -29,8 +29,8 @@ typedef struct ihipEvent_t *HIPevent; typedef struct ihipModule_t *HIPmodule; typedef void *HIPdeviceptr; -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // TODO the interops for context, device, event, platform and program @@ -132,5 +132,5 @@ template <> struct BackendReturn { #endif } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/backend_traits_level_zero.hpp b/sycl/include/sycl/detail/backend_traits_level_zero.hpp index 9f69d9f65b0f2..a1fdd594bcf79 100644 --- a/sycl/include/sycl/detail/backend_traits_level_zero.hpp +++ b/sycl/include/sycl/detail/backend_traits_level_zero.hpp @@ -35,8 +35,8 @@ typedef struct _ze_image_handle_t *ze_image_handle_t; typedef struct _ze_kernel_handle_t *ze_kernel_handle_t; typedef struct _ze_module_handle_t *ze_module_handle_t; -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // Forward declarations @@ -269,5 +269,5 @@ template <> struct InteropFeatureSupportMap { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/backend_traits_opencl.hpp b/sycl/include/sycl/detail/backend_traits_opencl.hpp index dd5ec51e10060..55fb22ed93db4 100644 --- a/sycl/include/sycl/detail/backend_traits_opencl.hpp +++ b/sycl/include/sycl/detail/backend_traits_opencl.hpp @@ -25,8 +25,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // TODO the interops for context, device, event, platform and program @@ -212,5 +212,5 @@ inline PiDevice cast(cl_device_id) = delete; // Use piextCreateDeviceWithNativeHandle } // namespace pi } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/boolean.hpp b/sycl/include/sycl/detail/boolean.hpp index 2923fb565357f..60461596fcd7a 100644 --- a/sycl/include/sycl/detail/boolean.hpp +++ b/sycl/include/sycl/detail/boolean.hpp @@ -14,8 +14,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { template struct Assigner { @@ -126,5 +126,5 @@ template <> struct Boolean<1> { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/buffer_impl.hpp b/sycl/include/sycl/detail/buffer_impl.hpp index 272ef2e493dc4..fa740e463fa62 100644 --- a/sycl/include/sycl/detail/buffer_impl.hpp +++ b/sycl/include/sycl/detail/buffer_impl.hpp @@ -24,8 +24,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // Forward declarations template #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // Forward declarations class queue; @@ -523,5 +523,5 @@ class CGBarrier : public CG { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/cg_types.hpp b/sycl/include/sycl/detail/cg_types.hpp index e97b33c2b555e..cef96878d2fe0 100644 --- a/sycl/include/sycl/detail/cg_types.hpp +++ b/sycl/include/sycl/detail/cg_types.hpp @@ -19,8 +19,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // The structure represents kernel argument. @@ -427,5 +427,5 @@ class HostKernel : public HostKernelBase { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/common.hpp b/sycl/include/sycl/detail/common.hpp index 4f6af2cc4090d..a67f1803cf10d 100644 --- a/sycl/include/sycl/detail/common.hpp +++ b/sycl/include/sycl/detail/common.hpp @@ -21,8 +21,8 @@ // public methods as a default argument. If the end-user wants to disable the // code location information, they must compile the code with // -DDISABLE_SYCL_INSTRUMENTATION_METADATA flag -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { #if !defined(NDEBUG) && (_MSC_VER > 1929 || __has_builtin(__builtin_FILE)) @@ -84,11 +84,11 @@ struct code_location { unsigned long MColumnNo; }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { __SYCL_EXPORT const char *stringifyErrorCode(pi_int32 error); @@ -99,8 +99,8 @@ static inline std::string codeToString(pi_int32 code) { } } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #ifdef __SYCL_DEVICE_ONLY__ // TODO remove this when 'assert' is supported in device code @@ -185,8 +185,8 @@ static inline std::string codeToString(pi_int32 code) { __SYCL_REPORT_ERR_TO_EXC_THROW_VIA_ERRC(X, ERRC) #endif -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // Helper function for extracting implementation from SYCL's interface objects. @@ -355,5 +355,5 @@ template struct InlineVariableHelper { template constexpr T InlineVariableHelper::value; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/common_info.hpp b/sycl/include/sycl/detail/common_info.hpp index d63d00e18ea70..8a4d9dcec36c2 100644 --- a/sycl/include/sycl/detail/common_info.hpp +++ b/sycl/include/sycl/detail/common_info.hpp @@ -10,13 +10,13 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { std::vector __SYCL_EXPORT split_string(const std::string &str, char delimeter); } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/defines_elementary.hpp b/sycl/include/sycl/detail/defines_elementary.hpp index dd7be03767efd..aa609776521d6 100644 --- a/sycl/include/sycl/detail/defines_elementary.hpp +++ b/sycl/include/sycl/detail/defines_elementary.hpp @@ -10,6 +10,8 @@ #define __SYCL_INLINE_NAMESPACE(X) inline namespace X +#define __SYCL_INLINE_VER_NAMESPACE(X) inline namespace X + #ifndef __has_attribute #define __has_attribute(x) 0 #endif diff --git a/sycl/include/sycl/detail/device_binary_image.hpp b/sycl/include/sycl/detail/device_binary_image.hpp index 086482b41156b..61070124d33b9 100644 --- a/sycl/include/sycl/detail/device_binary_image.hpp +++ b/sycl/include/sycl/detail/device_binary_image.hpp @@ -12,8 +12,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // SYCL RT wrapper over PI binary image. @@ -68,5 +68,5 @@ class DynRTDeviceBinaryImage : public RTDeviceBinaryImage { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/device_filter.hpp b/sycl/include/sycl/detail/device_filter.hpp index c5546a24b74bc..9f19ef0ebb521 100644 --- a/sycl/include/sycl/detail/device_filter.hpp +++ b/sycl/include/sycl/detail/device_filter.hpp @@ -15,8 +15,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { struct device_filter { @@ -83,5 +83,5 @@ inline std::ostream &operator<<(std::ostream &Out, } } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/device_global_map.hpp b/sycl/include/sycl/detail/device_global_map.hpp index 35ec15c092de2..2e97a7c706f2a 100644 --- a/sycl/include/sycl/detail/device_global_map.hpp +++ b/sycl/include/sycl/detail/device_global_map.hpp @@ -8,8 +8,8 @@ #pragma once -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { namespace device_global_map { @@ -17,5 +17,5 @@ __SYCL_EXPORT void add(const void *DeviceGlobalPtr, const char *UniqueId); } // namespace device_global_map } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/generic_type_lists.hpp b/sycl/include/sycl/detail/generic_type_lists.hpp index ba4ea08d8ac99..b833192405a31 100644 --- a/sycl/include/sycl/detail/generic_type_lists.hpp +++ b/sycl/include/sycl/detail/generic_type_lists.hpp @@ -18,8 +18,8 @@ // types of parameters to kernel functions // Forward declarations -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { template class vec; template class marray; namespace detail { @@ -28,11 +28,11 @@ class half; } } // namespace detail using half = detail::half_impl::half; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { namespace gtl { // floating point types @@ -557,5 +557,5 @@ using nonlocal_address_space_list = access::address_space::ext_intel_global_host_space>; } // namespace gvl } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/generic_type_traits.hpp b/sycl/include/sycl/detail/generic_type_traits.hpp index edb62c98e4f3d..5425211336f2f 100644 --- a/sycl/include/sycl/detail/generic_type_traits.hpp +++ b/sycl/include/sycl/detail/generic_type_traits.hpp @@ -17,8 +17,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { template using is_floatn = is_contained; @@ -641,5 +641,5 @@ template inline void check_vector_size() { } } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/group_sort_impl.hpp b/sycl/include/sycl/detail/group_sort_impl.hpp index 11fc079d9f745..8a2ffb0eaaccf 100644 --- a/sycl/include/sycl/detail/group_sort_impl.hpp +++ b/sycl/include/sycl/detail/group_sort_impl.hpp @@ -15,8 +15,8 @@ #ifdef __SYCL_DEVICE_ONLY__ -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // ---- merge sort implementation @@ -250,7 +250,7 @@ void merge_sort(Group group, Iter first, const std::size_t n, Compare comp, } } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #endif -#endif // __cplusplus >=201703L \ No newline at end of file +#endif // __cplusplus >=201703L diff --git a/sycl/include/sycl/detail/handler_proxy.hpp b/sycl/include/sycl/detail/handler_proxy.hpp index d6347605fe58f..c8bb5adefbeaa 100644 --- a/sycl/include/sycl/detail/handler_proxy.hpp +++ b/sycl/include/sycl/detail/handler_proxy.hpp @@ -11,8 +11,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { class handler; @@ -30,5 +30,5 @@ __SYCL_EXPORT void associateWithHandler(handler &, AccessorBaseHost *, access::target); #endif } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/helpers.hpp b/sycl/include/sycl/detail/helpers.hpp index 1bbc42d6d04a4..0301605892e02 100644 --- a/sycl/include/sycl/detail/helpers.hpp +++ b/sycl/include/sycl/detail/helpers.hpp @@ -21,8 +21,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { class context; class event; template class item; @@ -247,5 +247,5 @@ getSPIRVMemorySemanticsMask(const access::fence_space AccessSpace, } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/host_profiling_info.hpp b/sycl/include/sycl/detail/host_profiling_info.hpp index 25bdb805ace8b..4b906205300bf 100644 --- a/sycl/include/sycl/detail/host_profiling_info.hpp +++ b/sycl/include/sycl/detail/host_profiling_info.hpp @@ -11,8 +11,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { /// Profiling info for the host execution. @@ -36,5 +36,5 @@ class __SYCL_EXPORT HostProfilingInfo { void end(); }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/image_accessor_util.hpp b/sycl/include/sycl/detail/image_accessor_util.hpp index 33ceb06e7d679..e0482544ba3c3 100644 --- a/sycl/include/sycl/detail/image_accessor_util.hpp +++ b/sycl/include/sycl/detail/image_accessor_util.hpp @@ -22,8 +22,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { template @@ -1117,6 +1117,6 @@ DataT imageReadSamplerHostImpl(const CoordT &Coords, const sampler &Smpl, } } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #endif diff --git a/sycl/include/sycl/detail/image_impl.hpp b/sycl/include/sycl/detail/image_impl.hpp index 4a828950a6383..303ebf3444ec2 100644 --- a/sycl/include/sycl/detail/image_impl.hpp +++ b/sycl/include/sycl/detail/image_impl.hpp @@ -19,8 +19,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // forward declarations enum class image_channel_order : unsigned int; @@ -289,5 +289,5 @@ class __SYCL_EXPORT image_impl final : public SYCLMemObjT { size_t MSlicePitch = 0; }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/image_ocl_types.hpp b/sycl/include/sycl/detail/image_ocl_types.hpp index 0389a1aaa5916..7da95c9c5fc87 100644 --- a/sycl/include/sycl/detail/image_ocl_types.hpp +++ b/sycl/include/sycl/detail/image_ocl_types.hpp @@ -33,16 +33,16 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // Type trait to get the associated sampled image type for a given image type. template struct sampled_opencl_image_type; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #define __SYCL_INVOKE_SPIRV_CALL_ARG1(call) \ template inline R __invoke_##call(T1 ParT1) { \ @@ -113,8 +113,8 @@ static RetType __invoke__ImageReadSampler(ImageT Img, CoordT Coords, return sycl::detail::convertDataToType(Ret); } -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // Function to return the number of channels for Image Channel Order returned by @@ -256,8 +256,8 @@ __SYCL_IMAGETY_WRITE_2_DIM_IARRAY __SYCL_IMAGETY_DISCARD_WRITE_2_DIM_IARRAY } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #undef __SYCL_SAMPLED_AND_IMAGETY_DEFINE #undef __SYCL_INVOKE_SPIRV_CALL_ARG1 diff --git a/sycl/include/sycl/detail/item_base.hpp b/sycl/include/sycl/detail/item_base.hpp index 82facd3fa71f1..602b6741f9f6c 100644 --- a/sycl/include/sycl/detail/item_base.hpp +++ b/sycl/include/sycl/detail/item_base.hpp @@ -11,8 +11,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { template class id; template class range; @@ -72,5 +72,5 @@ template struct ItemBase { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/kernel_desc.hpp b/sycl/include/sycl/detail/kernel_desc.hpp index 20770bea0da45..e5f7580407684 100644 --- a/sycl/include/sycl/detail/kernel_desc.hpp +++ b/sycl/include/sycl/detail/kernel_desc.hpp @@ -13,8 +13,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { #ifndef __SYCL_DEVICE_ONLY__ @@ -156,5 +156,5 @@ template struct KernelInfo { #endif //__SYCL_UNNAMED_LAMBDA__ } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/locked.hpp b/sycl/include/sycl/detail/locked.hpp index e990d4e102194..5b1d6395da089 100644 --- a/sycl/include/sycl/detail/locked.hpp +++ b/sycl/include/sycl/detail/locked.hpp @@ -13,8 +13,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { /// Represents a reference to value with appropriate lock acquired. /// Employed for acquire/release logic. Acquire action is construction @@ -30,5 +30,5 @@ template class Locked { T &get() const { return m_Value.get(); } }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/memory_manager.hpp b/sycl/include/sycl/detail/memory_manager.hpp index 4ac08d9f00190..f064ebab4fc91 100644 --- a/sycl/include/sycl/detail/memory_manager.hpp +++ b/sycl/include/sycl/detail/memory_manager.hpp @@ -18,8 +18,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { class queue_impl; @@ -183,5 +183,5 @@ class __SYCL_EXPORT MemoryManager { RT::PiEvent &OutEvent); }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/os_util.hpp b/sycl/include/sycl/detail/os_util.hpp index 148a869a8c896..4a83913f16b5e 100644 --- a/sycl/include/sycl/detail/os_util.hpp +++ b/sycl/include/sycl/detail/os_util.hpp @@ -39,8 +39,8 @@ #error "Unsupported compiler or OS" #endif // _WIN32 -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { /// Uniquely identifies an operating system module (executable or a dynamic @@ -99,5 +99,5 @@ class __SYCL_EXPORT OSUtil { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/pi.hpp b/sycl/include/sycl/detail/pi.hpp index aa10889b573bc..d666d6aacc8b6 100644 --- a/sycl/include/sycl/detail/pi.hpp +++ b/sycl/include/sycl/detail/pi.hpp @@ -32,8 +32,8 @@ struct trace_event_data_t; } #endif -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { class context; @@ -441,7 +441,7 @@ template To cast(std::vector Values) { // For shortness of using PI from the top-level sycl files. namespace RT = sycl::detail::pi; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #undef _PI_API diff --git a/sycl/include/sycl/detail/property_helper.hpp b/sycl/include/sycl/detail/property_helper.hpp index c9d467e5fcf71..ff0f4aa8568b0 100644 --- a/sycl/include/sycl/detail/property_helper.hpp +++ b/sycl/include/sycl/detail/property_helper.hpp @@ -10,8 +10,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { @@ -88,5 +88,5 @@ template class PropertyWithData : public PropertyWithDataBase { } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/property_list_base.hpp b/sycl/include/sycl/detail/property_list_base.hpp index ae96a06cd4c3c..7c52fe9409dfd 100644 --- a/sycl/include/sycl/detail/property_list_base.hpp +++ b/sycl/include/sycl/detail/property_list_base.hpp @@ -16,8 +16,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { class PropertyListBase { protected: @@ -133,5 +133,5 @@ class PropertyListBase { std::vector> MPropsWithData; }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/service_kernel_names.hpp b/sycl/include/sycl/detail/service_kernel_names.hpp index 86a5defeae8c4..c3609695f60b2 100644 --- a/sycl/include/sycl/detail/service_kernel_names.hpp +++ b/sycl/include/sycl/detail/service_kernel_names.hpp @@ -8,8 +8,8 @@ #pragma once -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { namespace __sycl_service_kernel__ { @@ -17,5 +17,5 @@ class AssertInfoCopier; } // namespace __sycl_service_kernel__ } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/spec_const_integration.hpp b/sycl/include/sycl/detail/spec_const_integration.hpp index 056e197eeac72..e582c220f89e5 100644 --- a/sycl/include/sycl/detail/spec_const_integration.hpp +++ b/sycl/include/sycl/detail/spec_const_integration.hpp @@ -11,8 +11,8 @@ // This header file must not be included to any DPC++ headers. // This header file should only be included to integration footer. -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { #if __cplusplus >= 201703L @@ -24,5 +24,5 @@ template const char *get_spec_constant_symbolic_ID() { #endif } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/spinlock.hpp b/sycl/include/sycl/detail/spinlock.hpp index ded4ff8cd4848..e512ebd37a21f 100644 --- a/sycl/include/sycl/detail/spinlock.hpp +++ b/sycl/include/sycl/detail/spinlock.hpp @@ -13,8 +13,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { /// SpinLock is a synchronization primitive, that uses atomic variable and /// causes thread trying acquire lock wait in loop while repeatedly check if @@ -36,5 +36,5 @@ class SpinLock { std::atomic_flag MLock = ATOMIC_FLAG_INIT; }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/spirv.hpp b/sycl/include/sycl/detail/spirv.hpp index 780f52e8675c5..78af19f559c5c 100644 --- a/sycl/include/sycl/detail/spirv.hpp +++ b/sycl/include/sycl/detail/spirv.hpp @@ -18,8 +18,8 @@ #include #ifdef __SYCL_DEVICE_ONLY__ -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace ext { namespace oneapi { struct sub_group; @@ -734,6 +734,6 @@ EnableIfGenericShuffle SubgroupShuffleUp(T x, uint32_t delta) { } // namespace spirv } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #endif // __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/sycl/detail/stl_type_traits.hpp b/sycl/include/sycl/detail/stl_type_traits.hpp index 9c3353e54c8e6..efa7e7cc73d99 100644 --- a/sycl/include/sycl/detail/stl_type_traits.hpp +++ b/sycl/include/sycl/detail/stl_type_traits.hpp @@ -13,8 +13,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // Type traits identical to those in std in newer versions. Can be removed when @@ -79,5 +79,5 @@ struct is_output_iterator> { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp b/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp index 617e679857cbf..d6a256f7b0bf5 100644 --- a/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp +++ b/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp @@ -8,8 +8,8 @@ #pragma once -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { template class aligned_allocator; @@ -87,5 +87,5 @@ class SYCLMemObjAllocatorHolder : public SYCLMemObjAllocator { std::size_t MValueSize; }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/sycl_mem_obj_i.hpp b/sycl/include/sycl/detail/sycl_mem_obj_i.hpp index f4415145603ab..d2688d3fab4c7 100644 --- a/sycl/include/sycl/detail/sycl_mem_obj_i.hpp +++ b/sycl/include/sycl/detail/sycl_mem_obj_i.hpp @@ -11,8 +11,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { @@ -77,5 +77,5 @@ class SYCLMemObjI { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/sycl_mem_obj_t.hpp b/sycl/include/sycl/detail/sycl_mem_obj_t.hpp index 6d6a852ce619a..a7f5a22a934bf 100644 --- a/sycl/include/sycl/detail/sycl_mem_obj_t.hpp +++ b/sycl/include/sycl/detail/sycl_mem_obj_t.hpp @@ -23,8 +23,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { // Forward declarations @@ -350,5 +350,5 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/tuple.hpp b/sycl/include/sycl/detail/tuple.hpp index e0da3e7713c41..b17d0a17390ec 100644 --- a/sycl/include/sycl/detail/tuple.hpp +++ b/sycl/include/sycl/detail/tuple.hpp @@ -15,8 +15,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { template struct tuple; @@ -189,8 +189,8 @@ template <> struct tuple<> { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) namespace std { diff --git a/sycl/include/sycl/detail/type_list.hpp b/sycl/include/sycl/detail/type_list.hpp index b246043674813..441e5dfd4ba02 100644 --- a/sycl/include/sycl/detail/type_list.hpp +++ b/sycl/include/sycl/detail/type_list.hpp @@ -11,8 +11,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { template using head_t = typename T::head; @@ -139,5 +139,5 @@ using find_twice_as_large_type_t = find_type_t; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/type_traits.hpp b/sycl/include/sycl/detail/type_traits.hpp index 34522afdc7899..500c28d32558e 100644 --- a/sycl/include/sycl/detail/type_traits.hpp +++ b/sycl/include/sycl/detail/type_traits.hpp @@ -17,8 +17,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { template class group; namespace ext { namespace oneapi { @@ -364,5 +364,5 @@ template struct function_traits { }; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/usm_impl.hpp b/sycl/include/sycl/detail/usm_impl.hpp index f7b50d48285e6..5a737cce2b4dd 100644 --- a/sycl/include/sycl/detail/usm_impl.hpp +++ b/sycl/include/sycl/detail/usm_impl.hpp @@ -11,8 +11,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { namespace usm { @@ -30,5 +30,5 @@ __SYCL_EXPORT void free(void *Ptr, const context &Ctxt, } // namespace usm } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/detail/util.hpp b/sycl/include/sycl/detail/util.hpp index c91fa4d74efcb..1fa387b530a8f 100644 --- a/sycl/include/sycl/detail/util.hpp +++ b/sycl/include/sycl/detail/util.hpp @@ -16,8 +16,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { /// Groups and provides access to all the locks used the SYCL runtime. @@ -56,7 +56,7 @@ struct CmpCStr { using SerializedObj = std::vector; } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) #endif //__SYCL_DEVICE_ONLY diff --git a/sycl/include/sycl/device.hpp b/sycl/include/sycl/device.hpp index 2bccd7d97e989..68fbbd3920e18 100644 --- a/sycl/include/sycl/device.hpp +++ b/sycl/include/sycl/device.hpp @@ -20,8 +20,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // Forward declarations class device_selector; template @@ -219,8 +219,8 @@ class __SYCL_EXPORT device { -> backend_return_t; }; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) namespace std { template <> struct hash { diff --git a/sycl/include/sycl/device_event.hpp b/sycl/include/sycl/device_event.hpp index 21509ed3217f6..c7e91dcd47862 100644 --- a/sycl/include/sycl/device_event.hpp +++ b/sycl/include/sycl/device_event.hpp @@ -11,8 +11,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { /// Encapsulates a single SYCL device event which is available only within SYCL /// kernel functions and can be used to wait for asynchronous operations within @@ -34,5 +34,5 @@ class device_event { void wait() { __spirv_GroupWaitEvents(__spv::Scope::Workgroup, 1, &m_Event); } }; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/device_selector.hpp b/sycl/include/sycl/device_selector.hpp index 85bae514b1fba..d3fee2b5c2f9e 100644 --- a/sycl/include/sycl/device_selector.hpp +++ b/sycl/include/sycl/device_selector.hpp @@ -13,8 +13,8 @@ // 4.6.1 Device selection class -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // Forward declarations class device; @@ -87,5 +87,5 @@ class __SYCL_EXPORT host_selector : public device_selector { public: int operator()(const device &dev) const override; }; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/event.hpp b/sycl/include/sycl/event.hpp index cca10d757e77a..4819c28063dff 100644 --- a/sycl/include/sycl/event.hpp +++ b/sycl/include/sycl/event.hpp @@ -17,8 +17,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // Forward declaration class context; @@ -153,8 +153,8 @@ class __SYCL_EXPORT event { -> backend_return_t; }; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) namespace std { template <> struct hash { diff --git a/sycl/include/sycl/exception.hpp b/sycl/include/sycl/exception.hpp index 3d4c3b66a83ea..95ce90416f0b5 100644 --- a/sycl/include/sycl/exception.hpp +++ b/sycl/include/sycl/exception.hpp @@ -19,8 +19,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // Forward declaration class context; @@ -329,8 +329,8 @@ class __SYCL2020_DEPRECATED( : device_error(make_error_code(errc::feature_not_supported), Msg, Err) {} }; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) namespace std { template <> struct is_error_code_enum : true_type {}; diff --git a/sycl/include/sycl/exception_list.hpp b/sycl/include/sycl/exception_list.hpp index ddbe3621f3ed7..2cad3f7c850fb 100644 --- a/sycl/include/sycl/exception_list.hpp +++ b/sycl/include/sycl/exception_list.hpp @@ -16,8 +16,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { // Forward declaration namespace detail { @@ -52,5 +52,5 @@ class __SYCL_EXPORT exception_list { using async_handler = std::function; +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp b/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp index b011b0564406e..7b72c54b0962b 100644 --- a/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp +++ b/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp @@ -11,9 +11,9 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_NS { - +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd { /// @addtogroup sycl_esimd_misc /// @{ @@ -65,5 +65,6 @@ __ESIMD_API auto merge(simd_view v1, /// @} sycl_esimd_misc -} // namespace __ESIMD_NS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/common.hpp b/sycl/include/sycl/ext/intel/esimd/common.hpp index 414dbfe7b275a..3af8e419c9f3d 100644 --- a/sycl/include/sycl/ext/intel/esimd/common.hpp +++ b/sycl/include/sycl/ext/intel/esimd/common.hpp @@ -73,8 +73,9 @@ /// @endcond ESIMD_DETAIL -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_NS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd { /// @addtogroup sycl_esimd_core /// @{ @@ -201,5 +202,6 @@ enum class atomic_op : uint8_t { /// @} sycl_esimd_core -} // namespace __ESIMD_NS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp b/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp index 888f6874eafa9..1fb46e41ef24b 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/elem_type_traits.hpp @@ -87,8 +87,9 @@ /// @cond ESIMD_DETAIL -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail { // Primitive C++ operations supported by simd objects and templated upon by some // of the functions/classes. @@ -734,7 +735,8 @@ inline std::istream &operator>>(std::istream &I, sycl::half &rhs) { //////////////////////////////////////////////////////////////////////////////// // TODO -} // namespace __ESIMD_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl /// @endcond ESIMD_DETAIL diff --git a/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp b/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp index 166b8fc1e3b66..cda0b020e6c56 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp @@ -21,18 +21,19 @@ #define SIMDCF_ELEMENT_SKIP(i) -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { namespace half_impl { class half; } // namespace half_impl } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_EMU_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::emu::detail { using half = sycl::detail::half_impl::half; constexpr int sat_is_on = 1; @@ -702,8 +703,9 @@ template <> struct dwordtype { static const bool value = true; }; -} // namespace __ESIMD_EMU_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::emu::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl #endif // #ifndef __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp index 5b12441f4696f..c772bee143ae0 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp @@ -133,8 +133,9 @@ __esimd_wrindirect(__ESIMD_DNS::vector_type_t OldVal, __ESIMD_DNS::vector_type_t Offset, __ESIMD_DNS::simd_mask_storage_t Mask = 1); -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail { template using __st = __raw_t; @@ -207,8 +208,9 @@ ESIMD_INLINE } } -} // namespace __ESIMD_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl // vload // diff --git a/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp index c69fc1da9f097..602baa6634037 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp @@ -215,15 +215,17 @@ __ESIMD_INTRIN int __esimd_lane_id(); return retv; \ } -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail { // TODO support half vectors in std sycl math functions. ESIMD_MATH_INTRINSIC_IMPL(float, sin) ESIMD_MATH_INTRINSIC_IMPL(float, cos) ESIMD_MATH_INTRINSIC_IMPL(float, exp) ESIMD_MATH_INTRINSIC_IMPL(float, log) -} // namespace __ESIMD_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl #undef __ESIMD_SIMT_BEGIN #undef __ESIMD_SIMT_END diff --git a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp index 4dd4fefe5e954..813a8dfb35d16 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp @@ -36,8 +36,9 @@ const std::array<__ESIMD_NS::rgba_channel, 4> ChannelMaskArray{ #endif // ifndef __SYCL_DEVICE_ONLY__ -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail { // Provides access to sycl accessor class' private members. class AccessorPrivateProxy { @@ -77,8 +78,9 @@ constexpr unsigned int ElemsPerAddrDecoding(unsigned int ElemsPerAddrEncoded) { return (1 << ElemsPerAddrEncoded); } -} // namespace __ESIMD_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl // flat_read does flat-address gather template diff --git a/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp b/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp index b502ac20f5926..aef195b3668e2 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp @@ -23,8 +23,9 @@ // (which would stop further lookup, leaving just non-viable sycl::operator < // etc. on the table). -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail { // clang-format off /// @addtogroup sycl_esimd_core /// @{ @@ -481,5 +482,6 @@ __ESIMD_DEF_SIMD_VIEW_CMP_OP(>=, __ESIMD_DNS::is_simd_type_v) #undef __ESIMD_DEF_SIMD_VIEW_CMP_OP -} // namespace __ESIMD_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/detail/region.hpp b/sycl/include/sycl/ext/intel/esimd/detail/region.hpp index ebc99469ccd28..a158ec7ac611d 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/region.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/region.hpp @@ -17,8 +17,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace ext { namespace intel { namespace esimd { @@ -138,7 +138,7 @@ template T getBaseRegion(std::pair Reg) { } // namespace esimd } // namespace intel } // namespace ext +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) /// @endcond ESIMD_DETAIL diff --git a/sycl/include/sycl/ext/intel/esimd/detail/simd_mask_impl.hpp b/sycl/include/sycl/ext/intel/esimd/detail/simd_mask_impl.hpp index 6fff465a84610..46e5b4507d860 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/simd_mask_impl.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/simd_mask_impl.hpp @@ -13,8 +13,9 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail { /// @addtogroup sycl_esimd_core_vectors /// @{ @@ -138,5 +139,6 @@ class simd_mask_impl /// @} sycl_esimd_core_vectors -} // namespace __ESIMD_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/detail/simd_obj_impl.hpp b/sycl/include/sycl/ext/intel/esimd/detail/simd_obj_impl.hpp index 61301ad5571e7..12bfaecebe8d6 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/simd_obj_impl.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/simd_obj_impl.hpp @@ -18,8 +18,9 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_NS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd { /// @addtogroup sycl_esimd_core /// @{ @@ -888,5 +889,6 @@ class simd_obj_impl { } // namespace detail -} // namespace __ESIMD_NS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/detail/simd_view_impl.hpp b/sycl/include/sycl/ext/intel/esimd/detail/simd_view_impl.hpp index d98f5cdab2f52..3b5e78fc02fa4 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/simd_view_impl.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/simd_view_impl.hpp @@ -14,8 +14,9 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail { /// @addtogroup sycl_esimd_core_vectors /// @{ @@ -606,5 +607,6 @@ class simd_view_impl { /// @} sycl_esimd_core_vectors -} // namespace __ESIMD_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp b/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp index 6e1337641e338..dd64b3593f95f 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp @@ -15,8 +15,8 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace ext { namespace intel { namespace esimd { @@ -86,7 +86,7 @@ using EnableIfAccessor = sycl::detail::enable_if_t< } // namespace esimd } // namespace intel } // namespace ext +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) /// @endcond ESIMD_DETAIL diff --git a/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp b/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp index d45a18edc2372..42f8294e3c579 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp @@ -53,8 +53,9 @@ M_testProxy = std::move(other.M_testProxy); \ } while (false) -__SYCL_INLINE_NAMESPACE(cl) { -namespace sycl::ext::intel::esimd::detail::test { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail::test { // The test_proxy class. // Being intended solely for the test purposes, it is enabled only if the @@ -101,8 +102,9 @@ class test_proxy { bool was_move_destination() const { return M_move_destination; } }; -} // namespace sycl::ext::intel::esimd::detail::test -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail::test +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl #endif // __ESIMD_ENABLE_TEST_PROXY diff --git a/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp b/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp index e058e7aaee955..ea252d58faec7 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp @@ -15,8 +15,9 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail { template struct compute_format_type; @@ -82,7 +83,8 @@ template using compute_format_type_2d_t = typename compute_format_type_2d::type; -} // namespace __ESIMD_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl /// @endcond ESIMD_DETAIL diff --git a/sycl/include/sycl/ext/intel/esimd/detail/types.hpp b/sycl/include/sycl/ext/intel/esimd/detail/types.hpp index e38c1955540e0..ab1af7f9bbe95 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/types.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/types.hpp @@ -24,8 +24,9 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_NS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd { // simd and simd_view_impl forward declarations template class simd; @@ -398,5 +399,6 @@ bitcast(vector_type_t Val) { // Alias for backward compatibility. template using mask_type_t = detail::simd_mask_storage_t; -} // namespace __ESIMD_NS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/detail/util.hpp b/sycl/include/sycl/ext/intel/esimd/detail/util.hpp index 7a97a40de2cc4..040bddb41b96d 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/util.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/util.hpp @@ -23,8 +23,9 @@ #define __ESIMD_INTRIN inline #endif // __SYCL_DEVICE_ONLY__ -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_DNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd::detail { /// ESIMD intrinsic operand size in bytes. struct OperandSize { @@ -197,7 +198,8 @@ T *accessorToPointer(AccessorTy Acc, uint32_t Offset = 0) { } #endif // __ESIMD_FORCE_STATELESS_MEM -} // namespace __ESIMD_DNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl /// @endcond ESIMD_DETAIL diff --git a/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp b/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp index 672537e6da95f..5b59ba763db77 100644 --- a/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp +++ b/sycl/include/sycl/ext/intel/esimd/emu/detail/esimd_emulator_device_interface.hpp @@ -28,8 +28,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace detail { /// This is the device interface version required (and used) by this @@ -71,7 +71,7 @@ struct ESIMDEmuPluginOpaqueData { __SYCL_EXPORT ESIMDDeviceInterface *getESIMDDeviceInterface(); } // namespace detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) /// @endcond ESIMD_EMU diff --git a/sycl/include/sycl/ext/intel/esimd/math.hpp b/sycl/include/sycl/ext/intel/esimd/math.hpp index fb0fa45edc94d..d34b9f36e0e42 100644 --- a/sycl/include/sycl/ext/intel/esimd/math.hpp +++ b/sycl/include/sycl/ext/intel/esimd/math.hpp @@ -21,8 +21,9 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_NS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd { /// @addtogroup sycl_esimd_math /// @{ @@ -1085,5 +1086,6 @@ ESIMD_INLINE ESIMD_NODEBUG T0 reduce(simd v, BinaryOperation op) { /// @} sycl_esimd_math -} // namespace __ESIMD_NS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/memory.hpp b/sycl/include/sycl/ext/intel/esimd/memory.hpp index bdc208d7350f3..36f06d91f2a91 100644 --- a/sycl/include/sycl/ext/intel/esimd/memory.hpp +++ b/sycl/include/sycl/ext/intel/esimd/memory.hpp @@ -19,8 +19,9 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_NS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd { /// @addtogroup sycl_esimd_memory /// @{ @@ -1498,5 +1499,6 @@ simd_obj_impl::copy_to(AccessorT acc, uint32_t offset, } // namespace detail /// @endcond EXCLUDE -} // namespace __ESIMD_NS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/simd.hpp b/sycl/include/sycl/ext/intel/esimd/simd.hpp index 3337d1daf50a1..e48c6e9f74e8a 100644 --- a/sycl/include/sycl/ext/intel/esimd/simd.hpp +++ b/sycl/include/sycl/ext/intel/esimd/simd.hpp @@ -25,8 +25,9 @@ #include #endif // __SYCL_DEVICE_ONLY__ -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_NS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd { /// @addtogroup sycl_esimd_core /// @{ @@ -198,8 +199,9 @@ template using simd_mask = detail::simd_mask_type; /// @} sycl_esimd_core_vectors -} // namespace __ESIMD_NS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl /// @ingroup sycl_esimd_misc /// Prints a \c simd object to an output stream. diff --git a/sycl/include/sycl/ext/intel/esimd/simd_view.hpp b/sycl/include/sycl/ext/intel/esimd/simd_view.hpp index d1307e8d3c400..6fd24741bae88 100644 --- a/sycl/include/sycl/ext/intel/esimd/simd_view.hpp +++ b/sycl/include/sycl/ext/intel/esimd/simd_view.hpp @@ -13,8 +13,9 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_NS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::esimd { /// @addtogroup sycl_esimd_core_vectors /// @{ @@ -224,5 +225,6 @@ class simd_view, NestedRegion>> /// @} sycl_esimd_core_vectors -} // namespace __ESIMD_NS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp index 9b3fb1945c72b..1f925154aa7bd 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp @@ -20,8 +20,9 @@ /// @endcond ESIMD_DETAIL -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_ENS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::experimental::esimd { /// @addtogroup sycl_esimd_core /// @{ @@ -420,5 +421,6 @@ enum class split_barrier_action : uint8_t { /// @} sycl_esimd_core -} // namespace __ESIMD_ENS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::experimental::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp index a39472e7382fb..6d536f06204f4 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp @@ -14,8 +14,9 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_EDNS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::experimental::esimd::detail { template constexpr unsigned int roundUpNextMultiple() { @@ -52,7 +53,8 @@ struct is_one_of_enum { template inline constexpr bool is_one_of_enum_v = is_one_of_enum::value; -} // namespace __ESIMD_EDNS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::experimental::esimd::detail +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl /// @endcond ESIMD_DETAIL diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/kernel_properties.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/kernel_properties.hpp index 221fa7239dde3..445a7ec4e70ac 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/kernel_properties.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/kernel_properties.hpp @@ -15,8 +15,9 @@ #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_ENS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::experimental::esimd { namespace kernel_properties { @@ -74,5 +75,6 @@ void set_kernel_properties(KernelProps... props) { }); } -} // namespace __ESIMD_ENS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::experimental::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp index 68a440f665710..ddd8cadae76f2 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp @@ -15,8 +15,9 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_ENS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::experimental::esimd { /// @addtogroup sycl_esimd_bitmanip /// @{ @@ -2122,5 +2123,6 @@ __ESIMD_API __ESIMD_NS::simd dpasw2(__ESIMD_NS::simd src1, } /// @} sycl_esimd_systolic_array_api -} // namespace __ESIMD_ENS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::experimental::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp index 87a9aaa37f7b8..371ecd1cc4245 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp @@ -15,8 +15,9 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace __ESIMD_ENS { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::experimental::esimd { #define __ESIMD_GET_SURF_HANDLE(acc) __ESIMD_NS::get_surface_index(acc) @@ -1564,5 +1565,6 @@ __ESIMD_API void lsc_fence(__ESIMD_NS::simd_mask pred = 1) { #undef __ESIMD_GET_SURF_HANDLE -} // namespace __ESIMD_ENS -} // __SYCL_INLINE_NAMESPACE(cl) +} // namespace ext::intel::experimental::esimd +} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // namespace sycl diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp index a49a7fe94dd83..7adeb65c8af66 100644 --- a/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp +++ b/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp @@ -12,8 +12,8 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { namespace ext { namespace intel { namespace experimental { @@ -199,5 +199,5 @@ template class lsu final { } // namespace experimental } // namespace intel } // namespace ext +} // __SYCL_INLINE_VER_NAMESPACE(_V1) } // namespace sycl -} // __SYCL_INLINE_NAMESPACE(cl) diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp index e6a762137c43d..4656b5322cbeb 100644 --- a/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp +++ b/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp @@ -14,8 +14,9 @@ #include #include -__SYCL_INLINE_NAMESPACE(cl) { -namespace sycl::ext::intel::experimental::detail { +namespace sycl { +__SYCL_INLINE_VER_NAMESPACE(_V1) { +namespace ext::intel::experimental::detail { template