From 80b17752a3745e302574ba76f2555b0294ca3379 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Thu, 20 Jul 2023 21:17:07 -0700 Subject: [PATCH 1/4] [SYCL][NFC] Remove __SYCL_INLINE_VER_NAMESPACE macro --- clang/lib/Sema/SemaSYCL.cpp | 8 +- .../anonymous_integration_footer.cpp | 88 +++++++++---------- .../anonymous_integration_footer2.cpp | 36 ++++---- .../device_global_int_footer_header.cpp | 4 +- .../device_globals_with_spec_ids.cpp | 24 ++--- .../host_pipe_int_footer_header.cpp | 4 +- .../int_header_without_kernels.cpp | 4 +- clang/test/CodeGenSYCL/integration_footer.cpp | 48 +++++----- .../CodeGenSYCL/kernel-param-acc-array-ih.cpp | 2 +- .../kernel-param-member-acc-array-ih.cpp | 2 +- .../CodeGenSYCL/kernel-param-pod-array-ih.cpp | 2 +- .../CodeGenSYCL/union-kernel-param-ih.cpp | 2 +- clang/test/CodeGenSYCL/wrapped-accessor.cpp | 2 +- .../Inputs/sycl/detail/defines_elementary.hpp | 1 - .../Inputs/sycl/detail/kernel_desc.hpp | 4 +- sycl/.clang-format | 2 +- .../SYCL2020-SpecializationConstants.md | 4 +- sycl/doc/doxygen.cfg.in | 1 - sycl/include/CL/__spirv/spirv_types.hpp | 4 +- sycl/include/sycl/access/access.hpp | 4 +- sycl/include/sycl/accessor.hpp | 4 +- sycl/include/sycl/aliases.hpp | 8 +- sycl/include/sycl/aspects.hpp | 4 +- sycl/include/sycl/async_handler.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 +- .../include/sycl/detail/accessor_iterator.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/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/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 | 4 +- sycl/include/sycl/detail/handler_proxy.hpp | 4 +- sycl/include/sycl/detail/helpers.hpp | 4 +- sycl/include/sycl/detail/host_pipe_map.hpp | 4 +- .../sycl/detail/host_profiling_info.hpp | 4 +- .../sycl/detail/image_accessor_util.hpp | 4 +- sycl/include/sycl/detail/image_ocl_types.hpp | 8 +- sycl/include/sycl/detail/impl_utils.hpp | 4 +- .../include/sycl/detail/info_desc_helpers.hpp | 4 +- sycl/include/sycl/detail/item_base.hpp | 4 +- sycl/include/sycl/detail/kernel_desc.hpp | 4 +- .../include/sycl/detail/kernel_properties.hpp | 4 +- sycl/include/sycl/detail/locked.hpp | 4 +- sycl/include/sycl/detail/memcpy.hpp | 4 +- sycl/include/sycl/detail/native_cpu.hpp | 4 +- sycl/include/sycl/detail/os_util.hpp | 4 +- sycl/include/sycl/detail/owner_less_base.hpp | 4 +- sycl/include/sycl/detail/pi.hpp | 4 +- sycl/include/sycl/detail/property_helper.hpp | 4 +- .../sycl/detail/property_list_base.hpp | 4 +- .../include/sycl/detail/reduction_forward.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/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/detail/vector_traits.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 +- .../experimental/fusion_properties.hpp | 4 +- .../codeplay/experimental/fusion_wrapper.hpp | 4 +- sycl/include/sycl/ext/intel/esimd/alt_ui.hpp | 4 +- sycl/include/sycl/ext/intel/esimd/common.hpp | 4 +- .../esimd/detail/bfloat16_type_traits.hpp | 4 +- .../intel/esimd/detail/elem_type_traits.hpp | 4 +- .../intel/esimd/detail/half_type_traits.hpp | 4 +- .../sycl/ext/intel/esimd/detail/host_util.hpp | 8 +- .../sycl/ext/intel/esimd/detail/intrin.hpp | 4 +- .../ext/intel/esimd/detail/math_intrin.hpp | 4 +- .../ext/intel/esimd/detail/memory_intrin.hpp | 4 +- .../sycl/ext/intel/esimd/detail/operators.hpp | 4 +- .../sycl/ext/intel/esimd/detail/region.hpp | 4 +- .../ext/intel/esimd/detail/simd_mask_impl.hpp | 4 +- .../ext/intel/esimd/detail/simd_obj_impl.hpp | 4 +- .../ext/intel/esimd/detail/simd_view_impl.hpp | 4 +- .../sycl/ext/intel/esimd/detail/sycl_util.hpp | 4 +- .../ext/intel/esimd/detail/test_proxy.hpp | 4 +- .../esimd/detail/tfloat32_type_traits.hpp | 4 +- .../ext/intel/esimd/detail/type_format.hpp | 4 +- .../sycl/ext/intel/esimd/detail/types.hpp | 4 +- .../sycl/ext/intel/esimd/detail/util.hpp | 4 +- .../esimd_emulator_device_interface.hpp | 4 +- sycl/include/sycl/ext/intel/esimd/math.hpp | 4 +- sycl/include/sycl/ext/intel/esimd/memory.hpp | 4 +- .../sycl/ext/intel/esimd/native/common.hpp | 4 +- sycl/include/sycl/ext/intel/esimd/simd.hpp | 4 +- .../sycl/ext/intel/esimd/simd_view.hpp | 4 +- .../sycl/ext/intel/esimd/xmx/common.hpp | 4 +- .../include/sycl/ext/intel/esimd/xmx/dpas.hpp | 4 +- .../ext/intel/experimental/esimd/common.hpp | 4 +- .../intel/experimental/esimd/detail/util.hpp | 4 +- .../ext/intel/experimental/esimd/math.hpp | 4 +- .../ext/intel/experimental/esimd/memory.hpp | 4 +- .../ext/intel/experimental/esimd/tfloat32.hpp | 4 +- .../experimental/fpga_kernel_properties.hpp | 4 +- .../sycl/ext/intel/experimental/fpga_lsu.hpp | 4 +- .../ext/intel/experimental/fpga_utils.hpp | 4 +- .../experimental/grf_size_properties.hpp | 4 +- .../kernel_execution_properties.hpp | 4 +- .../intel/experimental/online_compiler.hpp | 4 +- .../intel/experimental/pipe_properties.hpp | 4 +- .../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/math.hpp | 4 +- .../sycl/ext/intel/math/imf_half_trivial.hpp | 4 +- sycl/include/sycl/ext/intel/math/imf_simd.hpp | 4 +- sycl/include/sycl/ext/intel/pipes.hpp | 4 +- sycl/include/sycl/ext/intel/usm_pointers.hpp | 4 +- .../ext/oneapi/accessor_property_list.hpp | 4 +- .../oneapi/annotated_arg/annotated_arg.hpp | 4 +- .../oneapi/annotated_arg/annotated_ptr.hpp | 4 +- .../ext/oneapi/annotated_arg/properties.hpp | 4 +- sycl/include/sycl/ext/oneapi/backend/hip.hpp | 4 +- .../sycl/ext/oneapi/backend/level_zero.hpp | 4 +- .../oneapi/backend/level_zero_ownership.hpp | 4 +- .../sycl/ext/oneapi/bf16_storage_builtins.hpp | 4 +- sycl/include/sycl/ext/oneapi/bfloat16.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 +- .../ext/oneapi/experimental/ballot_group.hpp | 4 +- .../ext/oneapi/experimental/bfloat16_math.hpp | 4 +- .../sycl/ext/oneapi/experimental/builtins.hpp | 4 +- .../ext/oneapi/experimental/cuda/barrier.hpp | 4 +- .../ext/oneapi/experimental/cuda/builtins.hpp | 4 +- .../cuda/non_uniform_algorithms.hpp | 4 +- .../experimental/detail/invoke_simd_types.hpp | 4 +- .../experimental/device_architecture.hpp | 4 +- .../oneapi/experimental/fixed_size_group.hpp | 4 +- .../sycl/ext/oneapi/experimental/graph.hpp | 4 +- .../experimental/group_helpers_sorters.hpp | 4 +- .../ext/oneapi/experimental/group_sort.hpp | 4 +- .../ext/oneapi/experimental/invoke_simd.hpp | 4 +- .../experimental/non_uniform_groups.hpp | 4 +- .../experimental/opportunistic_group.hpp | 4 +- .../ext/oneapi/experimental/root_group.hpp | 4 +- .../ext/oneapi/experimental/sycl_complex.hpp | 4 +- .../ext/oneapi/experimental/tangle_group.hpp | 4 +- .../sycl/ext/oneapi/experimental/uniform.hpp | 10 +-- .../experimental/user_defined_reductions.hpp | 4 +- .../sycl/ext/oneapi/filter_selector.hpp | 4 +- sycl/include/sycl/ext/oneapi/functional.hpp | 4 +- .../sycl/ext/oneapi/group_local_memory.hpp | 4 +- .../oneapi/kernel_properties/properties.hpp | 4 +- .../ext/oneapi/latency_control/properties.hpp | 4 +- .../sycl/ext/oneapi/matrix/matrix-intel.hpp | 4 +- .../sycl/ext/oneapi/matrix/matrix-jit.hpp | 4 +- .../ext/oneapi/matrix/matrix-tensorcores.hpp | 4 +- .../oneapi/matrix/matrix-unified-utils.hpp | 4 +- .../sycl/ext/oneapi/matrix/matrix-unified.hpp | 4 +- .../ext/oneapi/matrix/static-query-use.hpp | 4 +- .../sycl/ext/oneapi/matrix/static-query.hpp | 4 +- sycl/include/sycl/ext/oneapi/matrix/utils.hpp | 4 +- sycl/include/sycl/ext/oneapi/owner_less.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/sub_group.hpp | 4 +- .../sycl/ext/oneapi/sub_group_mask.hpp | 4 +- sycl/include/sycl/ext/oneapi/weak_object.hpp | 4 +- .../sycl/ext/oneapi/weak_object_base.hpp | 4 +- sycl/include/sycl/functional.hpp | 4 +- sycl/include/sycl/group.hpp | 4 +- sycl/include/sycl/group_algorithm.hpp | 4 +- sycl/include/sycl/group_barrier.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/item.hpp | 4 +- sycl/include/sycl/kernel.hpp | 4 +- sycl/include/sycl/kernel_bundle.hpp | 4 +- sycl/include/sycl/kernel_bundle_enums.hpp | 2 +- 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/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 | 8 +- 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/include/sycl/usm/usm_pointer_info.hpp | 4 +- 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/buffer.cpp | 4 +- sycl/source/context.cpp | 4 +- sycl/source/detail/accessor_impl.cpp | 4 +- sycl/source/detail/accessor_impl.hpp | 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/buffer_impl.hpp | 4 +- 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_binary_image.hpp | 4 +- sycl/source/detail/device_filter.cpp | 4 +- sycl/source/detail/device_global_map.cpp | 4 +- .../source/detail/device_global_map_entry.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/error_handling.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 | 4 +- sycl/source/detail/filter_selector_impl.hpp | 4 +- sycl/source/detail/fusion/fusion_wrapper.cpp | 4 +- .../detail/fusion/fusion_wrapper_impl.cpp | 4 +- .../detail/fusion/fusion_wrapper_impl.hpp | 4 +- sycl/source/detail/global_handler.cpp | 4 +- sycl/source/detail/global_handler.hpp | 4 +- sycl/source/detail/graph_impl.cpp | 4 +- sycl/source/detail/graph_impl.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/host_pipe_map.cpp | 4 +- sycl/source/detail/host_pipe_map_entry.hpp | 4 +- sycl/source/detail/image_accessor_util.cpp | 4 +- sycl/source/detail/image_impl.cpp | 4 +- sycl/source/detail/image_impl.hpp | 4 +- sycl/source/detail/jit_compiler.cpp | 4 +- sycl/source/detail/jit_compiler.hpp | 4 +- sycl/source/detail/jit_device_binaries.cpp | 4 +- sycl/source/detail/jit_device_binaries.hpp | 4 +- sycl/source/detail/kernel_arg_mask.hpp | 4 +- sycl/source/detail/kernel_bundle_impl.hpp | 4 +- sycl/source/detail/kernel_id_impl.hpp | 4 +- sycl/source/detail/kernel_impl.cpp | 4 +- sycl/source/detail/kernel_impl.hpp | 4 +- sycl/source/detail/kernel_info.hpp | 4 +- sycl/source/detail/kernel_program_cache.cpp | 4 +- sycl/source/detail/kernel_program_cache.hpp | 4 +- sycl/source/detail/mem_alloc_helper.hpp | 4 +- sycl/source/detail/memory_manager.cpp | 4 +- sycl/source/detail/memory_manager.hpp | 4 +- .../online_compiler/online_compiler.cpp | 4 +- sycl/source/detail/os_util.cpp | 4 +- .../detail/persistent_device_code_cache.cpp | 4 +- .../detail/persistent_device_code_cache.hpp | 4 +- sycl/source/detail/pi.cpp | 4 +- sycl/source/detail/pi_utils.hpp | 4 +- sycl/source/detail/pipes.cpp | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- sycl/source/detail/scheduler/scheduler.cpp | 4 +- sycl/source/detail/scheduler/scheduler.hpp | 4 +- sycl/source/detail/spec_constant_impl.cpp | 4 +- sycl/source/detail/spec_constant_impl.hpp | 4 +- sycl/source/detail/stream_impl.cpp | 4 +- sycl/source/detail/stream_impl.hpp | 4 +- sycl/source/detail/sycl_mem_obj_i.hpp | 4 +- sycl/source/detail/sycl_mem_obj_t.cpp | 4 +- sycl/source/detail/sycl_mem_obj_t.hpp | 4 +- sycl/source/detail/thread_pool.hpp | 4 +- sycl/source/detail/usm/usm_impl.cpp | 4 +- sycl/source/detail/usm/usm_impl.hpp | 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 | 4 +- .../esimd_emulator_device_interface.cpp | 4 +- sycl/source/event.cpp | 4 +- sycl/source/exception.cpp | 4 +- sycl/source/exception_list.cpp | 4 +- sycl/source/feature_test.hpp.in | 4 +- sycl/source/handler.cpp | 4 +- sycl/source/image.cpp | 4 +- sycl/source/interop_handle.cpp | 4 +- sycl/source/kernel.cpp | 4 +- sycl/source/kernel_bundle.cpp | 4 +- sycl/source/platform.cpp | 4 +- sycl/source/queue.cpp | 4 +- sycl/source/queue_v3.cpp | 4 +- sycl/source/sampler.cpp | 4 +- sycl/source/stream.cpp | 4 +- sycl/test-e2e/ESIMD/linear/bitmap_helpers.h | 4 +- .../xpti_helpers/pi_arguments_handler.hpp | 4 +- sycl/unittests/Extensions/DeviceGlobal.cpp | 4 +- sycl/unittests/Extensions/USMMemcpy2D.cpp | 4 +- sycl/unittests/SYCL2020/IsCompatible.cpp | 4 +- sycl/unittests/SYCL2020/KernelBundle.cpp | 4 +- .../SYCL2020/KernelBundleStateFiltering.cpp | 4 +- sycl/unittests/SYCL2020/KernelID.cpp | 4 +- .../SYCL2020/SpecializationConstant.cpp | 4 +- sycl/unittests/assert/assert.cpp | 4 +- sycl/unittests/buffer/KernelArgMemObj.cpp | 4 +- sycl/unittests/helpers/MockKernelInfo.hpp | 4 +- sycl/unittests/helpers/PiImage.hpp | 4 +- sycl/unittests/helpers/PiMock.hpp | 4 +- sycl/unittests/helpers/ScopedEnvVar.hpp | 4 +- sycl/unittests/helpers/TestKernel.hpp | 4 +- sycl/unittests/kernel-and-program/Cache.cpp | 4 +- .../kernel-and-program/KernelBuildOptions.cpp | 4 +- .../kernel-and-program/MultipleDevsCache.cpp | 4 +- .../pipes/host_pipe_registration.cpp | 4 +- .../program_manager/EliminatedArgMask.cpp | 4 +- .../passing_link_and_compile_options.cpp | 4 +- sycl/unittests/queue/GetProfilingInfo.cpp | 4 +- .../scheduler/CommandsWaitForEvents.cpp | 4 +- .../scheduler/SchedulerTestUtils.hpp | 4 +- 407 files changed, 915 insertions(+), 921 deletions(-) diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp index fc9792d55c2d8..7b9554a408c22 100644 --- a/clang/lib/Sema/SemaSYCL.cpp +++ b/clang/lib/Sema/SemaSYCL.cpp @@ -5184,7 +5184,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) { O << "\n"; O << "namespace sycl {\n"; - O << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n"; + O << "inline namespace _V1 {\n"; O << "namespace detail {\n"; // Generate declaration of variable of type __sycl_device_global_registration @@ -5347,7 +5347,7 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) { } O << "\n"; O << "} // namespace detail\n"; - O << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n"; + O << "} // inline namespace _V1\n"; O << "} // namespace sycl\n"; O << "\n"; } @@ -5659,7 +5659,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) { } else { EmittedFirstSpecConstant = true; OS << "namespace sycl {\n"; - OS << "__SYCL_INLINE_VER_NAMESPACE(_V1) {\n"; + OS << "inline namespace _V1 {\n"; OS << "namespace detail {\n"; OS << "template<>\n"; OS << "inline const char *get_spec_constant_symbolic_ID_impl<"; @@ -5677,7 +5677,7 @@ bool SYCLIntegrationFooter::emit(raw_ostream &OS) { OS << "\";\n"; OS << "}\n"; OS << "} // namespace detail\n"; - OS << "} // __SYCL_INLINE_VER_NAMESPACE(_V1)\n"; + OS << "} // inline namespace _V1\n"; OS << "} // namespace sycl\n"; } } diff --git a/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp b/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp index 301f028bfc7e7..e08fb2e1feb49 100644 --- a/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp +++ b/clang/test/CodeGenSYCL/anonymous_integration_footer.cpp @@ -16,48 +16,48 @@ int main() { struct S1 { static constexpr sycl::specialization_id a{1}; // CHECK: namespace sycl { - // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { + // CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl }; constexpr sycl::specialization_id b{2}; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl inline constexpr sycl::specialization_id c{3}; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl static constexpr sycl::specialization_id d{4}; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace { @@ -71,14 +71,14 @@ struct S2 { // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { - // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { + // CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl }; } // namespace @@ -89,25 +89,25 @@ struct S3 { }; template class S3<1>; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl template class S3<2>; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace { @@ -127,14 +127,14 @@ template class inner::S3<10>; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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_15inner2S3ILi10EE1aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail -// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) +// CHECK-NEXT: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace { @@ -154,39 +154,39 @@ template class inner::S4<10, 20>; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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_15inner2S4ILi10ELi20EE1aE"; // CHECK-NEXT: } // CHECK-NEXT: } // namespace detail -// CHECK-NEXT: } // __SYCL_INLINE_VER_NAMESPACE(_V1) +// CHECK-NEXT: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace inner { constexpr sycl::specialization_id same_name{5}; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } constexpr sycl::specialization_id same_name{6}; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace { constexpr sycl::specialization_id same_name{7}; @@ -198,14 +198,14 @@ constexpr sycl::specialization_id same_name{7}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } namespace { @@ -219,14 +219,14 @@ constexpr sycl::specialization_id same_name{8}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } } // namespace @@ -243,14 +243,14 @@ constexpr sycl::specialization_id same_name{9}; // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace inner // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } } // namespace inner @@ -258,14 +258,14 @@ constexpr sycl::specialization_id same_name{9}; namespace outer { constexpr sycl::specialization_id same_name{10}; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace { constexpr sycl::specialization_id same_name{11}; @@ -279,14 +279,14 @@ constexpr sycl::specialization_id same_name{11}; // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace inner { @@ -301,14 +301,14 @@ constexpr sycl::specialization_id same_name{12}; // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace { @@ -339,14 +339,14 @@ constexpr sycl::specialization_id same_name{13}; // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } } // namespace inner @@ -364,14 +364,14 @@ constexpr sycl::specialization_id same_name{14}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace { constexpr sycl::specialization_id same_name{15}; @@ -394,14 +394,14 @@ constexpr sycl::specialization_id same_name{15}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace inner { constexpr sycl::specialization_id same_name{16}; @@ -424,14 +424,14 @@ constexpr sycl::specialization_id same_name{16}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } } // namespace @@ -442,14 +442,14 @@ namespace outer { namespace inner { constexpr sycl::specialization_id same_name{17}; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } } // namespace outer diff --git a/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp b/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp index 86259b10544b1..9a3648439271d 100644 --- a/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp +++ b/clang/test/CodeGenSYCL/anonymous_integration_footer2.cpp @@ -15,73 +15,73 @@ struct S1 { static constexpr sycl::specialization_id a{1}; }; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl constexpr sycl::specialization_id b{202}; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl inline constexpr sycl::specialization_id c{3}; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl static constexpr sycl::specialization_id d{205}; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace inner { constexpr sycl::specialization_id same_name{5}; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } constexpr sycl::specialization_id same_name{6}; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace { constexpr sycl::specialization_id same_name{207}; @@ -93,14 +93,14 @@ constexpr sycl::specialization_id same_name{207}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } namespace { @@ -114,14 +114,14 @@ constexpr sycl::specialization_id same_name{208}; // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } } // namespace @@ -141,14 +141,14 @@ constexpr sycl::specialization_id same_name{209}; // CHECK-NEXT: } // inline namespace inner // CHECK-NEXT: } // namespace outer // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } } diff --git a/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp b/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp index 0ba2cc486b584..8a63f596e6f46 100644 --- a/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp +++ b/clang/test/CodeGenSYCL/device_global_int_footer_header.cpp @@ -14,7 +14,7 @@ int main() { } // CHECK-HEADER: namespace sycl { -// CHECK-HEADER-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-HEADER-NEXT: inline namespace _V1 { // CHECK-HEADER-NEXT: namespace detail { // CHECK-HEADER-NEXT: namespace { // CHECK-HEADER-NEXT: class __sycl_device_global_registration { @@ -24,7 +24,7 @@ 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: } // inline namespace _V1 // CHECK-HEADER: } // namespace sycl // 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 8eb773ead6b3c..35213af10d2b2 100644 --- a/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp +++ b/clang/test/CodeGenSYCL/device_globals_with_spec_ids.cpp @@ -13,14 +13,14 @@ int main() { // CHECK: #include constexpr sycl::specialization_id a{2}; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl sycl::ext::oneapi::device_global b; @@ -29,14 +29,14 @@ struct Wrapper { static sycl::ext::oneapi::device_global b; }; // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl template @@ -47,14 +47,14 @@ struct TemplateWrapper { template class TemplateWrapper; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace { @@ -71,14 +71,14 @@ sycl::ext::oneapi::device_global b; // CHECK-NEXT: } // namespace // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl // CHECK: namespace { @@ -117,14 +117,14 @@ constexpr sycl::specialization_id a{2}; // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl sycl::ext::oneapi::device_global b; // CHECK: namespace outer { @@ -177,14 +177,14 @@ struct Wrapper { // CHECK-NEXT: } // namespace // CHECK-NEXT: } // namespace outer // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl // CHECK-NEXT: namespace outer { diff --git a/clang/test/CodeGenSYCL/host_pipe_int_footer_header.cpp b/clang/test/CodeGenSYCL/host_pipe_int_footer_header.cpp index 31899db188470..4100e42235397 100644 --- a/clang/test/CodeGenSYCL/host_pipe_int_footer_header.cpp +++ b/clang/test/CodeGenSYCL/host_pipe_int_footer_header.cpp @@ -21,7 +21,7 @@ void foo() { } // CHECK-HEADER: namespace sycl { -// CHECK-HEADER-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-HEADER-NEXT: inline namespace _V1 { // CHECK-HEADER-NEXT: namespace detail { // CHECK-HEADER-NEXT: namespace { // CHECK-HEADER-NEXT: class __sycl_host_pipe_registration { @@ -31,7 +31,7 @@ void foo() { // CHECK-HEADER-NEXT: __sycl_host_pipe_registration __sycl_host_pipe_registrar; // CHECK-HEADER-NEXT: } // namespace // CHECK-HEADER: } // namespace detail -// CHECK-HEADER: } // __SYCL_INLINE_VER_NAMESPACE(_V1) +// CHECK-HEADER: } // inline namespace _V1 // CHECK-HEADER: } // namespace sycl // CHECK-FOOTER: #include diff --git a/clang/test/CodeGenSYCL/int_header_without_kernels.cpp b/clang/test/CodeGenSYCL/int_header_without_kernels.cpp index 7533255770b9a..098240d199aa3 100644 --- a/clang/test/CodeGenSYCL/int_header_without_kernels.cpp +++ b/clang/test/CodeGenSYCL/int_header_without_kernels.cpp @@ -10,7 +10,7 @@ using namespace sycl::ext::oneapi; // CHECK-HEADER: namespace sycl { -// CHECK-HEADER-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-HEADER-NEXT: inline namespace _V1 { // CHECK-HEADER-NEXT: namespace detail { // CHECK-HEADER-NEXT: namespace { // CHECK-HEADER-NEXT: class __sycl_device_global_registration { @@ -20,7 +20,7 @@ using namespace 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: } // inline namespace _V1 // CHECK-HEADER: } // namespace sycl // CHECK-FOOTER: #include diff --git a/clang/test/CodeGenSYCL/integration_footer.cpp b/clang/test/CodeGenSYCL/integration_footer.cpp index 85d7717ecbddf..fdfb979c7d7ea 100644 --- a/clang/test/CodeGenSYCL/integration_footer.cpp +++ b/clang/test/CodeGenSYCL/integration_footer.cpp @@ -13,27 +13,27 @@ using namespace sycl; sycl::specialization_id GlobalSpecID; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl struct Wrapper { static specialization_id WrapperSpecID; // CHECK: namespace sycl { - // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { + // CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl }; @@ -43,74 +43,74 @@ struct WrapperTemplate { }; template class WrapperTemplate; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl template class WrapperTemplate; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl namespace Foo { specialization_id NSSpecID; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl inline namespace Bar { specialization_id InlineNSSpecID; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl specialization_id NSSpecID; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl struct Wrapper { static specialization_id WrapperSpecID; // CHECK: namespace sycl { - // CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { + // CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl }; @@ -120,25 +120,25 @@ struct WrapperTemplate { }; template class WrapperTemplate; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl template class WrapperTemplate; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } // namespace Bar namespace { @@ -155,14 +155,14 @@ specialization_id AnonNSSpecID; // CHECK-NEXT: } // namespace Foo // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl } // namespace @@ -202,14 +202,14 @@ auto x = HasVarTemplate::VarTempl.getDefaultValue(); // CHECK-NEXT: } // namespace __sycl_detail // CHECK-NEXT: } // namespace // CHECK-NEXT: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline 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: } // inline namespace _V1 // CHECK-NEXT: } // namespace sycl template struct GlobalWrapper { diff --git a/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp index 4d6cf68f8a7df..15a1a2bd2f9e7 100644 --- a/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-acc-array-ih.cpp @@ -9,7 +9,7 @@ // CHECK: class kernel_A; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline namespace _V1 { // CHECK-NEXT: namespace detail { // CHECK: static constexpr 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 2d77af1a0280b..2050aac50626c 100644 --- a/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-member-acc-array-ih.cpp @@ -9,7 +9,7 @@ // CHECK: class kernel_C; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline namespace _V1 { // CHECK-NEXT: namespace detail { // CHECK: static constexpr diff --git a/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp b/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp index cbd207c3d9223..68b0f412a701a 100644 --- a/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp +++ b/clang/test/CodeGenSYCL/kernel-param-pod-array-ih.cpp @@ -8,7 +8,7 @@ // CHECK: class kernel_B; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline namespace _V1 { // CHECK-NEXT: namespace detail { // CHECK: static constexpr diff --git a/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp b/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp index b00bac5bd23ab..aa030417b68ee 100644 --- a/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp +++ b/clang/test/CodeGenSYCL/union-kernel-param-ih.cpp @@ -9,7 +9,7 @@ // CHECK: class kernel_A; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline namespace _V1 { // CHECK-NEXT: namespace detail { // CHECK: static constexpr diff --git a/clang/test/CodeGenSYCL/wrapped-accessor.cpp b/clang/test/CodeGenSYCL/wrapped-accessor.cpp index 79f573ea8854a..6d46d03cad2e5 100644 --- a/clang/test/CodeGenSYCL/wrapped-accessor.cpp +++ b/clang/test/CodeGenSYCL/wrapped-accessor.cpp @@ -6,7 +6,7 @@ // CHECK: class wrapped_access; // CHECK: namespace sycl { -// CHECK-NEXT: __SYCL_INLINE_VER_NAMESPACE(_V1) { +// CHECK-NEXT: inline namespace _V1 { // CHECK-NEXT: namespace detail { // CHECK: static constexpr diff --git a/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp b/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp index d21230727dcb8..ecca3de1368fe 100644 --- a/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp +++ b/clang/test/SemaSYCL/Inputs/sycl/detail/defines_elementary.hpp @@ -1,4 +1,3 @@ #pragma once -#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 11b23c00e21b1..3d653e8ff1a48 100644 --- a/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp +++ b/clang/test/SemaSYCL/Inputs/sycl/detail/kernel_desc.hpp @@ -3,7 +3,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { #ifndef __SYCL_DEVICE_ONLY__ @@ -57,5 +57,5 @@ namespace detail { static constexpr int64_t getKernelSize() { return 0; } }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/.clang-format b/sycl/.clang-format index 412e67480725c..d9e54adc5d653 100644 --- a/sycl/.clang-format +++ b/sycl/.clang-format @@ -1,2 +1,2 @@ BasedOnStyle: LLVM -NamespaceMacros: ['__SYCL_INLINE_NAMESPACE', '__SYCL_INLINE_VER_NAMESPACE'] +NamespaceMacros: ['__SYCL_INLINE_NAMESPACE'] diff --git a/sycl/doc/design/SYCL2020-SpecializationConstants.md b/sycl/doc/design/SYCL2020-SpecializationConstants.md index 6a430001b9f46..4d7c50b098f50 100644 --- a/sycl/doc/design/SYCL2020-SpecializationConstants.md +++ b/sycl/doc/design/SYCL2020-SpecializationConstants.md @@ -785,7 +785,7 @@ The integration footer will look like: ``` namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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,7 +814,7 @@ inline const char *get_spec_constant_symbolic_ID() { } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl // Detailed description of this header is provided below in corresponding RT section diff --git a/sycl/doc/doxygen.cfg.in b/sycl/doc/doxygen.cfg.in index c9c3122f510c8..abebc9ea52631 100644 --- a/sycl/doc/doxygen.cfg.in +++ b/sycl/doc/doxygen.cfg.in @@ -2105,7 +2105,6 @@ INCLUDE_FILE_PATTERNS = # This tag requires that the tag ENABLE_PREPROCESSING is set to YES. PREDEFINED = "__SYCL_INLINE_NAMESPACE(X)=namespace X" \ - "__SYCL_INLINE_VER_NAMESPACE(X)=namespace X" \ "__SYCL_EXPORT" \ "__SYCL_EXPORT_DEPRECATED(x)=" \ "__ESIMD_NS=sycl::ext::intel::esimd" \ diff --git a/sycl/include/CL/__spirv/spirv_types.hpp b/sycl/include/CL/__spirv/spirv_types.hpp index ab56a4a8b35b2..3d741927522a4 100644 --- a/sycl/include/CL/__spirv/spirv_types.hpp +++ b/sycl/include/CL/__spirv/spirv_types.hpp @@ -184,12 +184,12 @@ struct ConstantPipeStorage { }; namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // Arbitrary precision integer type template using ap_int = _BitInt(Bits); } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #endif // __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/sycl/access/access.hpp b/sycl/include/sycl/access/access.hpp index 1f92c6b8ed397..bfe99561ea6a6 100644 --- a/sycl/include/sycl/access/access.hpp +++ b/sycl/include/sycl/access/access.hpp @@ -12,7 +12,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace access { enum class target { @@ -377,5 +377,5 @@ template inline ToT cast_AS(FromT from) { #undef __OPENCL_CONSTANT_AS__ #undef __OPENCL_PRIVATE_AS__ -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/accessor.hpp b/sycl/include/sycl/accessor.hpp index b857af948f695..02838cc08b282 100644 --- a/sycl/include/sycl/accessor.hpp +++ b/sycl/include/sycl/accessor.hpp @@ -211,7 +211,7 @@ /// accessor(3) namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { class stream; namespace ext::intel::esimd::detail { // Forward declare a "back-door" access class to support ESIMD. @@ -4075,7 +4075,7 @@ class __SYCL_EBO host_sampled_image_accessor friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj); }; -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace std { diff --git a/sycl/include/sycl/aliases.hpp b/sycl/include/sycl/aliases.hpp index 8805651d33627..4abacb5a61651 100644 --- a/sycl/include/sycl/aliases.hpp +++ b/sycl/include/sycl/aliases.hpp @@ -16,12 +16,12 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { template class vec; namespace detail::half_impl { class half; } // namespace detail::half_impl -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #define __SYCL_MAKE_VECTOR_ALIAS(ALIAS, TYPE, N) \ @@ -91,7 +91,7 @@ class half; __SYCL_MAKE_VECTOR_ALIAS(half, half, N) namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { using byte __SYCL2020_DEPRECATED("use std::byte instead") = std::uint8_t; using schar __SYCL2020_DEPRECATED("") = signed char; using uchar __SYCL2020_DEPRECATED("") = unsigned char; @@ -156,7 +156,7 @@ __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(4) __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(8) __SYCL_MAKE_VECTOR_ALIASES_FOR_VECTOR_LENGTH(16) #endif -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #undef __SYCL_MAKE_VECTOR_ALIAS diff --git a/sycl/include/sycl/aspects.hpp b/sycl/include/sycl/aspects.hpp index d2e389f4c9f8a..3fec152be9447 100644 --- a/sycl/include/sycl/aspects.hpp +++ b/sycl/include/sycl/aspects.hpp @@ -10,7 +10,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { #define __SYCL_ASPECT(ASPECT, ID) ASPECT = ID, #define __SYCL_ASPECT_DEPRECATED(ASPECT, ID, MESSAGE) \ @@ -25,5 +25,5 @@ enum class __SYCL_TYPE(aspect) aspect { #undef __SYCL_ASPECT_DEPRECATED #undef __SYCL_ASPECT -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/async_handler.hpp b/sycl/include/sycl/async_handler.hpp index 01ba71dc51efd..6140e68861890 100644 --- a/sycl/include/sycl/async_handler.hpp +++ b/sycl/include/sycl/async_handler.hpp @@ -13,11 +13,11 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // Forward declaration class exception_list; using async_handler = std::function; -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/atomic.hpp b/sycl/include/sycl/atomic.hpp index b972541c578f7..89b23f04430b7 100644 --- a/sycl/include/sycl/atomic.hpp +++ b/sycl/include/sycl/atomic.hpp @@ -26,7 +26,7 @@ "SYCL atomic function not available for float type") namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // Forward declaration template struct GetSpirvMemoryScope { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #ifndef __SYCL_DEVICE_ONLY__ // host implementation of SYCL atomics namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // Translate sycl::memory_order or __spv::MemorySemanticsMask::Flag // into std::memory_order @@ -83,7 +83,7 @@ inline std::memory_order getStdMemoryOrder(__spv::MemorySemanticsMask::Flag) { return std::memory_order_relaxed; } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl // std::atomic version of atomic SPIR-V builtins @@ -165,7 +165,7 @@ extern T __spirv_AtomicMax(std::atomic *Ptr, __spv::Scope::Flag, #endif // !defined(__SYCL_DEVICE_ONLY__) namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { template @@ -401,7 +401,7 @@ T atomic_fetch_max(atomic Object, T Operand, return Object.fetch_max(Operand, MemoryOrder); } -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #undef __SYCL_STATIC_ASSERT_NOT_FLOAT diff --git a/sycl/include/sycl/atomic_fence.hpp b/sycl/include/sycl/atomic_fence.hpp index 95b66092f3ec8..81999a7f37278 100644 --- a/sycl/include/sycl/atomic_fence.hpp +++ b/sycl/include/sycl/atomic_fence.hpp @@ -17,7 +17,7 @@ #endif namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { inline void atomic_fence(memory_order order, memory_scope scope) { #ifdef __SYCL_DEVICE_ONLY__ @@ -31,5 +31,5 @@ inline void atomic_fence(memory_order order, memory_scope scope) { #endif } -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/atomic_ref.hpp b/sycl/include/sycl/atomic_ref.hpp index 5e77c1fda5e3a..694f6c0547cc2 100644 --- a/sycl/include/sycl/atomic_ref.hpp +++ b/sycl/include/sycl/atomic_ref.hpp @@ -24,7 +24,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { using memory_order = sycl::memory_order; @@ -720,5 +720,5 @@ class atomic_ref AddressSpace>::operator=; }; -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/backend.hpp b/sycl/include/sycl/backend.hpp index 6ebb66da93619..bfc8e48eea5af 100644 --- a/sycl/include/sycl/backend.hpp +++ b/sycl/include/sycl/backend.hpp @@ -45,7 +45,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // TODO each backend can have its own custom errc enumeration @@ -363,5 +363,5 @@ make_kernel_bundle(const typename backend_traits::template input_type< false, State, Backend); return detail::createSyclObjFromImpl>(KBImpl); } -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/backend/opencl.hpp b/sycl/include/sycl/backend/opencl.hpp index fd4646d237190..6ffd43a2f0c42 100644 --- a/sycl/include/sycl/backend/opencl.hpp +++ b/sycl/include/sycl/backend/opencl.hpp @@ -14,7 +14,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace opencl { // Implementation of various "make" functions resides in SYCL RT because // creating SYCL objects requires knowing details not accessible here. @@ -65,5 +65,5 @@ T make(const context &Context, return make_queue(Context, detail::pi::cast(Interop)); } } // namespace opencl -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/backend_types.hpp b/sycl/include/sycl/backend_types.hpp index ce308e3d52d82..f35350ce912f5 100644 --- a/sycl/include/sycl/backend_types.hpp +++ b/sycl/include/sycl/backend_types.hpp @@ -13,7 +13,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { enum class backend : char { host __SYCL2020_DEPRECATED("'host' backend is no longer supported") = 0, @@ -64,5 +64,5 @@ inline std::ostream &operator<<(std::ostream &Out, backend be) { return Out; } -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/bit_cast.hpp b/sycl/include/sycl/bit_cast.hpp index 179ac1304988f..fdf40a138913f 100644 --- a/sycl/include/sycl/bit_cast.hpp +++ b/sycl/include/sycl/bit_cast.hpp @@ -18,7 +18,7 @@ #endif namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { template #if __cpp_lib_bit_cast || __has_builtin(__builtin_bit_cast) @@ -45,5 +45,5 @@ constexpr #endif // __cpp_lib_bit_cast } -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/buffer.hpp b/sycl/include/sycl/buffer.hpp index bf56a88e760d8..a140c8943a74f 100644 --- a/sycl/include/sycl/buffer.hpp +++ b/sycl/include/sycl/buffer.hpp @@ -22,7 +22,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { class handler; class queue; @@ -840,7 +840,7 @@ buffer(const T *, const range &, const property_list & = {}) -> buffer; #endif // __cpp_deduction_guides -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace std { diff --git a/sycl/include/sycl/builtins.hpp b/sycl/include/sycl/builtins.hpp index 72134be3d666f..5dbf3b05a3c04 100644 --- a/sycl/include/sycl/builtins.hpp +++ b/sycl/include/sycl/builtins.hpp @@ -22,7 +22,7 @@ namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template vec to_vec2(marray x, size_t start) { @@ -2560,7 +2560,7 @@ std::enable_if_t::value, T> tan(T x) __NOEXC { } #endif // __FAST_MATH__ -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #ifdef __SYCL_DEVICE_ONLY__ diff --git a/sycl/include/sycl/builtins_esimd.hpp b/sycl/include/sycl/builtins_esimd.hpp index 1b97dc8a054fd..3024e223c9839 100644 --- a/sycl/include/sycl/builtins_esimd.hpp +++ b/sycl/include/sycl/builtins_esimd.hpp @@ -19,7 +19,7 @@ #define __NOEXC /*noexcept*/ namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // cos template @@ -65,7 +65,7 @@ log(__ESIMD_NS::simd x) __NOEXC { #endif // __SYCL_DEVICE_ONLY__ } -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #undef __NOEXC diff --git a/sycl/include/sycl/context.hpp b/sycl/include/sycl/context.hpp index 1c4cd91678567..b9cb4b0a641f9 100644 --- a/sycl/include/sycl/context.hpp +++ b/sycl/include/sycl/context.hpp @@ -18,7 +18,7 @@ // 4.6.2 Context class namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // Forward declarations class device; class platform; @@ -238,7 +238,7 @@ class __SYCL_EXPORT context : public detail::OwnerLessBase { friend T detail::createSyclObjFromImpl(decltype(T::impl) ImplObj); }; -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace std { diff --git a/sycl/include/sycl/detail/accessor_iterator.hpp b/sycl/include/sycl/detail/accessor_iterator.hpp index 192bd63b67b0a..6657c7745f0a8 100644 --- a/sycl/include/sycl/detail/accessor_iterator.hpp +++ b/sycl/include/sycl/detail/accessor_iterator.hpp @@ -35,7 +35,7 @@ /// > over the elements that are within the sub-range. namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { template class accessor_iterator { #endif // NDEBUG }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/aligned_allocator.hpp b/sycl/include/sycl/detail/aligned_allocator.hpp index 39e5abd4a8b61..3f0354b4b230e 100644 --- a/sycl/include/sycl/detail/aligned_allocator.hpp +++ b/sycl/include/sycl/detail/aligned_allocator.hpp @@ -16,7 +16,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template class aligned_allocator { public: @@ -77,7 +77,7 @@ template class aligned_allocator { size_t MAlignment = 128; }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace std { diff --git a/sycl/include/sycl/detail/array.hpp b/sycl/include/sycl/detail/array.hpp index 91ccca296ab00..d58c091b062f3 100644 --- a/sycl/include/sycl/detail/array.hpp +++ b/sycl/include/sycl/detail/array.hpp @@ -13,7 +13,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { template class id; template class range; namespace detail { @@ -120,5 +120,5 @@ template class array { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/assert_happened.hpp b/sycl/include/sycl/detail/assert_happened.hpp index ae4e1b707ab48..7049bd909e503 100644 --- a/sycl/include/sycl/detail/assert_happened.hpp +++ b/sycl/include/sycl/detail/assert_happened.hpp @@ -19,7 +19,7 @@ __devicelib_assert_read(void *); #endif namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/backend_traits.hpp b/sycl/include/sycl/detail/backend_traits.hpp index 7f9cf23ec325a..c379b976acbda 100644 --- a/sycl/include/sycl/detail/backend_traits.hpp +++ b/sycl/include/sycl/detail/backend_traits.hpp @@ -12,7 +12,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template struct interop; @@ -33,5 +33,5 @@ template struct InteropFeatureSupportMap { static constexpr bool MakeImage = false; }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/backend_traits_cuda.hpp b/sycl/include/sycl/detail/backend_traits_cuda.hpp index ac75566573627..df8476038c157 100644 --- a/sycl/include/sycl/detail/backend_traits_cuda.hpp +++ b/sycl/include/sycl/detail/backend_traits_cuda.hpp @@ -35,7 +35,7 @@ typedef unsigned int CUdeviceptr; #endif namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // TODO the interops for context, device, event, platform and program @@ -102,5 +102,5 @@ template <> struct BackendReturn { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/backend_traits_hip.hpp b/sycl/include/sycl/detail/backend_traits_hip.hpp index 90a5913ac0774..51484ab86a557 100644 --- a/sycl/include/sycl/detail/backend_traits_hip.hpp +++ b/sycl/include/sycl/detail/backend_traits_hip.hpp @@ -29,7 +29,7 @@ typedef struct ihipModule_t *HIPmodule; typedef void *HIPdeviceptr; namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // TODO the interops for context, device, event, platform and program @@ -96,5 +96,5 @@ template <> struct BackendReturn { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/backend_traits_level_zero.hpp b/sycl/include/sycl/detail/backend_traits_level_zero.hpp index 3db321833276b..cceb45ab76449 100644 --- a/sycl/include/sycl/detail/backend_traits_level_zero.hpp +++ b/sycl/include/sycl/detail/backend_traits_level_zero.hpp @@ -37,7 +37,7 @@ typedef struct _ze_kernel_handle_t *ze_kernel_handle_t; typedef struct _ze_module_handle_t *ze_module_handle_t; namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // Forward declarations @@ -212,5 +212,5 @@ template <> struct InteropFeatureSupportMap { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/backend_traits_opencl.hpp b/sycl/include/sycl/detail/backend_traits_opencl.hpp index 190d01e89c564..2ccd6543feab1 100644 --- a/sycl/include/sycl/detail/backend_traits_opencl.hpp +++ b/sycl/include/sycl/detail/backend_traits_opencl.hpp @@ -25,7 +25,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // TODO the interops for context, device, event, platform and program @@ -153,5 +153,5 @@ inline PiDevice cast(cl_device_id) = delete; // Use piextCreateDeviceWithNativeHandle } // namespace pi } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/boolean.hpp b/sycl/include/sycl/detail/boolean.hpp index 21ee47b0ac441..d3d3ffea3a4f8 100644 --- a/sycl/include/sycl/detail/boolean.hpp +++ b/sycl/include/sycl/detail/boolean.hpp @@ -15,7 +15,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template struct Assigner { @@ -127,5 +127,5 @@ template <> struct Boolean<1> { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/cg.hpp b/sycl/include/sycl/detail/cg.hpp index 47b5a50067db7..08462e517034b 100644 --- a/sycl/include/sycl/detail/cg.hpp +++ b/sycl/include/sycl/detail/cg.hpp @@ -30,7 +30,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // Forward declarations class queue; @@ -509,5 +509,5 @@ class CGExecCommandBuffer : public CG { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/cg_types.hpp b/sycl/include/sycl/detail/cg_types.hpp index 4b433cc222687..60ffca1ed9a09 100644 --- a/sycl/include/sycl/detail/cg_types.hpp +++ b/sycl/include/sycl/detail/cg_types.hpp @@ -19,7 +19,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // The structure represents kernel argument. @@ -416,5 +416,5 @@ class HostKernel : public HostKernelBase { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/common.hpp b/sycl/include/sycl/detail/common.hpp index 7983baca607ec..4ca51300cead9 100644 --- a/sycl/include/sycl/detail/common.hpp +++ b/sycl/include/sycl/detail/common.hpp @@ -20,7 +20,7 @@ // Default signature enables the passing of user code location information to // public methods as a default argument. namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // The check for output iterator is commented out as it blocks set_final_data @@ -147,11 +147,11 @@ class __SYCL_EXPORT tls_code_loc_t { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { __SYCL_EXPORT const char *stringifyErrorCode(pi_int32 error); @@ -162,7 +162,7 @@ inline std::string codeToString(pi_int32 code) { } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #ifdef __SYCL_DEVICE_ONLY__ @@ -257,7 +257,7 @@ inline std::string codeToString(pi_int32 code) { #endif namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // Produces N-dimensional object of type T whose all components are initialized // to given integer value. @@ -459,5 +459,5 @@ static constexpr std::array RepeatValue(const T &Arg) { } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/common_info.hpp b/sycl/include/sycl/detail/common_info.hpp index c8eb643cd221f..f6499e5c7b9aa 100644 --- a/sycl/include/sycl/detail/common_info.hpp +++ b/sycl/include/sycl/detail/common_info.hpp @@ -13,12 +13,12 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { std::vector __SYCL_EXPORT split_string(const std::string &str, char delimeter); } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/defines_elementary.hpp b/sycl/include/sycl/detail/defines_elementary.hpp index 08cb77e479194..bd899117fd69f 100644 --- a/sycl/include/sycl/detail/defines_elementary.hpp +++ b/sycl/include/sycl/detail/defines_elementary.hpp @@ -8,8 +8,6 @@ #pragma once -#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_filter.hpp b/sycl/include/sycl/detail/device_filter.hpp index c0c97aad0b524..b7fdf9d1ebd34 100644 --- a/sycl/include/sycl/detail/device_filter.hpp +++ b/sycl/include/sycl/detail/device_filter.hpp @@ -17,7 +17,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // --------------------------------------- @@ -129,5 +129,5 @@ inline std::ostream &operator<<(std::ostream &Out, } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/device_global_map.hpp b/sycl/include/sycl/detail/device_global_map.hpp index 2e97a7c706f2a..a4b88a1c1697d 100644 --- a/sycl/include/sycl/detail/device_global_map.hpp +++ b/sycl/include/sycl/detail/device_global_map.hpp @@ -9,7 +9,7 @@ #pragma once namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/generic_type_lists.hpp b/sycl/include/sycl/detail/generic_type_lists.hpp index c8fc23a7a3b76..303758edad8ae 100644 --- a/sycl/include/sycl/detail/generic_type_lists.hpp +++ b/sycl/include/sycl/detail/generic_type_lists.hpp @@ -20,14 +20,14 @@ // Forward declarations namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { template class vec; template class marray; -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { namespace gtl { // floating point types @@ -591,5 +591,5 @@ using nonlocal_address_space_list = access::address_space::ext_intel_global_host_space>; } // namespace gvl } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/generic_type_traits.hpp b/sycl/include/sycl/detail/generic_type_traits.hpp index 22ac73db586eb..23e01d134b323 100644 --- a/sycl/include/sycl/detail/generic_type_traits.hpp +++ b/sycl/include/sycl/detail/generic_type_traits.hpp @@ -21,7 +21,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template using is_floatn = is_contained; @@ -786,5 +786,5 @@ template inline void check_vector_size() { } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/group_sort_impl.hpp b/sycl/include/sycl/detail/group_sort_impl.hpp index 2cbf6d01c59da..df7222ecc1e4b 100644 --- a/sycl/include/sycl/detail/group_sort_impl.hpp +++ b/sycl/include/sycl/detail/group_sort_impl.hpp @@ -19,7 +19,7 @@ #ifdef __SYCL_DEVICE_ONLY__ namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // ---- merge sort implementation @@ -654,6 +654,6 @@ void privateStaticSort(GroupT group, T *keys, U *values, std::byte *scratch, } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #endif diff --git a/sycl/include/sycl/detail/handler_proxy.hpp b/sycl/include/sycl/detail/handler_proxy.hpp index a04ca37af7c2a..50c6fb950f2b7 100644 --- a/sycl/include/sycl/detail/handler_proxy.hpp +++ b/sycl/include/sycl/detail/handler_proxy.hpp @@ -12,7 +12,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { class handler; @@ -37,5 +37,5 @@ __SYCL_EXPORT void associateWithHandler(handler &, SampledImageAccessorBaseHost *, image_target); #endif } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/helpers.hpp b/sycl/include/sycl/detail/helpers.hpp index a02b15a6df5c7..c4059fdf2c304 100644 --- a/sycl/include/sycl/detail/helpers.hpp +++ b/sycl/include/sycl/detail/helpers.hpp @@ -23,7 +23,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { class context; class event; template class item; @@ -252,5 +252,5 @@ template void loop(F &&f) { } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/host_pipe_map.hpp b/sycl/include/sycl/detail/host_pipe_map.hpp index 5e2e222bd9fb5..9e2ba09035456 100644 --- a/sycl/include/sycl/detail/host_pipe_map.hpp +++ b/sycl/include/sycl/detail/host_pipe_map.hpp @@ -9,7 +9,7 @@ #pragma once namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { namespace host_pipe_map { @@ -17,5 +17,5 @@ __SYCL_EXPORT void add(const void *HostPipePtr, const char *UniqueId); } // namespace host_pipe_map } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/host_profiling_info.hpp b/sycl/include/sycl/detail/host_profiling_info.hpp index 4b906205300bf..2421af7494f32 100644 --- a/sycl/include/sycl/detail/host_profiling_info.hpp +++ b/sycl/include/sycl/detail/host_profiling_info.hpp @@ -12,7 +12,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/image_accessor_util.hpp b/sycl/include/sycl/detail/image_accessor_util.hpp index eb2315006414e..86d4bc94018d4 100644 --- a/sycl/include/sycl/detail/image_accessor_util.hpp +++ b/sycl/include/sycl/detail/image_accessor_util.hpp @@ -23,7 +23,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template @@ -1152,6 +1152,6 @@ DataT imageReadSamplerHostImpl(const CoordT &Coords, const image_sampler &Smpl, } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #endif diff --git a/sycl/include/sycl/detail/image_ocl_types.hpp b/sycl/include/sycl/detail/image_ocl_types.hpp index 2a923cb8a17a0..d777ff7f250a0 100644 --- a/sycl/include/sycl/detail/image_ocl_types.hpp +++ b/sycl/include/sycl/detail/image_ocl_types.hpp @@ -34,14 +34,14 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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) +} // inline namespace _V1 } // namespace sycl #define __SYCL_INVOKE_SPIRV_CALL_ARG1(call) \ @@ -164,7 +164,7 @@ static RetType __invoke__ImageReadSampler(ImageT Img, CoordT Coords, } namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // Function to return the number of channels for Image Channel Order returned by @@ -306,7 +306,7 @@ __SYCL_IMAGETY_WRITE_2_DIM_IARRAY __SYCL_IMAGETY_DISCARD_WRITE_2_DIM_IARRAY } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #undef __SYCL_SAMPLED_AND_IMAGETY_DEFINE diff --git a/sycl/include/sycl/detail/impl_utils.hpp b/sycl/include/sycl/detail/impl_utils.hpp index 622d2d540a6fd..d6a64748d1430 100644 --- a/sycl/include/sycl/detail/impl_utils.hpp +++ b/sycl/include/sycl/detail/impl_utils.hpp @@ -13,7 +13,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // Helper function for extracting implementation from SYCL's interface objects. @@ -51,5 +51,5 @@ template T createSyclObjFromImpl(decltype(T::impl) ImplObj) { } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/info_desc_helpers.hpp b/sycl/include/sycl/detail/info_desc_helpers.hpp index b6f652b33520c..5992434d0a4cf 100644 --- a/sycl/include/sycl/detail/info_desc_helpers.hpp +++ b/sycl/include/sycl/detail/info_desc_helpers.hpp @@ -14,7 +14,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template struct PiInfoCode; template struct is_platform_info_desc : std::false_type {}; @@ -120,5 +120,5 @@ struct IsSubGroupInfo #undef __SYCL_PARAM_TRAITS_SPEC } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/item_base.hpp b/sycl/include/sycl/detail/item_base.hpp index 602b6741f9f6c..2e11ba52ee885 100644 --- a/sycl/include/sycl/detail/item_base.hpp +++ b/sycl/include/sycl/detail/item_base.hpp @@ -12,7 +12,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { template class id; template class range; @@ -72,5 +72,5 @@ template struct ItemBase { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/kernel_desc.hpp b/sycl/include/sycl/detail/kernel_desc.hpp index 9f7c4db7dac55..e019367ee296e 100644 --- a/sycl/include/sycl/detail/kernel_desc.hpp +++ b/sycl/include/sycl/detail/kernel_desc.hpp @@ -14,7 +14,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { #ifndef __SYCL_DEVICE_ONLY__ @@ -151,5 +151,5 @@ template struct KernelInfo { #endif //__SYCL_UNNAMED_LAMBDA__ } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/kernel_properties.hpp b/sycl/include/sycl/detail/kernel_properties.hpp index 1cd510f1f2cf2..a9451c6781acc 100644 --- a/sycl/include/sycl/detail/kernel_properties.hpp +++ b/sycl/include/sycl/detail/kernel_properties.hpp @@ -14,7 +14,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { enum class register_alloc_mode_enum : uint32_t { automatic = 0, @@ -56,5 +56,5 @@ struct PropertyMetaInfo> { }; } // namespace detail } // namespace ext::oneapi::experimental -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/locked.hpp b/sycl/include/sycl/detail/locked.hpp index 5b1d6395da089..582279f94eb32 100644 --- a/sycl/include/sycl/detail/locked.hpp +++ b/sycl/include/sycl/detail/locked.hpp @@ -14,7 +14,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/memcpy.hpp b/sycl/include/sycl/detail/memcpy.hpp index d51f623c89dac..9e82d42331a79 100644 --- a/sycl/include/sycl/detail/memcpy.hpp +++ b/sycl/include/sycl/detail/memcpy.hpp @@ -11,7 +11,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { inline void memcpy(void *Dst, const void *Src, size_t Size) { char *Destination = reinterpret_cast(Dst); @@ -21,5 +21,5 @@ inline void memcpy(void *Dst, const void *Src, size_t Size) { } } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/native_cpu.hpp b/sycl/include/sycl/detail/native_cpu.hpp index 065e81f781186..f3298ec87994d 100644 --- a/sycl/include/sycl/detail/native_cpu.hpp +++ b/sycl/include/sycl/detail/native_cpu.hpp @@ -12,7 +12,7 @@ #include #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { struct NativeCPUArgDesc { @@ -22,7 +22,7 @@ struct NativeCPUArgDesc { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl struct __nativecpu_state { diff --git a/sycl/include/sycl/detail/os_util.hpp b/sycl/include/sycl/detail/os_util.hpp index 2946616b5b1e6..691a25cfa8ebc 100644 --- a/sycl/include/sycl/detail/os_util.hpp +++ b/sycl/include/sycl/detail/os_util.hpp @@ -40,7 +40,7 @@ #endif // _WIN32 namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { /// Groups the OS-dependent services. @@ -84,5 +84,5 @@ class __SYCL_EXPORT OSUtil { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/owner_less_base.hpp b/sycl/include/sycl/detail/owner_less_base.hpp index b810596c1f217..052fbb1c5f2e4 100644 --- a/sycl/include/sycl/detail/owner_less_base.hpp +++ b/sycl/include/sycl/detail/owner_less_base.hpp @@ -13,7 +13,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // Common CRTP base class supplying a common definition of owner-before ordering @@ -53,5 +53,5 @@ template class OwnerLessBase { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/pi.hpp b/sycl/include/sycl/detail/pi.hpp index 65f447a144b02..9dfb7493c999d 100644 --- a/sycl/include/sycl/detail/pi.hpp +++ b/sycl/include/sycl/detail/pi.hpp @@ -33,7 +33,7 @@ struct trace_event_data_t; #endif namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { class context; @@ -298,7 +298,7 @@ template To cast(std::vector Values) { } // namespace pi } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #undef _PI_API diff --git a/sycl/include/sycl/detail/property_helper.hpp b/sycl/include/sycl/detail/property_helper.hpp index 5ada3ee10c4d9..801b8e41f9631 100644 --- a/sycl/include/sycl/detail/property_helper.hpp +++ b/sycl/include/sycl/detail/property_helper.hpp @@ -11,7 +11,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { @@ -101,5 +101,5 @@ template class PropertyWithData : public PropertyWithDataBase { } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/property_list_base.hpp b/sycl/include/sycl/detail/property_list_base.hpp index 96ff4aab89a55..ca84a526eb011 100644 --- a/sycl/include/sycl/detail/property_list_base.hpp +++ b/sycl/include/sycl/detail/property_list_base.hpp @@ -17,7 +17,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { class PropertyListBase { protected: @@ -130,5 +130,5 @@ class PropertyListBase { std::vector> MPropsWithData; }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/reduction_forward.hpp b/sycl/include/sycl/detail/reduction_forward.hpp index cc32eb8a4d4a6..331182357336a 100644 --- a/sycl/include/sycl/detail/reduction_forward.hpp +++ b/sycl/include/sycl/detail/reduction_forward.hpp @@ -15,7 +15,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template @@ -65,5 +65,5 @@ template struct IsReduction; template struct AreAllButLastReductions; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/service_kernel_names.hpp b/sycl/include/sycl/detail/service_kernel_names.hpp index c3609695f60b2..472ff9e706d73 100644 --- a/sycl/include/sycl/detail/service_kernel_names.hpp +++ b/sycl/include/sycl/detail/service_kernel_names.hpp @@ -9,7 +9,7 @@ #pragma once namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/spec_const_integration.hpp b/sycl/include/sycl/detail/spec_const_integration.hpp index e375dc05c2127..b55ee26a30969 100644 --- a/sycl/include/sycl/detail/spec_const_integration.hpp +++ b/sycl/include/sycl/detail/spec_const_integration.hpp @@ -12,7 +12,7 @@ // This header file should only be included to integration footer. namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // Translates SYCL 2020 `specialization_id` to a unique symbolic identifier // which is used internally by the toolchain @@ -20,5 +20,5 @@ template const char *get_spec_constant_symbolic_ID() { return get_spec_constant_symbolic_ID_impl(); } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/spinlock.hpp b/sycl/include/sycl/detail/spinlock.hpp index e512ebd37a21f..4d3bfa8ae6a7f 100644 --- a/sycl/include/sycl/detail/spinlock.hpp +++ b/sycl/include/sycl/detail/spinlock.hpp @@ -14,7 +14,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/spirv.hpp b/sycl/include/sycl/detail/spirv.hpp index b01017c4db75f..a672ad103c43a 100644 --- a/sycl/include/sycl/detail/spirv.hpp +++ b/sycl/include/sycl/detail/spirv.hpp @@ -21,7 +21,7 @@ #ifdef __SYCL_DEVICE_ONLY__ namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { struct sub_group; namespace ext { namespace oneapi { @@ -1183,6 +1183,6 @@ __SYCL_GROUP_COLLECTIVE_OVERLOAD(LogicalOrKHR) } // namespace spirv } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #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 747632f649c20..a159589e4453d 100644 --- a/sycl/include/sycl/detail/stl_type_traits.hpp +++ b/sycl/include/sycl/detail/stl_type_traits.hpp @@ -14,7 +14,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // Custom type traits. @@ -51,5 +51,5 @@ struct is_output_iterator> { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp b/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp index dffc146635c86..70469ac303cb3 100644 --- a/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp +++ b/sycl/include/sycl/detail/sycl_mem_obj_allocator.hpp @@ -11,7 +11,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template @@ -87,5 +87,5 @@ class SYCLMemObjAllocatorHolder : public SYCLMemObjAllocator { std::size_t MValueSize; }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/tuple.hpp b/sycl/include/sycl/detail/tuple.hpp index fb9708d717131..baa02eb26340a 100644 --- a/sycl/include/sycl/detail/tuple.hpp +++ b/sycl/include/sycl/detail/tuple.hpp @@ -16,7 +16,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template struct tuple; @@ -189,7 +189,7 @@ template <> struct tuple<> { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace std { diff --git a/sycl/include/sycl/detail/type_list.hpp b/sycl/include/sycl/detail/type_list.hpp index 1ecca91febf56..f07d61c73ebd4 100644 --- a/sycl/include/sycl/detail/type_list.hpp +++ b/sycl/include/sycl/detail/type_list.hpp @@ -12,7 +12,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template using head_t = typename T::head; @@ -140,5 +140,5 @@ using find_twice_as_large_type_t = find_type_t; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/type_traits.hpp b/sycl/include/sycl/detail/type_traits.hpp index 596ce1ef4c44d..f9a40730814ea 100644 --- a/sycl/include/sycl/detail/type_traits.hpp +++ b/sycl/include/sycl/detail/type_traits.hpp @@ -19,7 +19,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { template struct is_fixed_size_group : std::false_type {}; @@ -479,5 +479,5 @@ template struct function_traits { }; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/usm_impl.hpp b/sycl/include/sycl/detail/usm_impl.hpp index 2eb39ba77575d..45e3399b700ce 100644 --- a/sycl/include/sycl/detail/usm_impl.hpp +++ b/sycl/include/sycl/detail/usm_impl.hpp @@ -12,7 +12,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail::usm { __SYCL_EXPORT void *alignedAlloc(size_t Alignment, size_t Bytes, @@ -28,5 +28,5 @@ __SYCL_EXPORT void free(void *Ptr, const context &Ctxt, const code_location &CL); } // namespace detail::usm -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/detail/util.hpp b/sycl/include/sycl/detail/util.hpp index 835cdac410ebd..6ccdd5aa5fef0 100644 --- a/sycl/include/sycl/detail/util.hpp +++ b/sycl/include/sycl/detail/util.hpp @@ -17,7 +17,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { /// Groups and provides access to all the locks used the SYCL runtime. @@ -68,7 +68,7 @@ struct CmpCStr { using SerializedObj = std::vector; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #endif //__SYCL_DEVICE_ONLY diff --git a/sycl/include/sycl/detail/vector_traits.hpp b/sycl/include/sycl/detail/vector_traits.hpp index ac86fb1654a36..8362fe09bb948 100644 --- a/sycl/include/sycl/detail/vector_traits.hpp +++ b/sycl/include/sycl/detail/vector_traits.hpp @@ -13,7 +13,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { // 4.10.2.6 Memory layout and alignment @@ -26,5 +26,5 @@ template struct vector_alignment : vector_alignment_impl>, N> {}; } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/device.hpp b/sycl/include/sycl/device.hpp index 9f4202f674be4..541cae2125f1d 100644 --- a/sycl/include/sycl/device.hpp +++ b/sycl/include/sycl/device.hpp @@ -24,7 +24,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // Forward declarations class device_selector; template @@ -289,7 +289,7 @@ class __SYCL_EXPORT device : public detail::OwnerLessBase { -> backend_return_t; }; -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace std { diff --git a/sycl/include/sycl/device_event.hpp b/sycl/include/sycl/device_event.hpp index c7e91dcd47862..58fc93c1ee11b 100644 --- a/sycl/include/sycl/device_event.hpp +++ b/sycl/include/sycl/device_event.hpp @@ -12,7 +12,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/device_selector.hpp b/sycl/include/sycl/device_selector.hpp index 4a23f701d53aa..19f26eba8766d 100644 --- a/sycl/include/sycl/device_selector.hpp +++ b/sycl/include/sycl/device_selector.hpp @@ -17,7 +17,7 @@ // 4.6.1 Device selection class namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // Forward declarations class device; @@ -169,5 +169,5 @@ detail::DSelectorInvocableType aspect_selector() { return aspect_selector({AspectList...}, {}); } -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/event.hpp b/sycl/include/sycl/event.hpp index 52d7fe21aa12c..8d802f803615c 100644 --- a/sycl/include/sycl/event.hpp +++ b/sycl/include/sycl/event.hpp @@ -20,7 +20,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // Forward declaration class context; @@ -150,7 +150,7 @@ class __SYCL_EXPORT event : public detail::OwnerLessBase { -> backend_return_t; }; -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace std { diff --git a/sycl/include/sycl/exception.hpp b/sycl/include/sycl/exception.hpp index 5906277ab3717..a43940d640a44 100644 --- a/sycl/include/sycl/exception.hpp +++ b/sycl/include/sycl/exception.hpp @@ -19,7 +19,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // Forward declaration class context; @@ -324,7 +324,7 @@ class __SYCL2020_DEPRECATED( : device_error(make_error_code(errc::feature_not_supported), Msg, Err) {} }; -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace std { diff --git a/sycl/include/sycl/exception_list.hpp b/sycl/include/sycl/exception_list.hpp index 4b2f73831442c..78b795b7eae10 100644 --- a/sycl/include/sycl/exception_list.hpp +++ b/sycl/include/sycl/exception_list.hpp @@ -20,7 +20,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { // Forward declaration namespace detail { @@ -71,5 +71,5 @@ inline void defaultAsyncHandler(exception_list Exceptions) { std::terminate(); } } // namespace detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp b/sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp index 5ec2aef927a45..5355d4a725dce 100644 --- a/sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp +++ b/sycl/include/sycl/ext/codeplay/experimental/fusion_properties.hpp @@ -13,7 +13,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::codeplay::experimental::property { class promote_private @@ -98,5 +98,5 @@ struct is_property_of< ext::codeplay::experimental::property::queue::enable_fusion, queue> : std::true_type {}; -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp b/sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp index 368aea65ed9fa..7370729f72ac2 100644 --- a/sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp +++ b/sycl/include/sycl/ext/codeplay/experimental/fusion_wrapper.hpp @@ -11,7 +11,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail { class fusion_wrapper_impl; @@ -90,5 +90,5 @@ class __SYCL_EXPORT fusion_wrapper { std::shared_ptr MImpl; }; } // namespace ext::codeplay::experimental -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp b/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp index 7b72c54b0962b..fbd9d7f453df4 100644 --- a/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp +++ b/sycl/include/sycl/ext/intel/esimd/alt_ui.hpp @@ -12,7 +12,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd { /// @addtogroup sycl_esimd_misc /// @{ @@ -66,5 +66,5 @@ __ESIMD_API auto merge(simd_view v1, /// @} sycl_esimd_misc } // namespace ext::intel::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 fe7ed6655796d..2ac6d2fc1c58c 100644 --- a/sycl/include/sycl/ext/intel/esimd/common.hpp +++ b/sycl/include/sycl/ext/intel/esimd/common.hpp @@ -32,7 +32,7 @@ /// @endcond ESIMD_DETAIL namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd { /// @addtogroup sycl_esimd_core @@ -336,5 +336,5 @@ template <__ESIMD_NS::atomic_op Op> constexpr int get_num_args() { } // namespace detail } // namespace ext::intel::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/detail/bfloat16_type_traits.hpp b/sycl/include/sycl/ext/intel/esimd/detail/bfloat16_type_traits.hpp index 6b3dff557b990..94b47ece5ea5c 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/bfloat16_type_traits.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/bfloat16_type_traits.hpp @@ -18,7 +18,7 @@ /// @cond ESIMD_DETAIL namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { using bfloat16 = sycl::ext::oneapi::bfloat16; @@ -105,7 +105,7 @@ inline std::ostream &operator<<(std::ostream &O, bfloat16 const &rhs) { } } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl /// @endcond ESIMD_DETAIL 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 243077373ec99..a967753c08a24 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 @@ -86,7 +86,7 @@ /// @cond ESIMD_DETAIL namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { // ----------------------------------------------------------------------------- @@ -607,7 +607,7 @@ static inline constexpr bool is_generic_floating_point_v = element_type_traits::is_floating_point; } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl /// @endcond ESIMD_DETAIL diff --git a/sycl/include/sycl/ext/intel/esimd/detail/half_type_traits.hpp b/sycl/include/sycl/ext/intel/esimd/detail/half_type_traits.hpp index b84543d779acd..c07f8de3f8ba2 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/half_type_traits.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/half_type_traits.hpp @@ -17,7 +17,7 @@ /// @cond ESIMD_DETAIL namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { // Standalone definitions to use w/o instantiating element_type_traits. @@ -151,7 +151,7 @@ inline std::istream &operator>>(std::istream &I, sycl::half &rhs) { } } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 d6123d5d2db36..c70e6434aa863 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/host_util.hpp @@ -22,15 +22,15 @@ #define SIMDCF_ELEMENT_SKIP(i) namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace detail::half_impl { class half; } // namespace detail::half_impl -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::emu::detail { using half = sycl::detail::half_impl::half; @@ -702,7 +702,7 @@ template <> struct dwordtype { }; } // namespace ext::intel::esimd::emu::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 3b9d6f1347728..8db425dfda9c8 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/intrin.hpp @@ -134,7 +134,7 @@ __esimd_wrindirect(__ESIMD_DNS::vector_type_t OldVal, __ESIMD_DNS::simd_mask_storage_t Mask = 1); namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { template using __st = __raw_t; @@ -209,7 +209,7 @@ ESIMD_INLINE } } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 db0af8d212c1a..b7238fec5dcf4 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/math_intrin.hpp @@ -216,7 +216,7 @@ __ESIMD_INTRIN int __esimd_lane_id(); } namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { // TODO support half vectors in std sycl math functions. ESIMD_MATH_INTRINSIC_IMPL(float, sin) @@ -224,7 +224,7 @@ ESIMD_MATH_INTRINSIC_IMPL(float, cos) ESIMD_MATH_INTRINSIC_IMPL(float, exp) ESIMD_MATH_INTRINSIC_IMPL(float, log) } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #undef __ESIMD_SIMT_BEGIN 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 fdad9c5f0ff5c..b8a08d0a17681 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/memory_intrin.hpp @@ -37,7 +37,7 @@ const std::array<__ESIMD_NS::rgba_channel, 4> ChannelMaskArray{ #endif // ifndef __SYCL_DEVICE_ONLY__ namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { // Provides access to sycl accessor class' private members. @@ -83,7 +83,7 @@ constexpr unsigned int ElemsPerAddrDecoding(unsigned int ElemsPerAddrEncoded) { } } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl // flat_read does flat-address gather diff --git a/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp b/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp index aef195b3668e2..a8dc0261f0019 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/operators.hpp @@ -24,7 +24,7 @@ // etc. on the table). namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { // clang-format off /// @addtogroup sycl_esimd_core @@ -483,5 +483,5 @@ __ESIMD_DEF_SIMD_VIEW_CMP_OP(>=, __ESIMD_DNS::is_simd_type_v) #undef __ESIMD_DEF_SIMD_VIEW_CMP_OP } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 162d57e14a00a..2071b4bb2e46e 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/region.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/region.hpp @@ -18,7 +18,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd { /// @cond ESIMD_DETAIL @@ -134,7 +134,7 @@ template T getBaseRegion(std::pair Reg) { /// @endcond ESIMD_DETAIL } // namespace ext::intel::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl /// @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 fa2a42a08eb95..06a484e141f0c 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 @@ -15,7 +15,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { /// @addtogroup sycl_esimd_core_vectors @@ -151,5 +151,5 @@ class simd_mask_impl /// @} sycl_esimd_core_vectors } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 c1ab27c8d507c..ff78513f1b133 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 @@ -19,7 +19,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd { /// @addtogroup sycl_esimd_core @@ -929,5 +929,5 @@ template <> struct is_simd_flag_type : std::true_type { }; } // namespace ext::intel::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 462504542f170..03c6a1060de3a 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 @@ -15,7 +15,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { /// @addtogroup sycl_esimd_core_vectors @@ -603,5 +603,5 @@ class simd_view_impl { /// @} sycl_esimd_core_vectors } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 3bc57f39b33a2..0dca47ebd50d2 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/sycl_util.hpp @@ -16,7 +16,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { // Checks that given type is a SYCL accessor type. Sets its static field @@ -86,7 +86,7 @@ __ESIMD_API uint32_t localAccessorToOffset(local_accessor acc) { } } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl /// @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 42f8294e3c579..ffbcbab16840a 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/test_proxy.hpp @@ -54,7 +54,7 @@ } while (false) namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail::test { // The test_proxy class. @@ -103,7 +103,7 @@ class test_proxy { }; } // namespace ext::intel::esimd::detail::test -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl #endif // __ESIMD_ENABLE_TEST_PROXY diff --git a/sycl/include/sycl/ext/intel/esimd/detail/tfloat32_type_traits.hpp b/sycl/include/sycl/ext/intel/esimd/detail/tfloat32_type_traits.hpp index 29b751b938181..10a0997a34486 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/tfloat32_type_traits.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/tfloat32_type_traits.hpp @@ -18,7 +18,7 @@ /// @cond ESIMD_DETAIL namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { // Standalone definitions to use w/o instantiating element_type_traits. @@ -81,7 +81,7 @@ inline std::ostream &operator<<(std::ostream &O, tfloat32 const &rhs) { template <> struct is_esimd_arithmetic_type : std::true_type {}; } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl /// @endcond ESIMD_DETAIL 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 ea252d58faec7..48b449f445800 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/type_format.hpp @@ -16,7 +16,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { template struct compute_format_type; @@ -84,7 +84,7 @@ using compute_format_type_2d_t = typename compute_format_type_2d::type; } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 4a1455325c27c..28a345cfe870b 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/types.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/types.hpp @@ -27,7 +27,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd { // simd and simd_view_impl forward declarations @@ -391,5 +391,5 @@ using computation_type_t = template using mask_type_t = detail::simd_mask_storage_t; } // namespace ext::intel::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 8b751217e5233..f222485e65a4e 100644 --- a/sycl/include/sycl/ext/intel/esimd/detail/util.hpp +++ b/sycl/include/sycl/ext/intel/esimd/detail/util.hpp @@ -24,7 +24,7 @@ #endif // __SYCL_DEVICE_ONLY__ namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::detail { /// ESIMD intrinsic operand size in bytes. @@ -196,7 +196,7 @@ auto accessorToPointer(AccessorTy Acc, OffsetTy Offset = 0) { #endif // __ESIMD_FORCE_STATELESS_MEM } // namespace ext::intel::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 5b59ba763db77..9a141efdd268c 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 @@ -29,7 +29,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline 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) +} // inline namespace _V1 } // namespace sycl /// @endcond ESIMD_EMU diff --git a/sycl/include/sycl/ext/intel/esimd/math.hpp b/sycl/include/sycl/ext/intel/esimd/math.hpp index 1e03d922ee8ee..d6b25f064c90b 100644 --- a/sycl/include/sycl/ext/intel/esimd/math.hpp +++ b/sycl/include/sycl/ext/intel/esimd/math.hpp @@ -22,7 +22,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd { /// @addtogroup sycl_esimd_math @@ -1087,5 +1087,5 @@ ESIMD_INLINE ESIMD_NODEBUG T0 reduce(simd v, BinaryOperation op) { /// @} sycl_esimd_math } // namespace ext::intel::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 c4b776fdc9797..e7592077e9130 100644 --- a/sycl/include/sycl/ext/intel/esimd/memory.hpp +++ b/sycl/include/sycl/ext/intel/esimd/memory.hpp @@ -21,7 +21,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd { /// @addtogroup sycl_esimd_memory @@ -2489,5 +2489,5 @@ simd_obj_impl::copy_to(AccessorT acc, /// @endcond EXCLUDE } // namespace ext::intel::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/native/common.hpp b/sycl/include/sycl/ext/intel/esimd/native/common.hpp index 0df73949a40b2..28f4cfa8dc78a 100644 --- a/sycl/include/sycl/ext/intel/esimd/native/common.hpp +++ b/sycl/include/sycl/ext/intel/esimd/native/common.hpp @@ -15,7 +15,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::native::lsc { /// @addtogroup sycl_esimd_memory @@ -61,5 +61,5 @@ enum class atomic_op : uint8_t { /// @} sycl_esimd_memory_lsc } // namespace ext::intel::esimd::native::lsc -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 1a41e95c90f48..51170b5a41897 100644 --- a/sycl/include/sycl/ext/intel/esimd/simd.hpp +++ b/sycl/include/sycl/ext/intel/esimd/simd.hpp @@ -26,7 +26,7 @@ #endif // __SYCL_DEVICE_ONLY__ namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd { /// @addtogroup sycl_esimd_core @@ -205,7 +205,7 @@ template using simd_mask = detail::simd_mask_type; /// @} sycl_esimd_core_vectors } // namespace ext::intel::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl /// @ingroup sycl_esimd_misc diff --git a/sycl/include/sycl/ext/intel/esimd/simd_view.hpp b/sycl/include/sycl/ext/intel/esimd/simd_view.hpp index 6fd24741bae88..cbc6065166a0f 100644 --- a/sycl/include/sycl/ext/intel/esimd/simd_view.hpp +++ b/sycl/include/sycl/ext/intel/esimd/simd_view.hpp @@ -14,7 +14,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd { /// @addtogroup sycl_esimd_core_vectors @@ -226,5 +226,5 @@ class simd_view, NestedRegion>> /// @} sycl_esimd_core_vectors } // namespace ext::intel::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/xmx/common.hpp b/sycl/include/sycl/ext/intel/esimd/xmx/common.hpp index 9f3722e2f1693..b75aeb4ea06c7 100644 --- a/sycl/include/sycl/ext/intel/esimd/xmx/common.hpp +++ b/sycl/include/sycl/ext/intel/esimd/xmx/common.hpp @@ -13,7 +13,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::xmx { /// Describes the element types in the input matrices. @@ -35,5 +35,5 @@ enum class dpas_argument_type { }; } // namespace ext::intel::esimd::xmx -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/intel/esimd/xmx/dpas.hpp b/sycl/include/sycl/ext/intel/esimd/xmx/dpas.hpp index fc109a5c8297f..982c03c569f81 100644 --- a/sycl/include/sycl/ext/intel/esimd/xmx/dpas.hpp +++ b/sycl/include/sycl/ext/intel/esimd/xmx/dpas.hpp @@ -17,7 +17,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::esimd::xmx { @@ -343,5 +343,5 @@ auto dpasw(__ESIMD_NS::simd B, __ESIMD_NS::simd A) { /// @} sycl_esimd_xmx_systolic_array_api } // namespace ext::intel::esimd::xmx -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 5758bfccdf324..b3cb7d4f1944c 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/common.hpp @@ -18,7 +18,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::experimental::esimd { /// @addtogroup sycl_esimd_core @@ -297,5 +297,5 @@ enum class split_barrier_action : uint8_t { /// @} sycl_esimd_core } // namespace ext::intel::experimental::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 db1278230f173..24897ae82ca9f 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/detail/util.hpp @@ -15,7 +15,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::experimental::esimd::detail { template @@ -53,7 +53,7 @@ template inline constexpr bool is_one_of_enum_v = is_one_of_enum::value; } // namespace ext::intel::experimental::esimd::detail -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl /// @endcond ESIMD_DETAIL diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp index 99fb8d574c48f..fa40539b71560 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/math.hpp @@ -18,7 +18,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::experimental::esimd { /// @addtogroup sycl_esimd_bitmanip @@ -1765,5 +1765,5 @@ bfn(T src0, T src1, T src2) { /// @} sycl_esimd_logical } // namespace ext::intel::experimental::esimd -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 16864a1c3f2c4..fdd54eacadeb1 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/memory.hpp @@ -16,7 +16,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel { namespace experimental::esimd { @@ -3577,5 +3577,5 @@ template class slm_allocator { } // namespace esimd } // namespace ext::intel -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp b/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp index 4808e764a9879..d3f90e22ab851 100644 --- a/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp +++ b/sycl/include/sycl/ext/intel/experimental/esimd/tfloat32.hpp @@ -14,7 +14,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext { namespace intel { namespace experimental { @@ -65,5 +65,5 @@ class tfloat32 { } // namespace intel } // namespace ext -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_kernel_properties.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_kernel_properties.hpp index 1e0e60e8f0f97..bad9f4d7ceb4e 100644 --- a/sycl/include/sycl/ext/intel/experimental/fpga_kernel_properties.hpp +++ b/sycl/include/sycl/ext/intel/experimental/fpga_kernel_properties.hpp @@ -13,7 +13,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::experimental { template class fpga_kernel_attribute; @@ -150,5 +150,5 @@ struct PropertyMetaInfo> { } // namespace detail } // namespace ext::oneapi::experimental -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline 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 275157cea5b4b..d6477449da88a 100644 --- a/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp +++ b/sycl/include/sycl/ext/intel/experimental/fpga_lsu.hpp @@ -13,7 +13,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::experimental { constexpr uint8_t BURST_COALESCE = 0x1; @@ -200,5 +200,5 @@ template class lsu final { }; } // namespace ext::intel::experimental -} // __SYCL_INLINE_VER_NAMESPACE(_V1) +} // inline namespace _V1 } // namespace sycl diff --git a/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp b/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp index fbef746369d7d..ef928826a7f78 100644 --- a/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp +++ b/sycl/include/sycl/ext/intel/experimental/fpga_utils.hpp @@ -15,7 +15,7 @@ #include namespace sycl { -__SYCL_INLINE_VER_NAMESPACE(_V1) { +inline namespace _V1 { namespace ext::intel::experimental::detail { template