From c89438f7fe87068c944a2db859a9eebcec55677a Mon Sep 17 00:00:00 2001 From: Vladimir Lazarev Date: Thu, 5 Nov 2020 17:04:37 +0300 Subject: [PATCH] [SYCL] Move tests with dependencies to on-device directory --- sycl/test/accessors.o | Bin 147 -> 0 bytes .../fpga_device_link_diag.cpp | 0 .../linear-host-dev.cpp | 0 .../{reduction => basic_tests}/reduction_ctor.cpp | 2 +- .../spec_const_types.cpp | 0 sycl/test/{ => on-device}/aot/Inputs/aot.cpp | 0 sycl/test/{ => on-device}/aot/accelerator.cpp | 0 sycl/test/{ => on-device}/aot/cpu.cpp | 0 sycl/test/{ => on-device}/aot/gpu.cpp | 0 .../test/{ => on-device}/aot/multiple-devices.cpp | 0 sycl/test/{ => on-device}/aot/spec_const_aot.cpp | 0 sycl/test/{ => on-device}/aot/with-llvm-bc.cpp | 0 .../basic_tests/access_to_subset.cpp | 0 .../accessor/Inputs/device_accessor.cpp | 0 .../basic_tests/accessor/Inputs/host_accessor.cpp | 0 .../accessor/Inputs/host_task_accessor.cpp | 0 .../basic_tests/accessor/accessor.cpp | 0 .../accessor/device_accessor_deduction.cpp | 0 .../accessor/get_device_access_deduction.cpp | 0 .../accessor/get_host_access_deduction.cpp | 0 .../accessor/get_host_task_access_deduction.cpp | 0 .../accessor/host_accessor_deduction.cpp | 0 .../accessor/host_task_accessor_deduction.cpp | 0 sycl/test/{ => on-device}/basic_tests/boolean.cpp | 0 .../{ => on-device}/basic_tests/buffer/buffer.cpp | 0 .../basic_tests/buffer/buffer_container.cpp | 0 .../basic_tests/buffer/buffer_dev_to_dev.cpp | 0 .../basic_tests/buffer/buffer_full_copy.cpp | 0 .../basic_tests/buffer/buffer_interop.cpp | 0 .../buffer/native_buffer_creation_flags.cpp | 0 .../basic_tests/buffer/reinterpret.cpp | 0 .../basic_tests/buffer/subbuffer.cpp | 0 .../basic_tests/buffer/subbuffer_interop.cpp | 0 .../basic_tests/compare_exchange_strong.cpp | 0 .../basic_tests/context_platforms.cpp | 0 .../basic_tests/device_equality.cpp | 0 .../{ => on-device}/basic_tests/device_event.cpp | 0 .../basic_tests/diagnostics/device-check.cpp | 0 .../basic_tests/diagnostics/handler.cpp | 0 .../diagnostics/non-uniform-wk-gp-test.cpp | 0 sycl/test/{ => on-device}/basic_tests/event.cpp | 0 .../basic_tests/event_creation.cpp | 0 .../basic_tests/event_profiling_info.cpp | 0 .../{ => on-device}/basic_tests/event_release.cpp | 0 .../free_function_queries.cpp | 0 .../free_function_queries_sub_group.cpp | 0 .../{ => on-device}/basic_tests/get_backend.cpp | 0 .../basic_tests/get_nonhost_devices.cpp | 0 .../basic_tests/group_async_copy.cpp | 0 .../{ => on-device}/basic_tests/half_type.cpp | 0 .../handler/handler_copy_with_offset.cpp | 0 .../handler/handler_generic_integral_lambda.cpp | 0 .../basic_tests/handler/handler_mem_op.cpp | 0 .../basic_tests/handler/handler_set_args.cpp | 0 .../basic_tests/handler/interop_task.cpp | 2 +- .../basic_tests/handler/run_on_host_intel.cpp | 2 +- .../basic_tests/handler/run_on_host_intel2.cpp | 0 .../basic_tests/host_always_works.cpp | 0 .../basic_tests/host_platform_avail.cpp | 0 sycl/test/{ => on-device}/basic_tests/image.cpp | 2 +- .../basic_tests/image/image_read.cpp | 0 .../basic_tests/image/image_read.h | 0 .../basic_tests/image/image_read_fp16.cpp | 0 .../basic_tests/image/image_sample.cpp | 0 .../basic_tests/image/image_write.cpp | 0 .../basic_tests/image/image_write.h | 0 .../basic_tests/image/image_write_fp16.cpp | 0 .../basic_tests/image_accessor_readsampler.cpp | 0 .../basic_tests/image_accessor_readwrite.cpp | 0 .../basic_tests/image_accessor_readwrite_half.cpp | 0 .../{ => on-device}/basic_tests/image_array.cpp | 2 +- .../basic_tests/image_constructors.cpp | 0 sycl/test/{ => on-device}/basic_tests/info.cpp | 0 .../basic_tests/info_ocl_version.cpp | 0 .../{ => on-device}/basic_tests/kernel_info.cpp | 0 .../basic_tests/kernel_interop.cpp | 0 .../basic_tests/memory-consumption.cpp | 0 .../basic_tests/opencl_interop.cpp | 0 .../basic_tests/parallel_for_indexers.cpp | 0 .../basic_tests/parallel_for_range.cpp | 0 .../{ => on-device}/basic_tests/queue/queue.cpp | 0 .../queue/queue_parallel_for_generic.cpp | 0 .../{ => on-device}/basic_tests/queue/release.cpp | 0 .../basic_tests/range_offset_fit_in_int.cpp | 0 .../basic_tests/reqd_work_group_size.cpp | 0 .../basic_tests/sampler/sampler.cpp | 0 .../basic_tests/sampler/sampler_ocl.cpp | 0 .../basic_tests/scalar_vec_access.cpp | 0 .../basic_tests/set_arg_interop.cpp | 0 .../basic_tests/stream/auto_flush.cpp | 0 .../stream/blocking_pipes_and_stream.cpp | 0 .../basic_tests/stream/release_resources_test.cpp | 0 .../{ => on-device}/basic_tests/stream/stream.cpp | 0 .../{ => on-device}/basic_tests/subdevice.cpp | 0 .../{ => on-device}/basic_tests/subdevice_pi.cpp | 0 .../{ => on-device}/basic_tests/swizzle_op.cpp | 0 .../basic_tests/sycl-namespace.cpp | 0 .../basic_tests/unused_pointer.cpp | 0 .../basic_tests/use_pinned_host_memory.cpp | 0 .../{ => on-device}/basic_tests/vec_convert.hpp | 0 .../basic_tests/vec_convert_f_to_f.cpp | 0 .../basic_tests/vec_convert_f_to_i.cpp | 0 .../basic_tests/vec_convert_half.cpp | 0 .../basic_tests/vec_convert_i_to_i.cpp | 0 sycl/test/{ => on-device}/basic_tests/vec_op.cpp | 0 .../basic_tests}/vector_operators.cpp | 0 sycl/test/{ => on-device}/built-ins/nan.cpp | 0 sycl/test/{ => on-device}/built-ins/printf.cpp | 0 .../{ => on-device}/built-ins/scalar_common.cpp | 0 .../built-ins/scalar_geometric.cpp | 0 .../{ => on-device}/built-ins/scalar_integer.cpp | 0 .../{ => on-device}/built-ins/scalar_math.cpp | 0 .../{ => on-device}/built-ins/scalar_math_2.cpp | 0 .../built-ins/scalar_relational.cpp | 0 .../{ => on-device}/built-ins/vector_common.cpp | 0 .../built-ins/vector_geometric.cpp | 0 .../{ => on-device}/built-ins/vector_integer.cpp | 0 .../{ => on-device}/built-ins/vector_math.cpp | 0 .../built-ins/vector_relational.cpp | 0 sycl/test/{ => on-device}/config/allowlist.cpp | 0 sycl/test/{ => on-device}/config/config.cpp | 0 .../test/{ => on-device}/config/select_device.cpp | 0 .../Inputs/split-per-source-second-file.cpp | 0 .../device-code-split/Inputs/split-per-source.h | 0 .../device-code-split/aot-accelerator.cpp | 0 .../{ => on-device}/device-code-split/aot-cpu.cpp | 0 .../{ => on-device}/device-code-split/aot-gpu.cpp | 0 .../device-code-split/split-per-kernel.cpp | 0 .../device-code-split/split-per-source-main.cpp | 0 .../device_code_dae/device_code_dae.cpp | 0 .../test/{ => on-device}/devicelib/assert-aot.cpp | 0 .../{ => on-device}/devicelib/assert-windows.cpp | 0 sycl/test/{ => on-device}/devicelib/assert.cpp | 0 sycl/test/{ => on-device}/devicelib/cmath-aot.cpp | 0 .../{ => on-device}/devicelib/cmath_fp64_test.cpp | 0 .../test/{ => on-device}/devicelib/cmath_test.cpp | 0 .../{ => on-device}/devicelib/complex-fpga.cpp | 0 .../{ => on-device}/devicelib/math_fp64_test.cpp | 0 .../devicelib/math_override_test.cpp | 0 sycl/test/{ => on-device}/devicelib/math_test.cpp | 0 .../test/{ => on-device}/devicelib/math_utils.hpp | 0 .../devicelib/separate_compile_test.cpp | 0 .../devicelib/std_complex_math_fp64_test.cpp | 0 .../devicelib/std_complex_math_test.cpp | 0 .../dot_product/dot_product_int_test.cpp | 0 .../dot_product/dot_product_vec_test.cpp | 0 .../{ => on-device}/filter_selector/reuse.cpp | 0 .../{ => on-device}/filter_selector/select.cpp | 0 .../filter_selector/select_device.cpp | 0 .../filter_selector/select_device_acc.cpp | 0 .../filter_selector/select_device_cpu.cpp | 0 .../filter_selector/select_device_cuda.cpp | 0 .../filter_selector/select_device_level_zero.cpp | 0 .../filter_selector/select_device_opencl.cpp | 0 .../fpga_tests/Inputs/fpga_device.cpp | 0 .../fpga_tests/Inputs/fpga_host.cpp | 0 .../fpga_tests/buffer_location.cpp | 0 .../test/{ => on-device}/fpga_tests/fpga_aocx.cpp | 0 .../{ => on-device}/fpga_tests/fpga_aocx_win.cpp | 0 .../{ => on-device}/fpga_tests/fpga_io_pipes.cpp | 0 sycl/test/{ => on-device}/fpga_tests/fpga_lsu.cpp | 0 .../{ => on-device}/fpga_tests/fpga_pipes.cpp | 0 .../fpga_tests/fpga_pipes_legacy_ns.cpp | 0 .../{ => on-device}/fpga_tests/fpga_queue.cpp | 0 .../fpga_tests/global_fpga_device_selector.cpp | 0 .../test/{ => on-device}/fpga_tests/io_pipe_def.h | 0 .../{ => on-device}/fpga_tests/pipes_info.cpp | 0 .../{ => on-device}/group-algorithm/all_of.cpp | 0 .../{ => on-device}/group-algorithm/any_of.cpp | 0 .../{ => on-device}/group-algorithm/broadcast.cpp | 0 .../group-algorithm/exclusive_scan.cpp | 0 .../group-algorithm/inclusive_scan.cpp | 0 .../{ => on-device}/group-algorithm/leader.cpp | 0 .../{ => on-device}/group-algorithm/none_of.cpp | 0 .../{ => on-device}/group-algorithm/reduce.cpp | 0 .../{ => on-device}/group-algorithm/support.h | 0 .../hier_par/Inputs/hier_par_wgscope_impl.hpp | 0 .../{ => on-device}/hier_par/hier_par_basic.cpp | 0 .../{ => on-device}/hier_par/hier_par_wgscope.cpp | 0 .../hier_par/hier_par_wgscope_O0.cpp | 0 .../host-interop-task/host-task-dependency.cpp | 0 .../host-interop-task/host-task-dependency2.cpp | 0 .../host-interop-task/host-task-dependency3.cpp | 0 .../host-interop-task/host-task-dependency4.cpp | 0 .../host-interop-task/host-task-failure.cpp | 0 .../host-interop-task/host-task-two-queues.cpp | 0 .../host-interop-task/host-task.cpp | 0 .../host-interop-task/interop-task.cpp | 0 .../linear_id/linear-sub_group.cpp | 0 .../{ => on-device}/linear_id/opencl-interop.cpp | 0 .../plugins/enqueue-arg-order-buffer.cpp | 0 .../plugins/enqueue-arg-order-image.cpp | 0 .../{ => on-device}/plugins/interop-opencl.cpp | 0 .../{ => on-device}/plugins/sycl-ls-gpu-cuda.cpp | 0 .../plugins/sycl-ls-gpu-default.cpp | 0 .../plugins/sycl-ls-gpu-level-zero.cpp | 0 .../plugins/sycl-ls-gpu-opencl.cpp | 0 .../plugins/sycl-ls-gpu-sycl-be.cpp | 0 sycl/test/{ => on-device}/plugins/sycl-ls.cpp | 0 .../plugins/sycl-targets-order.cpp | 0 .../reduction/reduction_nd_conditional.cpp | 0 .../reduction/reduction_nd_ext_double.cpp | 0 .../reduction/reduction_nd_ext_half.cpp | 0 .../reduction/reduction_nd_ext_type.hpp | 0 .../reduction/reduction_nd_lambda.cpp | 0 .../reduction/reduction_nd_s0_dw.cpp | 0 .../reduction/reduction_nd_s0_rw.cpp | 0 .../reduction/reduction_nd_s1_dw.cpp | 0 .../reduction/reduction_nd_s1_rw.cpp | 0 .../reduction/reduction_placeholder.cpp | 0 .../reduction/reduction_queue_parallel_for.cpp | 0 .../reduction/reduction_transparent.cpp | 0 .../{ => on-device}/reduction/reduction_usm.cpp | 0 .../{ => on-device}/reduction/reduction_utils.hpp | 0 .../regression/usm_malloc_shared.cpp | 0 .../{ => on-device}/spec_const/spec_const_hw.cpp | 0 .../spec_const/spec_const_hw_accelerator.cpp | 0 .../{ => on-device}/spec_const/spec_const_neg.cpp | 0 .../spec_const/spec_const_redefine.cpp | 0 .../spec_const_redefine_accelerator.cpp | 0 .../test/{ => on-device}/sub_group/attributes.cpp | 0 sycl/test/{ => on-device}/sub_group/barrier.cpp | 0 sycl/test/{ => on-device}/sub_group/broadcast.cpp | 0 sycl/test/{ => on-device}/sub_group/broadcast.hpp | 0 .../{ => on-device}/sub_group/broadcast_fp16.cpp | 0 .../{ => on-device}/sub_group/broadcast_fp64.cpp | 0 sycl/test/{ => on-device}/sub_group/common.cpp | 0 .../{ => on-device}/sub_group/generic-shuffle.cpp | 0 .../{ => on-device}/sub_group/generic_reduce.cpp | 0 sycl/test/{ => on-device}/sub_group/helper.hpp | 0 sycl/test/{ => on-device}/sub_group/info.cpp | 0 .../test/{ => on-device}/sub_group/load_store.cpp | 0 sycl/test/{ => on-device}/sub_group/reduce.cpp | 0 sycl/test/{ => on-device}/sub_group/reduce.hpp | 0 .../{ => on-device}/sub_group/reduce_fp16.cpp | 0 .../{ => on-device}/sub_group/reduce_fp64.cpp | 0 sycl/test/{ => on-device}/sub_group/scan.cpp | 0 sycl/test/{ => on-device}/sub_group/scan.hpp | 0 sycl/test/{ => on-device}/sub_group/scan_fp16.cpp | 0 sycl/test/{ => on-device}/sub_group/scan_fp64.cpp | 0 sycl/test/{ => on-device}/sub_group/sg.cl | 0 sycl/test/{ => on-device}/sub_group/shuffle.cpp | 0 sycl/test/{ => on-device}/sub_group/shuffle.hpp | 0 .../{ => on-device}/sub_group/shuffle_fp16.cpp | 0 .../{ => on-device}/sub_group/shuffle_fp64.cpp | 0 sycl/test/{ => on-device}/sub_group/vote.cpp | 0 sycl/test/{ => on-device}/usm/allocator_equal.cpp | 0 .../test/{ => on-device}/usm/allocator_shared.cpp | 0 .../test/{ => on-device}/usm/allocator_vector.cpp | 0 sycl/test/{ => on-device}/usm/badmalloc.cpp | 0 sycl/test/{ => on-device}/usm/depends_on.cpp | 0 sycl/test/{ => on-device}/usm/dmem_varied.cpp | 0 sycl/test/{ => on-device}/usm/dmemll.cpp | 0 sycl/test/{ => on-device}/usm/dmemllaligned.cpp | 0 sycl/test/{ => on-device}/usm/fill.cpp | 0 sycl/test/{ => on-device}/usm/findplatforms.hpp | 0 sycl/test/{ => on-device}/usm/hmemll.cpp | 0 sycl/test/{ => on-device}/usm/hmemllaligned.cpp | 0 sycl/test/{ => on-device}/usm/math.cpp | 0 sycl/test/{ => on-device}/usm/memadvise.cpp | 0 sycl/test/{ => on-device}/usm/memcpy.cpp | 0 sycl/test/{ => on-device}/usm/memset.cpp | 0 sycl/test/{ => on-device}/usm/mixed.cpp | 0 sycl/test/{ => on-device}/usm/mixed2.cpp | 0 sycl/test/{ => on-device}/usm/mixed2template.cpp | 0 sycl/test/{ => on-device}/usm/mixed_queue.cpp | 0 sycl/test/{ => on-device}/usm/multictxt.cpp | 0 sycl/test/{ => on-device}/usm/pfor_flatten.cpp | 0 .../usm/pfor_flatten_range_shortcut.cpp | 0 sycl/test/{ => on-device}/usm/pointer_query.cpp | 0 sycl/test/{ => on-device}/usm/prefetch.cpp | 0 sycl/test/{ => on-device}/usm/queue_wait.cpp | 0 sycl/test/{ => on-device}/usm/smem_concurrent.cpp | 0 sycl/test/{ => on-device}/usm/smem_varied.cpp | 0 sycl/test/{ => on-device}/usm/smemll.cpp | 0 sycl/test/{ => on-device}/usm/smemllaligned.cpp | 0 .../usm/source_kernel_indirect_access.cpp | 0 277 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 sycl/test/accessors.o rename sycl/test/{fpga_tests => basic_tests}/fpga_device_link_diag.cpp (100%) rename sycl/test/{linear_id => basic_tests}/linear-host-dev.cpp (100%) rename sycl/test/{reduction => basic_tests}/reduction_ctor.cpp (98%) rename sycl/test/{spec_const => basic_tests}/spec_const_types.cpp (100%) rename sycl/test/{ => on-device}/aot/Inputs/aot.cpp (100%) rename sycl/test/{ => on-device}/aot/accelerator.cpp (100%) rename sycl/test/{ => on-device}/aot/cpu.cpp (100%) rename sycl/test/{ => on-device}/aot/gpu.cpp (100%) rename sycl/test/{ => on-device}/aot/multiple-devices.cpp (100%) rename sycl/test/{ => on-device}/aot/spec_const_aot.cpp (100%) rename sycl/test/{ => on-device}/aot/with-llvm-bc.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/access_to_subset.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/Inputs/device_accessor.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/Inputs/host_accessor.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/Inputs/host_task_accessor.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/accessor.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/device_accessor_deduction.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/get_device_access_deduction.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/get_host_access_deduction.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/get_host_task_access_deduction.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/host_accessor_deduction.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/accessor/host_task_accessor_deduction.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/boolean.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/buffer/buffer.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/buffer/buffer_container.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/buffer/buffer_dev_to_dev.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/buffer/buffer_full_copy.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/buffer/buffer_interop.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/buffer/native_buffer_creation_flags.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/buffer/reinterpret.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/buffer/subbuffer.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/buffer/subbuffer_interop.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/compare_exchange_strong.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/context_platforms.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/device_equality.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/device_event.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/diagnostics/device-check.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/diagnostics/handler.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/diagnostics/non-uniform-wk-gp-test.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/event.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/event_creation.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/event_profiling_info.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/event_release.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/free_function_queries/free_function_queries.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/free_function_queries/free_function_queries_sub_group.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/get_backend.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/get_nonhost_devices.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/group_async_copy.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/half_type.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/handler/handler_copy_with_offset.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/handler/handler_generic_integral_lambda.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/handler/handler_mem_op.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/handler/handler_set_args.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/handler/interop_task.cpp (98%) rename sycl/test/{ => on-device}/basic_tests/handler/run_on_host_intel.cpp (98%) rename sycl/test/{ => on-device}/basic_tests/handler/run_on_host_intel2.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/host_always_works.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/host_platform_avail.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/image.cpp (99%) rename sycl/test/{ => on-device}/basic_tests/image/image_read.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/image/image_read.h (100%) rename sycl/test/{ => on-device}/basic_tests/image/image_read_fp16.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/image/image_sample.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/image/image_write.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/image/image_write.h (100%) rename sycl/test/{ => on-device}/basic_tests/image/image_write_fp16.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/image_accessor_readsampler.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/image_accessor_readwrite.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/image_accessor_readwrite_half.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/image_array.cpp (99%) rename sycl/test/{ => on-device}/basic_tests/image_constructors.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/info.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/info_ocl_version.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/kernel_info.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/kernel_interop.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/memory-consumption.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/opencl_interop.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/parallel_for_indexers.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/parallel_for_range.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/queue/queue.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/queue/queue_parallel_for_generic.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/queue/release.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/range_offset_fit_in_int.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/reqd_work_group_size.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/sampler/sampler.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/sampler/sampler_ocl.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/scalar_vec_access.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/set_arg_interop.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/stream/auto_flush.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/stream/blocking_pipes_and_stream.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/stream/release_resources_test.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/stream/stream.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/subdevice.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/subdevice_pi.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/swizzle_op.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/sycl-namespace.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/unused_pointer.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/use_pinned_host_memory.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/vec_convert.hpp (100%) rename sycl/test/{ => on-device}/basic_tests/vec_convert_f_to_f.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/vec_convert_f_to_i.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/vec_convert_half.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/vec_convert_i_to_i.cpp (100%) rename sycl/test/{ => on-device}/basic_tests/vec_op.cpp (100%) rename sycl/test/{basic_tests/vectors => on-device/basic_tests}/vector_operators.cpp (100%) rename sycl/test/{ => on-device}/built-ins/nan.cpp (100%) rename sycl/test/{ => on-device}/built-ins/printf.cpp (100%) rename sycl/test/{ => on-device}/built-ins/scalar_common.cpp (100%) rename sycl/test/{ => on-device}/built-ins/scalar_geometric.cpp (100%) rename sycl/test/{ => on-device}/built-ins/scalar_integer.cpp (100%) rename sycl/test/{ => on-device}/built-ins/scalar_math.cpp (100%) rename sycl/test/{ => on-device}/built-ins/scalar_math_2.cpp (100%) rename sycl/test/{ => on-device}/built-ins/scalar_relational.cpp (100%) rename sycl/test/{ => on-device}/built-ins/vector_common.cpp (100%) rename sycl/test/{ => on-device}/built-ins/vector_geometric.cpp (100%) rename sycl/test/{ => on-device}/built-ins/vector_integer.cpp (100%) rename sycl/test/{ => on-device}/built-ins/vector_math.cpp (100%) rename sycl/test/{ => on-device}/built-ins/vector_relational.cpp (100%) rename sycl/test/{ => on-device}/config/allowlist.cpp (100%) rename sycl/test/{ => on-device}/config/config.cpp (100%) rename sycl/test/{ => on-device}/config/select_device.cpp (100%) rename sycl/test/{ => on-device}/device-code-split/Inputs/split-per-source-second-file.cpp (100%) rename sycl/test/{ => on-device}/device-code-split/Inputs/split-per-source.h (100%) rename sycl/test/{ => on-device}/device-code-split/aot-accelerator.cpp (100%) rename sycl/test/{ => on-device}/device-code-split/aot-cpu.cpp (100%) rename sycl/test/{ => on-device}/device-code-split/aot-gpu.cpp (100%) rename sycl/test/{ => on-device}/device-code-split/split-per-kernel.cpp (100%) rename sycl/test/{ => on-device}/device-code-split/split-per-source-main.cpp (100%) rename sycl/test/{ => on-device}/device_code_dae/device_code_dae.cpp (100%) rename sycl/test/{ => on-device}/devicelib/assert-aot.cpp (100%) rename sycl/test/{ => on-device}/devicelib/assert-windows.cpp (100%) rename sycl/test/{ => on-device}/devicelib/assert.cpp (100%) rename sycl/test/{ => on-device}/devicelib/cmath-aot.cpp (100%) rename sycl/test/{ => on-device}/devicelib/cmath_fp64_test.cpp (100%) rename sycl/test/{ => on-device}/devicelib/cmath_test.cpp (100%) rename sycl/test/{ => on-device}/devicelib/complex-fpga.cpp (100%) rename sycl/test/{ => on-device}/devicelib/math_fp64_test.cpp (100%) rename sycl/test/{ => on-device}/devicelib/math_override_test.cpp (100%) rename sycl/test/{ => on-device}/devicelib/math_test.cpp (100%) rename sycl/test/{ => on-device}/devicelib/math_utils.hpp (100%) rename sycl/test/{ => on-device}/devicelib/separate_compile_test.cpp (100%) rename sycl/test/{ => on-device}/devicelib/std_complex_math_fp64_test.cpp (100%) rename sycl/test/{ => on-device}/devicelib/std_complex_math_test.cpp (100%) rename sycl/test/{ => on-device}/dot_product/dot_product_int_test.cpp (100%) rename sycl/test/{ => on-device}/dot_product/dot_product_vec_test.cpp (100%) rename sycl/test/{ => on-device}/filter_selector/reuse.cpp (100%) rename sycl/test/{ => on-device}/filter_selector/select.cpp (100%) rename sycl/test/{ => on-device}/filter_selector/select_device.cpp (100%) rename sycl/test/{ => on-device}/filter_selector/select_device_acc.cpp (100%) rename sycl/test/{ => on-device}/filter_selector/select_device_cpu.cpp (100%) rename sycl/test/{ => on-device}/filter_selector/select_device_cuda.cpp (100%) rename sycl/test/{ => on-device}/filter_selector/select_device_level_zero.cpp (100%) rename sycl/test/{ => on-device}/filter_selector/select_device_opencl.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/Inputs/fpga_device.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/Inputs/fpga_host.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/buffer_location.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/fpga_aocx.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/fpga_aocx_win.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/fpga_io_pipes.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/fpga_lsu.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/fpga_pipes.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/fpga_pipes_legacy_ns.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/fpga_queue.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/global_fpga_device_selector.cpp (100%) rename sycl/test/{ => on-device}/fpga_tests/io_pipe_def.h (100%) rename sycl/test/{ => on-device}/fpga_tests/pipes_info.cpp (100%) rename sycl/test/{ => on-device}/group-algorithm/all_of.cpp (100%) rename sycl/test/{ => on-device}/group-algorithm/any_of.cpp (100%) rename sycl/test/{ => on-device}/group-algorithm/broadcast.cpp (100%) rename sycl/test/{ => on-device}/group-algorithm/exclusive_scan.cpp (100%) rename sycl/test/{ => on-device}/group-algorithm/inclusive_scan.cpp (100%) rename sycl/test/{ => on-device}/group-algorithm/leader.cpp (100%) rename sycl/test/{ => on-device}/group-algorithm/none_of.cpp (100%) rename sycl/test/{ => on-device}/group-algorithm/reduce.cpp (100%) rename sycl/test/{ => on-device}/group-algorithm/support.h (100%) rename sycl/test/{ => on-device}/hier_par/Inputs/hier_par_wgscope_impl.hpp (100%) rename sycl/test/{ => on-device}/hier_par/hier_par_basic.cpp (100%) rename sycl/test/{ => on-device}/hier_par/hier_par_wgscope.cpp (100%) rename sycl/test/{ => on-device}/hier_par/hier_par_wgscope_O0.cpp (100%) rename sycl/test/{ => on-device}/host-interop-task/host-task-dependency.cpp (100%) rename sycl/test/{ => on-device}/host-interop-task/host-task-dependency2.cpp (100%) rename sycl/test/{ => on-device}/host-interop-task/host-task-dependency3.cpp (100%) rename sycl/test/{ => on-device}/host-interop-task/host-task-dependency4.cpp (100%) rename sycl/test/{ => on-device}/host-interop-task/host-task-failure.cpp (100%) rename sycl/test/{ => on-device}/host-interop-task/host-task-two-queues.cpp (100%) rename sycl/test/{ => on-device}/host-interop-task/host-task.cpp (100%) rename sycl/test/{ => on-device}/host-interop-task/interop-task.cpp (100%) rename sycl/test/{ => on-device}/linear_id/linear-sub_group.cpp (100%) rename sycl/test/{ => on-device}/linear_id/opencl-interop.cpp (100%) rename sycl/test/{ => on-device}/plugins/enqueue-arg-order-buffer.cpp (100%) rename sycl/test/{ => on-device}/plugins/enqueue-arg-order-image.cpp (100%) rename sycl/test/{ => on-device}/plugins/interop-opencl.cpp (100%) rename sycl/test/{ => on-device}/plugins/sycl-ls-gpu-cuda.cpp (100%) rename sycl/test/{ => on-device}/plugins/sycl-ls-gpu-default.cpp (100%) rename sycl/test/{ => on-device}/plugins/sycl-ls-gpu-level-zero.cpp (100%) rename sycl/test/{ => on-device}/plugins/sycl-ls-gpu-opencl.cpp (100%) rename sycl/test/{ => on-device}/plugins/sycl-ls-gpu-sycl-be.cpp (100%) rename sycl/test/{ => on-device}/plugins/sycl-ls.cpp (100%) rename sycl/test/{ => on-device}/plugins/sycl-targets-order.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_nd_conditional.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_nd_ext_double.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_nd_ext_half.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_nd_ext_type.hpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_nd_lambda.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_nd_s0_dw.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_nd_s0_rw.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_nd_s1_dw.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_nd_s1_rw.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_placeholder.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_queue_parallel_for.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_transparent.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_usm.cpp (100%) rename sycl/test/{ => on-device}/reduction/reduction_utils.hpp (100%) rename sycl/test/{ => on-device}/regression/usm_malloc_shared.cpp (100%) rename sycl/test/{ => on-device}/spec_const/spec_const_hw.cpp (100%) rename sycl/test/{ => on-device}/spec_const/spec_const_hw_accelerator.cpp (100%) rename sycl/test/{ => on-device}/spec_const/spec_const_neg.cpp (100%) rename sycl/test/{ => on-device}/spec_const/spec_const_redefine.cpp (100%) rename sycl/test/{ => on-device}/spec_const/spec_const_redefine_accelerator.cpp (100%) rename sycl/test/{ => on-device}/sub_group/attributes.cpp (100%) rename sycl/test/{ => on-device}/sub_group/barrier.cpp (100%) rename sycl/test/{ => on-device}/sub_group/broadcast.cpp (100%) rename sycl/test/{ => on-device}/sub_group/broadcast.hpp (100%) rename sycl/test/{ => on-device}/sub_group/broadcast_fp16.cpp (100%) rename sycl/test/{ => on-device}/sub_group/broadcast_fp64.cpp (100%) rename sycl/test/{ => on-device}/sub_group/common.cpp (100%) rename sycl/test/{ => on-device}/sub_group/generic-shuffle.cpp (100%) rename sycl/test/{ => on-device}/sub_group/generic_reduce.cpp (100%) rename sycl/test/{ => on-device}/sub_group/helper.hpp (100%) rename sycl/test/{ => on-device}/sub_group/info.cpp (100%) rename sycl/test/{ => on-device}/sub_group/load_store.cpp (100%) rename sycl/test/{ => on-device}/sub_group/reduce.cpp (100%) rename sycl/test/{ => on-device}/sub_group/reduce.hpp (100%) rename sycl/test/{ => on-device}/sub_group/reduce_fp16.cpp (100%) rename sycl/test/{ => on-device}/sub_group/reduce_fp64.cpp (100%) rename sycl/test/{ => on-device}/sub_group/scan.cpp (100%) rename sycl/test/{ => on-device}/sub_group/scan.hpp (100%) rename sycl/test/{ => on-device}/sub_group/scan_fp16.cpp (100%) rename sycl/test/{ => on-device}/sub_group/scan_fp64.cpp (100%) rename sycl/test/{ => on-device}/sub_group/sg.cl (100%) rename sycl/test/{ => on-device}/sub_group/shuffle.cpp (100%) rename sycl/test/{ => on-device}/sub_group/shuffle.hpp (100%) rename sycl/test/{ => on-device}/sub_group/shuffle_fp16.cpp (100%) rename sycl/test/{ => on-device}/sub_group/shuffle_fp64.cpp (100%) rename sycl/test/{ => on-device}/sub_group/vote.cpp (100%) rename sycl/test/{ => on-device}/usm/allocator_equal.cpp (100%) rename sycl/test/{ => on-device}/usm/allocator_shared.cpp (100%) rename sycl/test/{ => on-device}/usm/allocator_vector.cpp (100%) rename sycl/test/{ => on-device}/usm/badmalloc.cpp (100%) rename sycl/test/{ => on-device}/usm/depends_on.cpp (100%) rename sycl/test/{ => on-device}/usm/dmem_varied.cpp (100%) rename sycl/test/{ => on-device}/usm/dmemll.cpp (100%) rename sycl/test/{ => on-device}/usm/dmemllaligned.cpp (100%) rename sycl/test/{ => on-device}/usm/fill.cpp (100%) rename sycl/test/{ => on-device}/usm/findplatforms.hpp (100%) rename sycl/test/{ => on-device}/usm/hmemll.cpp (100%) rename sycl/test/{ => on-device}/usm/hmemllaligned.cpp (100%) rename sycl/test/{ => on-device}/usm/math.cpp (100%) rename sycl/test/{ => on-device}/usm/memadvise.cpp (100%) rename sycl/test/{ => on-device}/usm/memcpy.cpp (100%) rename sycl/test/{ => on-device}/usm/memset.cpp (100%) rename sycl/test/{ => on-device}/usm/mixed.cpp (100%) rename sycl/test/{ => on-device}/usm/mixed2.cpp (100%) rename sycl/test/{ => on-device}/usm/mixed2template.cpp (100%) rename sycl/test/{ => on-device}/usm/mixed_queue.cpp (100%) rename sycl/test/{ => on-device}/usm/multictxt.cpp (100%) rename sycl/test/{ => on-device}/usm/pfor_flatten.cpp (100%) rename sycl/test/{ => on-device}/usm/pfor_flatten_range_shortcut.cpp (100%) rename sycl/test/{ => on-device}/usm/pointer_query.cpp (100%) rename sycl/test/{ => on-device}/usm/prefetch.cpp (100%) rename sycl/test/{ => on-device}/usm/queue_wait.cpp (100%) rename sycl/test/{ => on-device}/usm/smem_concurrent.cpp (100%) rename sycl/test/{ => on-device}/usm/smem_varied.cpp (100%) rename sycl/test/{ => on-device}/usm/smemll.cpp (100%) rename sycl/test/{ => on-device}/usm/smemllaligned.cpp (100%) rename sycl/test/{ => on-device}/usm/source_kernel_indirect_access.cpp (100%) diff --git a/sycl/test/accessors.o b/sycl/test/accessors.o deleted file mode 100644 index b173caed7981085e6b815dc684cf4d3b3a0257b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcma!#clL4gbC36TbMx_cbcuHg^>guYjgMzyfPl$R8b+x>8O4>!Il9FKnMGzMx}|y9 rdHLmea2h0+l3JFToQken7OFcVzqmxV!on;bNq0_WUTKAHdR{32BkCee diff --git a/sycl/test/fpga_tests/fpga_device_link_diag.cpp b/sycl/test/basic_tests/fpga_device_link_diag.cpp similarity index 100% rename from sycl/test/fpga_tests/fpga_device_link_diag.cpp rename to sycl/test/basic_tests/fpga_device_link_diag.cpp diff --git a/sycl/test/linear_id/linear-host-dev.cpp b/sycl/test/basic_tests/linear-host-dev.cpp similarity index 100% rename from sycl/test/linear_id/linear-host-dev.cpp rename to sycl/test/basic_tests/linear-host-dev.cpp diff --git a/sycl/test/reduction/reduction_ctor.cpp b/sycl/test/basic_tests/reduction_ctor.cpp similarity index 98% rename from sycl/test/reduction/reduction_ctor.cpp rename to sycl/test/basic_tests/reduction_ctor.cpp index c10fe74d7643c..d160f6339ea5a 100644 --- a/sycl/test/reduction/reduction_ctor.cpp +++ b/sycl/test/basic_tests/reduction_ctor.cpp @@ -4,7 +4,7 @@ // This performs basic checks such as reduction creation, getIdentity() method, // and the combine() method of the aux class 'reducer'. -#include "reduction_utils.hpp" +#include "../on-device/reduction/reduction_utils.hpp" #include #include diff --git a/sycl/test/spec_const/spec_const_types.cpp b/sycl/test/basic_tests/spec_const_types.cpp similarity index 100% rename from sycl/test/spec_const/spec_const_types.cpp rename to sycl/test/basic_tests/spec_const_types.cpp diff --git a/sycl/test/aot/Inputs/aot.cpp b/sycl/test/on-device/aot/Inputs/aot.cpp similarity index 100% rename from sycl/test/aot/Inputs/aot.cpp rename to sycl/test/on-device/aot/Inputs/aot.cpp diff --git a/sycl/test/aot/accelerator.cpp b/sycl/test/on-device/aot/accelerator.cpp similarity index 100% rename from sycl/test/aot/accelerator.cpp rename to sycl/test/on-device/aot/accelerator.cpp diff --git a/sycl/test/aot/cpu.cpp b/sycl/test/on-device/aot/cpu.cpp similarity index 100% rename from sycl/test/aot/cpu.cpp rename to sycl/test/on-device/aot/cpu.cpp diff --git a/sycl/test/aot/gpu.cpp b/sycl/test/on-device/aot/gpu.cpp similarity index 100% rename from sycl/test/aot/gpu.cpp rename to sycl/test/on-device/aot/gpu.cpp diff --git a/sycl/test/aot/multiple-devices.cpp b/sycl/test/on-device/aot/multiple-devices.cpp similarity index 100% rename from sycl/test/aot/multiple-devices.cpp rename to sycl/test/on-device/aot/multiple-devices.cpp diff --git a/sycl/test/aot/spec_const_aot.cpp b/sycl/test/on-device/aot/spec_const_aot.cpp similarity index 100% rename from sycl/test/aot/spec_const_aot.cpp rename to sycl/test/on-device/aot/spec_const_aot.cpp diff --git a/sycl/test/aot/with-llvm-bc.cpp b/sycl/test/on-device/aot/with-llvm-bc.cpp similarity index 100% rename from sycl/test/aot/with-llvm-bc.cpp rename to sycl/test/on-device/aot/with-llvm-bc.cpp diff --git a/sycl/test/basic_tests/access_to_subset.cpp b/sycl/test/on-device/basic_tests/access_to_subset.cpp similarity index 100% rename from sycl/test/basic_tests/access_to_subset.cpp rename to sycl/test/on-device/basic_tests/access_to_subset.cpp diff --git a/sycl/test/basic_tests/accessor/Inputs/device_accessor.cpp b/sycl/test/on-device/basic_tests/accessor/Inputs/device_accessor.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/Inputs/device_accessor.cpp rename to sycl/test/on-device/basic_tests/accessor/Inputs/device_accessor.cpp diff --git a/sycl/test/basic_tests/accessor/Inputs/host_accessor.cpp b/sycl/test/on-device/basic_tests/accessor/Inputs/host_accessor.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/Inputs/host_accessor.cpp rename to sycl/test/on-device/basic_tests/accessor/Inputs/host_accessor.cpp diff --git a/sycl/test/basic_tests/accessor/Inputs/host_task_accessor.cpp b/sycl/test/on-device/basic_tests/accessor/Inputs/host_task_accessor.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/Inputs/host_task_accessor.cpp rename to sycl/test/on-device/basic_tests/accessor/Inputs/host_task_accessor.cpp diff --git a/sycl/test/basic_tests/accessor/accessor.cpp b/sycl/test/on-device/basic_tests/accessor/accessor.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/accessor.cpp rename to sycl/test/on-device/basic_tests/accessor/accessor.cpp diff --git a/sycl/test/basic_tests/accessor/device_accessor_deduction.cpp b/sycl/test/on-device/basic_tests/accessor/device_accessor_deduction.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/device_accessor_deduction.cpp rename to sycl/test/on-device/basic_tests/accessor/device_accessor_deduction.cpp diff --git a/sycl/test/basic_tests/accessor/get_device_access_deduction.cpp b/sycl/test/on-device/basic_tests/accessor/get_device_access_deduction.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/get_device_access_deduction.cpp rename to sycl/test/on-device/basic_tests/accessor/get_device_access_deduction.cpp diff --git a/sycl/test/basic_tests/accessor/get_host_access_deduction.cpp b/sycl/test/on-device/basic_tests/accessor/get_host_access_deduction.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/get_host_access_deduction.cpp rename to sycl/test/on-device/basic_tests/accessor/get_host_access_deduction.cpp diff --git a/sycl/test/basic_tests/accessor/get_host_task_access_deduction.cpp b/sycl/test/on-device/basic_tests/accessor/get_host_task_access_deduction.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/get_host_task_access_deduction.cpp rename to sycl/test/on-device/basic_tests/accessor/get_host_task_access_deduction.cpp diff --git a/sycl/test/basic_tests/accessor/host_accessor_deduction.cpp b/sycl/test/on-device/basic_tests/accessor/host_accessor_deduction.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/host_accessor_deduction.cpp rename to sycl/test/on-device/basic_tests/accessor/host_accessor_deduction.cpp diff --git a/sycl/test/basic_tests/accessor/host_task_accessor_deduction.cpp b/sycl/test/on-device/basic_tests/accessor/host_task_accessor_deduction.cpp similarity index 100% rename from sycl/test/basic_tests/accessor/host_task_accessor_deduction.cpp rename to sycl/test/on-device/basic_tests/accessor/host_task_accessor_deduction.cpp diff --git a/sycl/test/basic_tests/boolean.cpp b/sycl/test/on-device/basic_tests/boolean.cpp similarity index 100% rename from sycl/test/basic_tests/boolean.cpp rename to sycl/test/on-device/basic_tests/boolean.cpp diff --git a/sycl/test/basic_tests/buffer/buffer.cpp b/sycl/test/on-device/basic_tests/buffer/buffer.cpp similarity index 100% rename from sycl/test/basic_tests/buffer/buffer.cpp rename to sycl/test/on-device/basic_tests/buffer/buffer.cpp diff --git a/sycl/test/basic_tests/buffer/buffer_container.cpp b/sycl/test/on-device/basic_tests/buffer/buffer_container.cpp similarity index 100% rename from sycl/test/basic_tests/buffer/buffer_container.cpp rename to sycl/test/on-device/basic_tests/buffer/buffer_container.cpp diff --git a/sycl/test/basic_tests/buffer/buffer_dev_to_dev.cpp b/sycl/test/on-device/basic_tests/buffer/buffer_dev_to_dev.cpp similarity index 100% rename from sycl/test/basic_tests/buffer/buffer_dev_to_dev.cpp rename to sycl/test/on-device/basic_tests/buffer/buffer_dev_to_dev.cpp diff --git a/sycl/test/basic_tests/buffer/buffer_full_copy.cpp b/sycl/test/on-device/basic_tests/buffer/buffer_full_copy.cpp similarity index 100% rename from sycl/test/basic_tests/buffer/buffer_full_copy.cpp rename to sycl/test/on-device/basic_tests/buffer/buffer_full_copy.cpp diff --git a/sycl/test/basic_tests/buffer/buffer_interop.cpp b/sycl/test/on-device/basic_tests/buffer/buffer_interop.cpp similarity index 100% rename from sycl/test/basic_tests/buffer/buffer_interop.cpp rename to sycl/test/on-device/basic_tests/buffer/buffer_interop.cpp diff --git a/sycl/test/basic_tests/buffer/native_buffer_creation_flags.cpp b/sycl/test/on-device/basic_tests/buffer/native_buffer_creation_flags.cpp similarity index 100% rename from sycl/test/basic_tests/buffer/native_buffer_creation_flags.cpp rename to sycl/test/on-device/basic_tests/buffer/native_buffer_creation_flags.cpp diff --git a/sycl/test/basic_tests/buffer/reinterpret.cpp b/sycl/test/on-device/basic_tests/buffer/reinterpret.cpp similarity index 100% rename from sycl/test/basic_tests/buffer/reinterpret.cpp rename to sycl/test/on-device/basic_tests/buffer/reinterpret.cpp diff --git a/sycl/test/basic_tests/buffer/subbuffer.cpp b/sycl/test/on-device/basic_tests/buffer/subbuffer.cpp similarity index 100% rename from sycl/test/basic_tests/buffer/subbuffer.cpp rename to sycl/test/on-device/basic_tests/buffer/subbuffer.cpp diff --git a/sycl/test/basic_tests/buffer/subbuffer_interop.cpp b/sycl/test/on-device/basic_tests/buffer/subbuffer_interop.cpp similarity index 100% rename from sycl/test/basic_tests/buffer/subbuffer_interop.cpp rename to sycl/test/on-device/basic_tests/buffer/subbuffer_interop.cpp diff --git a/sycl/test/basic_tests/compare_exchange_strong.cpp b/sycl/test/on-device/basic_tests/compare_exchange_strong.cpp similarity index 100% rename from sycl/test/basic_tests/compare_exchange_strong.cpp rename to sycl/test/on-device/basic_tests/compare_exchange_strong.cpp diff --git a/sycl/test/basic_tests/context_platforms.cpp b/sycl/test/on-device/basic_tests/context_platforms.cpp similarity index 100% rename from sycl/test/basic_tests/context_platforms.cpp rename to sycl/test/on-device/basic_tests/context_platforms.cpp diff --git a/sycl/test/basic_tests/device_equality.cpp b/sycl/test/on-device/basic_tests/device_equality.cpp similarity index 100% rename from sycl/test/basic_tests/device_equality.cpp rename to sycl/test/on-device/basic_tests/device_equality.cpp diff --git a/sycl/test/basic_tests/device_event.cpp b/sycl/test/on-device/basic_tests/device_event.cpp similarity index 100% rename from sycl/test/basic_tests/device_event.cpp rename to sycl/test/on-device/basic_tests/device_event.cpp diff --git a/sycl/test/basic_tests/diagnostics/device-check.cpp b/sycl/test/on-device/basic_tests/diagnostics/device-check.cpp similarity index 100% rename from sycl/test/basic_tests/diagnostics/device-check.cpp rename to sycl/test/on-device/basic_tests/diagnostics/device-check.cpp diff --git a/sycl/test/basic_tests/diagnostics/handler.cpp b/sycl/test/on-device/basic_tests/diagnostics/handler.cpp similarity index 100% rename from sycl/test/basic_tests/diagnostics/handler.cpp rename to sycl/test/on-device/basic_tests/diagnostics/handler.cpp diff --git a/sycl/test/basic_tests/diagnostics/non-uniform-wk-gp-test.cpp b/sycl/test/on-device/basic_tests/diagnostics/non-uniform-wk-gp-test.cpp similarity index 100% rename from sycl/test/basic_tests/diagnostics/non-uniform-wk-gp-test.cpp rename to sycl/test/on-device/basic_tests/diagnostics/non-uniform-wk-gp-test.cpp diff --git a/sycl/test/basic_tests/event.cpp b/sycl/test/on-device/basic_tests/event.cpp similarity index 100% rename from sycl/test/basic_tests/event.cpp rename to sycl/test/on-device/basic_tests/event.cpp diff --git a/sycl/test/basic_tests/event_creation.cpp b/sycl/test/on-device/basic_tests/event_creation.cpp similarity index 100% rename from sycl/test/basic_tests/event_creation.cpp rename to sycl/test/on-device/basic_tests/event_creation.cpp diff --git a/sycl/test/basic_tests/event_profiling_info.cpp b/sycl/test/on-device/basic_tests/event_profiling_info.cpp similarity index 100% rename from sycl/test/basic_tests/event_profiling_info.cpp rename to sycl/test/on-device/basic_tests/event_profiling_info.cpp diff --git a/sycl/test/basic_tests/event_release.cpp b/sycl/test/on-device/basic_tests/event_release.cpp similarity index 100% rename from sycl/test/basic_tests/event_release.cpp rename to sycl/test/on-device/basic_tests/event_release.cpp diff --git a/sycl/test/basic_tests/free_function_queries/free_function_queries.cpp b/sycl/test/on-device/basic_tests/free_function_queries/free_function_queries.cpp similarity index 100% rename from sycl/test/basic_tests/free_function_queries/free_function_queries.cpp rename to sycl/test/on-device/basic_tests/free_function_queries/free_function_queries.cpp diff --git a/sycl/test/basic_tests/free_function_queries/free_function_queries_sub_group.cpp b/sycl/test/on-device/basic_tests/free_function_queries/free_function_queries_sub_group.cpp similarity index 100% rename from sycl/test/basic_tests/free_function_queries/free_function_queries_sub_group.cpp rename to sycl/test/on-device/basic_tests/free_function_queries/free_function_queries_sub_group.cpp diff --git a/sycl/test/basic_tests/get_backend.cpp b/sycl/test/on-device/basic_tests/get_backend.cpp similarity index 100% rename from sycl/test/basic_tests/get_backend.cpp rename to sycl/test/on-device/basic_tests/get_backend.cpp diff --git a/sycl/test/basic_tests/get_nonhost_devices.cpp b/sycl/test/on-device/basic_tests/get_nonhost_devices.cpp similarity index 100% rename from sycl/test/basic_tests/get_nonhost_devices.cpp rename to sycl/test/on-device/basic_tests/get_nonhost_devices.cpp diff --git a/sycl/test/basic_tests/group_async_copy.cpp b/sycl/test/on-device/basic_tests/group_async_copy.cpp similarity index 100% rename from sycl/test/basic_tests/group_async_copy.cpp rename to sycl/test/on-device/basic_tests/group_async_copy.cpp diff --git a/sycl/test/basic_tests/half_type.cpp b/sycl/test/on-device/basic_tests/half_type.cpp similarity index 100% rename from sycl/test/basic_tests/half_type.cpp rename to sycl/test/on-device/basic_tests/half_type.cpp diff --git a/sycl/test/basic_tests/handler/handler_copy_with_offset.cpp b/sycl/test/on-device/basic_tests/handler/handler_copy_with_offset.cpp similarity index 100% rename from sycl/test/basic_tests/handler/handler_copy_with_offset.cpp rename to sycl/test/on-device/basic_tests/handler/handler_copy_with_offset.cpp diff --git a/sycl/test/basic_tests/handler/handler_generic_integral_lambda.cpp b/sycl/test/on-device/basic_tests/handler/handler_generic_integral_lambda.cpp similarity index 100% rename from sycl/test/basic_tests/handler/handler_generic_integral_lambda.cpp rename to sycl/test/on-device/basic_tests/handler/handler_generic_integral_lambda.cpp diff --git a/sycl/test/basic_tests/handler/handler_mem_op.cpp b/sycl/test/on-device/basic_tests/handler/handler_mem_op.cpp similarity index 100% rename from sycl/test/basic_tests/handler/handler_mem_op.cpp rename to sycl/test/on-device/basic_tests/handler/handler_mem_op.cpp diff --git a/sycl/test/basic_tests/handler/handler_set_args.cpp b/sycl/test/on-device/basic_tests/handler/handler_set_args.cpp similarity index 100% rename from sycl/test/basic_tests/handler/handler_set_args.cpp rename to sycl/test/on-device/basic_tests/handler/handler_set_args.cpp diff --git a/sycl/test/basic_tests/handler/interop_task.cpp b/sycl/test/on-device/basic_tests/handler/interop_task.cpp similarity index 98% rename from sycl/test/basic_tests/handler/interop_task.cpp rename to sycl/test/on-device/basic_tests/handler/interop_task.cpp index 2cff0daf5da32..d7aac4f5d2d5d 100644 --- a/sycl/test/basic_tests/handler/interop_task.cpp +++ b/sycl/test/on-device/basic_tests/handler/interop_task.cpp @@ -15,7 +15,7 @@ #include #include -#include "../../helpers.hpp" +#include "../../../helpers.hpp" #include #include diff --git a/sycl/test/basic_tests/handler/run_on_host_intel.cpp b/sycl/test/on-device/basic_tests/handler/run_on_host_intel.cpp similarity index 98% rename from sycl/test/basic_tests/handler/run_on_host_intel.cpp rename to sycl/test/on-device/basic_tests/handler/run_on_host_intel.cpp index e6308e9e3e047..7b30ff3a59647 100644 --- a/sycl/test/basic_tests/handler/run_on_host_intel.cpp +++ b/sycl/test/on-device/basic_tests/handler/run_on_host_intel.cpp @@ -13,7 +13,7 @@ #include "CL/sycl/access/access.hpp" #include -#include "../../helpers.hpp" +#include "../../../helpers.hpp" using namespace cl; diff --git a/sycl/test/basic_tests/handler/run_on_host_intel2.cpp b/sycl/test/on-device/basic_tests/handler/run_on_host_intel2.cpp similarity index 100% rename from sycl/test/basic_tests/handler/run_on_host_intel2.cpp rename to sycl/test/on-device/basic_tests/handler/run_on_host_intel2.cpp diff --git a/sycl/test/basic_tests/host_always_works.cpp b/sycl/test/on-device/basic_tests/host_always_works.cpp similarity index 100% rename from sycl/test/basic_tests/host_always_works.cpp rename to sycl/test/on-device/basic_tests/host_always_works.cpp diff --git a/sycl/test/basic_tests/host_platform_avail.cpp b/sycl/test/on-device/basic_tests/host_platform_avail.cpp similarity index 100% rename from sycl/test/basic_tests/host_platform_avail.cpp rename to sycl/test/on-device/basic_tests/host_platform_avail.cpp diff --git a/sycl/test/basic_tests/image.cpp b/sycl/test/on-device/basic_tests/image.cpp similarity index 99% rename from sycl/test/basic_tests/image.cpp rename to sycl/test/on-device/basic_tests/image.cpp index f062f426623ff..e20096f4d0229 100644 --- a/sycl/test/basic_tests/image.cpp +++ b/sycl/test/on-device/basic_tests/image.cpp @@ -16,7 +16,7 @@ #include #include -#include "../helpers.hpp" +#include "../../helpers.hpp" using namespace cl; diff --git a/sycl/test/basic_tests/image/image_read.cpp b/sycl/test/on-device/basic_tests/image/image_read.cpp similarity index 100% rename from sycl/test/basic_tests/image/image_read.cpp rename to sycl/test/on-device/basic_tests/image/image_read.cpp diff --git a/sycl/test/basic_tests/image/image_read.h b/sycl/test/on-device/basic_tests/image/image_read.h similarity index 100% rename from sycl/test/basic_tests/image/image_read.h rename to sycl/test/on-device/basic_tests/image/image_read.h diff --git a/sycl/test/basic_tests/image/image_read_fp16.cpp b/sycl/test/on-device/basic_tests/image/image_read_fp16.cpp similarity index 100% rename from sycl/test/basic_tests/image/image_read_fp16.cpp rename to sycl/test/on-device/basic_tests/image/image_read_fp16.cpp diff --git a/sycl/test/basic_tests/image/image_sample.cpp b/sycl/test/on-device/basic_tests/image/image_sample.cpp similarity index 100% rename from sycl/test/basic_tests/image/image_sample.cpp rename to sycl/test/on-device/basic_tests/image/image_sample.cpp diff --git a/sycl/test/basic_tests/image/image_write.cpp b/sycl/test/on-device/basic_tests/image/image_write.cpp similarity index 100% rename from sycl/test/basic_tests/image/image_write.cpp rename to sycl/test/on-device/basic_tests/image/image_write.cpp diff --git a/sycl/test/basic_tests/image/image_write.h b/sycl/test/on-device/basic_tests/image/image_write.h similarity index 100% rename from sycl/test/basic_tests/image/image_write.h rename to sycl/test/on-device/basic_tests/image/image_write.h diff --git a/sycl/test/basic_tests/image/image_write_fp16.cpp b/sycl/test/on-device/basic_tests/image/image_write_fp16.cpp similarity index 100% rename from sycl/test/basic_tests/image/image_write_fp16.cpp rename to sycl/test/on-device/basic_tests/image/image_write_fp16.cpp diff --git a/sycl/test/basic_tests/image_accessor_readsampler.cpp b/sycl/test/on-device/basic_tests/image_accessor_readsampler.cpp similarity index 100% rename from sycl/test/basic_tests/image_accessor_readsampler.cpp rename to sycl/test/on-device/basic_tests/image_accessor_readsampler.cpp diff --git a/sycl/test/basic_tests/image_accessor_readwrite.cpp b/sycl/test/on-device/basic_tests/image_accessor_readwrite.cpp similarity index 100% rename from sycl/test/basic_tests/image_accessor_readwrite.cpp rename to sycl/test/on-device/basic_tests/image_accessor_readwrite.cpp diff --git a/sycl/test/basic_tests/image_accessor_readwrite_half.cpp b/sycl/test/on-device/basic_tests/image_accessor_readwrite_half.cpp similarity index 100% rename from sycl/test/basic_tests/image_accessor_readwrite_half.cpp rename to sycl/test/on-device/basic_tests/image_accessor_readwrite_half.cpp diff --git a/sycl/test/basic_tests/image_array.cpp b/sycl/test/on-device/basic_tests/image_array.cpp similarity index 99% rename from sycl/test/basic_tests/image_array.cpp rename to sycl/test/on-device/basic_tests/image_array.cpp index 6adf7c0352dcd..478f5412ffdc0 100644 --- a/sycl/test/basic_tests/image_array.cpp +++ b/sycl/test/on-device/basic_tests/image_array.cpp @@ -19,7 +19,7 @@ #include #include -#include "../helpers.hpp" +#include "../../helpers.hpp" using namespace cl; diff --git a/sycl/test/basic_tests/image_constructors.cpp b/sycl/test/on-device/basic_tests/image_constructors.cpp similarity index 100% rename from sycl/test/basic_tests/image_constructors.cpp rename to sycl/test/on-device/basic_tests/image_constructors.cpp diff --git a/sycl/test/basic_tests/info.cpp b/sycl/test/on-device/basic_tests/info.cpp similarity index 100% rename from sycl/test/basic_tests/info.cpp rename to sycl/test/on-device/basic_tests/info.cpp diff --git a/sycl/test/basic_tests/info_ocl_version.cpp b/sycl/test/on-device/basic_tests/info_ocl_version.cpp similarity index 100% rename from sycl/test/basic_tests/info_ocl_version.cpp rename to sycl/test/on-device/basic_tests/info_ocl_version.cpp diff --git a/sycl/test/basic_tests/kernel_info.cpp b/sycl/test/on-device/basic_tests/kernel_info.cpp similarity index 100% rename from sycl/test/basic_tests/kernel_info.cpp rename to sycl/test/on-device/basic_tests/kernel_info.cpp diff --git a/sycl/test/basic_tests/kernel_interop.cpp b/sycl/test/on-device/basic_tests/kernel_interop.cpp similarity index 100% rename from sycl/test/basic_tests/kernel_interop.cpp rename to sycl/test/on-device/basic_tests/kernel_interop.cpp diff --git a/sycl/test/basic_tests/memory-consumption.cpp b/sycl/test/on-device/basic_tests/memory-consumption.cpp similarity index 100% rename from sycl/test/basic_tests/memory-consumption.cpp rename to sycl/test/on-device/basic_tests/memory-consumption.cpp diff --git a/sycl/test/basic_tests/opencl_interop.cpp b/sycl/test/on-device/basic_tests/opencl_interop.cpp similarity index 100% rename from sycl/test/basic_tests/opencl_interop.cpp rename to sycl/test/on-device/basic_tests/opencl_interop.cpp diff --git a/sycl/test/basic_tests/parallel_for_indexers.cpp b/sycl/test/on-device/basic_tests/parallel_for_indexers.cpp similarity index 100% rename from sycl/test/basic_tests/parallel_for_indexers.cpp rename to sycl/test/on-device/basic_tests/parallel_for_indexers.cpp diff --git a/sycl/test/basic_tests/parallel_for_range.cpp b/sycl/test/on-device/basic_tests/parallel_for_range.cpp similarity index 100% rename from sycl/test/basic_tests/parallel_for_range.cpp rename to sycl/test/on-device/basic_tests/parallel_for_range.cpp diff --git a/sycl/test/basic_tests/queue/queue.cpp b/sycl/test/on-device/basic_tests/queue/queue.cpp similarity index 100% rename from sycl/test/basic_tests/queue/queue.cpp rename to sycl/test/on-device/basic_tests/queue/queue.cpp diff --git a/sycl/test/basic_tests/queue/queue_parallel_for_generic.cpp b/sycl/test/on-device/basic_tests/queue/queue_parallel_for_generic.cpp similarity index 100% rename from sycl/test/basic_tests/queue/queue_parallel_for_generic.cpp rename to sycl/test/on-device/basic_tests/queue/queue_parallel_for_generic.cpp diff --git a/sycl/test/basic_tests/queue/release.cpp b/sycl/test/on-device/basic_tests/queue/release.cpp similarity index 100% rename from sycl/test/basic_tests/queue/release.cpp rename to sycl/test/on-device/basic_tests/queue/release.cpp diff --git a/sycl/test/basic_tests/range_offset_fit_in_int.cpp b/sycl/test/on-device/basic_tests/range_offset_fit_in_int.cpp similarity index 100% rename from sycl/test/basic_tests/range_offset_fit_in_int.cpp rename to sycl/test/on-device/basic_tests/range_offset_fit_in_int.cpp diff --git a/sycl/test/basic_tests/reqd_work_group_size.cpp b/sycl/test/on-device/basic_tests/reqd_work_group_size.cpp similarity index 100% rename from sycl/test/basic_tests/reqd_work_group_size.cpp rename to sycl/test/on-device/basic_tests/reqd_work_group_size.cpp diff --git a/sycl/test/basic_tests/sampler/sampler.cpp b/sycl/test/on-device/basic_tests/sampler/sampler.cpp similarity index 100% rename from sycl/test/basic_tests/sampler/sampler.cpp rename to sycl/test/on-device/basic_tests/sampler/sampler.cpp diff --git a/sycl/test/basic_tests/sampler/sampler_ocl.cpp b/sycl/test/on-device/basic_tests/sampler/sampler_ocl.cpp similarity index 100% rename from sycl/test/basic_tests/sampler/sampler_ocl.cpp rename to sycl/test/on-device/basic_tests/sampler/sampler_ocl.cpp diff --git a/sycl/test/basic_tests/scalar_vec_access.cpp b/sycl/test/on-device/basic_tests/scalar_vec_access.cpp similarity index 100% rename from sycl/test/basic_tests/scalar_vec_access.cpp rename to sycl/test/on-device/basic_tests/scalar_vec_access.cpp diff --git a/sycl/test/basic_tests/set_arg_interop.cpp b/sycl/test/on-device/basic_tests/set_arg_interop.cpp similarity index 100% rename from sycl/test/basic_tests/set_arg_interop.cpp rename to sycl/test/on-device/basic_tests/set_arg_interop.cpp diff --git a/sycl/test/basic_tests/stream/auto_flush.cpp b/sycl/test/on-device/basic_tests/stream/auto_flush.cpp similarity index 100% rename from sycl/test/basic_tests/stream/auto_flush.cpp rename to sycl/test/on-device/basic_tests/stream/auto_flush.cpp diff --git a/sycl/test/basic_tests/stream/blocking_pipes_and_stream.cpp b/sycl/test/on-device/basic_tests/stream/blocking_pipes_and_stream.cpp similarity index 100% rename from sycl/test/basic_tests/stream/blocking_pipes_and_stream.cpp rename to sycl/test/on-device/basic_tests/stream/blocking_pipes_and_stream.cpp diff --git a/sycl/test/basic_tests/stream/release_resources_test.cpp b/sycl/test/on-device/basic_tests/stream/release_resources_test.cpp similarity index 100% rename from sycl/test/basic_tests/stream/release_resources_test.cpp rename to sycl/test/on-device/basic_tests/stream/release_resources_test.cpp diff --git a/sycl/test/basic_tests/stream/stream.cpp b/sycl/test/on-device/basic_tests/stream/stream.cpp similarity index 100% rename from sycl/test/basic_tests/stream/stream.cpp rename to sycl/test/on-device/basic_tests/stream/stream.cpp diff --git a/sycl/test/basic_tests/subdevice.cpp b/sycl/test/on-device/basic_tests/subdevice.cpp similarity index 100% rename from sycl/test/basic_tests/subdevice.cpp rename to sycl/test/on-device/basic_tests/subdevice.cpp diff --git a/sycl/test/basic_tests/subdevice_pi.cpp b/sycl/test/on-device/basic_tests/subdevice_pi.cpp similarity index 100% rename from sycl/test/basic_tests/subdevice_pi.cpp rename to sycl/test/on-device/basic_tests/subdevice_pi.cpp diff --git a/sycl/test/basic_tests/swizzle_op.cpp b/sycl/test/on-device/basic_tests/swizzle_op.cpp similarity index 100% rename from sycl/test/basic_tests/swizzle_op.cpp rename to sycl/test/on-device/basic_tests/swizzle_op.cpp diff --git a/sycl/test/basic_tests/sycl-namespace.cpp b/sycl/test/on-device/basic_tests/sycl-namespace.cpp similarity index 100% rename from sycl/test/basic_tests/sycl-namespace.cpp rename to sycl/test/on-device/basic_tests/sycl-namespace.cpp diff --git a/sycl/test/basic_tests/unused_pointer.cpp b/sycl/test/on-device/basic_tests/unused_pointer.cpp similarity index 100% rename from sycl/test/basic_tests/unused_pointer.cpp rename to sycl/test/on-device/basic_tests/unused_pointer.cpp diff --git a/sycl/test/basic_tests/use_pinned_host_memory.cpp b/sycl/test/on-device/basic_tests/use_pinned_host_memory.cpp similarity index 100% rename from sycl/test/basic_tests/use_pinned_host_memory.cpp rename to sycl/test/on-device/basic_tests/use_pinned_host_memory.cpp diff --git a/sycl/test/basic_tests/vec_convert.hpp b/sycl/test/on-device/basic_tests/vec_convert.hpp similarity index 100% rename from sycl/test/basic_tests/vec_convert.hpp rename to sycl/test/on-device/basic_tests/vec_convert.hpp diff --git a/sycl/test/basic_tests/vec_convert_f_to_f.cpp b/sycl/test/on-device/basic_tests/vec_convert_f_to_f.cpp similarity index 100% rename from sycl/test/basic_tests/vec_convert_f_to_f.cpp rename to sycl/test/on-device/basic_tests/vec_convert_f_to_f.cpp diff --git a/sycl/test/basic_tests/vec_convert_f_to_i.cpp b/sycl/test/on-device/basic_tests/vec_convert_f_to_i.cpp similarity index 100% rename from sycl/test/basic_tests/vec_convert_f_to_i.cpp rename to sycl/test/on-device/basic_tests/vec_convert_f_to_i.cpp diff --git a/sycl/test/basic_tests/vec_convert_half.cpp b/sycl/test/on-device/basic_tests/vec_convert_half.cpp similarity index 100% rename from sycl/test/basic_tests/vec_convert_half.cpp rename to sycl/test/on-device/basic_tests/vec_convert_half.cpp diff --git a/sycl/test/basic_tests/vec_convert_i_to_i.cpp b/sycl/test/on-device/basic_tests/vec_convert_i_to_i.cpp similarity index 100% rename from sycl/test/basic_tests/vec_convert_i_to_i.cpp rename to sycl/test/on-device/basic_tests/vec_convert_i_to_i.cpp diff --git a/sycl/test/basic_tests/vec_op.cpp b/sycl/test/on-device/basic_tests/vec_op.cpp similarity index 100% rename from sycl/test/basic_tests/vec_op.cpp rename to sycl/test/on-device/basic_tests/vec_op.cpp diff --git a/sycl/test/basic_tests/vectors/vector_operators.cpp b/sycl/test/on-device/basic_tests/vector_operators.cpp similarity index 100% rename from sycl/test/basic_tests/vectors/vector_operators.cpp rename to sycl/test/on-device/basic_tests/vector_operators.cpp diff --git a/sycl/test/built-ins/nan.cpp b/sycl/test/on-device/built-ins/nan.cpp similarity index 100% rename from sycl/test/built-ins/nan.cpp rename to sycl/test/on-device/built-ins/nan.cpp diff --git a/sycl/test/built-ins/printf.cpp b/sycl/test/on-device/built-ins/printf.cpp similarity index 100% rename from sycl/test/built-ins/printf.cpp rename to sycl/test/on-device/built-ins/printf.cpp diff --git a/sycl/test/built-ins/scalar_common.cpp b/sycl/test/on-device/built-ins/scalar_common.cpp similarity index 100% rename from sycl/test/built-ins/scalar_common.cpp rename to sycl/test/on-device/built-ins/scalar_common.cpp diff --git a/sycl/test/built-ins/scalar_geometric.cpp b/sycl/test/on-device/built-ins/scalar_geometric.cpp similarity index 100% rename from sycl/test/built-ins/scalar_geometric.cpp rename to sycl/test/on-device/built-ins/scalar_geometric.cpp diff --git a/sycl/test/built-ins/scalar_integer.cpp b/sycl/test/on-device/built-ins/scalar_integer.cpp similarity index 100% rename from sycl/test/built-ins/scalar_integer.cpp rename to sycl/test/on-device/built-ins/scalar_integer.cpp diff --git a/sycl/test/built-ins/scalar_math.cpp b/sycl/test/on-device/built-ins/scalar_math.cpp similarity index 100% rename from sycl/test/built-ins/scalar_math.cpp rename to sycl/test/on-device/built-ins/scalar_math.cpp diff --git a/sycl/test/built-ins/scalar_math_2.cpp b/sycl/test/on-device/built-ins/scalar_math_2.cpp similarity index 100% rename from sycl/test/built-ins/scalar_math_2.cpp rename to sycl/test/on-device/built-ins/scalar_math_2.cpp diff --git a/sycl/test/built-ins/scalar_relational.cpp b/sycl/test/on-device/built-ins/scalar_relational.cpp similarity index 100% rename from sycl/test/built-ins/scalar_relational.cpp rename to sycl/test/on-device/built-ins/scalar_relational.cpp diff --git a/sycl/test/built-ins/vector_common.cpp b/sycl/test/on-device/built-ins/vector_common.cpp similarity index 100% rename from sycl/test/built-ins/vector_common.cpp rename to sycl/test/on-device/built-ins/vector_common.cpp diff --git a/sycl/test/built-ins/vector_geometric.cpp b/sycl/test/on-device/built-ins/vector_geometric.cpp similarity index 100% rename from sycl/test/built-ins/vector_geometric.cpp rename to sycl/test/on-device/built-ins/vector_geometric.cpp diff --git a/sycl/test/built-ins/vector_integer.cpp b/sycl/test/on-device/built-ins/vector_integer.cpp similarity index 100% rename from sycl/test/built-ins/vector_integer.cpp rename to sycl/test/on-device/built-ins/vector_integer.cpp diff --git a/sycl/test/built-ins/vector_math.cpp b/sycl/test/on-device/built-ins/vector_math.cpp similarity index 100% rename from sycl/test/built-ins/vector_math.cpp rename to sycl/test/on-device/built-ins/vector_math.cpp diff --git a/sycl/test/built-ins/vector_relational.cpp b/sycl/test/on-device/built-ins/vector_relational.cpp similarity index 100% rename from sycl/test/built-ins/vector_relational.cpp rename to sycl/test/on-device/built-ins/vector_relational.cpp diff --git a/sycl/test/config/allowlist.cpp b/sycl/test/on-device/config/allowlist.cpp similarity index 100% rename from sycl/test/config/allowlist.cpp rename to sycl/test/on-device/config/allowlist.cpp diff --git a/sycl/test/config/config.cpp b/sycl/test/on-device/config/config.cpp similarity index 100% rename from sycl/test/config/config.cpp rename to sycl/test/on-device/config/config.cpp diff --git a/sycl/test/config/select_device.cpp b/sycl/test/on-device/config/select_device.cpp similarity index 100% rename from sycl/test/config/select_device.cpp rename to sycl/test/on-device/config/select_device.cpp diff --git a/sycl/test/device-code-split/Inputs/split-per-source-second-file.cpp b/sycl/test/on-device/device-code-split/Inputs/split-per-source-second-file.cpp similarity index 100% rename from sycl/test/device-code-split/Inputs/split-per-source-second-file.cpp rename to sycl/test/on-device/device-code-split/Inputs/split-per-source-second-file.cpp diff --git a/sycl/test/device-code-split/Inputs/split-per-source.h b/sycl/test/on-device/device-code-split/Inputs/split-per-source.h similarity index 100% rename from sycl/test/device-code-split/Inputs/split-per-source.h rename to sycl/test/on-device/device-code-split/Inputs/split-per-source.h diff --git a/sycl/test/device-code-split/aot-accelerator.cpp b/sycl/test/on-device/device-code-split/aot-accelerator.cpp similarity index 100% rename from sycl/test/device-code-split/aot-accelerator.cpp rename to sycl/test/on-device/device-code-split/aot-accelerator.cpp diff --git a/sycl/test/device-code-split/aot-cpu.cpp b/sycl/test/on-device/device-code-split/aot-cpu.cpp similarity index 100% rename from sycl/test/device-code-split/aot-cpu.cpp rename to sycl/test/on-device/device-code-split/aot-cpu.cpp diff --git a/sycl/test/device-code-split/aot-gpu.cpp b/sycl/test/on-device/device-code-split/aot-gpu.cpp similarity index 100% rename from sycl/test/device-code-split/aot-gpu.cpp rename to sycl/test/on-device/device-code-split/aot-gpu.cpp diff --git a/sycl/test/device-code-split/split-per-kernel.cpp b/sycl/test/on-device/device-code-split/split-per-kernel.cpp similarity index 100% rename from sycl/test/device-code-split/split-per-kernel.cpp rename to sycl/test/on-device/device-code-split/split-per-kernel.cpp diff --git a/sycl/test/device-code-split/split-per-source-main.cpp b/sycl/test/on-device/device-code-split/split-per-source-main.cpp similarity index 100% rename from sycl/test/device-code-split/split-per-source-main.cpp rename to sycl/test/on-device/device-code-split/split-per-source-main.cpp diff --git a/sycl/test/device_code_dae/device_code_dae.cpp b/sycl/test/on-device/device_code_dae/device_code_dae.cpp similarity index 100% rename from sycl/test/device_code_dae/device_code_dae.cpp rename to sycl/test/on-device/device_code_dae/device_code_dae.cpp diff --git a/sycl/test/devicelib/assert-aot.cpp b/sycl/test/on-device/devicelib/assert-aot.cpp similarity index 100% rename from sycl/test/devicelib/assert-aot.cpp rename to sycl/test/on-device/devicelib/assert-aot.cpp diff --git a/sycl/test/devicelib/assert-windows.cpp b/sycl/test/on-device/devicelib/assert-windows.cpp similarity index 100% rename from sycl/test/devicelib/assert-windows.cpp rename to sycl/test/on-device/devicelib/assert-windows.cpp diff --git a/sycl/test/devicelib/assert.cpp b/sycl/test/on-device/devicelib/assert.cpp similarity index 100% rename from sycl/test/devicelib/assert.cpp rename to sycl/test/on-device/devicelib/assert.cpp diff --git a/sycl/test/devicelib/cmath-aot.cpp b/sycl/test/on-device/devicelib/cmath-aot.cpp similarity index 100% rename from sycl/test/devicelib/cmath-aot.cpp rename to sycl/test/on-device/devicelib/cmath-aot.cpp diff --git a/sycl/test/devicelib/cmath_fp64_test.cpp b/sycl/test/on-device/devicelib/cmath_fp64_test.cpp similarity index 100% rename from sycl/test/devicelib/cmath_fp64_test.cpp rename to sycl/test/on-device/devicelib/cmath_fp64_test.cpp diff --git a/sycl/test/devicelib/cmath_test.cpp b/sycl/test/on-device/devicelib/cmath_test.cpp similarity index 100% rename from sycl/test/devicelib/cmath_test.cpp rename to sycl/test/on-device/devicelib/cmath_test.cpp diff --git a/sycl/test/devicelib/complex-fpga.cpp b/sycl/test/on-device/devicelib/complex-fpga.cpp similarity index 100% rename from sycl/test/devicelib/complex-fpga.cpp rename to sycl/test/on-device/devicelib/complex-fpga.cpp diff --git a/sycl/test/devicelib/math_fp64_test.cpp b/sycl/test/on-device/devicelib/math_fp64_test.cpp similarity index 100% rename from sycl/test/devicelib/math_fp64_test.cpp rename to sycl/test/on-device/devicelib/math_fp64_test.cpp diff --git a/sycl/test/devicelib/math_override_test.cpp b/sycl/test/on-device/devicelib/math_override_test.cpp similarity index 100% rename from sycl/test/devicelib/math_override_test.cpp rename to sycl/test/on-device/devicelib/math_override_test.cpp diff --git a/sycl/test/devicelib/math_test.cpp b/sycl/test/on-device/devicelib/math_test.cpp similarity index 100% rename from sycl/test/devicelib/math_test.cpp rename to sycl/test/on-device/devicelib/math_test.cpp diff --git a/sycl/test/devicelib/math_utils.hpp b/sycl/test/on-device/devicelib/math_utils.hpp similarity index 100% rename from sycl/test/devicelib/math_utils.hpp rename to sycl/test/on-device/devicelib/math_utils.hpp diff --git a/sycl/test/devicelib/separate_compile_test.cpp b/sycl/test/on-device/devicelib/separate_compile_test.cpp similarity index 100% rename from sycl/test/devicelib/separate_compile_test.cpp rename to sycl/test/on-device/devicelib/separate_compile_test.cpp diff --git a/sycl/test/devicelib/std_complex_math_fp64_test.cpp b/sycl/test/on-device/devicelib/std_complex_math_fp64_test.cpp similarity index 100% rename from sycl/test/devicelib/std_complex_math_fp64_test.cpp rename to sycl/test/on-device/devicelib/std_complex_math_fp64_test.cpp diff --git a/sycl/test/devicelib/std_complex_math_test.cpp b/sycl/test/on-device/devicelib/std_complex_math_test.cpp similarity index 100% rename from sycl/test/devicelib/std_complex_math_test.cpp rename to sycl/test/on-device/devicelib/std_complex_math_test.cpp diff --git a/sycl/test/dot_product/dot_product_int_test.cpp b/sycl/test/on-device/dot_product/dot_product_int_test.cpp similarity index 100% rename from sycl/test/dot_product/dot_product_int_test.cpp rename to sycl/test/on-device/dot_product/dot_product_int_test.cpp diff --git a/sycl/test/dot_product/dot_product_vec_test.cpp b/sycl/test/on-device/dot_product/dot_product_vec_test.cpp similarity index 100% rename from sycl/test/dot_product/dot_product_vec_test.cpp rename to sycl/test/on-device/dot_product/dot_product_vec_test.cpp diff --git a/sycl/test/filter_selector/reuse.cpp b/sycl/test/on-device/filter_selector/reuse.cpp similarity index 100% rename from sycl/test/filter_selector/reuse.cpp rename to sycl/test/on-device/filter_selector/reuse.cpp diff --git a/sycl/test/filter_selector/select.cpp b/sycl/test/on-device/filter_selector/select.cpp similarity index 100% rename from sycl/test/filter_selector/select.cpp rename to sycl/test/on-device/filter_selector/select.cpp diff --git a/sycl/test/filter_selector/select_device.cpp b/sycl/test/on-device/filter_selector/select_device.cpp similarity index 100% rename from sycl/test/filter_selector/select_device.cpp rename to sycl/test/on-device/filter_selector/select_device.cpp diff --git a/sycl/test/filter_selector/select_device_acc.cpp b/sycl/test/on-device/filter_selector/select_device_acc.cpp similarity index 100% rename from sycl/test/filter_selector/select_device_acc.cpp rename to sycl/test/on-device/filter_selector/select_device_acc.cpp diff --git a/sycl/test/filter_selector/select_device_cpu.cpp b/sycl/test/on-device/filter_selector/select_device_cpu.cpp similarity index 100% rename from sycl/test/filter_selector/select_device_cpu.cpp rename to sycl/test/on-device/filter_selector/select_device_cpu.cpp diff --git a/sycl/test/filter_selector/select_device_cuda.cpp b/sycl/test/on-device/filter_selector/select_device_cuda.cpp similarity index 100% rename from sycl/test/filter_selector/select_device_cuda.cpp rename to sycl/test/on-device/filter_selector/select_device_cuda.cpp diff --git a/sycl/test/filter_selector/select_device_level_zero.cpp b/sycl/test/on-device/filter_selector/select_device_level_zero.cpp similarity index 100% rename from sycl/test/filter_selector/select_device_level_zero.cpp rename to sycl/test/on-device/filter_selector/select_device_level_zero.cpp diff --git a/sycl/test/filter_selector/select_device_opencl.cpp b/sycl/test/on-device/filter_selector/select_device_opencl.cpp similarity index 100% rename from sycl/test/filter_selector/select_device_opencl.cpp rename to sycl/test/on-device/filter_selector/select_device_opencl.cpp diff --git a/sycl/test/fpga_tests/Inputs/fpga_device.cpp b/sycl/test/on-device/fpga_tests/Inputs/fpga_device.cpp similarity index 100% rename from sycl/test/fpga_tests/Inputs/fpga_device.cpp rename to sycl/test/on-device/fpga_tests/Inputs/fpga_device.cpp diff --git a/sycl/test/fpga_tests/Inputs/fpga_host.cpp b/sycl/test/on-device/fpga_tests/Inputs/fpga_host.cpp similarity index 100% rename from sycl/test/fpga_tests/Inputs/fpga_host.cpp rename to sycl/test/on-device/fpga_tests/Inputs/fpga_host.cpp diff --git a/sycl/test/fpga_tests/buffer_location.cpp b/sycl/test/on-device/fpga_tests/buffer_location.cpp similarity index 100% rename from sycl/test/fpga_tests/buffer_location.cpp rename to sycl/test/on-device/fpga_tests/buffer_location.cpp diff --git a/sycl/test/fpga_tests/fpga_aocx.cpp b/sycl/test/on-device/fpga_tests/fpga_aocx.cpp similarity index 100% rename from sycl/test/fpga_tests/fpga_aocx.cpp rename to sycl/test/on-device/fpga_tests/fpga_aocx.cpp diff --git a/sycl/test/fpga_tests/fpga_aocx_win.cpp b/sycl/test/on-device/fpga_tests/fpga_aocx_win.cpp similarity index 100% rename from sycl/test/fpga_tests/fpga_aocx_win.cpp rename to sycl/test/on-device/fpga_tests/fpga_aocx_win.cpp diff --git a/sycl/test/fpga_tests/fpga_io_pipes.cpp b/sycl/test/on-device/fpga_tests/fpga_io_pipes.cpp similarity index 100% rename from sycl/test/fpga_tests/fpga_io_pipes.cpp rename to sycl/test/on-device/fpga_tests/fpga_io_pipes.cpp diff --git a/sycl/test/fpga_tests/fpga_lsu.cpp b/sycl/test/on-device/fpga_tests/fpga_lsu.cpp similarity index 100% rename from sycl/test/fpga_tests/fpga_lsu.cpp rename to sycl/test/on-device/fpga_tests/fpga_lsu.cpp diff --git a/sycl/test/fpga_tests/fpga_pipes.cpp b/sycl/test/on-device/fpga_tests/fpga_pipes.cpp similarity index 100% rename from sycl/test/fpga_tests/fpga_pipes.cpp rename to sycl/test/on-device/fpga_tests/fpga_pipes.cpp diff --git a/sycl/test/fpga_tests/fpga_pipes_legacy_ns.cpp b/sycl/test/on-device/fpga_tests/fpga_pipes_legacy_ns.cpp similarity index 100% rename from sycl/test/fpga_tests/fpga_pipes_legacy_ns.cpp rename to sycl/test/on-device/fpga_tests/fpga_pipes_legacy_ns.cpp diff --git a/sycl/test/fpga_tests/fpga_queue.cpp b/sycl/test/on-device/fpga_tests/fpga_queue.cpp similarity index 100% rename from sycl/test/fpga_tests/fpga_queue.cpp rename to sycl/test/on-device/fpga_tests/fpga_queue.cpp diff --git a/sycl/test/fpga_tests/global_fpga_device_selector.cpp b/sycl/test/on-device/fpga_tests/global_fpga_device_selector.cpp similarity index 100% rename from sycl/test/fpga_tests/global_fpga_device_selector.cpp rename to sycl/test/on-device/fpga_tests/global_fpga_device_selector.cpp diff --git a/sycl/test/fpga_tests/io_pipe_def.h b/sycl/test/on-device/fpga_tests/io_pipe_def.h similarity index 100% rename from sycl/test/fpga_tests/io_pipe_def.h rename to sycl/test/on-device/fpga_tests/io_pipe_def.h diff --git a/sycl/test/fpga_tests/pipes_info.cpp b/sycl/test/on-device/fpga_tests/pipes_info.cpp similarity index 100% rename from sycl/test/fpga_tests/pipes_info.cpp rename to sycl/test/on-device/fpga_tests/pipes_info.cpp diff --git a/sycl/test/group-algorithm/all_of.cpp b/sycl/test/on-device/group-algorithm/all_of.cpp similarity index 100% rename from sycl/test/group-algorithm/all_of.cpp rename to sycl/test/on-device/group-algorithm/all_of.cpp diff --git a/sycl/test/group-algorithm/any_of.cpp b/sycl/test/on-device/group-algorithm/any_of.cpp similarity index 100% rename from sycl/test/group-algorithm/any_of.cpp rename to sycl/test/on-device/group-algorithm/any_of.cpp diff --git a/sycl/test/group-algorithm/broadcast.cpp b/sycl/test/on-device/group-algorithm/broadcast.cpp similarity index 100% rename from sycl/test/group-algorithm/broadcast.cpp rename to sycl/test/on-device/group-algorithm/broadcast.cpp diff --git a/sycl/test/group-algorithm/exclusive_scan.cpp b/sycl/test/on-device/group-algorithm/exclusive_scan.cpp similarity index 100% rename from sycl/test/group-algorithm/exclusive_scan.cpp rename to sycl/test/on-device/group-algorithm/exclusive_scan.cpp diff --git a/sycl/test/group-algorithm/inclusive_scan.cpp b/sycl/test/on-device/group-algorithm/inclusive_scan.cpp similarity index 100% rename from sycl/test/group-algorithm/inclusive_scan.cpp rename to sycl/test/on-device/group-algorithm/inclusive_scan.cpp diff --git a/sycl/test/group-algorithm/leader.cpp b/sycl/test/on-device/group-algorithm/leader.cpp similarity index 100% rename from sycl/test/group-algorithm/leader.cpp rename to sycl/test/on-device/group-algorithm/leader.cpp diff --git a/sycl/test/group-algorithm/none_of.cpp b/sycl/test/on-device/group-algorithm/none_of.cpp similarity index 100% rename from sycl/test/group-algorithm/none_of.cpp rename to sycl/test/on-device/group-algorithm/none_of.cpp diff --git a/sycl/test/group-algorithm/reduce.cpp b/sycl/test/on-device/group-algorithm/reduce.cpp similarity index 100% rename from sycl/test/group-algorithm/reduce.cpp rename to sycl/test/on-device/group-algorithm/reduce.cpp diff --git a/sycl/test/group-algorithm/support.h b/sycl/test/on-device/group-algorithm/support.h similarity index 100% rename from sycl/test/group-algorithm/support.h rename to sycl/test/on-device/group-algorithm/support.h diff --git a/sycl/test/hier_par/Inputs/hier_par_wgscope_impl.hpp b/sycl/test/on-device/hier_par/Inputs/hier_par_wgscope_impl.hpp similarity index 100% rename from sycl/test/hier_par/Inputs/hier_par_wgscope_impl.hpp rename to sycl/test/on-device/hier_par/Inputs/hier_par_wgscope_impl.hpp diff --git a/sycl/test/hier_par/hier_par_basic.cpp b/sycl/test/on-device/hier_par/hier_par_basic.cpp similarity index 100% rename from sycl/test/hier_par/hier_par_basic.cpp rename to sycl/test/on-device/hier_par/hier_par_basic.cpp diff --git a/sycl/test/hier_par/hier_par_wgscope.cpp b/sycl/test/on-device/hier_par/hier_par_wgscope.cpp similarity index 100% rename from sycl/test/hier_par/hier_par_wgscope.cpp rename to sycl/test/on-device/hier_par/hier_par_wgscope.cpp diff --git a/sycl/test/hier_par/hier_par_wgscope_O0.cpp b/sycl/test/on-device/hier_par/hier_par_wgscope_O0.cpp similarity index 100% rename from sycl/test/hier_par/hier_par_wgscope_O0.cpp rename to sycl/test/on-device/hier_par/hier_par_wgscope_O0.cpp diff --git a/sycl/test/host-interop-task/host-task-dependency.cpp b/sycl/test/on-device/host-interop-task/host-task-dependency.cpp similarity index 100% rename from sycl/test/host-interop-task/host-task-dependency.cpp rename to sycl/test/on-device/host-interop-task/host-task-dependency.cpp diff --git a/sycl/test/host-interop-task/host-task-dependency2.cpp b/sycl/test/on-device/host-interop-task/host-task-dependency2.cpp similarity index 100% rename from sycl/test/host-interop-task/host-task-dependency2.cpp rename to sycl/test/on-device/host-interop-task/host-task-dependency2.cpp diff --git a/sycl/test/host-interop-task/host-task-dependency3.cpp b/sycl/test/on-device/host-interop-task/host-task-dependency3.cpp similarity index 100% rename from sycl/test/host-interop-task/host-task-dependency3.cpp rename to sycl/test/on-device/host-interop-task/host-task-dependency3.cpp diff --git a/sycl/test/host-interop-task/host-task-dependency4.cpp b/sycl/test/on-device/host-interop-task/host-task-dependency4.cpp similarity index 100% rename from sycl/test/host-interop-task/host-task-dependency4.cpp rename to sycl/test/on-device/host-interop-task/host-task-dependency4.cpp diff --git a/sycl/test/host-interop-task/host-task-failure.cpp b/sycl/test/on-device/host-interop-task/host-task-failure.cpp similarity index 100% rename from sycl/test/host-interop-task/host-task-failure.cpp rename to sycl/test/on-device/host-interop-task/host-task-failure.cpp diff --git a/sycl/test/host-interop-task/host-task-two-queues.cpp b/sycl/test/on-device/host-interop-task/host-task-two-queues.cpp similarity index 100% rename from sycl/test/host-interop-task/host-task-two-queues.cpp rename to sycl/test/on-device/host-interop-task/host-task-two-queues.cpp diff --git a/sycl/test/host-interop-task/host-task.cpp b/sycl/test/on-device/host-interop-task/host-task.cpp similarity index 100% rename from sycl/test/host-interop-task/host-task.cpp rename to sycl/test/on-device/host-interop-task/host-task.cpp diff --git a/sycl/test/host-interop-task/interop-task.cpp b/sycl/test/on-device/host-interop-task/interop-task.cpp similarity index 100% rename from sycl/test/host-interop-task/interop-task.cpp rename to sycl/test/on-device/host-interop-task/interop-task.cpp diff --git a/sycl/test/linear_id/linear-sub_group.cpp b/sycl/test/on-device/linear_id/linear-sub_group.cpp similarity index 100% rename from sycl/test/linear_id/linear-sub_group.cpp rename to sycl/test/on-device/linear_id/linear-sub_group.cpp diff --git a/sycl/test/linear_id/opencl-interop.cpp b/sycl/test/on-device/linear_id/opencl-interop.cpp similarity index 100% rename from sycl/test/linear_id/opencl-interop.cpp rename to sycl/test/on-device/linear_id/opencl-interop.cpp diff --git a/sycl/test/plugins/enqueue-arg-order-buffer.cpp b/sycl/test/on-device/plugins/enqueue-arg-order-buffer.cpp similarity index 100% rename from sycl/test/plugins/enqueue-arg-order-buffer.cpp rename to sycl/test/on-device/plugins/enqueue-arg-order-buffer.cpp diff --git a/sycl/test/plugins/enqueue-arg-order-image.cpp b/sycl/test/on-device/plugins/enqueue-arg-order-image.cpp similarity index 100% rename from sycl/test/plugins/enqueue-arg-order-image.cpp rename to sycl/test/on-device/plugins/enqueue-arg-order-image.cpp diff --git a/sycl/test/plugins/interop-opencl.cpp b/sycl/test/on-device/plugins/interop-opencl.cpp similarity index 100% rename from sycl/test/plugins/interop-opencl.cpp rename to sycl/test/on-device/plugins/interop-opencl.cpp diff --git a/sycl/test/plugins/sycl-ls-gpu-cuda.cpp b/sycl/test/on-device/plugins/sycl-ls-gpu-cuda.cpp similarity index 100% rename from sycl/test/plugins/sycl-ls-gpu-cuda.cpp rename to sycl/test/on-device/plugins/sycl-ls-gpu-cuda.cpp diff --git a/sycl/test/plugins/sycl-ls-gpu-default.cpp b/sycl/test/on-device/plugins/sycl-ls-gpu-default.cpp similarity index 100% rename from sycl/test/plugins/sycl-ls-gpu-default.cpp rename to sycl/test/on-device/plugins/sycl-ls-gpu-default.cpp diff --git a/sycl/test/plugins/sycl-ls-gpu-level-zero.cpp b/sycl/test/on-device/plugins/sycl-ls-gpu-level-zero.cpp similarity index 100% rename from sycl/test/plugins/sycl-ls-gpu-level-zero.cpp rename to sycl/test/on-device/plugins/sycl-ls-gpu-level-zero.cpp diff --git a/sycl/test/plugins/sycl-ls-gpu-opencl.cpp b/sycl/test/on-device/plugins/sycl-ls-gpu-opencl.cpp similarity index 100% rename from sycl/test/plugins/sycl-ls-gpu-opencl.cpp rename to sycl/test/on-device/plugins/sycl-ls-gpu-opencl.cpp diff --git a/sycl/test/plugins/sycl-ls-gpu-sycl-be.cpp b/sycl/test/on-device/plugins/sycl-ls-gpu-sycl-be.cpp similarity index 100% rename from sycl/test/plugins/sycl-ls-gpu-sycl-be.cpp rename to sycl/test/on-device/plugins/sycl-ls-gpu-sycl-be.cpp diff --git a/sycl/test/plugins/sycl-ls.cpp b/sycl/test/on-device/plugins/sycl-ls.cpp similarity index 100% rename from sycl/test/plugins/sycl-ls.cpp rename to sycl/test/on-device/plugins/sycl-ls.cpp diff --git a/sycl/test/plugins/sycl-targets-order.cpp b/sycl/test/on-device/plugins/sycl-targets-order.cpp similarity index 100% rename from sycl/test/plugins/sycl-targets-order.cpp rename to sycl/test/on-device/plugins/sycl-targets-order.cpp diff --git a/sycl/test/reduction/reduction_nd_conditional.cpp b/sycl/test/on-device/reduction/reduction_nd_conditional.cpp similarity index 100% rename from sycl/test/reduction/reduction_nd_conditional.cpp rename to sycl/test/on-device/reduction/reduction_nd_conditional.cpp diff --git a/sycl/test/reduction/reduction_nd_ext_double.cpp b/sycl/test/on-device/reduction/reduction_nd_ext_double.cpp similarity index 100% rename from sycl/test/reduction/reduction_nd_ext_double.cpp rename to sycl/test/on-device/reduction/reduction_nd_ext_double.cpp diff --git a/sycl/test/reduction/reduction_nd_ext_half.cpp b/sycl/test/on-device/reduction/reduction_nd_ext_half.cpp similarity index 100% rename from sycl/test/reduction/reduction_nd_ext_half.cpp rename to sycl/test/on-device/reduction/reduction_nd_ext_half.cpp diff --git a/sycl/test/reduction/reduction_nd_ext_type.hpp b/sycl/test/on-device/reduction/reduction_nd_ext_type.hpp similarity index 100% rename from sycl/test/reduction/reduction_nd_ext_type.hpp rename to sycl/test/on-device/reduction/reduction_nd_ext_type.hpp diff --git a/sycl/test/reduction/reduction_nd_lambda.cpp b/sycl/test/on-device/reduction/reduction_nd_lambda.cpp similarity index 100% rename from sycl/test/reduction/reduction_nd_lambda.cpp rename to sycl/test/on-device/reduction/reduction_nd_lambda.cpp diff --git a/sycl/test/reduction/reduction_nd_s0_dw.cpp b/sycl/test/on-device/reduction/reduction_nd_s0_dw.cpp similarity index 100% rename from sycl/test/reduction/reduction_nd_s0_dw.cpp rename to sycl/test/on-device/reduction/reduction_nd_s0_dw.cpp diff --git a/sycl/test/reduction/reduction_nd_s0_rw.cpp b/sycl/test/on-device/reduction/reduction_nd_s0_rw.cpp similarity index 100% rename from sycl/test/reduction/reduction_nd_s0_rw.cpp rename to sycl/test/on-device/reduction/reduction_nd_s0_rw.cpp diff --git a/sycl/test/reduction/reduction_nd_s1_dw.cpp b/sycl/test/on-device/reduction/reduction_nd_s1_dw.cpp similarity index 100% rename from sycl/test/reduction/reduction_nd_s1_dw.cpp rename to sycl/test/on-device/reduction/reduction_nd_s1_dw.cpp diff --git a/sycl/test/reduction/reduction_nd_s1_rw.cpp b/sycl/test/on-device/reduction/reduction_nd_s1_rw.cpp similarity index 100% rename from sycl/test/reduction/reduction_nd_s1_rw.cpp rename to sycl/test/on-device/reduction/reduction_nd_s1_rw.cpp diff --git a/sycl/test/reduction/reduction_placeholder.cpp b/sycl/test/on-device/reduction/reduction_placeholder.cpp similarity index 100% rename from sycl/test/reduction/reduction_placeholder.cpp rename to sycl/test/on-device/reduction/reduction_placeholder.cpp diff --git a/sycl/test/reduction/reduction_queue_parallel_for.cpp b/sycl/test/on-device/reduction/reduction_queue_parallel_for.cpp similarity index 100% rename from sycl/test/reduction/reduction_queue_parallel_for.cpp rename to sycl/test/on-device/reduction/reduction_queue_parallel_for.cpp diff --git a/sycl/test/reduction/reduction_transparent.cpp b/sycl/test/on-device/reduction/reduction_transparent.cpp similarity index 100% rename from sycl/test/reduction/reduction_transparent.cpp rename to sycl/test/on-device/reduction/reduction_transparent.cpp diff --git a/sycl/test/reduction/reduction_usm.cpp b/sycl/test/on-device/reduction/reduction_usm.cpp similarity index 100% rename from sycl/test/reduction/reduction_usm.cpp rename to sycl/test/on-device/reduction/reduction_usm.cpp diff --git a/sycl/test/reduction/reduction_utils.hpp b/sycl/test/on-device/reduction/reduction_utils.hpp similarity index 100% rename from sycl/test/reduction/reduction_utils.hpp rename to sycl/test/on-device/reduction/reduction_utils.hpp diff --git a/sycl/test/regression/usm_malloc_shared.cpp b/sycl/test/on-device/regression/usm_malloc_shared.cpp similarity index 100% rename from sycl/test/regression/usm_malloc_shared.cpp rename to sycl/test/on-device/regression/usm_malloc_shared.cpp diff --git a/sycl/test/spec_const/spec_const_hw.cpp b/sycl/test/on-device/spec_const/spec_const_hw.cpp similarity index 100% rename from sycl/test/spec_const/spec_const_hw.cpp rename to sycl/test/on-device/spec_const/spec_const_hw.cpp diff --git a/sycl/test/spec_const/spec_const_hw_accelerator.cpp b/sycl/test/on-device/spec_const/spec_const_hw_accelerator.cpp similarity index 100% rename from sycl/test/spec_const/spec_const_hw_accelerator.cpp rename to sycl/test/on-device/spec_const/spec_const_hw_accelerator.cpp diff --git a/sycl/test/spec_const/spec_const_neg.cpp b/sycl/test/on-device/spec_const/spec_const_neg.cpp similarity index 100% rename from sycl/test/spec_const/spec_const_neg.cpp rename to sycl/test/on-device/spec_const/spec_const_neg.cpp diff --git a/sycl/test/spec_const/spec_const_redefine.cpp b/sycl/test/on-device/spec_const/spec_const_redefine.cpp similarity index 100% rename from sycl/test/spec_const/spec_const_redefine.cpp rename to sycl/test/on-device/spec_const/spec_const_redefine.cpp diff --git a/sycl/test/spec_const/spec_const_redefine_accelerator.cpp b/sycl/test/on-device/spec_const/spec_const_redefine_accelerator.cpp similarity index 100% rename from sycl/test/spec_const/spec_const_redefine_accelerator.cpp rename to sycl/test/on-device/spec_const/spec_const_redefine_accelerator.cpp diff --git a/sycl/test/sub_group/attributes.cpp b/sycl/test/on-device/sub_group/attributes.cpp similarity index 100% rename from sycl/test/sub_group/attributes.cpp rename to sycl/test/on-device/sub_group/attributes.cpp diff --git a/sycl/test/sub_group/barrier.cpp b/sycl/test/on-device/sub_group/barrier.cpp similarity index 100% rename from sycl/test/sub_group/barrier.cpp rename to sycl/test/on-device/sub_group/barrier.cpp diff --git a/sycl/test/sub_group/broadcast.cpp b/sycl/test/on-device/sub_group/broadcast.cpp similarity index 100% rename from sycl/test/sub_group/broadcast.cpp rename to sycl/test/on-device/sub_group/broadcast.cpp diff --git a/sycl/test/sub_group/broadcast.hpp b/sycl/test/on-device/sub_group/broadcast.hpp similarity index 100% rename from sycl/test/sub_group/broadcast.hpp rename to sycl/test/on-device/sub_group/broadcast.hpp diff --git a/sycl/test/sub_group/broadcast_fp16.cpp b/sycl/test/on-device/sub_group/broadcast_fp16.cpp similarity index 100% rename from sycl/test/sub_group/broadcast_fp16.cpp rename to sycl/test/on-device/sub_group/broadcast_fp16.cpp diff --git a/sycl/test/sub_group/broadcast_fp64.cpp b/sycl/test/on-device/sub_group/broadcast_fp64.cpp similarity index 100% rename from sycl/test/sub_group/broadcast_fp64.cpp rename to sycl/test/on-device/sub_group/broadcast_fp64.cpp diff --git a/sycl/test/sub_group/common.cpp b/sycl/test/on-device/sub_group/common.cpp similarity index 100% rename from sycl/test/sub_group/common.cpp rename to sycl/test/on-device/sub_group/common.cpp diff --git a/sycl/test/sub_group/generic-shuffle.cpp b/sycl/test/on-device/sub_group/generic-shuffle.cpp similarity index 100% rename from sycl/test/sub_group/generic-shuffle.cpp rename to sycl/test/on-device/sub_group/generic-shuffle.cpp diff --git a/sycl/test/sub_group/generic_reduce.cpp b/sycl/test/on-device/sub_group/generic_reduce.cpp similarity index 100% rename from sycl/test/sub_group/generic_reduce.cpp rename to sycl/test/on-device/sub_group/generic_reduce.cpp diff --git a/sycl/test/sub_group/helper.hpp b/sycl/test/on-device/sub_group/helper.hpp similarity index 100% rename from sycl/test/sub_group/helper.hpp rename to sycl/test/on-device/sub_group/helper.hpp diff --git a/sycl/test/sub_group/info.cpp b/sycl/test/on-device/sub_group/info.cpp similarity index 100% rename from sycl/test/sub_group/info.cpp rename to sycl/test/on-device/sub_group/info.cpp diff --git a/sycl/test/sub_group/load_store.cpp b/sycl/test/on-device/sub_group/load_store.cpp similarity index 100% rename from sycl/test/sub_group/load_store.cpp rename to sycl/test/on-device/sub_group/load_store.cpp diff --git a/sycl/test/sub_group/reduce.cpp b/sycl/test/on-device/sub_group/reduce.cpp similarity index 100% rename from sycl/test/sub_group/reduce.cpp rename to sycl/test/on-device/sub_group/reduce.cpp diff --git a/sycl/test/sub_group/reduce.hpp b/sycl/test/on-device/sub_group/reduce.hpp similarity index 100% rename from sycl/test/sub_group/reduce.hpp rename to sycl/test/on-device/sub_group/reduce.hpp diff --git a/sycl/test/sub_group/reduce_fp16.cpp b/sycl/test/on-device/sub_group/reduce_fp16.cpp similarity index 100% rename from sycl/test/sub_group/reduce_fp16.cpp rename to sycl/test/on-device/sub_group/reduce_fp16.cpp diff --git a/sycl/test/sub_group/reduce_fp64.cpp b/sycl/test/on-device/sub_group/reduce_fp64.cpp similarity index 100% rename from sycl/test/sub_group/reduce_fp64.cpp rename to sycl/test/on-device/sub_group/reduce_fp64.cpp diff --git a/sycl/test/sub_group/scan.cpp b/sycl/test/on-device/sub_group/scan.cpp similarity index 100% rename from sycl/test/sub_group/scan.cpp rename to sycl/test/on-device/sub_group/scan.cpp diff --git a/sycl/test/sub_group/scan.hpp b/sycl/test/on-device/sub_group/scan.hpp similarity index 100% rename from sycl/test/sub_group/scan.hpp rename to sycl/test/on-device/sub_group/scan.hpp diff --git a/sycl/test/sub_group/scan_fp16.cpp b/sycl/test/on-device/sub_group/scan_fp16.cpp similarity index 100% rename from sycl/test/sub_group/scan_fp16.cpp rename to sycl/test/on-device/sub_group/scan_fp16.cpp diff --git a/sycl/test/sub_group/scan_fp64.cpp b/sycl/test/on-device/sub_group/scan_fp64.cpp similarity index 100% rename from sycl/test/sub_group/scan_fp64.cpp rename to sycl/test/on-device/sub_group/scan_fp64.cpp diff --git a/sycl/test/sub_group/sg.cl b/sycl/test/on-device/sub_group/sg.cl similarity index 100% rename from sycl/test/sub_group/sg.cl rename to sycl/test/on-device/sub_group/sg.cl diff --git a/sycl/test/sub_group/shuffle.cpp b/sycl/test/on-device/sub_group/shuffle.cpp similarity index 100% rename from sycl/test/sub_group/shuffle.cpp rename to sycl/test/on-device/sub_group/shuffle.cpp diff --git a/sycl/test/sub_group/shuffle.hpp b/sycl/test/on-device/sub_group/shuffle.hpp similarity index 100% rename from sycl/test/sub_group/shuffle.hpp rename to sycl/test/on-device/sub_group/shuffle.hpp diff --git a/sycl/test/sub_group/shuffle_fp16.cpp b/sycl/test/on-device/sub_group/shuffle_fp16.cpp similarity index 100% rename from sycl/test/sub_group/shuffle_fp16.cpp rename to sycl/test/on-device/sub_group/shuffle_fp16.cpp diff --git a/sycl/test/sub_group/shuffle_fp64.cpp b/sycl/test/on-device/sub_group/shuffle_fp64.cpp similarity index 100% rename from sycl/test/sub_group/shuffle_fp64.cpp rename to sycl/test/on-device/sub_group/shuffle_fp64.cpp diff --git a/sycl/test/sub_group/vote.cpp b/sycl/test/on-device/sub_group/vote.cpp similarity index 100% rename from sycl/test/sub_group/vote.cpp rename to sycl/test/on-device/sub_group/vote.cpp diff --git a/sycl/test/usm/allocator_equal.cpp b/sycl/test/on-device/usm/allocator_equal.cpp similarity index 100% rename from sycl/test/usm/allocator_equal.cpp rename to sycl/test/on-device/usm/allocator_equal.cpp diff --git a/sycl/test/usm/allocator_shared.cpp b/sycl/test/on-device/usm/allocator_shared.cpp similarity index 100% rename from sycl/test/usm/allocator_shared.cpp rename to sycl/test/on-device/usm/allocator_shared.cpp diff --git a/sycl/test/usm/allocator_vector.cpp b/sycl/test/on-device/usm/allocator_vector.cpp similarity index 100% rename from sycl/test/usm/allocator_vector.cpp rename to sycl/test/on-device/usm/allocator_vector.cpp diff --git a/sycl/test/usm/badmalloc.cpp b/sycl/test/on-device/usm/badmalloc.cpp similarity index 100% rename from sycl/test/usm/badmalloc.cpp rename to sycl/test/on-device/usm/badmalloc.cpp diff --git a/sycl/test/usm/depends_on.cpp b/sycl/test/on-device/usm/depends_on.cpp similarity index 100% rename from sycl/test/usm/depends_on.cpp rename to sycl/test/on-device/usm/depends_on.cpp diff --git a/sycl/test/usm/dmem_varied.cpp b/sycl/test/on-device/usm/dmem_varied.cpp similarity index 100% rename from sycl/test/usm/dmem_varied.cpp rename to sycl/test/on-device/usm/dmem_varied.cpp diff --git a/sycl/test/usm/dmemll.cpp b/sycl/test/on-device/usm/dmemll.cpp similarity index 100% rename from sycl/test/usm/dmemll.cpp rename to sycl/test/on-device/usm/dmemll.cpp diff --git a/sycl/test/usm/dmemllaligned.cpp b/sycl/test/on-device/usm/dmemllaligned.cpp similarity index 100% rename from sycl/test/usm/dmemllaligned.cpp rename to sycl/test/on-device/usm/dmemllaligned.cpp diff --git a/sycl/test/usm/fill.cpp b/sycl/test/on-device/usm/fill.cpp similarity index 100% rename from sycl/test/usm/fill.cpp rename to sycl/test/on-device/usm/fill.cpp diff --git a/sycl/test/usm/findplatforms.hpp b/sycl/test/on-device/usm/findplatforms.hpp similarity index 100% rename from sycl/test/usm/findplatforms.hpp rename to sycl/test/on-device/usm/findplatforms.hpp diff --git a/sycl/test/usm/hmemll.cpp b/sycl/test/on-device/usm/hmemll.cpp similarity index 100% rename from sycl/test/usm/hmemll.cpp rename to sycl/test/on-device/usm/hmemll.cpp diff --git a/sycl/test/usm/hmemllaligned.cpp b/sycl/test/on-device/usm/hmemllaligned.cpp similarity index 100% rename from sycl/test/usm/hmemllaligned.cpp rename to sycl/test/on-device/usm/hmemllaligned.cpp diff --git a/sycl/test/usm/math.cpp b/sycl/test/on-device/usm/math.cpp similarity index 100% rename from sycl/test/usm/math.cpp rename to sycl/test/on-device/usm/math.cpp diff --git a/sycl/test/usm/memadvise.cpp b/sycl/test/on-device/usm/memadvise.cpp similarity index 100% rename from sycl/test/usm/memadvise.cpp rename to sycl/test/on-device/usm/memadvise.cpp diff --git a/sycl/test/usm/memcpy.cpp b/sycl/test/on-device/usm/memcpy.cpp similarity index 100% rename from sycl/test/usm/memcpy.cpp rename to sycl/test/on-device/usm/memcpy.cpp diff --git a/sycl/test/usm/memset.cpp b/sycl/test/on-device/usm/memset.cpp similarity index 100% rename from sycl/test/usm/memset.cpp rename to sycl/test/on-device/usm/memset.cpp diff --git a/sycl/test/usm/mixed.cpp b/sycl/test/on-device/usm/mixed.cpp similarity index 100% rename from sycl/test/usm/mixed.cpp rename to sycl/test/on-device/usm/mixed.cpp diff --git a/sycl/test/usm/mixed2.cpp b/sycl/test/on-device/usm/mixed2.cpp similarity index 100% rename from sycl/test/usm/mixed2.cpp rename to sycl/test/on-device/usm/mixed2.cpp diff --git a/sycl/test/usm/mixed2template.cpp b/sycl/test/on-device/usm/mixed2template.cpp similarity index 100% rename from sycl/test/usm/mixed2template.cpp rename to sycl/test/on-device/usm/mixed2template.cpp diff --git a/sycl/test/usm/mixed_queue.cpp b/sycl/test/on-device/usm/mixed_queue.cpp similarity index 100% rename from sycl/test/usm/mixed_queue.cpp rename to sycl/test/on-device/usm/mixed_queue.cpp diff --git a/sycl/test/usm/multictxt.cpp b/sycl/test/on-device/usm/multictxt.cpp similarity index 100% rename from sycl/test/usm/multictxt.cpp rename to sycl/test/on-device/usm/multictxt.cpp diff --git a/sycl/test/usm/pfor_flatten.cpp b/sycl/test/on-device/usm/pfor_flatten.cpp similarity index 100% rename from sycl/test/usm/pfor_flatten.cpp rename to sycl/test/on-device/usm/pfor_flatten.cpp diff --git a/sycl/test/usm/pfor_flatten_range_shortcut.cpp b/sycl/test/on-device/usm/pfor_flatten_range_shortcut.cpp similarity index 100% rename from sycl/test/usm/pfor_flatten_range_shortcut.cpp rename to sycl/test/on-device/usm/pfor_flatten_range_shortcut.cpp diff --git a/sycl/test/usm/pointer_query.cpp b/sycl/test/on-device/usm/pointer_query.cpp similarity index 100% rename from sycl/test/usm/pointer_query.cpp rename to sycl/test/on-device/usm/pointer_query.cpp diff --git a/sycl/test/usm/prefetch.cpp b/sycl/test/on-device/usm/prefetch.cpp similarity index 100% rename from sycl/test/usm/prefetch.cpp rename to sycl/test/on-device/usm/prefetch.cpp diff --git a/sycl/test/usm/queue_wait.cpp b/sycl/test/on-device/usm/queue_wait.cpp similarity index 100% rename from sycl/test/usm/queue_wait.cpp rename to sycl/test/on-device/usm/queue_wait.cpp diff --git a/sycl/test/usm/smem_concurrent.cpp b/sycl/test/on-device/usm/smem_concurrent.cpp similarity index 100% rename from sycl/test/usm/smem_concurrent.cpp rename to sycl/test/on-device/usm/smem_concurrent.cpp diff --git a/sycl/test/usm/smem_varied.cpp b/sycl/test/on-device/usm/smem_varied.cpp similarity index 100% rename from sycl/test/usm/smem_varied.cpp rename to sycl/test/on-device/usm/smem_varied.cpp diff --git a/sycl/test/usm/smemll.cpp b/sycl/test/on-device/usm/smemll.cpp similarity index 100% rename from sycl/test/usm/smemll.cpp rename to sycl/test/on-device/usm/smemll.cpp diff --git a/sycl/test/usm/smemllaligned.cpp b/sycl/test/on-device/usm/smemllaligned.cpp similarity index 100% rename from sycl/test/usm/smemllaligned.cpp rename to sycl/test/on-device/usm/smemllaligned.cpp diff --git a/sycl/test/usm/source_kernel_indirect_access.cpp b/sycl/test/on-device/usm/source_kernel_indirect_access.cpp similarity index 100% rename from sycl/test/usm/source_kernel_indirect_access.cpp rename to sycl/test/on-device/usm/source_kernel_indirect_access.cpp