intel
diff --git a/‎sycl/test/accessors.o
-147 Bytes b/‎sycl/test/accessors.o
-147 Bytes
diff --git a/‎sycl/test/fpga_tests/fpga_device_link_diag.cpp renamed to ‎sycl/test/basic_tests/fpga_device_link_diag.cpp b/‎sycl/test/fpga_tests/fpga_device_link_diag.cpp renamed to ‎sycl/test/basic_tests/fpga_device_link_diag.cpp
diff --git a/‎sycl/test/linear_id/linear-host-dev.cpp renamed to ‎sycl/test/basic_tests/linear-host-dev.cpp b/‎sycl/test/linear_id/linear-host-dev.cpp renamed to ‎sycl/test/basic_tests/linear-host-dev.cpp
diff --git a/‎sycl/test/reduction/reduction_ctor.cpp renamed to ‎sycl/test/basic_tests/reduction_ctor.cpp
Lines changed: 1 addition & 1 deletion b/‎sycl/test/reduction/reduction_ctor.cpp renamed to ‎sycl/test/basic_tests/reduction_ctor.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎sycl/test/spec_const/spec_const_types.cpp renamed to ‎sycl/test/basic_tests/spec_const_types.cpp b/‎sycl/test/spec_const/spec_const_types.cpp renamed to ‎sycl/test/basic_tests/spec_const_types.cpp
diff --git a/‎sycl/test/aot/Inputs/aot.cpp renamed to ‎sycl/test/on-device/aot/Inputs/aot.cpp b/‎sycl/test/aot/Inputs/aot.cpp renamed to ‎sycl/test/on-device/aot/Inputs/aot.cpp
diff --git a/‎sycl/test/aot/accelerator.cpp renamed to ‎sycl/test/on-device/aot/accelerator.cpp b/‎sycl/test/aot/accelerator.cpp renamed to ‎sycl/test/on-device/aot/accelerator.cpp
diff --git a/‎sycl/test/aot/cpu.cpp renamed to ‎sycl/test/on-device/aot/cpu.cpp b/‎sycl/test/aot/cpu.cpp renamed to ‎sycl/test/on-device/aot/cpu.cpp
diff --git a/‎sycl/test/aot/gpu.cpp renamed to ‎sycl/test/on-device/aot/gpu.cpp b/‎sycl/test/aot/gpu.cpp renamed to ‎sycl/test/on-device/aot/gpu.cpp
diff --git a/‎sycl/test/aot/multiple-devices.cpp renamed to ‎sycl/test/on-device/aot/multiple-devices.cpp b/‎sycl/test/aot/multiple-devices.cpp renamed to ‎sycl/test/on-device/aot/multiple-devices.cpp
diff --git a/‎sycl/test/aot/spec_const_aot.cpp renamed to ‎sycl/test/on-device/aot/spec_const_aot.cpp b/‎sycl/test/aot/spec_const_aot.cpp renamed to ‎sycl/test/on-device/aot/spec_const_aot.cpp
diff --git a/‎sycl/test/aot/with-llvm-bc.cpp renamed to ‎sycl/test/on-device/aot/with-llvm-bc.cpp b/‎sycl/test/aot/with-llvm-bc.cpp renamed to ‎sycl/test/on-device/aot/with-llvm-bc.cpp
diff --git a/‎sycl/test/basic_tests/access_to_subset.cpp renamed to ‎sycl/test/on-device/basic_tests/access_to_subset.cpp b/‎sycl/test/basic_tests/access_to_subset.cpp renamed to ‎sycl/test/on-device/basic_tests/access_to_subset.cpp
diff --git a/‎sycl/test/basic_tests/accessor/Inputs/device_accessor.cpp renamed to ‎sycl/test/on-device/basic_tests/accessor/Inputs/device_accessor.cpp b/‎sycl/test/basic_tests/accessor/Inputs/device_accessor.cpp renamed to ‎sycl/test/on-device/basic_tests/accessor/Inputs/device_accessor.cpp
diff --git a/‎sycl/test/basic_tests/accessor/Inputs/host_accessor.cpp renamed to ‎sycl/test/on-device/basic_tests/accessor/Inputs/host_accessor.cpp b/‎sycl/test/basic_tests/accessor/Inputs/host_accessor.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/accessor/Inputs/host_task_accessor.cpp b/‎sycl/test/basic_tests/accessor/Inputs/host_task_accessor.cpp renamed to ‎sycl/test/on-device/basic_tests/accessor/Inputs/host_task_accessor.cpp
diff --git a/‎sycl/test/basic_tests/accessor/accessor.cpp renamed to ‎sycl/test/on-device/basic_tests/accessor/accessor.cpp b/‎sycl/test/basic_tests/accessor/accessor.cpp renamed to ‎sycl/test/on-device/basic_tests/accessor/accessor.cpp
diff --git a/‎sycl/test/basic_tests/accessor/device_accessor_deduction.cpp renamed to ‎sycl/test/on-device/basic_tests/accessor/device_accessor_deduction.cpp b/‎sycl/test/basic_tests/accessor/device_accessor_deduction.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/accessor/get_device_access_deduction.cpp b/‎sycl/test/basic_tests/accessor/get_device_access_deduction.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/accessor/get_host_access_deduction.cpp b/‎sycl/test/basic_tests/accessor/get_host_access_deduction.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/accessor/get_host_task_access_deduction.cpp b/‎sycl/test/basic_tests/accessor/get_host_task_access_deduction.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/accessor/host_accessor_deduction.cpp b/‎sycl/test/basic_tests/accessor/host_accessor_deduction.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/accessor/host_task_accessor_deduction.cpp b/‎sycl/test/basic_tests/accessor/host_task_accessor_deduction.cpp renamed to ‎sycl/test/on-device/basic_tests/accessor/host_task_accessor_deduction.cpp
diff --git a/‎sycl/test/basic_tests/boolean.cpp renamed to ‎sycl/test/on-device/basic_tests/boolean.cpp b/‎sycl/test/basic_tests/boolean.cpp renamed to ‎sycl/test/on-device/basic_tests/boolean.cpp
diff --git a/‎sycl/test/basic_tests/buffer/buffer.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/buffer.cpp b/‎sycl/test/basic_tests/buffer/buffer.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/buffer.cpp
diff --git a/‎sycl/test/basic_tests/buffer/buffer_container.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/buffer_container.cpp b/‎sycl/test/basic_tests/buffer/buffer_container.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/buffer_container.cpp
diff --git a/‎sycl/test/basic_tests/buffer/buffer_dev_to_dev.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/buffer_dev_to_dev.cpp b/‎sycl/test/basic_tests/buffer/buffer_dev_to_dev.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/buffer/buffer_full_copy.cpp b/‎sycl/test/basic_tests/buffer/buffer_full_copy.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/buffer_full_copy.cpp
diff --git a/‎sycl/test/basic_tests/buffer/buffer_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/buffer_interop.cpp b/‎sycl/test/basic_tests/buffer/buffer_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/buffer_interop.cpp
diff --git a/‎sycl/test/basic_tests/buffer/native_buffer_creation_flags.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/native_buffer_creation_flags.cpp b/‎sycl/test/basic_tests/buffer/native_buffer_creation_flags.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/native_buffer_creation_flags.cpp
diff --git a/‎sycl/test/basic_tests/buffer/reinterpret.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/reinterpret.cpp b/‎sycl/test/basic_tests/buffer/reinterpret.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/reinterpret.cpp
diff --git a/‎sycl/test/basic_tests/buffer/subbuffer.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/subbuffer.cpp b/‎sycl/test/basic_tests/buffer/subbuffer.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/subbuffer.cpp
diff --git a/‎sycl/test/basic_tests/buffer/subbuffer_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/subbuffer_interop.cpp b/‎sycl/test/basic_tests/buffer/subbuffer_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/buffer/subbuffer_interop.cpp
diff --git a/‎sycl/test/basic_tests/compare_exchange_strong.cpp renamed to ‎sycl/test/on-device/basic_tests/compare_exchange_strong.cpp b/‎sycl/test/basic_tests/compare_exchange_strong.cpp renamed to ‎sycl/test/on-device/basic_tests/compare_exchange_strong.cpp
diff --git a/‎sycl/test/basic_tests/context_platforms.cpp renamed to ‎sycl/test/on-device/basic_tests/context_platforms.cpp b/‎sycl/test/basic_tests/context_platforms.cpp renamed to ‎sycl/test/on-device/basic_tests/context_platforms.cpp
diff --git a/‎sycl/test/basic_tests/device_equality.cpp renamed to ‎sycl/test/on-device/basic_tests/device_equality.cpp b/‎sycl/test/basic_tests/device_equality.cpp renamed to ‎sycl/test/on-device/basic_tests/device_equality.cpp
diff --git a/‎sycl/test/basic_tests/device_event.cpp renamed to ‎sycl/test/on-device/basic_tests/device_event.cpp b/‎sycl/test/basic_tests/device_event.cpp renamed to ‎sycl/test/on-device/basic_tests/device_event.cpp
diff --git a/‎sycl/test/basic_tests/diagnostics/device-check.cpp renamed to ‎sycl/test/on-device/basic_tests/diagnostics/device-check.cpp b/‎sycl/test/basic_tests/diagnostics/device-check.cpp renamed to ‎sycl/test/on-device/basic_tests/diagnostics/device-check.cpp
diff --git a/‎sycl/test/basic_tests/diagnostics/handler.cpp renamed to ‎sycl/test/on-device/basic_tests/diagnostics/handler.cpp b/‎sycl/test/basic_tests/diagnostics/handler.cpp renamed to ‎sycl/test/on-device/basic_tests/diagnostics/handler.cpp
diff --git a/‎sycl/test/basic_tests/diagnostics/non-uniform-wk-gp-test.cpp renamed to ‎sycl/test/on-device/basic_tests/diagnostics/non-uniform-wk-gp-test.cpp b/‎sycl/test/basic_tests/diagnostics/non-uniform-wk-gp-test.cpp renamed to ‎sycl/test/on-device/basic_tests/diagnostics/non-uniform-wk-gp-test.cpp
diff --git a/‎sycl/test/basic_tests/event.cpp renamed to ‎sycl/test/on-device/basic_tests/event.cpp b/‎sycl/test/basic_tests/event.cpp renamed to ‎sycl/test/on-device/basic_tests/event.cpp
diff --git a/‎sycl/test/basic_tests/event_creation.cpp renamed to ‎sycl/test/on-device/basic_tests/event_creation.cpp b/‎sycl/test/basic_tests/event_creation.cpp renamed to ‎sycl/test/on-device/basic_tests/event_creation.cpp
diff --git a/‎sycl/test/basic_tests/event_profiling_info.cpp renamed to ‎sycl/test/on-device/basic_tests/event_profiling_info.cpp b/‎sycl/test/basic_tests/event_profiling_info.cpp renamed to ‎sycl/test/on-device/basic_tests/event_profiling_info.cpp
diff --git a/‎sycl/test/basic_tests/event_release.cpp renamed to ‎sycl/test/on-device/basic_tests/event_release.cpp b/‎sycl/test/basic_tests/event_release.cpp renamed to ‎sycl/test/on-device/basic_tests/event_release.cpp
diff --git a/‎sycl/test/basic_tests/free_function_queries/free_function_queries.cpp renamed to ‎sycl/test/on-device/basic_tests/free_function_queries/free_function_queries.cpp b/‎sycl/test/basic_tests/free_function_queries/free_function_queries.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/free_function_queries/free_function_queries_sub_group.cpp b/‎sycl/test/basic_tests/free_function_queries/free_function_queries_sub_group.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/get_backend.cpp b/‎sycl/test/basic_tests/get_backend.cpp renamed to ‎sycl/test/on-device/basic_tests/get_backend.cpp
diff --git a/‎sycl/test/basic_tests/get_nonhost_devices.cpp renamed to ‎sycl/test/on-device/basic_tests/get_nonhost_devices.cpp b/‎sycl/test/basic_tests/get_nonhost_devices.cpp renamed to ‎sycl/test/on-device/basic_tests/get_nonhost_devices.cpp
diff --git a/‎sycl/test/basic_tests/group_async_copy.cpp renamed to ‎sycl/test/on-device/basic_tests/group_async_copy.cpp b/‎sycl/test/basic_tests/group_async_copy.cpp renamed to ‎sycl/test/on-device/basic_tests/group_async_copy.cpp
diff --git a/‎sycl/test/basic_tests/half_type.cpp renamed to ‎sycl/test/on-device/basic_tests/half_type.cpp b/‎sycl/test/basic_tests/half_type.cpp renamed to ‎sycl/test/on-device/basic_tests/half_type.cpp
diff --git a/‎sycl/test/basic_tests/handler/handler_copy_with_offset.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/handler_copy_with_offset.cpp b/‎sycl/test/basic_tests/handler/handler_copy_with_offset.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/handler/handler_generic_integral_lambda.cpp b/‎sycl/test/basic_tests/handler/handler_generic_integral_lambda.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/handler/handler_mem_op.cpp b/‎sycl/test/basic_tests/handler/handler_mem_op.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/handler_mem_op.cpp
diff --git a/‎sycl/test/basic_tests/handler/handler_set_args.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/handler_set_args.cpp b/‎sycl/test/basic_tests/handler/handler_set_args.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/handler_set_args.cpp
diff --git a/‎sycl/test/basic_tests/handler/interop_task.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/interop_task.cpp
Lines changed: 1 addition & 1 deletion b/‎sycl/test/basic_tests/handler/interop_task.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/interop_task.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎sycl/test/basic_tests/handler/run_on_host_intel.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/run_on_host_intel.cpp
Lines changed: 1 addition & 1 deletion b/‎sycl/test/basic_tests/handler/run_on_host_intel.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/run_on_host_intel.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎sycl/test/basic_tests/handler/run_on_host_intel2.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/run_on_host_intel2.cpp b/‎sycl/test/basic_tests/handler/run_on_host_intel2.cpp renamed to ‎sycl/test/on-device/basic_tests/handler/run_on_host_intel2.cpp
diff --git a/‎sycl/test/basic_tests/host_always_works.cpp renamed to ‎sycl/test/on-device/basic_tests/host_always_works.cpp b/‎sycl/test/basic_tests/host_always_works.cpp renamed to ‎sycl/test/on-device/basic_tests/host_always_works.cpp
diff --git a/‎sycl/test/basic_tests/host_platform_avail.cpp renamed to ‎sycl/test/on-device/basic_tests/host_platform_avail.cpp b/‎sycl/test/basic_tests/host_platform_avail.cpp renamed to ‎sycl/test/on-device/basic_tests/host_platform_avail.cpp
diff --git a/‎sycl/test/basic_tests/image.cpp renamed to ‎sycl/test/on-device/basic_tests/image.cpp
Lines changed: 1 addition & 1 deletion b/‎sycl/test/basic_tests/image.cpp renamed to ‎sycl/test/on-device/basic_tests/image.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎sycl/test/basic_tests/image/image_read.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_read.cpp b/‎sycl/test/basic_tests/image/image_read.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_read.cpp
diff --git a/‎sycl/test/basic_tests/image/image_read.h renamed to ‎sycl/test/on-device/basic_tests/image/image_read.h b/‎sycl/test/basic_tests/image/image_read.h renamed to ‎sycl/test/on-device/basic_tests/image/image_read.h
diff --git a/‎sycl/test/basic_tests/image/image_read_fp16.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_read_fp16.cpp b/‎sycl/test/basic_tests/image/image_read_fp16.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_read_fp16.cpp
diff --git a/‎sycl/test/basic_tests/image/image_sample.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_sample.cpp b/‎sycl/test/basic_tests/image/image_sample.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_sample.cpp
diff --git a/‎sycl/test/basic_tests/image/image_write.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_write.cpp b/‎sycl/test/basic_tests/image/image_write.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_write.cpp
diff --git a/‎sycl/test/basic_tests/image/image_write.h renamed to ‎sycl/test/on-device/basic_tests/image/image_write.h b/‎sycl/test/basic_tests/image/image_write.h renamed to ‎sycl/test/on-device/basic_tests/image/image_write.h
diff --git a/‎sycl/test/basic_tests/image/image_write_fp16.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_write_fp16.cpp b/‎sycl/test/basic_tests/image/image_write_fp16.cpp renamed to ‎sycl/test/on-device/basic_tests/image/image_write_fp16.cpp
diff --git a/‎sycl/test/basic_tests/image_accessor_readsampler.cpp renamed to ‎sycl/test/on-device/basic_tests/image_accessor_readsampler.cpp b/‎sycl/test/basic_tests/image_accessor_readsampler.cpp renamed to ‎sycl/test/on-device/basic_tests/image_accessor_readsampler.cpp
diff --git a/‎sycl/test/basic_tests/image_accessor_readwrite.cpp renamed to ‎sycl/test/on-device/basic_tests/image_accessor_readwrite.cpp b/‎sycl/test/basic_tests/image_accessor_readwrite.cpp renamed to ‎sycl/test/on-device/basic_tests/image_accessor_readwrite.cpp
diff --git a/‎sycl/test/basic_tests/image_accessor_readwrite_half.cpp renamed to ‎sycl/test/on-device/basic_tests/image_accessor_readwrite_half.cpp b/‎sycl/test/basic_tests/image_accessor_readwrite_half.cpp renamed to ‎sycl/test/on-device/basic_tests/image_accessor_readwrite_half.cpp
diff --git a/‎sycl/test/basic_tests/image_array.cpp renamed to ‎sycl/test/on-device/basic_tests/image_array.cpp
Lines changed: 1 addition & 1 deletion b/‎sycl/test/basic_tests/image_array.cpp renamed to ‎sycl/test/on-device/basic_tests/image_array.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎sycl/test/basic_tests/image_constructors.cpp renamed to ‎sycl/test/on-device/basic_tests/image_constructors.cpp b/‎sycl/test/basic_tests/image_constructors.cpp renamed to ‎sycl/test/on-device/basic_tests/image_constructors.cpp
diff --git a/‎sycl/test/basic_tests/info.cpp renamed to ‎sycl/test/on-device/basic_tests/info.cpp b/‎sycl/test/basic_tests/info.cpp renamed to ‎sycl/test/on-device/basic_tests/info.cpp
diff --git a/‎sycl/test/basic_tests/info_ocl_version.cpp renamed to ‎sycl/test/on-device/basic_tests/info_ocl_version.cpp b/‎sycl/test/basic_tests/info_ocl_version.cpp renamed to ‎sycl/test/on-device/basic_tests/info_ocl_version.cpp
diff --git a/‎sycl/test/basic_tests/kernel_info.cpp renamed to ‎sycl/test/on-device/basic_tests/kernel_info.cpp b/‎sycl/test/basic_tests/kernel_info.cpp renamed to ‎sycl/test/on-device/basic_tests/kernel_info.cpp
diff --git a/‎sycl/test/basic_tests/kernel_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/kernel_interop.cpp b/‎sycl/test/basic_tests/kernel_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/kernel_interop.cpp
diff --git a/‎sycl/test/basic_tests/memory-consumption.cpp renamed to ‎sycl/test/on-device/basic_tests/memory-consumption.cpp b/‎sycl/test/basic_tests/memory-consumption.cpp renamed to ‎sycl/test/on-device/basic_tests/memory-consumption.cpp
diff --git a/‎sycl/test/basic_tests/opencl_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/opencl_interop.cpp b/‎sycl/test/basic_tests/opencl_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/opencl_interop.cpp
diff --git a/‎sycl/test/basic_tests/parallel_for_indexers.cpp renamed to ‎sycl/test/on-device/basic_tests/parallel_for_indexers.cpp b/‎sycl/test/basic_tests/parallel_for_indexers.cpp renamed to ‎sycl/test/on-device/basic_tests/parallel_for_indexers.cpp
diff --git a/‎sycl/test/basic_tests/parallel_for_range.cpp renamed to ‎sycl/test/on-device/basic_tests/parallel_for_range.cpp b/‎sycl/test/basic_tests/parallel_for_range.cpp renamed to ‎sycl/test/on-device/basic_tests/parallel_for_range.cpp
diff --git a/‎sycl/test/basic_tests/queue/queue.cpp renamed to ‎sycl/test/on-device/basic_tests/queue/queue.cpp b/‎sycl/test/basic_tests/queue/queue.cpp renamed to ‎sycl/test/on-device/basic_tests/queue/queue.cpp
diff --git a/‎sycl/test/basic_tests/queue/queue_parallel_for_generic.cpp renamed to ‎sycl/test/on-device/basic_tests/queue/queue_parallel_for_generic.cpp b/‎sycl/test/basic_tests/queue/queue_parallel_for_generic.cpp renamed to ‎sycl/test/on-device/basic_tests/queue/queue_parallel_for_generic.cpp
diff --git a/‎sycl/test/basic_tests/queue/release.cpp renamed to ‎sycl/test/on-device/basic_tests/queue/release.cpp b/‎sycl/test/basic_tests/queue/release.cpp renamed to ‎sycl/test/on-device/basic_tests/queue/release.cpp
diff --git a/‎sycl/test/basic_tests/range_offset_fit_in_int.cpp renamed to ‎sycl/test/on-device/basic_tests/range_offset_fit_in_int.cpp b/‎sycl/test/basic_tests/range_offset_fit_in_int.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/reqd_work_group_size.cpp b/‎sycl/test/basic_tests/reqd_work_group_size.cpp renamed to ‎sycl/test/on-device/basic_tests/reqd_work_group_size.cpp
diff --git a/‎sycl/test/basic_tests/sampler/sampler.cpp renamed to ‎sycl/test/on-device/basic_tests/sampler/sampler.cpp b/‎sycl/test/basic_tests/sampler/sampler.cpp renamed to ‎sycl/test/on-device/basic_tests/sampler/sampler.cpp
diff --git a/‎sycl/test/basic_tests/sampler/sampler_ocl.cpp renamed to ‎sycl/test/on-device/basic_tests/sampler/sampler_ocl.cpp b/‎sycl/test/basic_tests/sampler/sampler_ocl.cpp renamed to ‎sycl/test/on-device/basic_tests/sampler/sampler_ocl.cpp
diff --git a/‎sycl/test/basic_tests/scalar_vec_access.cpp renamed to ‎sycl/test/on-device/basic_tests/scalar_vec_access.cpp b/‎sycl/test/basic_tests/scalar_vec_access.cpp renamed to ‎sycl/test/on-device/basic_tests/scalar_vec_access.cpp
diff --git a/‎sycl/test/basic_tests/set_arg_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/set_arg_interop.cpp b/‎sycl/test/basic_tests/set_arg_interop.cpp renamed to ‎sycl/test/on-device/basic_tests/set_arg_interop.cpp
diff --git a/‎sycl/test/basic_tests/stream/auto_flush.cpp renamed to ‎sycl/test/on-device/basic_tests/stream/auto_flush.cpp b/‎sycl/test/basic_tests/stream/auto_flush.cpp renamed to ‎sycl/test/on-device/basic_tests/stream/auto_flush.cpp
diff --git a/‎sycl/test/basic_tests/stream/blocking_pipes_and_stream.cpp renamed to ‎sycl/test/on-device/basic_tests/stream/blocking_pipes_and_stream.cpp b/‎sycl/test/basic_tests/stream/blocking_pipes_and_stream.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/stream/release_resources_test.cpp b/‎sycl/test/basic_tests/stream/release_resources_test.cpp renamed to ‎sycl/test/on-device/basic_tests/stream/release_resources_test.cpp
diff --git a/‎sycl/test/basic_tests/stream/stream.cpp renamed to ‎sycl/test/on-device/basic_tests/stream/stream.cpp b/‎sycl/test/basic_tests/stream/stream.cpp renamed to ‎sycl/test/on-device/basic_tests/stream/stream.cpp
diff --git a/‎sycl/test/basic_tests/subdevice.cpp renamed to ‎sycl/test/on-device/basic_tests/subdevice.cpp b/‎sycl/test/basic_tests/subdevice.cpp renamed to ‎sycl/test/on-device/basic_tests/subdevice.cpp
diff --git a/‎sycl/test/basic_tests/subdevice_pi.cpp renamed to ‎sycl/test/on-device/basic_tests/subdevice_pi.cpp b/‎sycl/test/basic_tests/subdevice_pi.cpp renamed to ‎sycl/test/on-device/basic_tests/subdevice_pi.cpp
diff --git a/‎sycl/test/basic_tests/swizzle_op.cpp renamed to ‎sycl/test/on-device/basic_tests/swizzle_op.cpp b/‎sycl/test/basic_tests/swizzle_op.cpp renamed to ‎sycl/test/on-device/basic_tests/swizzle_op.cpp
diff --git a/‎sycl/test/basic_tests/sycl-namespace.cpp renamed to ‎sycl/test/on-device/basic_tests/sycl-namespace.cpp b/‎sycl/test/basic_tests/sycl-namespace.cpp renamed to ‎sycl/test/on-device/basic_tests/sycl-namespace.cpp
diff --git a/‎sycl/test/basic_tests/unused_pointer.cpp renamed to ‎sycl/test/on-device/basic_tests/unused_pointer.cpp b/‎sycl/test/basic_tests/unused_pointer.cpp renamed to ‎sycl/test/on-device/basic_tests/unused_pointer.cpp
diff --git a/‎sycl/test/basic_tests/use_pinned_host_memory.cpp renamed to ‎sycl/test/on-device/basic_tests/use_pinned_host_memory.cpp b/‎sycl/test/basic_tests/use_pinned_host_memory.cpp renamed to ‎sycl/test/on-device/basic_tests/use_pinned_host_memory.cpp
diff --git a/‎sycl/test/basic_tests/vec_convert.hpp renamed to ‎sycl/test/on-device/basic_tests/vec_convert.hpp b/‎sycl/test/basic_tests/vec_convert.hpp renamed to ‎sycl/test/on-device/basic_tests/vec_convert.hpp
diff --git a/‎sycl/test/basic_tests/vec_convert_f_to_f.cpp renamed to ‎sycl/test/on-device/basic_tests/vec_convert_f_to_f.cpp b/‎sycl/test/basic_tests/vec_convert_f_to_f.cpp renamed 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 renamed to ‎sycl/test/on-device/basic_tests/vec_convert_f_to_i.cpp b/‎sycl/test/basic_tests/vec_convert_f_to_i.cpp renamed to ‎sycl/test/on-device/basic_tests/vec_convert_f_to_i.cpp
diff --git a/‎sycl/test/basic_tests/vec_convert_half.cpp renamed to ‎sycl/test/on-device/basic_tests/vec_convert_half.cpp b/‎sycl/test/basic_tests/vec_convert_half.cpp renamed to ‎sycl/test/on-device/basic_tests/vec_convert_half.cpp
diff --git a/‎sycl/test/basic_tests/vec_convert_i_to_i.cpp renamed to ‎sycl/test/on-device/basic_tests/vec_convert_i_to_i.cpp b/‎sycl/test/basic_tests/vec_convert_i_to_i.cpp renamed to ‎sycl/test/on-device/basic_tests/vec_convert_i_to_i.cpp
diff --git a/‎sycl/test/basic_tests/vec_op.cpp renamed to ‎sycl/test/on-device/basic_tests/vec_op.cpp b/‎sycl/test/basic_tests/vec_op.cpp renamed to ‎sycl/test/on-device/basic_tests/vec_op.cpp
diff --git a/‎sycl/test/basic_tests/vectors/vector_operators.cpp renamed to ‎sycl/test/on-device/basic_tests/vector_operators.cpp b/‎sycl/test/basic_tests/vectors/vector_operators.cpp renamed to ‎sycl/test/on-device/basic_tests/vector_operators.cpp
diff --git a/‎sycl/test/built-ins/nan.cpp renamed to ‎sycl/test/on-device/built-ins/nan.cpp b/‎sycl/test/built-ins/nan.cpp renamed to ‎sycl/test/on-device/built-ins/nan.cpp
diff --git a/‎sycl/test/built-ins/printf.cpp renamed to ‎sycl/test/on-device/built-ins/printf.cpp b/‎sycl/test/built-ins/printf.cpp renamed to ‎sycl/test/on-device/built-ins/printf.cpp
diff --git a/‎sycl/test/built-ins/scalar_common.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_common.cpp b/‎sycl/test/built-ins/scalar_common.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_common.cpp
diff --git a/‎sycl/test/built-ins/scalar_geometric.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_geometric.cpp b/‎sycl/test/built-ins/scalar_geometric.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_geometric.cpp
diff --git a/‎sycl/test/built-ins/scalar_integer.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_integer.cpp b/‎sycl/test/built-ins/scalar_integer.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_integer.cpp
diff --git a/‎sycl/test/built-ins/scalar_math.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_math.cpp b/‎sycl/test/built-ins/scalar_math.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_math.cpp
diff --git a/‎sycl/test/built-ins/scalar_math_2.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_math_2.cpp b/‎sycl/test/built-ins/scalar_math_2.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_math_2.cpp
diff --git a/‎sycl/test/built-ins/scalar_relational.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_relational.cpp b/‎sycl/test/built-ins/scalar_relational.cpp renamed to ‎sycl/test/on-device/built-ins/scalar_relational.cpp
diff --git a/‎sycl/test/built-ins/vector_common.cpp renamed to ‎sycl/test/on-device/built-ins/vector_common.cpp b/‎sycl/test/built-ins/vector_common.cpp renamed to ‎sycl/test/on-device/built-ins/vector_common.cpp
diff --git a/‎sycl/test/built-ins/vector_geometric.cpp renamed to ‎sycl/test/on-device/built-ins/vector_geometric.cpp b/‎sycl/test/built-ins/vector_geometric.cpp renamed to ‎sycl/test/on-device/built-ins/vector_geometric.cpp
diff --git a/‎sycl/test/built-ins/vector_integer.cpp renamed to ‎sycl/test/on-device/built-ins/vector_integer.cpp b/‎sycl/test/built-ins/vector_integer.cpp renamed to ‎sycl/test/on-device/built-ins/vector_integer.cpp
diff --git a/‎sycl/test/built-ins/vector_math.cpp renamed to ‎sycl/test/on-device/built-ins/vector_math.cpp b/‎sycl/test/built-ins/vector_math.cpp renamed to ‎sycl/test/on-device/built-ins/vector_math.cpp
diff --git a/‎sycl/test/built-ins/vector_relational.cpp renamed to ‎sycl/test/on-device/built-ins/vector_relational.cpp b/‎sycl/test/built-ins/vector_relational.cpp renamed to ‎sycl/test/on-device/built-ins/vector_relational.cpp
diff --git a/‎sycl/test/config/allowlist.cpp renamed to ‎sycl/test/on-device/config/allowlist.cpp b/‎sycl/test/config/allowlist.cpp renamed to ‎sycl/test/on-device/config/allowlist.cpp
diff --git a/‎sycl/test/config/config.cpp renamed to ‎sycl/test/on-device/config/config.cpp b/‎sycl/test/config/config.cpp renamed to ‎sycl/test/on-device/config/config.cpp
diff --git a/‎sycl/test/config/select_device.cpp renamed to ‎sycl/test/on-device/config/select_device.cpp b/‎sycl/test/config/select_device.cpp renamed to ‎sycl/test/on-device/config/select_device.cpp
diff --git a/‎sycl/test/device-code-split/Inputs/split-per-source-second-file.cpp renamed to ‎sycl/test/on-device/device-code-split/Inputs/split-per-source-second-file.cpp b/‎sycl/test/device-code-split/Inputs/split-per-source-second-file.cpp renamed 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 renamed to ‎sycl/test/on-device/device-code-split/Inputs/split-per-source.h b/‎sycl/test/device-code-split/Inputs/split-per-source.h renamed to ‎sycl/test/on-device/device-code-split/Inputs/split-per-source.h
diff --git a/‎sycl/test/device-code-split/aot-accelerator.cpp renamed to ‎sycl/test/on-device/device-code-split/aot-accelerator.cpp b/‎sycl/test/device-code-split/aot-accelerator.cpp renamed to ‎sycl/test/on-device/device-code-split/aot-accelerator.cpp
diff --git a/‎sycl/test/device-code-split/aot-cpu.cpp renamed to ‎sycl/test/on-device/device-code-split/aot-cpu.cpp b/‎sycl/test/device-code-split/aot-cpu.cpp renamed to ‎sycl/test/on-device/device-code-split/aot-cpu.cpp
diff --git a/‎sycl/test/device-code-split/aot-gpu.cpp renamed to ‎sycl/test/on-device/device-code-split/aot-gpu.cpp b/‎sycl/test/device-code-split/aot-gpu.cpp renamed to ‎sycl/test/on-device/device-code-split/aot-gpu.cpp
diff --git a/‎sycl/test/device-code-split/split-per-kernel.cpp renamed to ‎sycl/test/on-device/device-code-split/split-per-kernel.cpp b/‎sycl/test/device-code-split/split-per-kernel.cpp renamed 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 renamed to ‎sycl/test/on-device/device-code-split/split-per-source-main.cpp b/‎sycl/test/device-code-split/split-per-source-main.cpp renamed 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 renamed to ‎sycl/test/on-device/device_code_dae/device_code_dae.cpp b/‎sycl/test/device_code_dae/device_code_dae.cpp renamed to ‎sycl/test/on-device/device_code_dae/device_code_dae.cpp
diff --git a/‎sycl/test/devicelib/assert-aot.cpp renamed to ‎sycl/test/on-device/devicelib/assert-aot.cpp b/‎sycl/test/devicelib/assert-aot.cpp renamed to ‎sycl/test/on-device/devicelib/assert-aot.cpp
diff --git a/‎sycl/test/devicelib/assert-windows.cpp renamed to ‎sycl/test/on-device/devicelib/assert-windows.cpp b/‎sycl/test/devicelib/assert-windows.cpp renamed to ‎sycl/test/on-device/devicelib/assert-windows.cpp
diff --git a/‎sycl/test/devicelib/assert.cpp renamed to ‎sycl/test/on-device/devicelib/assert.cpp b/‎sycl/test/devicelib/assert.cpp renamed to ‎sycl/test/on-device/devicelib/assert.cpp
diff --git a/‎sycl/test/devicelib/cmath-aot.cpp renamed to ‎sycl/test/on-device/devicelib/cmath-aot.cpp b/‎sycl/test/devicelib/cmath-aot.cpp renamed to ‎sycl/test/on-device/devicelib/cmath-aot.cpp
diff --git a/‎sycl/test/devicelib/cmath_fp64_test.cpp renamed to ‎sycl/test/on-device/devicelib/cmath_fp64_test.cpp b/‎sycl/test/devicelib/cmath_fp64_test.cpp renamed to ‎sycl/test/on-device/devicelib/cmath_fp64_test.cpp
diff --git a/‎sycl/test/devicelib/cmath_test.cpp renamed to ‎sycl/test/on-device/devicelib/cmath_test.cpp b/‎sycl/test/devicelib/cmath_test.cpp renamed to ‎sycl/test/on-device/devicelib/cmath_test.cpp
diff --git a/‎sycl/test/devicelib/complex-fpga.cpp renamed to ‎sycl/test/on-device/devicelib/complex-fpga.cpp b/‎sycl/test/devicelib/complex-fpga.cpp renamed to ‎sycl/test/on-device/devicelib/complex-fpga.cpp
diff --git a/‎sycl/test/devicelib/math_fp64_test.cpp renamed to ‎sycl/test/on-device/devicelib/math_fp64_test.cpp b/‎sycl/test/devicelib/math_fp64_test.cpp renamed to ‎sycl/test/on-device/devicelib/math_fp64_test.cpp
diff --git a/‎sycl/test/devicelib/math_override_test.cpp renamed to ‎sycl/test/on-device/devicelib/math_override_test.cpp b/‎sycl/test/devicelib/math_override_test.cpp renamed to ‎sycl/test/on-device/devicelib/math_override_test.cpp
diff --git a/‎sycl/test/devicelib/math_test.cpp renamed to ‎sycl/test/on-device/devicelib/math_test.cpp b/‎sycl/test/devicelib/math_test.cpp renamed to ‎sycl/test/on-device/devicelib/math_test.cpp
diff --git a/‎sycl/test/devicelib/math_utils.hpp renamed to ‎sycl/test/on-device/devicelib/math_utils.hpp b/‎sycl/test/devicelib/math_utils.hpp renamed to ‎sycl/test/on-device/devicelib/math_utils.hpp
diff --git a/‎sycl/test/devicelib/separate_compile_test.cpp renamed to ‎sycl/test/on-device/devicelib/separate_compile_test.cpp b/‎sycl/test/devicelib/separate_compile_test.cpp renamed to ‎sycl/test/on-device/devicelib/separate_compile_test.cpp
diff --git a/‎sycl/test/devicelib/std_complex_math_fp64_test.cpp renamed to ‎sycl/test/on-device/devicelib/std_complex_math_fp64_test.cpp b/‎sycl/test/devicelib/std_complex_math_fp64_test.cpp renamed to ‎sycl/test/on-device/devicelib/std_complex_math_fp64_test.cpp
diff --git a/‎sycl/test/devicelib/std_complex_math_test.cpp renamed to ‎sycl/test/on-device/devicelib/std_complex_math_test.cpp b/‎sycl/test/devicelib/std_complex_math_test.cpp renamed to ‎sycl/test/on-device/devicelib/std_complex_math_test.cpp
diff --git a/‎sycl/test/dot_product/dot_product_int_test.cpp renamed to ‎sycl/test/on-device/dot_product/dot_product_int_test.cpp b/‎sycl/test/dot_product/dot_product_int_test.cpp renamed to ‎sycl/test/on-device/dot_product/dot_product_int_test.cpp
diff --git a/‎sycl/test/dot_product/dot_product_vec_test.cpp renamed to ‎sycl/test/on-device/dot_product/dot_product_vec_test.cpp b/‎sycl/test/dot_product/dot_product_vec_test.cpp renamed to ‎sycl/test/on-device/dot_product/dot_product_vec_test.cpp
diff --git a/‎sycl/test/filter_selector/reuse.cpp renamed to ‎sycl/test/on-device/filter_selector/reuse.cpp b/‎sycl/test/filter_selector/reuse.cpp renamed to ‎sycl/test/on-device/filter_selector/reuse.cpp
diff --git a/‎sycl/test/filter_selector/select.cpp renamed to ‎sycl/test/on-device/filter_selector/select.cpp b/‎sycl/test/filter_selector/select.cpp renamed to ‎sycl/test/on-device/filter_selector/select.cpp
diff --git a/‎sycl/test/filter_selector/select_device.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device.cpp b/‎sycl/test/filter_selector/select_device.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device.cpp
diff --git a/‎sycl/test/filter_selector/select_device_acc.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_acc.cpp b/‎sycl/test/filter_selector/select_device_acc.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_acc.cpp
diff --git a/‎sycl/test/filter_selector/select_device_cpu.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_cpu.cpp b/‎sycl/test/filter_selector/select_device_cpu.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_cpu.cpp
diff --git a/‎sycl/test/filter_selector/select_device_cuda.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_cuda.cpp b/‎sycl/test/filter_selector/select_device_cuda.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_cuda.cpp
diff --git a/‎sycl/test/filter_selector/select_device_level_zero.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_level_zero.cpp b/‎sycl/test/filter_selector/select_device_level_zero.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_level_zero.cpp
diff --git a/‎sycl/test/filter_selector/select_device_opencl.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_opencl.cpp b/‎sycl/test/filter_selector/select_device_opencl.cpp renamed to ‎sycl/test/on-device/filter_selector/select_device_opencl.cpp
diff --git a/‎sycl/test/fpga_tests/Inputs/fpga_device.cpp renamed to ‎sycl/test/on-device/fpga_tests/Inputs/fpga_device.cpp b/‎sycl/test/fpga_tests/Inputs/fpga_device.cpp renamed to ‎sycl/test/on-device/fpga_tests/Inputs/fpga_device.cpp
diff --git a/‎sycl/test/fpga_tests/Inputs/fpga_host.cpp renamed to ‎sycl/test/on-device/fpga_tests/Inputs/fpga_host.cpp b/‎sycl/test/fpga_tests/Inputs/fpga_host.cpp renamed to ‎sycl/test/on-device/fpga_tests/Inputs/fpga_host.cpp
diff --git a/‎sycl/test/fpga_tests/buffer_location.cpp renamed to ‎sycl/test/on-device/fpga_tests/buffer_location.cpp b/‎sycl/test/fpga_tests/buffer_location.cpp renamed to ‎sycl/test/on-device/fpga_tests/buffer_location.cpp
diff --git a/‎sycl/test/fpga_tests/fpga_aocx.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_aocx.cpp b/‎sycl/test/fpga_tests/fpga_aocx.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_aocx.cpp
diff --git a/‎sycl/test/fpga_tests/fpga_aocx_win.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_aocx_win.cpp b/‎sycl/test/fpga_tests/fpga_aocx_win.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_aocx_win.cpp
diff --git a/‎sycl/test/fpga_tests/fpga_io_pipes.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_io_pipes.cpp b/‎sycl/test/fpga_tests/fpga_io_pipes.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_io_pipes.cpp
diff --git a/‎sycl/test/fpga_tests/fpga_lsu.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_lsu.cpp b/‎sycl/test/fpga_tests/fpga_lsu.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_lsu.cpp
diff --git a/‎sycl/test/fpga_tests/fpga_pipes.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_pipes.cpp b/‎sycl/test/fpga_tests/fpga_pipes.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_pipes.cpp
diff --git a/‎sycl/test/fpga_tests/fpga_pipes_legacy_ns.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_pipes_legacy_ns.cpp b/‎sycl/test/fpga_tests/fpga_pipes_legacy_ns.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_pipes_legacy_ns.cpp
diff --git a/‎sycl/test/fpga_tests/fpga_queue.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_queue.cpp b/‎sycl/test/fpga_tests/fpga_queue.cpp renamed to ‎sycl/test/on-device/fpga_tests/fpga_queue.cpp
diff --git a/‎sycl/test/fpga_tests/global_fpga_device_selector.cpp renamed to ‎sycl/test/on-device/fpga_tests/global_fpga_device_selector.cpp b/‎sycl/test/fpga_tests/global_fpga_device_selector.cpp renamed to ‎sycl/test/on-device/fpga_tests/global_fpga_device_selector.cpp
diff --git a/‎sycl/test/fpga_tests/io_pipe_def.h renamed to ‎sycl/test/on-device/fpga_tests/io_pipe_def.h b/‎sycl/test/fpga_tests/io_pipe_def.h renamed to ‎sycl/test/on-device/fpga_tests/io_pipe_def.h
diff --git a/‎sycl/test/fpga_tests/pipes_info.cpp renamed to ‎sycl/test/on-device/fpga_tests/pipes_info.cpp b/‎sycl/test/fpga_tests/pipes_info.cpp renamed to ‎sycl/test/on-device/fpga_tests/pipes_info.cpp
diff --git a/‎sycl/test/group-algorithm/all_of.cpp renamed to ‎sycl/test/on-device/group-algorithm/all_of.cpp b/‎sycl/test/group-algorithm/all_of.cpp renamed to ‎sycl/test/on-device/group-algorithm/all_of.cpp
diff --git a/‎sycl/test/group-algorithm/any_of.cpp renamed to ‎sycl/test/on-device/group-algorithm/any_of.cpp b/‎sycl/test/group-algorithm/any_of.cpp renamed to ‎sycl/test/on-device/group-algorithm/any_of.cpp
diff --git a/‎sycl/test/group-algorithm/broadcast.cpp renamed to ‎sycl/test/on-device/group-algorithm/broadcast.cpp b/‎sycl/test/group-algorithm/broadcast.cpp renamed to ‎sycl/test/on-device/group-algorithm/broadcast.cpp
diff --git a/‎sycl/test/group-algorithm/exclusive_scan.cpp renamed to ‎sycl/test/on-device/group-algorithm/exclusive_scan.cpp b/‎sycl/test/group-algorithm/exclusive_scan.cpp renamed to ‎sycl/test/on-device/group-algorithm/exclusive_scan.cpp
diff --git a/‎sycl/test/group-algorithm/inclusive_scan.cpp renamed to ‎sycl/test/on-device/group-algorithm/inclusive_scan.cpp b/‎sycl/test/group-algorithm/inclusive_scan.cpp renamed to ‎sycl/test/on-device/group-algorithm/inclusive_scan.cpp
diff --git a/‎sycl/test/group-algorithm/leader.cpp renamed to ‎sycl/test/on-device/group-algorithm/leader.cpp b/‎sycl/test/group-algorithm/leader.cpp renamed to ‎sycl/test/on-device/group-algorithm/leader.cpp
diff --git a/‎sycl/test/group-algorithm/none_of.cpp renamed to ‎sycl/test/on-device/group-algorithm/none_of.cpp b/‎sycl/test/group-algorithm/none_of.cpp renamed to ‎sycl/test/on-device/group-algorithm/none_of.cpp
diff --git a/‎sycl/test/group-algorithm/reduce.cpp renamed to ‎sycl/test/on-device/group-algorithm/reduce.cpp b/‎sycl/test/group-algorithm/reduce.cpp renamed to ‎sycl/test/on-device/group-algorithm/reduce.cpp
diff --git a/‎sycl/test/group-algorithm/support.h renamed to ‎sycl/test/on-device/group-algorithm/support.h b/‎sycl/test/group-algorithm/support.h renamed to ‎sycl/test/on-device/group-algorithm/support.h
diff --git a/‎sycl/test/hier_par/Inputs/hier_par_wgscope_impl.hpp renamed to ‎sycl/test/on-device/hier_par/Inputs/hier_par_wgscope_impl.hpp b/‎sycl/test/hier_par/Inputs/hier_par_wgscope_impl.hpp renamed to ‎sycl/test/on-device/hier_par/Inputs/hier_par_wgscope_impl.hpp
diff --git a/‎sycl/test/hier_par/hier_par_basic.cpp renamed to ‎sycl/test/on-device/hier_par/hier_par_basic.cpp b/‎sycl/test/hier_par/hier_par_basic.cpp renamed to ‎sycl/test/on-device/hier_par/hier_par_basic.cpp
diff --git a/‎sycl/test/hier_par/hier_par_wgscope.cpp renamed to ‎sycl/test/on-device/hier_par/hier_par_wgscope.cpp b/‎sycl/test/hier_par/hier_par_wgscope.cpp renamed to ‎sycl/test/on-device/hier_par/hier_par_wgscope.cpp
diff --git a/‎sycl/test/hier_par/hier_par_wgscope_O0.cpp renamed to ‎sycl/test/on-device/hier_par/hier_par_wgscope_O0.cpp b/‎sycl/test/hier_par/hier_par_wgscope_O0.cpp renamed to ‎sycl/test/on-device/hier_par/hier_par_wgscope_O0.cpp
diff --git a/‎sycl/test/host-interop-task/host-task-dependency2.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task-dependency2.cpp b/‎sycl/test/host-interop-task/host-task-dependency2.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task-dependency2.cpp
diff --git a/‎sycl/test/host-interop-task/host-task-dependency3.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task-dependency3.cpp b/‎sycl/test/host-interop-task/host-task-dependency3.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task-dependency3.cpp
diff --git a/‎sycl/test/host-interop-task/host-task-dependency4.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task-dependency4.cpp b/‎sycl/test/host-interop-task/host-task-dependency4.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task-dependency4.cpp
diff --git a/‎sycl/test/host-interop-task/host-task-failure.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task-failure.cpp b/‎sycl/test/host-interop-task/host-task-failure.cpp renamed 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 renamed to ‎sycl/test/on-device/host-interop-task/host-task-two-queues.cpp b/‎sycl/test/host-interop-task/host-task-two-queues.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task-two-queues.cpp
diff --git a/‎sycl/test/host-interop-task/host-task.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task.cpp b/‎sycl/test/host-interop-task/host-task.cpp renamed to ‎sycl/test/on-device/host-interop-task/host-task.cpp
diff --git a/‎sycl/test/host-interop-task/interop-task.cpp renamed to ‎sycl/test/on-device/host-interop-task/interop-task.cpp b/‎sycl/test/host-interop-task/interop-task.cpp renamed to ‎sycl/test/on-device/host-interop-task/interop-task.cpp
diff --git a/‎sycl/test/linear_id/linear-sub_group.cpp renamed to ‎sycl/test/on-device/linear_id/linear-sub_group.cpp b/‎sycl/test/linear_id/linear-sub_group.cpp renamed to ‎sycl/test/on-device/linear_id/linear-sub_group.cpp
diff --git a/‎sycl/test/linear_id/opencl-interop.cpp renamed to ‎sycl/test/on-device/linear_id/opencl-interop.cpp b/‎sycl/test/linear_id/opencl-interop.cpp renamed to ‎sycl/test/on-device/linear_id/opencl-interop.cpp
diff --git a/‎sycl/test/plugins/enqueue-arg-order-buffer.cpp renamed to ‎sycl/test/on-device/plugins/enqueue-arg-order-buffer.cpp b/‎sycl/test/plugins/enqueue-arg-order-buffer.cpp renamed to ‎sycl/test/on-device/plugins/enqueue-arg-order-buffer.cpp
diff --git a/‎sycl/test/plugins/enqueue-arg-order-image.cpp renamed to ‎sycl/test/on-device/plugins/enqueue-arg-order-image.cpp b/‎sycl/test/plugins/enqueue-arg-order-image.cpp renamed to ‎sycl/test/on-device/plugins/enqueue-arg-order-image.cpp
diff --git a/‎sycl/test/plugins/interop-opencl.cpp renamed to ‎sycl/test/on-device/plugins/interop-opencl.cpp b/‎sycl/test/plugins/interop-opencl.cpp renamed to ‎sycl/test/on-device/plugins/interop-opencl.cpp
diff --git a/‎sycl/test/plugins/sycl-ls-gpu-cuda.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-cuda.cpp b/‎sycl/test/plugins/sycl-ls-gpu-cuda.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-cuda.cpp
diff --git a/‎sycl/test/plugins/sycl-ls-gpu-default.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-default.cpp b/‎sycl/test/plugins/sycl-ls-gpu-default.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-default.cpp
diff --git a/‎sycl/test/plugins/sycl-ls-gpu-level-zero.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-level-zero.cpp b/‎sycl/test/plugins/sycl-ls-gpu-level-zero.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-level-zero.cpp
diff --git a/‎sycl/test/plugins/sycl-ls-gpu-opencl.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-opencl.cpp b/‎sycl/test/plugins/sycl-ls-gpu-opencl.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-opencl.cpp
diff --git a/‎sycl/test/plugins/sycl-ls-gpu-sycl-be.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-sycl-be.cpp b/‎sycl/test/plugins/sycl-ls-gpu-sycl-be.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls-gpu-sycl-be.cpp
diff --git a/‎sycl/test/plugins/sycl-ls.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls.cpp b/‎sycl/test/plugins/sycl-ls.cpp renamed to ‎sycl/test/on-device/plugins/sycl-ls.cpp
diff --git a/‎sycl/test/plugins/sycl-targets-order.cpp renamed to ‎sycl/test/on-device/plugins/sycl-targets-order.cpp b/‎sycl/test/plugins/sycl-targets-order.cpp renamed to ‎sycl/test/on-device/plugins/sycl-targets-order.cpp
diff --git a/‎sycl/test/reduction/reduction_nd_conditional.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_conditional.cpp b/‎sycl/test/reduction/reduction_nd_conditional.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_conditional.cpp
diff --git a/‎sycl/test/reduction/reduction_nd_ext_double.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_ext_double.cpp b/‎sycl/test/reduction/reduction_nd_ext_double.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_ext_double.cpp
diff --git a/‎sycl/test/reduction/reduction_nd_ext_half.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_ext_half.cpp b/‎sycl/test/reduction/reduction_nd_ext_half.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_ext_half.cpp
diff --git a/‎sycl/test/reduction/reduction_nd_ext_type.hpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_ext_type.hpp b/‎sycl/test/reduction/reduction_nd_ext_type.hpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_ext_type.hpp
diff --git a/‎sycl/test/reduction/reduction_nd_lambda.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_lambda.cpp b/‎sycl/test/reduction/reduction_nd_lambda.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_lambda.cpp
diff --git a/‎sycl/test/reduction/reduction_nd_s0_dw.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_s0_dw.cpp b/‎sycl/test/reduction/reduction_nd_s0_dw.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_s0_dw.cpp
diff --git a/‎sycl/test/reduction/reduction_nd_s0_rw.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_s0_rw.cpp b/‎sycl/test/reduction/reduction_nd_s0_rw.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_s0_rw.cpp
diff --git a/‎sycl/test/reduction/reduction_nd_s1_dw.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_s1_dw.cpp b/‎sycl/test/reduction/reduction_nd_s1_dw.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_s1_dw.cpp
diff --git a/‎sycl/test/reduction/reduction_nd_s1_rw.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_s1_rw.cpp b/‎sycl/test/reduction/reduction_nd_s1_rw.cpp renamed to ‎sycl/test/on-device/reduction/reduction_nd_s1_rw.cpp
diff --git a/‎sycl/test/reduction/reduction_placeholder.cpp renamed to ‎sycl/test/on-device/reduction/reduction_placeholder.cpp b/‎sycl/test/reduction/reduction_placeholder.cpp renamed to ‎sycl/test/on-device/reduction/reduction_placeholder.cpp
diff --git a/‎sycl/test/reduction/reduction_queue_parallel_for.cpp renamed to ‎sycl/test/on-device/reduction/reduction_queue_parallel_for.cpp b/‎sycl/test/reduction/reduction_queue_parallel_for.cpp renamed to ‎sycl/test/on-device/reduction/reduction_queue_parallel_for.cpp
diff --git a/‎sycl/test/reduction/reduction_transparent.cpp renamed to ‎sycl/test/on-device/reduction/reduction_transparent.cpp b/‎sycl/test/reduction/reduction_transparent.cpp renamed to ‎sycl/test/on-device/reduction/reduction_transparent.cpp
diff --git a/‎sycl/test/reduction/reduction_usm.cpp renamed to ‎sycl/test/on-device/reduction/reduction_usm.cpp b/‎sycl/test/reduction/reduction_usm.cpp renamed to ‎sycl/test/on-device/reduction/reduction_usm.cpp
diff --git a/‎sycl/test/reduction/reduction_utils.hpp renamed to ‎sycl/test/on-device/reduction/reduction_utils.hpp b/‎sycl/test/reduction/reduction_utils.hpp renamed to ‎sycl/test/on-device/reduction/reduction_utils.hpp
diff --git a/‎sycl/test/regression/usm_malloc_shared.cpp renamed to ‎sycl/test/on-device/regression/usm_malloc_shared.cpp b/‎sycl/test/regression/usm_malloc_shared.cpp renamed to ‎sycl/test/on-device/regression/usm_malloc_shared.cpp
diff --git a/‎sycl/test/spec_const/spec_const_hw.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_hw.cpp b/‎sycl/test/spec_const/spec_const_hw.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_hw.cpp
diff --git a/‎sycl/test/spec_const/spec_const_hw_accelerator.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_hw_accelerator.cpp b/‎sycl/test/spec_const/spec_const_hw_accelerator.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_hw_accelerator.cpp
diff --git a/‎sycl/test/spec_const/spec_const_neg.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_neg.cpp b/‎sycl/test/spec_const/spec_const_neg.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_neg.cpp
diff --git a/‎sycl/test/spec_const/spec_const_redefine.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_redefine.cpp b/‎sycl/test/spec_const/spec_const_redefine.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_redefine.cpp
diff --git a/‎sycl/test/spec_const/spec_const_redefine_accelerator.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_redefine_accelerator.cpp b/‎sycl/test/spec_const/spec_const_redefine_accelerator.cpp renamed to ‎sycl/test/on-device/spec_const/spec_const_redefine_accelerator.cpp
diff --git a/‎sycl/test/sub_group/attributes.cpp renamed to ‎sycl/test/on-device/sub_group/attributes.cpp b/‎sycl/test/sub_group/attributes.cpp renamed to ‎sycl/test/on-device/sub_group/attributes.cpp
diff --git a/‎sycl/test/sub_group/barrier.cpp renamed to ‎sycl/test/on-device/sub_group/barrier.cpp b/‎sycl/test/sub_group/barrier.cpp renamed to ‎sycl/test/on-device/sub_group/barrier.cpp
diff --git a/‎sycl/test/sub_group/broadcast.cpp renamed to ‎sycl/test/on-device/sub_group/broadcast.cpp b/‎sycl/test/sub_group/broadcast.cpp renamed to ‎sycl/test/on-device/sub_group/broadcast.cpp
diff --git a/‎sycl/test/sub_group/broadcast.hpp renamed to ‎sycl/test/on-device/sub_group/broadcast.hpp b/‎sycl/test/sub_group/broadcast.hpp renamed to ‎sycl/test/on-device/sub_group/broadcast.hpp
diff --git a/‎sycl/test/sub_group/broadcast_fp16.cpp renamed to ‎sycl/test/on-device/sub_group/broadcast_fp16.cpp b/‎sycl/test/sub_group/broadcast_fp16.cpp renamed to ‎sycl/test/on-device/sub_group/broadcast_fp16.cpp
diff --git a/‎sycl/test/sub_group/broadcast_fp64.cpp renamed to ‎sycl/test/on-device/sub_group/broadcast_fp64.cpp b/‎sycl/test/sub_group/broadcast_fp64.cpp renamed to ‎sycl/test/on-device/sub_group/broadcast_fp64.cpp
diff --git a/‎sycl/test/sub_group/common.cpp renamed to ‎sycl/test/on-device/sub_group/common.cpp b/‎sycl/test/sub_group/common.cpp renamed to ‎sycl/test/on-device/sub_group/common.cpp
diff --git a/‎sycl/test/sub_group/generic-shuffle.cpp renamed to ‎sycl/test/on-device/sub_group/generic-shuffle.cpp b/‎sycl/test/sub_group/generic-shuffle.cpp renamed to ‎sycl/test/on-device/sub_group/generic-shuffle.cpp
diff --git a/‎sycl/test/sub_group/generic_reduce.cpp renamed to ‎sycl/test/on-device/sub_group/generic_reduce.cpp b/‎sycl/test/sub_group/generic_reduce.cpp renamed to ‎sycl/test/on-device/sub_group/generic_reduce.cpp
diff --git a/‎sycl/test/sub_group/helper.hpp renamed to ‎sycl/test/on-device/sub_group/helper.hpp b/‎sycl/test/sub_group/helper.hpp renamed to ‎sycl/test/on-device/sub_group/helper.hpp
diff --git a/‎sycl/test/sub_group/info.cpp renamed to ‎sycl/test/on-device/sub_group/info.cpp b/‎sycl/test/sub_group/info.cpp renamed to ‎sycl/test/on-device/sub_group/info.cpp
diff --git a/‎sycl/test/sub_group/load_store.cpp renamed to ‎sycl/test/on-device/sub_group/load_store.cpp b/‎sycl/test/sub_group/load_store.cpp renamed to ‎sycl/test/on-device/sub_group/load_store.cpp
diff --git a/‎sycl/test/sub_group/reduce.cpp renamed to ‎sycl/test/on-device/sub_group/reduce.cpp b/‎sycl/test/sub_group/reduce.cpp renamed to ‎sycl/test/on-device/sub_group/reduce.cpp
diff --git a/‎sycl/test/sub_group/reduce.hpp renamed to ‎sycl/test/on-device/sub_group/reduce.hpp b/‎sycl/test/sub_group/reduce.hpp renamed to ‎sycl/test/on-device/sub_group/reduce.hpp
diff --git a/‎sycl/test/sub_group/reduce_fp16.cpp renamed to ‎sycl/test/on-device/sub_group/reduce_fp16.cpp b/‎sycl/test/sub_group/reduce_fp16.cpp renamed to ‎sycl/test/on-device/sub_group/reduce_fp16.cpp
diff --git a/‎sycl/test/sub_group/reduce_fp64.cpp renamed to ‎sycl/test/on-device/sub_group/reduce_fp64.cpp b/‎sycl/test/sub_group/reduce_fp64.cpp renamed to ‎sycl/test/on-device/sub_group/reduce_fp64.cpp
diff --git a/‎sycl/test/sub_group/scan.cpp renamed to ‎sycl/test/on-device/sub_group/scan.cpp b/‎sycl/test/sub_group/scan.cpp renamed to ‎sycl/test/on-device/sub_group/scan.cpp
diff --git a/‎sycl/test/sub_group/scan.hpp renamed to ‎sycl/test/on-device/sub_group/scan.hpp b/‎sycl/test/sub_group/scan.hpp renamed to ‎sycl/test/on-device/sub_group/scan.hpp
diff --git a/‎sycl/test/sub_group/scan_fp16.cpp renamed to ‎sycl/test/on-device/sub_group/scan_fp16.cpp b/‎sycl/test/sub_group/scan_fp16.cpp renamed to ‎sycl/test/on-device/sub_group/scan_fp16.cpp
diff --git a/‎sycl/test/sub_group/scan_fp64.cpp renamed to ‎sycl/test/on-device/sub_group/scan_fp64.cpp b/‎sycl/test/sub_group/scan_fp64.cpp renamed to ‎sycl/test/on-device/sub_group/scan_fp64.cpp
diff --git a/‎sycl/test/sub_group/sg.cl renamed to ‎sycl/test/on-device/sub_group/sg.cl b/‎sycl/test/sub_group/sg.cl renamed to ‎sycl/test/on-device/sub_group/sg.cl
diff --git a/‎sycl/test/sub_group/shuffle.cpp renamed to ‎sycl/test/on-device/sub_group/shuffle.cpp b/‎sycl/test/sub_group/shuffle.cpp renamed to ‎sycl/test/on-device/sub_group/shuffle.cpp
diff --git a/‎sycl/test/sub_group/shuffle.hpp renamed to ‎sycl/test/on-device/sub_group/shuffle.hpp b/‎sycl/test/sub_group/shuffle.hpp renamed to ‎sycl/test/on-device/sub_group/shuffle.hpp
diff --git a/‎sycl/test/sub_group/shuffle_fp16.cpp renamed to ‎sycl/test/on-device/sub_group/shuffle_fp16.cpp b/‎sycl/test/sub_group/shuffle_fp16.cpp renamed to ‎sycl/test/on-device/sub_group/shuffle_fp16.cpp
diff --git a/‎sycl/test/sub_group/shuffle_fp64.cpp renamed to ‎sycl/test/on-device/sub_group/shuffle_fp64.cpp b/‎sycl/test/sub_group/shuffle_fp64.cpp renamed to ‎sycl/test/on-device/sub_group/shuffle_fp64.cpp
diff --git a/‎sycl/test/sub_group/vote.cpp renamed to ‎sycl/test/on-device/sub_group/vote.cpp b/‎sycl/test/sub_group/vote.cpp renamed to ‎sycl/test/on-device/sub_group/vote.cpp
diff --git a/‎sycl/test/usm/allocator_equal.cpp renamed to ‎sycl/test/on-device/usm/allocator_equal.cpp b/‎sycl/test/usm/allocator_equal.cpp renamed to ‎sycl/test/on-device/usm/allocator_equal.cpp
diff --git a/‎sycl/test/usm/allocator_shared.cpp renamed to ‎sycl/test/on-device/usm/allocator_shared.cpp b/‎sycl/test/usm/allocator_shared.cpp renamed to ‎sycl/test/on-device/usm/allocator_shared.cpp
diff --git a/‎sycl/test/usm/allocator_vector.cpp renamed to ‎sycl/test/on-device/usm/allocator_vector.cpp b/‎sycl/test/usm/allocator_vector.cpp renamed to ‎sycl/test/on-device/usm/allocator_vector.cpp
diff --git a/‎sycl/test/usm/badmalloc.cpp renamed to ‎sycl/test/on-device/usm/badmalloc.cpp b/‎sycl/test/usm/badmalloc.cpp renamed to ‎sycl/test/on-device/usm/badmalloc.cpp
diff --git a/‎sycl/test/usm/depends_on.cpp renamed to ‎sycl/test/on-device/usm/depends_on.cpp b/‎sycl/test/usm/depends_on.cpp renamed to ‎sycl/test/on-device/usm/depends_on.cpp
diff --git a/‎sycl/test/usm/dmem_varied.cpp renamed to ‎sycl/test/on-device/usm/dmem_varied.cpp b/‎sycl/test/usm/dmem_varied.cpp renamed to ‎sycl/test/on-device/usm/dmem_varied.cpp
diff --git a/‎sycl/test/usm/dmemll.cpp renamed to ‎sycl/test/on-device/usm/dmemll.cpp b/‎sycl/test/usm/dmemll.cpp renamed to ‎sycl/test/on-device/usm/dmemll.cpp
diff --git a/‎sycl/test/usm/dmemllaligned.cpp renamed to ‎sycl/test/on-device/usm/dmemllaligned.cpp b/‎sycl/test/usm/dmemllaligned.cpp renamed to ‎sycl/test/on-device/usm/dmemllaligned.cpp
diff --git a/‎sycl/test/usm/fill.cpp renamed to ‎sycl/test/on-device/usm/fill.cpp b/‎sycl/test/usm/fill.cpp renamed to ‎sycl/test/on-device/usm/fill.cpp
diff --git a/‎sycl/test/usm/findplatforms.hpp renamed to ‎sycl/test/on-device/usm/findplatforms.hpp b/‎sycl/test/usm/findplatforms.hpp renamed to ‎sycl/test/on-device/usm/findplatforms.hpp
diff --git a/‎sycl/test/usm/hmemll.cpp renamed to ‎sycl/test/on-device/usm/hmemll.cpp b/‎sycl/test/usm/hmemll.cpp renamed to ‎sycl/test/on-device/usm/hmemll.cpp
diff --git a/‎sycl/test/usm/hmemllaligned.cpp renamed to ‎sycl/test/on-device/usm/hmemllaligned.cpp b/‎sycl/test/usm/hmemllaligned.cpp renamed to ‎sycl/test/on-device/usm/hmemllaligned.cpp
diff --git a/‎sycl/test/usm/math.cpp renamed to ‎sycl/test/on-device/usm/math.cpp b/‎sycl/test/usm/math.cpp renamed to ‎sycl/test/on-device/usm/math.cpp
diff --git a/‎sycl/test/usm/memadvise.cpp renamed to ‎sycl/test/on-device/usm/memadvise.cpp b/‎sycl/test/usm/memadvise.cpp renamed to ‎sycl/test/on-device/usm/memadvise.cpp
diff --git a/‎sycl/test/usm/memcpy.cpp renamed to ‎sycl/test/on-device/usm/memcpy.cpp b/‎sycl/test/usm/memcpy.cpp renamed to ‎sycl/test/on-device/usm/memcpy.cpp
diff --git a/‎sycl/test/usm/memset.cpp renamed to ‎sycl/test/on-device/usm/memset.cpp b/‎sycl/test/usm/memset.cpp renamed to ‎sycl/test/on-device/usm/memset.cpp
diff --git a/‎sycl/test/usm/mixed.cpp renamed to ‎sycl/test/on-device/usm/mixed.cpp b/‎sycl/test/usm/mixed.cpp renamed to ‎sycl/test/on-device/usm/mixed.cpp
diff --git a/‎sycl/test/usm/mixed2.cpp renamed to ‎sycl/test/on-device/usm/mixed2.cpp b/‎sycl/test/usm/mixed2.cpp renamed to ‎sycl/test/on-device/usm/mixed2.cpp
diff --git a/‎sycl/test/usm/mixed2template.cpp renamed to ‎sycl/test/on-device/usm/mixed2template.cpp b/‎sycl/test/usm/mixed2template.cpp renamed to ‎sycl/test/on-device/usm/mixed2template.cpp
diff --git a/‎sycl/test/usm/mixed_queue.cpp renamed to ‎sycl/test/on-device/usm/mixed_queue.cpp b/‎sycl/test/usm/mixed_queue.cpp renamed to ‎sycl/test/on-device/usm/mixed_queue.cpp
diff --git a/‎sycl/test/usm/multictxt.cpp renamed to ‎sycl/test/on-device/usm/multictxt.cpp b/‎sycl/test/usm/multictxt.cpp renamed to ‎sycl/test/on-device/usm/multictxt.cpp
diff --git a/‎sycl/test/usm/pfor_flatten.cpp renamed to ‎sycl/test/on-device/usm/pfor_flatten.cpp b/‎sycl/test/usm/pfor_flatten.cpp renamed to ‎sycl/test/on-device/usm/pfor_flatten.cpp
diff --git a/‎sycl/test/usm/pfor_flatten_range_shortcut.cpp renamed to ‎sycl/test/on-device/usm/pfor_flatten_range_shortcut.cpp b/‎sycl/test/usm/pfor_flatten_range_shortcut.cpp renamed to ‎sycl/test/on-device/usm/pfor_flatten_range_shortcut.cpp
diff --git a/‎sycl/test/usm/pointer_query.cpp renamed to ‎sycl/test/on-device/usm/pointer_query.cpp b/‎sycl/test/usm/pointer_query.cpp renamed to ‎sycl/test/on-device/usm/pointer_query.cpp
diff --git a/‎sycl/test/usm/prefetch.cpp renamed to ‎sycl/test/on-device/usm/prefetch.cpp b/‎sycl/test/usm/prefetch.cpp renamed to ‎sycl/test/on-device/usm/prefetch.cpp
diff --git a/‎sycl/test/usm/queue_wait.cpp renamed to ‎sycl/test/on-device/usm/queue_wait.cpp b/‎sycl/test/usm/queue_wait.cpp renamed to ‎sycl/test/on-device/usm/queue_wait.cpp
diff --git a/‎sycl/test/usm/smem_concurrent.cpp renamed to ‎sycl/test/on-device/usm/smem_concurrent.cpp b/‎sycl/test/usm/smem_concurrent.cpp renamed to ‎sycl/test/on-device/usm/smem_concurrent.cpp
diff --git a/‎sycl/test/usm/smem_varied.cpp renamed to ‎sycl/test/on-device/usm/smem_varied.cpp b/‎sycl/test/usm/smem_varied.cpp renamed to ‎sycl/test/on-device/usm/smem_varied.cpp
diff --git a/‎sycl/test/usm/smemll.cpp renamed to ‎sycl/test/on-device/usm/smemll.cpp b/‎sycl/test/usm/smemll.cpp renamed to ‎sycl/test/on-device/usm/smemll.cpp
diff --git a/‎sycl/test/usm/smemllaligned.cpp renamed to ‎sycl/test/on-device/usm/smemllaligned.cpp b/‎sycl/test/usm/smemllaligned.cpp renamed to ‎sycl/test/on-device/usm/smemllaligned.cpp
diff --git a/‎sycl/test/usm/source_kernel_indirect_access.cpp renamed to ‎sycl/test/on-device/usm/source_kernel_indirect_access.cpp b/‎sycl/test/usm/source_kernel_indirect_access.cpp renamed to ‎sycl/test/on-device/usm/source_kernel_indirect_access.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 <CL/sycl.hpp>
 #include <cassert>
 
 
@@ -15,7 +15,7 @@
 #include <CL/sycl.hpp>
 #include <CL/sycl/backend/opencl.hpp>
 
-#include "../../helpers.hpp"
+#include "../../../helpers.hpp"
 #include <chrono>
 #include <thread>
 
 
@@ -13,7 +13,7 @@
 #include "CL/sycl/access/access.hpp"
 #include <CL/sycl.hpp>
 
-#include "../../helpers.hpp"
+#include "../../../helpers.hpp"
 
 using namespace cl;
 
 
@@ -16,7 +16,7 @@
 #include <iostream>
 #include <vector>
 
-#include "../helpers.hpp"
+#include "../../helpers.hpp"
 
 using namespace cl;
 
 
@@ -19,7 +19,7 @@
 #include <iostream>
 #include <vector>
 
-#include "../helpers.hpp"
+#include "../../helpers.hpp"
 
 using namespace cl;