From e8852a68c46ae65f6479d8fb7917ccfbe7a75518 Mon Sep 17 00:00:00 2001 From: kamdiedrich Date: Sun, 23 Feb 2020 09:03:33 +0100 Subject: [PATCH] Reorganization directory structure [2/n] Change-Id: I47962d17d755e80dcd9476e1ed75560f433f6115 --- CMakeLists.txt | 8 +++++--- .../command_container_tests.cpp | 5 +++-- .../command_encoder_tests.cpp | 3 ++- .../compiler_cache_tests.cpp | 9 +++++---- .../compiler_interface_tests.cpp | 10 +++++----- .../direct_submission_tests.cpp | 9 +++++---- .../dispatchers/dispatcher_fixture.h | 3 ++- .../dispatchers/render_dispatcher_tests.cpp | 3 ++- .../linux/drm_direct_submission_tests.cpp | 5 +++-- .../windows/wddm_direct_submission_tests.cpp | 7 ++++--- .../encoders/test_encode_atomic.cpp | 3 ++- .../encoders/test_encode_command_buffer.cpp | 5 +++-- .../encoders/test_encode_dispatch_kernel.cpp | 3 ++- core/unit_tests/encoders/test_encode_math.cpp | 5 +++-- ...test_encode_media_interface_descriptor.cpp | 3 ++- .../encoders/test_encode_semaphore.cpp | 3 ++- .../encoders/test_encode_set_mmio.cpp | 5 +++-- .../encoders/test_encode_states.cpp | 3 ++- .../fixtures/command_container_fixture.h | 3 ++- .../fixtures/preemption_fixture.cpp | 12 ++++++------ core/unit_tests/fixtures/preemption_fixture.h | 2 +- core/unit_tests/gen11/cmd_parse_gen11.cpp | 15 +++++++-------- .../gen11/test_preemption_gen11.cpp | 9 +++++---- core/unit_tests/gen12lp/cmd_parse_gen12lp.cpp | 18 ++++++++---------- .../gen12lp/test_command_encoder_gen12lp.cpp | 4 ++-- .../gen12lp/test_preemption_gen12lp.inl | 7 ++++--- core/unit_tests/gen8/cmd_parse_gen8.cpp | 15 +++++++-------- core/unit_tests/gen8/test_preamble_gen8.cpp | 3 ++- core/unit_tests/gen8/test_preemption_gen8.cpp | 15 ++++++++------- core/unit_tests/gen9/cmd_parse_gen9.cpp | 15 +++++++-------- .../unit_tests/gen9/skl/test_preamble_skl.cpp | 3 ++- .../gen9/test_command_encoder_gen9.cpp | 4 ++-- core/unit_tests/gen9/test_preemption_gen9.cpp | 13 +++++++------ .../image/image_surface_state_fixture.h | 11 ++++++----- core/unit_tests/libult/gen11.cpp | 3 ++- core/unit_tests/libult/gen12lp.cpp | 3 ++- core/unit_tests/libult/gen8.cpp | 3 ++- core/unit_tests/libult/gen9.cpp | 3 ++- .../mock_dispatch_kernel_encoder_interface.h | 2 +- .../aub_memory_operations_handler_tests.cpp | 3 ++- .../aub_memory_operations_handler_tests.h | 2 +- .../linux/gmm_helper_tests_linux.cpp | 2 +- .../windows/gmm_helper_tests_win.cpp | 2 +- .../windows/wddm_preemption_tests.cpp | 3 ++- .../cpu_page_fault_manager_tests.cpp | 3 ++- core/unit_tests/preamble/preamble_fixture.h | 9 +++++---- core/unit_tests/preamble/preamble_tests.cpp | 6 +++--- .../preemption/preemption_tests.cpp | 12 ++++++------ .../program/program_initialization_tests.cpp | 6 +++--- .../source_level_debugger_preamble_test.h | 6 +++--- manifests/manifest.yml | 2 +- .../test/unit_test}/.clang-tidy | 0 .../test/unit_test}/CMakeLists.txt | 0 .../test/unit_test}/abort.cpp | 0 .../unit_test}/accelerators/CMakeLists.txt | 0 .../accelerators/media_image_arg_tests.cpp | 0 .../test/unit_test}/api/CMakeLists.txt | 0 .../api/additional_extensions_tests.cpp | 0 .../unit_test}/api/api_tests_wrapper1.cpp | 0 .../unit_test}/api/api_tests_wrapper2.cpp | 0 .../unit_test}/api/api_tests_wrapper3.cpp | 0 .../api/cl_add_comment_to_aub_tests.inl | 0 .../test/unit_test}/api/cl_api_tests.cpp | 0 .../test/unit_test}/api/cl_api_tests.h | 0 .../unit_test}/api/cl_build_program_tests.inl | 0 .../unit_test}/api/cl_clone_kernel_tests.inl | 0 .../api/cl_compile_program_tests.inl | 0 .../unit_test}/api/cl_create_buffer_tests.cpp | 0 .../api/cl_create_command_queue_tests.inl | 0 ...te_command_queue_with_properties_tests.cpp | 0 .../api/cl_create_context_from_type_tests.inl | 0 .../api/cl_create_context_tests.inl | 0 .../unit_test}/api/cl_create_image_tests.cpp | 0 .../unit_test}/api/cl_create_kernel_tests.inl | 0 .../cl_create_kernels_in_program_tests.inl | 0 ...eate_perf_counters_command_queue_tests.inl | 0 .../unit_test}/api/cl_create_pipe_tests.inl | 0 .../cl_create_program_with_binary_tests.inl | 0 ...te_program_with_built_in_kernels_tests.cpp | 0 .../api/cl_create_sampler_tests.inl | 0 ...l_create_sampler_with_properties_tests.inl | 0 .../api/cl_create_sub_buffer_tests.inl | 0 .../api/cl_create_sub_devices_tests.inl | 0 .../api/cl_create_user_event_tests.inl | 0 .../api/cl_create_user_event_tests_mt.cpp | 0 .../api/cl_enqueue_barrier_tests.inl | 0 ...l_enqueue_barrier_with_wait_list_tests.inl | 0 .../api/cl_enqueue_copy_buffer_rect_tests.inl | 0 .../cl_enqueue_copy_buffer_to_image_tests.inl | 0 .../api/cl_enqueue_copy_image_tests.inl | 0 .../cl_enqueue_copy_image_to_buffer_tests.inl | 0 .../api/cl_enqueue_fill_buffer_tests.inl | 0 .../api/cl_enqueue_fill_image_tests.inl | 0 .../unit_test}/api/cl_enqueue_image_tests.inl | 0 .../api/cl_enqueue_map_buffer_tests.inl | 0 .../api/cl_enqueue_map_image_tests.inl | 0 .../api/cl_enqueue_marker_tests.inl | 0 ...cl_enqueue_marker_with_wait_list_tests.inl | 0 .../cl_enqueue_migrate_mem_objects_tests.inl | 0 .../api/cl_enqueue_native_kernel_tests.inl | 0 .../api/cl_enqueue_nd_range_kernel_tests.inl | 0 .../api/cl_enqueue_read_buffer_rect_tests.inl | 0 .../api/cl_enqueue_read_buffer_tests.inl | 0 .../api/cl_enqueue_read_image_tests.inl | 0 .../api/cl_enqueue_svm_free_tests.inl | 0 .../api/cl_enqueue_svm_map_tests.inl | 0 .../api/cl_enqueue_svm_mem_fill_tests.inl | 0 .../api/cl_enqueue_svm_memcpy_tests.inl | 0 .../api/cl_enqueue_svm_migrate_mem_tests.cpp | 0 .../api/cl_enqueue_svm_unmap_tests.inl | 0 .../unit_test}/api/cl_enqueue_task_tests.inl | 0 .../api/cl_enqueue_unmap_mem_object_tests.inl | 0 .../api/cl_enqueue_verify_memory.inl | 0 .../api/cl_enqueue_wait_for_events_tests.inl | 0 .../cl_enqueue_write_buffer_rect_tests.inl | 0 .../api/cl_enqueue_write_buffer_tests.inl | 0 .../api/cl_enqueue_write_image_tests.inl | 0 .../test/unit_test}/api/cl_finish_tests.inl | 0 .../test/unit_test}/api/cl_flush_tests.inl | 0 .../api/cl_function_pointers_tests.inl | 0 .../api/cl_get_context_info_tests.inl | 0 .../api/cl_get_device_and_host_timer.inl | 0 .../api/cl_get_device_ids_tests.inl | 0 .../api/cl_get_device_info_tests.inl | 0 .../api/cl_get_event_profiling_info_tests.inl | 0 ...on_function_address_for_platform_tests.inl | 0 ...l_get_extension_function_address_tests.inl | 0 .../api/cl_get_image_info_tests.inl | 0 .../api/cl_get_image_params_tests.inl | 0 .../api/cl_get_kernel_arg_info_tests.inl | 0 .../api/cl_get_kernel_info_tests.inl | 0 ...oncurrent_work_group_count_intel_tests.inl | 0 ...cl_get_kernel_sub_group_info_khr_tests.inl | 0 .../cl_get_kernel_sub_group_info_tests.inl | 0 ..._suggested_local_work_size_intel_tests.inl | 0 .../cl_get_kernel_work_group_info_tests.inl | 0 .../api/cl_get_mem_object_info_tests.inl | 0 .../unit_test}/api/cl_get_pipe_info_tests.inl | 0 .../api/cl_get_platform_ids_tests.inl | 0 .../api/cl_get_platform_ids_tests_mt.cpp | 0 .../api/cl_get_platform_info_tests.inl | 0 .../api/cl_get_program_build_info_tests.inl | 0 .../api/cl_get_program_info_tests.inl | 0 .../cl_get_supported_image_formats_tests.inl | 0 .../api/cl_icd_get_platform_ids_khr_tests.inl | 0 .../api/cl_intel_accelerator_tests.inl | 0 .../api/cl_intel_motion_estimation.cpp | 0 .../unit_test}/api/cl_intel_tracing_tests.inl | 0 .../api/cl_intel_tracing_tests_mt.cpp | 0 .../unit_test}/api/cl_link_program_tests.inl | 0 ...cl_mem_locally_uncached_resource_tests.cpp | 0 .../api/cl_release_command_queue_tests.inl | 0 .../api/cl_release_context_tests.inl | 0 .../unit_test}/api/cl_release_event_tests.inl | 0 .../api/cl_release_kernel_tests.inl | 0 .../api/cl_release_mem_obj_tests.inl | 0 .../api/cl_release_program_tests.inl | 0 .../api/cl_retain_mem_obj_tests.inl | 0 .../cl_retain_release_command_queue_tests.inl | 0 .../api/cl_retain_release_context_tests.inl | 0 .../api/cl_retain_release_device_tests.inl | 0 .../api/cl_retain_release_sampler_tests.inl | 0 ...set_default_device_command_queue_tests.inl | 0 .../api/cl_set_event_callback_tests.inl | 0 .../cl_set_kernel_arg_svm_pointer_tests.inl | 0 .../api/cl_set_kernel_exec_info_tests.inl | 0 ...t_mem_object_destructor_callback_tests.inl | 0 ...em_object_destructor_callback_tests_mt.cpp | 0 ...cl_set_performance_configuration_tests.inl | 0 ..._program_specialization_constant_tests.inl | 0 .../unit_test}/api/cl_svm_alloc_tests.inl | 0 .../test/unit_test}/api/cl_svm_free_tests.inl | 0 .../api/cl_unified_shared_memory_tests.inl | 0 .../api/cl_unload_compiler_tests.inl | 0 .../api/cl_unload_platform_compiler_tests.inl | 0 .../test/unit_test}/api/gl/CMakeLists.txt | 0 .../api/gl/cl_create_from_gl_buffer_tests.cpp | 0 .../cl_create_from_gl_renderbuffer_tests.cpp | 0 .../gl/cl_create_from_gl_texture2d_tests.cpp | 0 .../gl/cl_create_from_gl_texture3d_tests.cpp | 0 .../gl/cl_create_from_gl_texture_tests.cpp | 0 .../cl_enqueue_acquire_gl_objects_tests.cpp | 0 .../cl_enqueue_release_gl_objects_tests.cpp | 0 .../gl/cl_get_gl_context_info_khr_tests.cpp | 0 .../api/gl/cl_get_gl_device_info_tests.cpp | 0 .../api/gl/cl_get_gl_object_info_tests.cpp | 0 .../api/gl/cl_get_gl_texture_info_tests.cpp | 0 .../api/gl/cl_gl_intel_tracing_tests.cpp | 0 .../test/unit_test}/aub/CMakeLists.txt | 0 .../test/unit_test}/aub/aub_center_tests.cpp | 0 ...aub_center_using_aubstream_stubs_tests.cpp | 0 .../test/unit_test}/aub/aub_helper_tests.cpp | 0 .../test/unit_test}/aub/aub_helper_tests.inl | 0 .../unit_test}/aub_mem_dump/CMakeLists.txt | 0 .../aub_mem_dump/aub_alloc_dump_tests.cpp | 0 .../aub_mem_dump/lrca_helper_tests.cpp | 0 .../aub_stream_interface_mock.cpp | 0 .../test/unit_test}/aub_tests/CMakeLists.txt | 0 .../aub_tests/aub_tests_configuration.cpp | 0 .../aub_tests/aub_tests_configuration.h | 0 .../aub_tests/aub_tests_configuration.inl | 0 .../aub_tests/command_queue/CMakeLists.txt | 0 .../command_queue/command_enqueue_fixture.h | 0 .../enqueue_copy_buffer_aub_tests.cpp | 0 .../enqueue_copy_buffer_rect_aub_tests.cpp | 0 .../enqueue_copy_image_aub_tests.cpp | 0 .../enqueue_fill_buffer_aub_tests.cpp | 0 .../enqueue_fill_image_aub_tests.cpp | 0 .../enqueue_kernel_aub_tests.cpp | 0 .../enqueue_map_buffer_aub_tests.cpp | 0 .../enqueue_map_image_aub_tests.cpp | 0 .../enqueue_read_buffer_aub_tests.cpp | 0 .../enqueue_read_buffer_rect_aub_tests.cpp | 0 .../enqueue_read_image_aub_tests.cpp | 0 .../enqueue_read_write_image_aub_fixture.h | 0 ...enqueue_verify_memory_buffer_aub_tests.cpp | 0 .../enqueue_verify_memory_image_aub_tests.cpp | 0 .../enqueue_write_buffer_aub_tests.cpp | 0 .../enqueue_write_buffer_rect_aub_tests.cpp | 0 ...queue_write_copy_read_buffer_aub_tests.cpp | 0 ...enqueue_write_copy_read_buffer_aub_tests.h | 0 .../enqueue_write_image_aub_tests.cpp | 0 .../aub_tests/command_stream/CMakeLists.txt | 0 .../aub_command_stream_fixture.cpp | 0 .../aub_command_stream_fixture.h | 0 .../aub_command_stream_tests.cpp | 0 .../command_stream/aub_mem_dump_tests.cpp | 0 .../command_stream/aub_mem_dump_tests.h | 0 .../test/unit_test}/aub_tests/common.cmake | 0 .../aub_tests/fixtures/CMakeLists.txt | 0 .../aub_tests/fixtures/aub_fixture.cpp | 0 .../aub_tests/fixtures/aub_fixture.h | 0 .../fixtures/aub_parent_kernel_fixture.h | 0 .../aub_tests/fixtures/fixture_tests.cpp | 0 .../aub_tests/fixtures/hello_world_fixture.h | 0 .../aub_tests/fixtures/run_kernel_fixture.h | 0 .../aub_tests/fixtures/simple_arg_fixture.h | 0 .../fixtures/unified_memory_fixture.h | 0 .../unit_test}/aub_tests/gen11/CMakeLists.txt | 0 .../gen11/aub_tests_configuration_gen11.cpp | 0 .../gen11/batch_buffer/CMakeLists.txt | 0 .../aub_batch_buffer_tests_gen11.cpp | 0 .../aub_batch_buffer_tests_gen11.h | 0 .../gen11/execution_model/CMakeLists.txt | 0 .../enqueue_parent_kernel_tests_gen11.cpp | 0 .../aub_tests/gen12lp/CMakeLists.txt | 0 .../gen12lp/aub_mem_dump_tests_gen12lp.cpp | 0 .../aub_tests_configuration_gen12lp.cpp | 0 .../gen12lp/batch_buffer/CMakeLists.txt | 0 .../aub_batch_buffer_tests_gen12lp.cpp | 0 .../aub_batch_buffer_tests_gen12lp.h | 0 .../gen12lp/execution_model/CMakeLists.txt | 0 .../enqueue_parent_kernel_tests_gen12lp.cpp | 0 .../unit_test}/aub_tests/gen8/CMakeLists.txt | 0 .../gen8/aub_tests_configuration_gen8.cpp | 0 .../gen8/execution_model/CMakeLists.txt | 0 .../enqueue_parent_kernel_tests_gen8.cpp | 0 .../unit_test}/aub_tests/gen9/CMakeLists.txt | 0 .../gen9/aub_tests_configuration_gen9.cpp | 0 .../gen9/batch_buffer/CMakeLists.txt | 0 .../batch_buffer/aub_batch_buffer_tests.cpp | 0 .../batch_buffer/aub_batch_buffer_tests.h | 0 .../gen9/execution_model/CMakeLists.txt | 0 .../enqueue_parent_kernel_tests_gen9.cpp | 0 .../aub_tests/gen9/skl/CMakeLists.txt | 0 .../gen9/skl/command_queue/CMakeLists.txt | 0 .../run_kernel_aub_tests_skl.cpp | 0 .../aub_tests/mem_obj/CMakeLists.txt | 0 .../mem_obj/create_image_aub_tests.cpp | 0 .../test/unit_test}/aub_tests/test_mode.h | 0 .../aub_tests/unified_memory/CMakeLists.txt | 0 .../unified_memory_aub_tests.cpp | 0 .../unified_memory_copy_aub_tests.cpp | 0 .../test/unit_test}/built_ins/CMakeLists.txt | 0 .../built_ins/built_in_kernels_tests.cpp | 0 .../unit_test}/built_ins/built_in_tests.cpp | 0 .../built_ins/built_ins_file_names.cpp | 0 .../built_ins/built_ins_file_names.h | 0 .../built_ins/get_built_ins_file_names.cpp | 0 .../test/unit_test}/built_ins/sip_tests.cpp | 0 .../unit_test}/command_queue/CMakeLists.txt | 0 .../command_queue/blit_enqueue_tests.cpp | 0 .../command_queue/buffer_operations_fixture.h | 0 .../command_queue/command_enqueue_fixture.h | 0 .../command_queue/command_queue_fixture.cpp | 0 .../command_queue/command_queue_fixture.h | 0 .../command_queue/command_queue_hw_tests.cpp | 0 .../command_queue/command_queue_tests.cpp | 0 .../command_queue/dispatch_walker_tests.cpp | 0 .../command_queue/enqueue_barrier_tests.cpp | 0 .../enqueue_command_without_kernel_tests.cpp | 0 .../enqueue_copy_buffer_event_tests.cpp | 0 .../enqueue_copy_buffer_fixture.h | 0 .../enqueue_copy_buffer_rect_fixture.h | 0 .../enqueue_copy_buffer_rect_tests.cpp | 0 .../enqueue_copy_buffer_tests.cpp | 0 .../enqueue_copy_buffer_to_image_fixture.h | 0 .../enqueue_copy_buffer_to_image_tests.cpp | 0 .../enqueue_copy_image_fixture.h | 0 .../enqueue_copy_image_tests.cpp | 0 .../enqueue_copy_image_to_buffer_fixture.h | 0 .../enqueue_copy_image_to_buffer_tests.cpp | 0 .../enqueue_debug_kernel_tests.cpp | 0 .../enqueue_fill_buffer_event_tests.cpp | 0 .../enqueue_fill_buffer_fixture.h | 0 .../enqueue_fill_buffer_negative_tests.cpp | 0 .../enqueue_fill_buffer_tests.cpp | 0 .../enqueue_fill_image_fixture.h | 0 .../enqueue_fill_image_tests.cpp | 0 .../command_queue/enqueue_fixture.cpp | 0 .../command_queue/enqueue_fixture.h | 0 .../command_queue/enqueue_handler_tests.cpp | 0 .../command_queue/enqueue_kernel_1_tests.cpp | 0 .../command_queue/enqueue_kernel_2_tests.cpp | 0 .../enqueue_kernel_event_tests.cpp | 0 .../enqueue_kernel_global_offset_tests.cpp | 0 .../enqueue_kernel_local_work_size_tests.cpp | 0 .../command_queue/enqueue_kernel_mt_tests.cpp | 0 .../enqueue_kernel_two_ioq_tests.cpp | 0 .../enqueue_kernel_two_ooq_tests.cpp | 0 .../enqueue_kernel_two_walker_ioq_tests.cpp | 0 .../enqueue_kernel_two_walker_ooq_tests.cpp | 0 .../enqueue_map_buffer_fixture.h | 0 .../enqueue_map_buffer_tests.cpp | 0 .../command_queue/enqueue_map_image_tests.cpp | 0 .../command_queue/enqueue_marker_tests.cpp | 0 .../command_queue/enqueue_media_kernel.cpp | 0 .../enqueue_migrate_mem_objects_tests.cpp | 0 .../enqueue_read_buffer_event_tests.cpp | 0 .../enqueue_read_buffer_fixture.h | 0 .../enqueue_read_buffer_rect_fixture.h | 0 .../enqueue_read_buffer_rect_tests.cpp | 0 .../enqueue_read_buffer_tests.cpp | 0 .../enqueue_read_image_fixture.h | 0 .../enqueue_read_image_tests.cpp | 0 .../enqueue_resource_barier_tests.cpp | 0 .../enqueue_svm_mem_copy_tests.cpp | 0 .../enqueue_svm_mem_fill_tests.cpp | 0 .../command_queue/enqueue_svm_tests.cpp | 0 .../command_queue/enqueue_thread_tests.cpp | 0 .../enqueue_unmap_memobject_tests.cpp | 0 .../command_queue/enqueue_waitlist_tests.cpp | 0 .../enqueue_write_buffer_event_tests.cpp | 0 .../enqueue_write_buffer_rect_fixture.h | 0 .../enqueue_write_buffer_rect_tests.cpp | 0 .../enqueue_write_buffer_tests.cpp | 0 .../enqueue_write_image_fixture.h | 0 .../enqueue_write_image_tests.cpp | 0 .../unit_test}/command_queue/finish_tests.cpp | 0 .../command_queue/flattened_id_tests.cpp | 0 .../unit_test}/command_queue/flush_tests.cpp | 0 .../get_command_queue_info_tests.cpp | 0 .../get_size_required_buffer_tests.cpp | 0 .../get_size_required_image_tests.cpp | 0 .../command_queue/get_size_required_tests.cpp | 0 .../command_queue/gl/CMakeLists.txt | 0 .../command_queue/gl/windows/CMakeLists.txt | 0 .../enqueue_kernel_gl_tests_windows.cpp | 0 .../command_queue/ioq_task_tests.cpp | 0 .../command_queue/ioq_task_tests_mt.cpp | 0 .../command_queue/local_id_tests.cpp | 0 .../command_queue/local_work_size_tests.cpp | 0 .../multi_dispatch_info_tests.cpp | 0 .../multiple_map_buffer_tests.cpp | 0 .../multiple_map_image_tests.cpp | 0 .../command_queue/oom_buffer_tests.cpp | 0 .../command_queue/oom_image_tests.cpp | 0 .../unit_test}/command_queue/oom_tests.cpp | 0 .../command_queue/ooq_task_tests.cpp | 0 .../command_queue/ooq_task_tests_mt.cpp | 0 .../read_write_buffer_cpu_copy.cpp | 0 .../sync_buffer_handler_tests.cpp | 0 .../command_queue/work_group_size_tests.cpp | 0 .../command_queue/zero_size_enqueue_tests.cpp | 0 .../unit_test}/command_stream/CMakeLists.txt | 0 .../aub_command_stream_receiver_1_tests.cpp | 0 .../aub_command_stream_receiver_2_tests.cpp | 0 .../command_stream/aub_file_stream_tests.cpp | 0 .../command_stream/aub_subcapture_tests.cpp | 0 .../command_stream/cmd_parse_tests.cpp | 0 .../command_stream/command_stream_fixture.h | 0 ...and_stream_receiver_flush_task_1_tests.cpp | 0 ...and_stream_receiver_flush_task_2_tests.cpp | 0 ...and_stream_receiver_flush_task_3_tests.cpp | 0 ...stream_receiver_flush_task_gmock_tests.cpp | 0 .../command_stream_receiver_hw_tests.cpp | 0 .../command_stream_receiver_hw_tests.inl | 0 .../command_stream_receiver_tests.cpp | 0 ...nd_stream_receiver_with_aub_dump_tests.cpp | 0 .../command_stream/compute_mode_tests.h | 0 .../create_command_stream_receiver_tests.cpp | 0 .../experimental_command_buffer_tests.cpp | 0 .../command_stream/get_devices_tests.cpp | 0 .../command_stream/linear_stream_fixture.h | 0 .../command_stream/linear_stream_tests.cpp | 0 .../submissions_aggregator_tests.cpp | 0 .../tbx_command_stream_fixture.cpp | 0 .../tbx_command_stream_fixture.h | 0 .../tbx_command_stream_tests.cpp | 0 .../command_stream/tbx_stream_tests.cpp | 0 .../thread_arbitration_policy_helper.cpp | 0 .../thread_arbitration_policy_helper.h | 0 ...thread_arbitration_policy_helper_tests.cpp | 0 .../compiler_interface/CMakeLists.txt | 0 .../default_cl_cache_config_tests.cpp | 0 .../test/unit_test}/context/CMakeLists.txt | 0 .../context/context_get_info_tests.cpp | 0 .../context/context_multi_device_tests.cpp | 0 .../context/context_negative_tests.cpp | 0 .../test/unit_test}/context/context_tests.cpp | 0 .../driver_diagnostics_enqueue_tests.cpp | 0 .../context/driver_diagnostics_tests.cpp | 0 .../context/driver_diagnostics_tests.h | 0 .../get_supported_image_formats_tests.cpp | 0 .../test/unit_test}/context/gl/CMakeLists.txt | 0 .../context/gl/context_gl_tests.cpp | 0 .../unit_test}/context/gl/context_gl_tests.h | 0 .../context/gl/windows/CMakeLists.txt | 0 .../gl/windows/context_gl_tests_windows.cpp | 0 .../unit_test}/core_unit_tests_files.cmake | 0 .../test/unit_test}/custom_event_listener.h | 0 .../unit_test}/d3d_sharing/CMakeLists.txt | 0 .../d3d_sharing/cl_dx_sharing_tests.cpp | 0 .../unit_test}/d3d_sharing/d3d9_tests.cpp | 0 .../unit_test}/d3d_sharing/d3d_aux_tests.cpp | 0 .../d3d_sharing/d3d_tests_part1.cpp | 0 .../d3d_sharing/d3d_tests_part2.cpp | 0 .../test/unit_test}/device/CMakeLists.txt | 0 .../unit_test}/device/device_caps_tests.cpp | 0 .../device/device_get_engine_tests.cpp | 0 .../test/unit_test}/device/device_tests.cpp | 0 .../unit_test}/device/device_timers_tests.cpp | 0 .../device/device_win_timers_tests.cpp | 0 .../device/get_device_info_size_tests.cpp | 0 .../device/get_device_info_tests.cpp | 0 .../test/unit_test}/device/gl/CMakeLists.txt | 0 .../device/gl/device_caps_gl_tests.cpp | 0 .../unit_test}/device/sub_device_tests.cpp | 0 .../unit_test}/device_queue/CMakeLists.txt | 0 .../device_queue/device_queue_hw_tests.cpp | 0 .../device_queue/device_queue_tests.cpp | 0 .../get_device_queue_info_tests.cpp | 0 .../test/unit_test}/event/CMakeLists.txt | 0 .../event/async_events_handler_tests.cpp | 0 .../unit_test}/event/event_builder_tests.cpp | 0 .../event/event_callbacks_tests.cpp | 0 .../test/unit_test}/event/event_fixture.h | 0 .../test/unit_test}/event/event_tests.cpp | 0 .../test/unit_test}/event/event_tests_mt.cpp | 0 .../unit_test}/event/event_tracker_tests.cpp | 0 .../unit_test}/event/user_events_tests.cpp | 0 .../unit_test}/event/user_events_tests_mt.cpp | 0 .../execution_environment/CMakeLists.txt | 0 .../execution_environment_tests.cpp | 0 .../unit_test}/execution_model/CMakeLists.txt | 0 .../enqueue_execution_model_kernel_tests.cpp | 0 .../parent_kernel_dispatch_tests.cpp | 0 .../scheduler_dispatch_tests.cpp | 0 .../submit_blocked_parent_kernel_tests.cpp | 0 .../test/unit_test}/fixtures/CMakeLists.txt | 0 .../aub_command_stream_receiver_fixture.h | 0 .../fixtures/buffer_enqueue_fixture.h | 0 .../unit_test}/fixtures/buffer_fixture.cpp | 0 .../test/unit_test}/fixtures/buffer_fixture.h | 0 .../unit_test}/fixtures/built_in_fixture.cpp | 0 .../unit_test}/fixtures/built_in_fixture.h | 0 .../unit_test}/fixtures/context_fixture.cpp | 0 .../unit_test}/fixtures/context_fixture.h | 0 .../unit_test}/fixtures/d3d_test_fixture.h | 0 .../unit_test}/fixtures/device_fixture.cpp | 0 .../test/unit_test}/fixtures/device_fixture.h | 0 .../fixtures/device_host_queue_fixture.cpp | 0 .../fixtures/device_host_queue_fixture.h | 0 .../unit_test}/fixtures/device_info_fixture.h | 0 .../device_instrumentation_fixture.cpp | 0 .../fixtures/device_instrumentation_fixture.h | 0 .../fixtures/dispatch_flags_fixture.h | 0 .../fixtures/enqueue_handler_fixture.h | 0 .../fixtures/execution_model_fixture.h | 0 .../fixtures/execution_model_kernel_fixture.h | 0 .../unit_test}/fixtures/hello_world_fixture.h | 0 .../fixtures/hello_world_kernel_fixture.h | 0 .../unit_test}/fixtures/image_fixture.cpp | 0 .../test/unit_test}/fixtures/image_fixture.h | 0 .../fixtures/kernel_arg_fixture.cpp | 0 .../unit_test}/fixtures/kernel_arg_fixture.h | 0 .../fixtures/kernel_data_fixture.cpp | 0 .../unit_test}/fixtures/kernel_data_fixture.h | 0 .../fixtures/media_kernel_fixture.h | 0 .../fixtures/memory_allocator_fixture.h | 0 .../memory_allocator_multi_device_fixture.h | 0 .../fixtures/memory_management_fixture.cpp | 0 .../fixtures/memory_management_fixture.h | 0 .../fixtures/memory_manager_fixture.cpp | 0 .../fixtures/memory_manager_fixture.h | 0 .../fixtures/mock_aub_center_fixture.h | 0 .../fixtures/multi_root_device_fixture.h | 0 .../unit_test}/fixtures/platform_fixture.cpp | 0 .../unit_test}/fixtures/platform_fixture.h | 0 .../unit_test}/fixtures/program_fixture.cpp | 0 .../unit_test}/fixtures/program_fixture.h | 0 .../unit_test}/fixtures/run_kernel_fixture.h | 0 .../fixtures/scenario_test_fixture.h | 0 .../unit_test}/fixtures/simple_arg_fixture.h | 0 .../fixtures/simple_arg_kernel_fixture.h | 0 .../fixtures/templated_fixture_tests.cpp | 0 .../unit_test}/fixtures/two_walker_fixture.h | 0 .../ult_command_stream_receiver_fixture.h | 0 .../test/unit_test}/gen11/CMakeLists.txt | 0 .../gen11/coherency_tests_gen11.cpp | 0 ...command_stream_receiver_hw_tests_gen11.cpp | 0 .../test/unit_test}/gen11/ehl/CMakeLists.txt | 0 .../unit_test}/gen11/ehl/linux/CMakeLists.txt | 0 .../gen11/ehl/linux/dll/CMakeLists.txt | 0 .../ehl/linux/dll/device_id_tests_ehl.cpp | 0 .../ehl/linux/hw_info_config_tests_ehl.cpp | 0 .../gen11/ehl/test_device_caps_ehl.cpp | 0 .../gen11/ehl/test_hw_info_config_ehl.cpp | 0 .../gen11/ehl/windows/CMakeLists.txt | 0 .../ehl/windows/hw_info_config_tests_ehl.cpp | 0 .../unit_test}/gen11/enqueue_kernel_gen11.cpp | 0 .../gen11/enqueue_media_kernel_gen11.cpp | 0 .../gen11/hw_helper_tests_gen11.cpp | 0 .../unit_test}/gen11/icllp/CMakeLists.txt | 0 .../gen11/icllp/linux/CMakeLists.txt | 0 .../gen11/icllp/linux/dll/CMakeLists.txt | 0 .../icllp/linux/dll/device_id_tests_icllp.cpp | 0 .../linux/hw_info_config_tests_icllp.cpp | 0 .../gen11/icllp/test_device_caps_icllp.cpp | 0 .../gen11/icllp/test_hw_info_config_icllp.cpp | 0 .../gen11/icllp/test_media_kernel_icllp.cpp | 0 .../test_program_media_sampler_icllp.cpp | 0 .../gen11/icllp/windows/CMakeLists.txt | 0 .../windows/hw_info_config_tests_icllp.cpp | 0 .../unit_test}/gen11/image_tests_gen11.cpp | 0 .../unit_test}/gen11/kernel_tests_gen11.cpp | 0 .../test/unit_test}/gen11/lkf/CMakeLists.txt | 0 .../unit_test}/gen11/lkf/linux/CMakeLists.txt | 0 .../gen11/lkf/linux/dll/CMakeLists.txt | 0 .../lkf/linux/dll/device_id_tests_lkf.cpp | 0 .../lkf/linux/hw_info_config_tests_lkf.cpp | 0 .../gen11/lkf/test_device_caps_lkf.cpp | 0 .../gen11/lkf/test_hw_info_config_lkf.cpp | 0 .../gen11/lkf/windows/CMakeLists.txt | 0 .../lkf/windows/hw_info_config_tests_lkf.cpp | 0 .../unit_test}/gen11/sampler_tests_gen11.cpp | 0 .../gen11/scheduler_source_tests_gen11.cpp | 0 ...bx_command_stream_receiver_tests_gen11.cpp | 0 .../gen11/test_device_caps_gen11.cpp | 0 .../gen11/test_device_queue_hw_gen11.cpp | 0 .../gen11/test_platform_caps_gen11.cpp | 0 .../unit_test}/gen11/test_sample_gen11.cpp | 0 .../gen11/unit_test_helper_gen11.cpp | 0 .../unit_test}/gen11/windows/CMakeLists.txt | 0 .../windows/gmm_callbacks_tests_gen11.cpp | 0 .../test/unit_test}/gen12lp/CMakeLists.txt | 0 ..._command_stream_receiver_tests_gen12lp.inl | 0 .../gen12lp/cmd_parse/cmd_parse_gen12lp.inl | 0 .../gen12lp/coherency_tests_gen12lp.inl | 0 ...mmand_stream_receiver_hw_tests_gen12lp.inl | 0 ...iver_simulated_common_hw_tests_gen12lp.inl | 0 .../gen12lp/compute_mode_tests_gen12lp.inl | 0 .../gen12lp/device_queue_tests_gen12lp.cpp | 0 .../gen12lp/enqueue_media_kernel_gen12lp.inl | 0 .../gen12lp/gen12lp_tests_wrapper.cpp | 0 .../gen12lp/hw_helper_tests_gen12lp.inl | 0 .../gen12lp/image_tests_gen12lp.inl | 0 .../gen12lp/kernel_tests_gen12lp.inl | 0 .../gen12lp/profiling_tests_gen12lp.inl | 0 .../gen12lp/sampler_tests_gen12lp.inl | 0 .../scheduler_source_tests_gen12lp.inl | 0 .../gen12lp/special_ult_helper_gen12lp.cpp | 0 .../gen12lp/special_ult_helper_gen12lp.h | 0 ..._command_stream_receiver_tests_gen12lp.inl | 0 .../gen12lp/test_device_caps_gen12lp.inl | 0 .../gen12lp/test_device_queue_hw_gen12lp.inl | 0 .../gen12lp/test_platform_caps_gen12lp.inl | 0 .../gen12lp/test_sample_gen12lp.inl | 0 .../unit_test}/gen12lp/tgllp/CMakeLists.txt | 0 .../gen12lp/tgllp/kernel_tests_tgllp.cpp | 0 .../gen12lp/tgllp/linux/CMakeLists.txt | 0 .../gen12lp/tgllp/linux/dll/CMakeLists.txt | 0 .../tgllp/linux/dll/device_id_tests_tgllp.cpp | 0 .../tgllp/linux/test_hw_info_config_tgllp.cpp | 0 .../gen12lp/tgllp/test_hw_helper_tgllp.cpp | 0 .../tgllp/test_hw_info_config_tgllp.cpp | 0 .../gen12lp/tgllp/windows/CMakeLists.txt | 0 .../windows/hw_info_config_tests_tgllp.cpp | 0 .../gen12lp/unit_test_helper_gen12lp.cpp | 0 .../unit_test}/gen12lp/windows/CMakeLists.txt | 0 .../windows/gmm_callbacks_tests_gen12lp.cpp | 0 .../windows/hw_info_config_tests_gen12lp.cpp | 0 .../gen12lp/windows/wddm_tests_gen12lp.cpp | 0 .../test/unit_test}/gen8/CMakeLists.txt | 0 .../test/unit_test}/gen8/bdw/CMakeLists.txt | 0 .../unit_test}/gen8/bdw/device_tests_bdw.cpp | 0 .../unit_test}/gen8/bdw/linux/CMakeLists.txt | 0 .../gen8/bdw/linux/dll/CMakeLists.txt | 0 .../bdw/linux/dll/device_id_tests_bdw.cpp | 0 .../bdw/linux/hw_info_config_tests_bdw.cpp | 0 .../gen8/bdw/test_device_caps_bdw.cpp | 0 .../gen8/bdw/test_hw_info_config_bdw.cpp | 0 .../gen8/bdw/windows/CMakeLists.txt | 0 .../bdw/windows/hw_info_config_tests_bdw.cpp | 0 .../windows/test_device_caps_bdw_windows.cpp | 0 .../unit_test}/gen8/coherency_tests_gen8.cpp | 0 .../command_stream_receiver_hw_tests_gen8.cpp | 0 .../gen8/enqueue_media_kernel_gen8.cpp | 0 .../unit_test}/gen8/hw_helper_tests_gen8.cpp | 0 .../test/unit_test}/gen8/image_tests_gen8.cpp | 0 .../unit_test}/gen8/kernel_tests_gen8.cpp | 0 .../unit_test}/gen8/sampler_tests_gen8.cpp | 0 .../gen8/scheduler_dispatch_tests_gen8.cpp | 0 .../gen8/scheduler_source_tests_gen8.cpp | 0 .../unit_test}/gen8/test_device_caps_gen8.cpp | 0 .../gen8/test_device_queue_hw_gen8.cpp | 0 .../gen8/test_platform_caps_gen8.cpp | 0 .../test/unit_test}/gen8/test_sample_gen8.cpp | 0 .../unit_test}/gen8/unit_test_helper_gen8.cpp | 0 .../unit_test}/gen8/windows/CMakeLists.txt | 0 .../gen8/windows/gmm_callbacks_tests_gen8.cpp | 0 .../test/unit_test}/gen9/CMakeLists.txt | 0 .../test/unit_test}/gen9/bxt/CMakeLists.txt | 0 .../unit_test}/gen9/bxt/device_tests_bxt.cpp | 0 .../unit_test}/gen9/bxt/linux/CMakeLists.txt | 0 .../gen9/bxt/linux/dll/CMakeLists.txt | 0 .../gen9/bxt/linux/dll/device_id_tests.cpp | 0 .../gen9/bxt/linux/hw_info_config_tests.cpp | 0 .../gen9/bxt/test_device_caps_bxt.cpp | 0 .../gen9/bxt/test_hw_info_config_bxt.cpp | 0 .../gen9/bxt/windows/CMakeLists.txt | 0 .../bxt/windows/hw_info_config_tests_bxt.cpp | 0 .../windows/test_device_caps_bxt_windows.cpp | 0 .../test/unit_test}/gen9/cfl/CMakeLists.txt | 0 .../unit_test}/gen9/cfl/linux/CMakeLists.txt | 0 .../gen9/cfl/linux/dll/CMakeLists.txt | 0 .../cfl/linux/dll/device_id_tests_cfl.cpp | 0 .../cfl/linux/hw_info_config_tests_cfl.cpp | 0 .../gen9/cfl/test_device_caps_cfl.cpp | 0 .../gen9/cfl/test_hw_info_config_cfl.cpp | 0 .../gen9/cfl/windows/CMakeLists.txt | 0 .../cfl/windows/hw_info_config_tests_cfl.cpp | 0 .../windows/test_device_caps_cfl_windows.cpp | 0 .../unit_test}/gen9/coherency_tests_gen9.cpp | 0 .../command_stream_receiver_hw_tests_gen9.cpp | 0 .../unit_test}/gen9/enqueue_kernel_gen9.cpp | 0 .../gen9/enqueue_media_kernel_gen9.cpp | 0 .../test/unit_test}/gen9/glk/CMakeLists.txt | 0 .../unit_test}/gen9/glk/linux/CMakeLists.txt | 0 .../gen9/glk/linux/dll/CMakeLists.txt | 0 .../glk/linux/dll/device_id_tests_glk.cpp | 0 .../glk/linux/hw_info_config_tests_glk.cpp | 0 .../gen9/glk/test_device_caps_glk.cpp | 0 .../gen9/glk/test_hw_info_config_glk.cpp | 0 .../gen9/glk/windows/CMakeLists.txt | 0 .../glk/windows/hw_info_config_tests_glk.cpp | 0 .../windows/test_device_caps_glk_windows.cpp | 0 .../unit_test}/gen9/hw_helper_tests_gen9.cpp | 0 .../test/unit_test}/gen9/image_tests_gen9.cpp | 0 .../test/unit_test}/gen9/kbl/CMakeLists.txt | 0 .../unit_test}/gen9/kbl/linux/CMakeLists.txt | 0 .../gen9/kbl/linux/dll/CMakeLists.txt | 0 .../kbl/linux/dll/device_id_tests_kbl.cpp | 0 .../kbl/linux/hw_info_config_tests_kbl.cpp | 0 .../gen9/kbl/test_device_caps_kbl.cpp | 0 .../gen9/kbl/test_hw_info_config_kbl.cpp | 0 .../gen9/kbl/windows/CMakeLists.txt | 0 .../kbl/windows/hw_info_config_tests_kbl.cpp | 0 .../windows/test_device_caps_kbl_windows.cpp | 0 .../unit_test}/gen9/kernel_tests_gen9.cpp | 0 .../unit_test}/gen9/sampler_tests_gen9.cpp | 0 .../gen9/scheduler_source_tests_gen9.cpp | 0 .../test/unit_test}/gen9/sip_tests_gen9.cpp | 0 .../test/unit_test}/gen9/skl/CMakeLists.txt | 0 .../unit_test}/gen9/skl/device_tests_skl.cpp | 0 .../unit_test}/gen9/skl/linux/CMakeLists.txt | 0 .../gen9/skl/linux/dll/CMakeLists.txt | 0 .../skl/linux/dll/device_id_tests_skl.cpp | 0 .../skl/linux/hw_info_config_tests_skl.cpp | 0 .../gen9/skl/test_device_caps_skl.cpp | 0 .../gen9/skl/test_hw_info_config_skl.cpp | 0 .../unit_test}/gen9/skl/test_sample_skl.cpp | 0 .../gen9/skl/windows/CMakeLists.txt | 0 .../skl/windows/hw_info_config_tests_skl.cpp | 0 .../windows/test_device_caps_skl_windows.cpp | 0 .../unit_test}/gen9/test_device_caps_gen9.cpp | 0 .../gen9/test_device_queue_hw_gen9.cpp | 0 .../gen9/test_platform_caps_gen9.cpp | 0 .../test/unit_test}/gen9/test_sample_gen9.cpp | 0 .../unit_test}/gen9/unit_test_helper_gen9.cpp | 0 .../unit_test}/gen9/windows/CMakeLists.txt | 0 .../gen9/windows/gmm_callbacks_tests_gen9.cpp | 0 .../test/unit_test}/gen_common/CMakeLists.txt | 0 .../unit_test}/gen_common/cmd_parse_base.inl | 0 .../gen_common/cmd_parse_base_mi_arb.inl | 0 .../gen_common/cmd_parse_compute_mode.inl | 0 .../gen_common/cmd_parse_gpgpu_walker.inl | 0 .../gen_common/cmd_parse_mi_arb.inl | 0 .../unit_test}/gen_common/cmd_parse_sip.inl | 0 .../exclude_tests/exclude_test_declare.cpp | 0 .../exclude_tests/exclude_test_exclude.cpp | 0 .../unit_test}/gen_common/gen_cmd_parse.h | 0 .../gen_commands_common_validation.h | 0 .../unit_test}/gen_common/hw_cmds_tests.cpp | 0 .../test/unit_test}/gen_common/matchers.h | 0 .../test/unit_test}/global_environment.cpp | 0 .../test/unit_test}/global_environment.h | 0 .../test/unit_test}/gmm_helper/CMakeLists.txt | 0 .../gmm_helper/gmm_helper_tests.cpp | 0 .../test/unit_test}/gtpin/CMakeLists.txt | 0 .../test/unit_test}/gtpin/gtpin_tests.cpp | 0 .../test/unit_test}/helpers/CMakeLists.txt | 0 .../unit_test}/helpers/array_count_tests.cpp | 0 .../unit_test}/helpers/base_object_tests.cpp | 0 .../helpers/base_object_tests_mt.cpp | 0 .../unit_test}/helpers/basic_math_tests.cpp | 0 .../unit_test}/helpers/bit_helpers_tests.cpp | 0 .../unit_test}/helpers/built_ins_helper.cpp | 0 .../unit_test}/helpers/cl_helper_tests.cpp | 0 .../unit_test}/helpers/cmd_buffer_validator.h | 0 .../helpers/cmd_buffer_validator_tests.cpp | 0 .../test/unit_test}/helpers/debug_helpers.cpp | 0 .../helpers/debug_helpers_tests.cpp | 0 .../deferred_deleter_helpers_tests.cpp | 0 .../helpers/dirty_state_helpers_tests.cpp | 0 .../helpers/dispatch_flags_helper.h | 0 .../helpers/dispatch_info_builder_tests.cpp | 0 .../helpers/dispatch_info_tests.cpp | 0 .../helpers/execution_environment_helper.cpp | 0 .../helpers/execution_environment_helper.h | 0 .../helpers/extendable_enum_tests.cpp | 0 .../unit_test}/helpers/flush_stamp_tests.cpp | 0 .../helpers/get_gpgpu_engines_tests.inl | 0 .../helpers/get_info_status_mapper_tests.cpp | 0 .../unit_test}/helpers/get_info_tests.cpp | 0 .../test/unit_test}/helpers/gtest_helpers.h | 0 .../hardware_commands_helper_tests.cpp | 0 .../helpers/hardware_commands_helper_tests.h | 0 .../helpers/hw_helper_default_tests.cpp | 0 .../unit_test}/helpers/hw_helper_tests.cpp | 0 .../test/unit_test}/helpers/hw_helper_tests.h | 0 .../test/unit_test}/helpers/hw_parse.h | 0 .../test/unit_test}/helpers/hw_parse.inl | 0 .../helpers/kernel_binary_helper.cpp | 0 .../unit_test}/helpers/kernel_binary_helper.h | 0 .../kernel_binary_helper_hash_value.cpp | 0 .../helpers/kernel_filename_helper.h | 0 .../unit_test}/helpers/kmd_notify_tests.cpp | 0 .../unit_test}/helpers/linux/CMakeLists.txt | 0 .../helpers/linux/kmd_notify_linux_tests.cpp | 0 .../mem_properties_parser_helper_tests.cpp | 0 .../helpers/memory_management_tests.cpp | 0 .../memory_properties_flags_helpers_tests.cpp | 0 .../test/unit_test}/helpers/mipmap_tests.cpp | 0 .../helpers/per_thread_data_tests.cpp | 0 .../unit_test}/helpers/ptr_math_tests.cpp | 0 .../helpers/queue_helpers_tests.cpp | 0 .../test/unit_test}/helpers/raii_hw_helper.h | 0 .../helpers/sampler_helpers_tests.cpp | 0 .../test/unit_test}/helpers/static_size3.h | 0 .../helpers/task_information_tests.cpp | 0 .../helpers/test_debug_variables.inl | 0 .../test/unit_test}/helpers/test_files.cpp | 0 .../test/unit_test}/helpers/test_files.h | 0 .../helpers/timestamp_packet_tests.cpp | 0 .../helpers/transfer_properties_tests.cpp | 0 .../unit_test}/helpers/uint16_sse4_tests.cpp | 0 .../test/unit_test}/helpers/ult_limits.h | 0 .../unit_test}/helpers/unit_test_helper.h | 0 .../unit_test}/helpers/unit_test_helper.inl | 0 .../unit_test}/helpers/validator_tests.cpp | 0 .../test/unit_test}/helpers/variable_backup.h | 0 .../unit_test}/helpers/windows/CMakeLists.txt | 0 .../helpers/windows/gl_helper_tests.cpp | 0 .../windows/kmd_notify_windows_tests.cpp | 0 .../helpers/windows/mock_function.cpp | 0 .../helpers/windows/mock_function.h | 0 .../test/unit_test}/igdrcl_tests_pch.cpp | 0 .../test/unit_test}/igdrcl_tests_pch.h | 0 .../indirect_heap/indirect_heap_fixture.cpp | 0 .../indirect_heap/indirect_heap_fixture.h | 0 .../test/unit_test}/kernel/CMakeLists.txt | 0 .../unit_test}/kernel/clone_kernel_tests.cpp | 0 .../unit_test}/kernel/debug_kernel_tests.cpp | 0 .../kernel/gl/kernel_arg_buffer_tests.cpp | 0 .../kernel/image_transformer_tests.cpp | 0 .../kernel/kernel_accelerator_arg_tests.cpp | 0 .../kernel/kernel_arg_buffer_fixture.cpp | 0 .../kernel/kernel_arg_buffer_fixture.h | 0 .../kernel/kernel_arg_buffer_tests.cpp | 0 .../kernel/kernel_arg_dev_queue_tests.cpp | 0 .../kernel/kernel_arg_info_tests.cpp | 0 .../kernel/kernel_arg_pipe_tests.cpp | 0 .../kernel/kernel_arg_svm_tests.cpp | 0 .../kernel_cache_flush_requirements_tests.cpp | 0 .../kernel/kernel_image_arg_tests.cpp | 0 .../kernel/kernel_immediate_arg_tests.cpp | 0 .../kernel/kernel_info_cl_tests.cpp | 0 .../kernel/kernel_is_patched_tests.cpp | 0 .../kernel_reflection_surface_tests.cpp | 0 .../kernel/kernel_slm_arg_tests.cpp | 0 .../unit_test}/kernel/kernel_slm_tests.cpp | 0 .../test/unit_test}/kernel/kernel_tests.cpp | 0 .../kernel/kernel_transformable_tests.cpp | 0 .../unit_test}/kernel/parent_kernel_tests.cpp | 0 .../kernel/substitute_kernel_heap_tests.cpp | 0 .../test/unit_test}/libult/CMakeLists.txt | 0 .../libult/create_command_stream.cpp | 0 .../unit_test}/libult/create_command_stream.h | 0 .../unit_test}/libult/create_tbx_sockets.cpp | 0 .../test/unit_test}/libult/debug_manager.cpp | 0 .../test/unit_test}/libult/os_interface.cpp | 0 .../libult/source_level_debugger.cpp | 0 .../libult/source_level_debugger_library.cpp | 0 .../libult/source_level_debugger_library.h | 0 .../libult/ult_aub_command_stream_receiver.h | 0 .../libult/ult_command_stream_receiver.h | 0 .../test/unit_test}/linux/CMakeLists.txt | 0 .../linux/drm_null_device_tests.cpp | 0 .../unit_test}/linux/drm_other_requests.cpp | 0 .../test/unit_test}/linux/drm_wrap.h | 0 .../linux/linux_tests_configuration.cpp | 0 .../test/unit_test}/linux/main_linux_dll.cpp | 0 .../test/unit_test}/linux/mock_os_layer.cpp | 0 .../test/unit_test}/linux/mock_os_layer.h | 0 .../test/unit_test}/linux/test_mode.h | 0 .../test/unit_test}/linux/va_tests.cpp | 0 .../test/unit_test}/main.cpp | 0 .../test/unit_test}/mem_obj/CMakeLists.txt | 0 .../unit_test}/mem_obj/buffer_pin_tests.cpp | 0 .../mem_obj/buffer_set_arg_tests.cpp | 0 .../test/unit_test}/mem_obj/buffer_tests.cpp | 0 .../mem_obj/create_image_format_tests.cpp | 0 .../mem_obj/destructor_callback_tests.cpp | 0 .../get_mem_object_info_subbuffer_tests.cpp | 0 .../mem_obj/get_mem_object_info_tests.cpp | 0 .../test/unit_test}/mem_obj/image1d_tests.cpp | 0 .../mem_obj/image2d_from_buffer_tests.cpp | 0 .../test/unit_test}/mem_obj/image2d_tests.cpp | 0 .../test/unit_test}/mem_obj/image3d_tests.cpp | 0 .../mem_obj/image_array_size_tests.cpp | 0 .../mem_obj/image_compression_fixture.h | 0 .../unit_test}/mem_obj/image_format_tests.cpp | 0 .../mem_obj/image_from_subbuffer_tests.cpp | 0 .../mem_obj/image_redescribe_tests.cpp | 0 .../image_release_mapped_ptr_tests.cpp | 0 .../mem_obj/image_set_arg_tests.cpp | 0 .../unit_test}/mem_obj/image_snorm_tests.cpp | 0 .../test/unit_test}/mem_obj/image_tests.cpp | 0 .../mem_obj/image_tests_tgllp_plus.cpp | 0 .../unit_test}/mem_obj/image_tiled_tests.cpp | 0 .../mem_obj/image_transfer_tests.cpp | 0 .../mem_obj/image_validate_tests.cpp | 0 .../mem_obj/map_operations_handler_tests.cpp | 0 .../mem_obj/mem_obj_destruction_tests.cpp | 0 .../mem_obj/mem_obj_helper_tests.cpp | 0 .../test/unit_test}/mem_obj/mem_obj_tests.cpp | 0 .../unit_test}/mem_obj/nv12_image_tests.cpp | 0 .../mem_obj/packed_yuv_image_tests.cpp | 0 .../test/unit_test}/mem_obj/pipe_tests.cpp | 0 .../unit_test}/mem_obj/sub_buffer_tests.cpp | 0 .../unit_test}/mem_obj/zero_copy_tests.cpp | 0 .../unit_test}/memory_manager/CMakeLists.txt | 0 .../memory_manager/address_mapper_tests.cpp | 0 ...u_page_fault_manager_memory_sync_tests.cpp | 0 .../deferrable_allocation_deletion_tests.cpp | 0 .../deferred_deleter_mt_tests.cpp | 0 .../memory_manager/gfx_partition_tests.cpp | 0 .../memory_manager/gfx_partition_tests.inl | 0 .../graphics_allocation_tests.cpp | 0 .../memory_manager/host_ptr_manager_tests.cpp | 0 .../internal_allocation_storage_tests.cpp | 0 .../local_memory_usage_tests.cpp | 0 ..._manager_allocate_in_device_pool_tests.cpp | 0 ..._manager_allocate_in_device_pool_tests.inl | 0 ...nager_allocate_in_preferred_pool_tests.cpp | 0 ...nager_allocate_in_preferred_pool_tests.inl | 0 .../memory_manager_multi_device_tests.cpp | 0 .../memory_manager/memory_manager_tests.cpp | 0 .../memory_manager/memory_pool_tests.cpp | 0 .../memory_manager/page_table_tests.cpp | 0 .../physical_address_allocator_tests.cpp | 0 .../memory_manager/surface_tests.cpp | 0 .../unified_memory_manager_tests.cpp | 0 .../unified_memory_token_tests.cpp | 0 .../test/unit_test}/mock_gdi/CMakeLists.txt | 0 .../test/unit_test}/mock_gdi/gdi32_mock.def | 0 .../test/unit_test}/mock_gdi/mock_gdi.cpp | 0 .../test/unit_test}/mock_gdi/mock_gdi.h | 0 .../mock_gdi/mock_gdi_gfx_partition.cpp | 0 .../test/unit_test}/mock_gl/CMakeLists.txt | 0 .../unit_test}/mock_gl/windows/CMakeLists.txt | 0 .../mock_gl/windows/mock_opengl32.cpp | 0 .../mock_gl/windows/mock_opengl32.def | 0 .../test/unit_test}/mock_gmm/CMakeLists.txt | 0 .../test/unit_test}/mock_gmm/mock_gmm.cpp | 0 .../test/unit_test}/mocks/CMakeLists.txt | 0 .../test/unit_test}/mocks/gl/CMakeLists.txt | 0 .../mocks/gl/windows/CMakeLists.txt | 0 .../windows/mock_gl_arb_sync_event_windows.h | 0 .../gl/windows/mock_gl_sharing_windows.cpp | 0 .../gl/windows/mock_gl_sharing_windows.h | 0 .../mocks/gmm_memory/mock_gmm_memory.h | 0 .../mocks/linux/mock_drm_allocation.h | 0 .../linux/mock_drm_command_stream_receiver.h | 0 .../mocks/linux/mock_drm_memory_manager.cpp | 0 .../mocks/linux/mock_drm_memory_manager.h | 0 .../mocks/mock_allocation_properties.h | 0 .../mocks/mock_async_event_handler.cpp | 0 .../mocks/mock_async_event_handler.h | 0 .../test/unit_test}/mocks/mock_aub_center.h | 0 .../test/unit_test}/mocks/mock_aub_csr.h | 0 .../unit_test}/mocks/mock_aub_file_stream.h | 0 .../test/unit_test}/mocks/mock_aub_manager.h | 0 .../test/unit_test}/mocks/mock_aub_stream.h | 0 .../mocks/mock_aub_subcapture_manager.h | 0 .../mocks/mock_block_kernel_manager.h | 0 .../test/unit_test}/mocks/mock_buffer.h | 0 .../mock_builtin_dispatch_info_builder.h | 0 .../test/unit_test}/mocks/mock_builtins.cpp | 0 .../test/unit_test}/mocks/mock_builtins.h | 0 .../test/unit_test}/mocks/mock_cif.cpp | 0 .../test/unit_test}/mocks/mock_cif.h | 0 .../unit_test}/mocks/mock_command_queue.h | 0 .../test/unit_test}/mocks/mock_compilers.cpp | 0 .../test/unit_test}/mocks/mock_compilers.h | 0 .../test/unit_test}/mocks/mock_context.cpp | 0 .../test/unit_test}/mocks/mock_context.h | 0 .../test/unit_test}/mocks/mock_csr.cpp | 0 .../test/unit_test}/mocks/mock_csr.h | 0 .../test/unit_test}/mocks/mock_d3d_objects.h | 0 .../mocks/mock_deferrable_deletion.cpp | 0 .../mocks/mock_deferrable_deletion.h | 0 .../mocks/mock_deferred_deleter.cpp | 0 .../unit_test}/mocks/mock_deferred_deleter.h | 0 .../test/unit_test}/mocks/mock_device.cpp | 0 .../test/unit_test}/mocks/mock_device.h | 0 .../test/unit_test}/mocks/mock_device_queue.h | 0 .../test/unit_test}/mocks/mock_event.h | 0 .../mocks/mock_execution_environment.h | 0 .../mocks/mock_experimental_command_buffer.h | 0 .../unit_test}/mocks/mock_gfx_partition.cpp | 0 .../unit_test}/mocks/mock_gfx_partition.h | 0 .../test/unit_test}/mocks/mock_gmm.h | 0 .../mocks/mock_gmm_client_context.cpp | 0 .../mocks/mock_gmm_client_context.h | 0 .../mocks/mock_gmm_client_context_base.cpp | 0 .../mocks/mock_gmm_client_context_base.h | 0 .../unit_test}/mocks/mock_gmm_memory_base.cpp | 0 .../unit_test}/mocks/mock_gmm_memory_base.h | 0 .../mocks/mock_gmm_page_table_mngr.cpp | 0 .../mocks/mock_gmm_page_table_mngr.h | 0 .../mocks/mock_gmm_resource_info.cpp | 0 .../unit_test}/mocks/mock_gmm_resource_info.h | 0 .../mocks/mock_graphics_allocation.h | 0 .../unit_test}/mocks/mock_host_ptr_manager.h | 0 .../test/unit_test}/mocks/mock_hw_helper.h | 0 .../test/unit_test}/mocks/mock_image.h | 0 .../mocks/mock_internal_allocation_storage.h | 0 .../test/unit_test}/mocks/mock_kernel.cpp | 0 .../test/unit_test}/mocks/mock_kernel.h | 0 .../test/unit_test}/mocks/mock_lrca_helper.h | 0 .../test/unit_test}/mocks/mock_mdi.h | 0 .../unit_test}/mocks/mock_memory_manager.cpp | 0 .../unit_test}/mocks/mock_memory_manager.h | 0 .../mocks/mock_memory_operations_handler.h | 0 .../test/unit_test}/mocks/mock_os_context.h | 0 .../test/unit_test}/mocks/mock_ostime.h | 0 .../test/unit_test}/mocks/mock_ostime_win.h | 0 .../mocks/mock_physical_address_allocator.h | 0 .../test/unit_test}/mocks/mock_pipe.h | 0 .../test/unit_test}/mocks/mock_platform.cpp | 0 .../test/unit_test}/mocks/mock_platform.h | 0 .../test/unit_test}/mocks/mock_program.cpp | 0 .../test/unit_test}/mocks/mock_program.h | 0 .../test/unit_test}/mocks/mock_sampler.h | 0 .../unit_test}/mocks/mock_sharing_factory.h | 0 .../test/unit_test}/mocks/mock_sip.cpp | 0 .../test/unit_test}/mocks/mock_sip.h | 0 .../mocks/mock_source_level_debugger.h | 0 .../mocks/mock_submissions_aggregator.h | 0 .../test/unit_test}/mocks/mock_svm_manager.h | 0 .../test/unit_test}/mocks/mock_tbx_csr.h | 0 .../test/unit_test}/mocks/mock_tbx_sockets.h | 0 .../test/unit_test}/mocks/mock_tbx_stream.h | 0 .../mocks/mock_timestamp_container.h | 0 .../test/unit_test}/mocks/mock_wddm.cpp | 0 .../test/unit_test}/mocks/mock_wddm.h | 0 .../unit_test}/mocks/mock_wddm_interface20.h | 0 .../unit_test}/mocks/mock_wddm_interface23.h | 0 ...ock_wddm_residency_allocations_container.h | 0 .../test/unit_test}/mocks/wddm_mock_helpers.h | 0 .../test/unit_test}/mt_tests/CMakeLists.txt | 0 .../unit_test}/mt_tests/api/CMakeLists.txt | 0 .../mt_tests/command_queue/CMakeLists.txt | 0 .../mt_tests/device_queue/CMakeLists.txt | 0 .../device_queue/device_queue_mt_tests.cpp | 0 .../unit_test}/mt_tests/event/CMakeLists.txt | 0 .../mt_tests/fixtures/CMakeLists.txt | 0 .../mt_tests/helpers/CMakeLists.txt | 0 .../helpers/interlocked_max_mt_tests.cpp | 0 .../mt_tests/memory_manager/CMakeLists.txt | 0 .../deferred_deleter_clear_queue_mt_tests.cpp | 0 .../mt_tests/os_interface/CMakeLists.txt | 0 .../linux/drm_memory_manager_mt_tests.cpp | 0 .../test/unit_test}/mt_tests/test_mode.h | 0 .../mt_tests/utilities/CMakeLists.txt | 0 .../reference_tracked_object_tests_mt.cpp | 0 .../offline_compiler/CMakeLists.txt | 0 .../decoder/decoder_tests.cpp | 0 .../decoder/encoder_tests.cpp | 0 .../decoder/mock/mock_decoder.h | 0 .../decoder/mock/mock_encoder.h | 0 .../decoder/mock/mock_iga_wrapper.h | 0 .../unit_test}/offline_compiler/environment.h | 0 .../test/unit_test}/offline_compiler/main.cpp | 0 .../mock/mock_offline_compiler.h | 0 .../mock/mock_sip_ocloc_tests.cpp | 0 .../ocloc_fatbinary_tests.cpp | 0 .../offline_compiler_tests.cpp | 0 .../offline_compiler/offline_compiler_tests.h | 0 .../segfault_test/CMakeLists.txt | 0 .../linux/safety_guard_caller_linux.cpp | 0 .../offline_compiler/segfault_test/main.cpp | 0 .../segfault_test/segfault_helper.h | 0 .../windows/safety_guard_caller_windows.cpp | 0 .../test/unit_test}/options_unit_tests.cpp | 0 .../unit_test}/os_interface/CMakeLists.txt | 0 .../os_interface/device_factory_tests.cpp | 0 .../os_interface/hw_info_config_tests.cpp | 0 .../os_interface/hw_info_config_tests.h | 0 .../unit_test}/os_interface/linux/.clang-tidy | 0 .../os_interface/linux/CMakeLists.txt | 0 .../os_interface/linux/allocator_helper.cpp | 0 .../linux/allocator_helper_tests.cpp | 0 .../linux/create_drm_memory_manager.cpp | 0 .../os_interface/linux/debug_env_reader.cpp | 0 .../linux/device_command_stream_fixture.h | 0 .../linux/device_command_stream_tests.cpp | 0 .../linux/device_factory_tests.cpp | 0 .../os_interface/linux/device_factory_tests.h | 0 .../os_interface/linux/device_os_tests.cpp | 0 .../os_interface/linux/driver_info_tests.cpp | 0 .../linux/drm_buffer_object_tests.cpp | 0 .../linux/drm_command_stream_fixture.h | 0 .../linux/drm_command_stream_mm_tests.cpp | 0 .../linux/drm_command_stream_tests.cpp | 0 .../linux/drm_engine_info_tests.cpp | 0 .../linux/drm_gem_close_worker_tests.cpp | 0 .../os_interface/linux/drm_mapper_tests.cpp | 0 .../linux/drm_memory_info_tests.cpp | 0 ..._manager_allocate_in_device_pool_tests.cpp | 0 .../linux/drm_memory_manager_tests.cpp | 0 .../linux/drm_memory_manager_tests.h | 0 .../os_interface/linux/drm_mock.cpp | 0 .../unit_test}/os_interface/linux/drm_mock.h | 0 .../os_interface/linux/drm_neo_create.cpp | 0 .../linux/drm_os_memory_tests.cpp | 0 .../linux/drm_residency_handler_tests.cpp | 0 .../os_interface/linux/drm_tests.cpp | 0 .../linux/file_logger_linux_tests.cpp | 0 .../linux/hw_info_config_linux_tests.cpp | 0 .../linux/hw_info_config_linux_tests.h | 0 ...te_command_queue_with_properties_tests.cpp | 0 .../os_interface/linux/mock_os_time_linux.h | 0 .../linux/mock_performance_counters_linux.cpp | 0 .../linux/mock_performance_counters_linux.h | 0 .../unit_test}/os_interface/linux/options.cpp | 0 .../linux/os_interface_linux_tests.cpp | 0 .../os_interface/linux/os_time_test.cpp | 0 .../performance_counters_linux_tests.cpp | 0 .../os_interface/linux/self_lib_lin.cpp | 0 .../linux/sys_calls_linux_ult.cpp | 0 .../mock_performance_counters.cpp | 0 .../os_interface/mock_performance_counters.h | 0 .../os_interface/os_context_tests.cpp | 0 .../os_interface/os_interface_tests.cpp | 0 .../os_interface/os_library_tests.cpp | 0 .../os_interface/os_memory_tests.cpp | 0 .../performance_counters_gen_tests.cpp | 0 .../performance_counters_tests.cpp | 0 .../os_interface/windows/CMakeLists.txt | 0 .../windows/create_wddm_memory_manager.cpp | 0 .../windows/deferrable_deletion_win_tests.cpp | 0 .../windows/device_command_stream_tests.cpp | 0 .../os_interface/windows/device_os_tests.cpp | 0 .../windows/driver_info_tests.cpp | 0 .../windows/file_logger_win_tests.cpp | 0 .../os_interface/windows/gdi_dll_fixture.h | 0 .../os_interface/windows/gl/CMakeLists.txt | 0 .../os_interface/windows/gl/gl_dll_helper.h | 0 .../os_interface/windows/gl/gl_options.cpp | 0 .../windows/gl/gl_os_sharing_tests.cpp | 0 .../windows/hw_info_config_win_tests.cpp | 0 .../windows/hw_info_config_win_tests.h | 0 .../windows/mock_environment_variables.cpp | 0 .../windows/mock_environment_variables.h | 0 .../windows/mock_kmdaf_listener.h | 0 .../os_interface/windows/mock_os_time_win.h | 0 .../windows/mock_performance_counters_win.cpp | 0 .../windows/mock_performance_counters_win.h | 0 .../windows/mock_registry_reader.cpp | 0 .../windows/mock_wddm_allocation.h | 0 .../windows/mock_wddm_memory_manager.h | 0 .../os_interface/windows/options.cpp | 2 +- .../windows/os_context_win_tests.cpp | 0 .../windows/os_interface_win_tests.cpp | 0 .../windows/os_interface_win_tests.h | 0 .../windows/os_library_win_tests.cpp | 0 .../windows/os_time_win_tests.cpp | 0 .../performance_counters_win_tests.cpp | 0 .../windows/registry_reader_tests.cpp | 0 .../windows/registry_reader_tests.h | 0 .../os_interface/windows/self_lib_win.cpp | 0 .../os_interface/windows/sys_calls.cpp | 0 .../os_interface/windows/ult_dxgi_factory.cpp | 0 .../os_interface/windows/ult_dxgi_factory.h | 0 .../os_interface/windows/wddm20_tests.cpp | 0 .../os_interface/windows/wddm23_tests.cpp | 0 .../windows/wddm_address_space_tests.cpp | 0 .../os_interface/windows/wddm_calls.cpp | 0 .../os_interface/windows/wddm_create.cpp | 0 .../os_interface/windows/wddm_fixture.h | 0 .../windows/wddm_kmdaf_listener_tests.cpp | 0 .../windows/wddm_mapper_tests.cpp | 0 ..._manager_allocate_in_device_pool_tests.cpp | 0 ..._manager_allocate_in_device_pool_tests.inl | 0 .../windows/wddm_memory_manager_tests.cpp | 0 .../windows/wddm_memory_manager_tests.h | 0 .../wddm_residency_controller_tests.cpp | 0 .../windows/wddm_residency_handler_tests.cpp | 0 .../page_fault_manager_tests/CMakeLists.txt | 0 .../test/unit_test}/perf_tests/CMakeLists.txt | 0 .../unit_test}/perf_tests/api/CMakeLists.txt | 0 .../unit_test}/perf_tests/api/api_tests.cpp | 0 .../unit_test}/perf_tests/api/api_tests.h | 0 .../perf_tests/api/context_tests.cpp | 0 .../perf_tests/fixtures/CMakeLists.txt | 0 .../fixtures/command_queue_fixture.cpp | 0 .../fixtures/command_queue_fixture.h | 0 .../perf_tests/fixtures/device_fixture.cpp | 0 .../perf_tests/fixtures/device_fixture.h | 0 .../perf_tests/fixtures/platform_fixture.cpp | 0 .../perf_tests/fixtures/platform_fixture.h | 0 .../perf_tests/options_perf_tests.cpp | 0 .../unit_test}/perf_tests/perf_test_utils.cpp | 0 .../unit_test}/perf_tests/perf_test_utils.h | 0 .../test/unit_test}/platform/CMakeLists.txt | 0 .../platform/platform_icd_tests.cpp | 0 .../unit_test}/platform/platform_tests.cpp | 0 .../test/unit_test}/profiling/CMakeLists.txt | 0 .../unit_test}/profiling/profiling_tests.cpp | 0 .../test/unit_test}/program/CMakeLists.txt | 0 .../program/block_kernel_manager_tests.cpp | 0 .../evaluate_unhandled_token_tests.cpp | 0 .../test/unit_test}/program/kernel_data.cpp | 0 .../unit_test}/program/kernel_data_OCL2_0.cpp | 0 .../kernel_info_from_patchtokens_tests.cpp | 0 .../unit_test}/program/kernel_info_tests.cpp | 0 .../program/printf_handler_tests.cpp | 0 .../program/printf_helper_tests.cpp | 0 .../program/process_debug_data_tests.cpp | 0 .../program/process_elf_binary_tests.cpp | 0 .../program/process_spir_binary_tests.cpp | 0 .../unit_test}/program/program_data_tests.cpp | 0 .../unit_test}/program/program_from_binary.h | 0 .../unit_test}/program/program_nonuniform.cpp | 0 .../program/program_spec_constants_tests.cpp | 0 .../test/unit_test}/program/program_tests.cpp | 0 .../test/unit_test}/program/program_tests.h | 0 .../program_with_block_kernels_tests.cpp | 0 .../program_with_kernel_debug_tests.cpp | 0 .../unit_test}/program/program_with_source.h | 0 .../test/unit_test}/sampler/CMakeLists.txt | 0 .../sampler/get_sampler_info_tests.cpp | 0 .../sampler/sampler_set_arg_tests.cpp | 0 .../test/unit_test}/sampler/sampler_tests.cpp | 0 .../test/unit_test}/scenarios/CMakeLists.txt | 0 ...blocked_enqueue_barrier_scenario_tests.cpp | 0 ...d_enqueue_with_callback_scenario_tests.cpp | 0 .../scenarios/windows/CMakeLists.txt | 0 ...d_write_buffer_scenarios_windows_tests.cpp | 0 .../test/unit_test}/scheduler/CMakeLists.txt | 0 .../scheduler/scheduler_kernel_tests.cpp | 0 .../scheduler/scheduler_source_tests.cpp | 0 .../scheduler/scheduler_source_tests.h | 0 .../scheduler/scheduler_source_tests.inl | 0 .../test/unit_test}/sharings/CMakeLists.txt | 0 .../unit_test}/sharings/d3d/CMakeLists.txt | 0 .../sharings/d3d/context_d3d_tests.cpp | 0 .../unit_test}/sharings/gl/CMakeLists.txt | 0 .../sharings/gl/windows/CMakeLists.txt | 0 .../gl/windows/gl_arb_sync_event_tests.cpp | 0 .../windows/gl_create_from_texture_tests.cpp | 0 .../gl/windows/gl_reused_buffers_tests.cpp | 0 .../gl/windows/gl_sharing_enable_tests.cpp | 0 .../sharings/gl/windows/gl_sharing_tests.cpp | 0 .../sharings/gl/windows/gl_texture_tests.cpp | 0 .../sharings/gl/windows/gl_types_tests.cpp | 0 .../sharings/sharing_factory_tests.cpp | 0 .../unit_test}/sharings/sharing_tests.cpp | 0 .../sharings/unified/CMakeLists.txt | 0 .../unified/unified_sharing_buffer_tests.cpp | 0 .../unified/unified_sharing_fixtures.h | 0 .../unified/unified_sharing_image_tests.cpp | 0 .../sharings/unified/unified_sharing_mocks.h | 0 .../unified/unified_sharing_tests.cpp | 0 .../unit_test}/sharings/va/CMakeLists.txt | 0 .../cl_create_from_va_media_surface_tests.cpp | 0 ...nqueue_acquire_va_media_surfaces_tests.cpp | 0 ...nqueue_release_va_media_surfaces_tests.cpp | 0 ...l_get_extension_function_address_tests.cpp | 0 .../sharings/va/context_va_tests.cpp | 0 .../sharings/va/kernel_va_image_arg_tests.cpp | 0 .../unit_test}/sharings/va/mock_va_sharing.h | 0 .../sharings/va/va_base_object_tests.cpp | 0 .../sharings/va/va_sharing_enable_tests.cpp | 0 .../sharings/va/va_sharing_linux_tests.cpp | 0 .../sharings/va/va_sharing_tests.cpp | 0 .../test/unit_test}/sku_info/CMakeLists.txt | 0 .../sku_info/sku_info_base_reference.h | 0 .../sku_info/sku_info_receiver_tests.cpp | 0 .../sku_info/sku_info_transfer_tests.cpp | 0 .../source_level_debugger/CMakeLists.txt | 0 .../source_level_debugger_csr_tests.cpp | 0 .../source_level_debugger_device_tests.cpp | 0 .../source_level_debugger_tests.cpp | 0 .../test_dynamic_lib/CMakeLists.txt | 0 .../test_dynamic_lib/test_dynamic_lib_lin.cpp | 0 .../test_dynamic_lib/test_dynamic_lib_win.cpp | 0 .../test_files/7030307152995455603.cl | 0 .../7030307152995455603_options.txt | 0 .../test_files/CopyBuffer_simd16.cl | 0 .../test_files/CopyBuffer_simd32.cl | 0 .../unit_test}/test_files/CopyBuffer_simd8.cl | 0 .../unit_test}/test_files/binary_with_zeroes | Bin .../test/unit_test}/test_files/copybuffer.cl | 0 .../test_files/copybuffer_with_header.cl | 0 .../test/unit_test}/test_files/devices/config | 0 .../devices/drm/card0/gt_max_freq_mhz | 0 .../test/unit_test}/test_files/emptykernel.cl | 0 .../test/unit_test}/test_files/igdrcl.config | 0 .../test_files/igdrcl_string.config | 0 .../test_files/kernel_data_param.cl | 0 .../unit_test}/test_files/kernel_num_args.cl | 0 .../test_files/media_kernels_backend.cl | 0 .../media_kernels_backend_options.txt | 0 .../test_files/media_kernels_frontend.cl | 0 .../media_kernels_frontend_options.txt | 0 .../test/unit_test}/test_files/patch_list.h | 0 .../test/unit_test}/test_files/printf.cl | 0 .../test_files/required_work_group.cl | 0 .../test/unit_test}/test_files/shouldfail.cl | 0 .../shouldfail_internal_options.txt | 0 .../test_files/shouldfail_options.txt | 0 .../unit_test}/test_files/simple_arg_int.cl | 0 .../test_files/simple_block_kernel.cl | 0 .../unit_test}/test_files/simple_header.h | 0 .../unit_test}/test_files/simple_kernels.cl | 0 .../test_files/simple_kernels_opts.cl | 0 .../simple_kernels_opts_options.txt | 0 .../test_files/simple_nonuniform.cl | 0 .../test_files/stateful_copy_buffer.cl | 0 .../stateful_copy_buffer_ocloc_options.txt | 0 .../unit_test}/test_files/stateless_kernel.cl | 0 .../test_files/test_basic_constant.cl | 0 ...t_basic_kernel_memory_alignment_private.cl | 0 .../test_files/test_constant_memory.cl | 0 .../test/unit_test}/test_files/vme_kernels.cl | 0 .../test_files/vme_kernels_options.txt | 0 .../test/unit_test}/test_mode.h | 0 .../test/unit_test}/tests_configuration.h | 0 .../test/unit_test}/ult_config_listener.cpp | 0 .../test/unit_test}/ult_config_listener.h | 0 .../test/unit_test}/ult_configuration.cpp | 0 .../test/unit_test}/user_settings_32.user | 0 .../test/unit_test}/user_settings_64.user | 0 .../test/unit_test}/utilities/.clang-tidy | 0 .../test/unit_test}/utilities/CMakeLists.txt | 0 .../utilities/debug_file_reader_tests.cpp | 0 .../utilities/debug_file_reader_tests.inl | 0 .../debug_settings_reader_creator.cpp | 0 .../utilities/debug_settings_reader_tests.cpp | 0 .../utilities/file_logger_tests.cpp | 0 .../unit_test}/utilities/file_logger_tests.h | 0 .../utilities/tag_allocator_tests.cpp | 0 .../test/unit_test}/verify.bat | 0 .../test/unit_test}/windows/CMakeLists.txt | 0 .../unit_test}/windows/get_devices_tests.cpp | 0 .../unit_test}/windows/os_interface_tests.cpp | 0 .../test/unit_test}/windows/test_mode.h | 0 .../unit_test}/windows/wddm_create_tests.cpp | 0 1292 files changed, 171 insertions(+), 142 deletions(-) rename {unit_tests => opencl/test/unit_test}/.clang-tidy (100%) rename {unit_tests => opencl/test/unit_test}/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/abort.cpp (100%) rename {unit_tests => opencl/test/unit_test}/accelerators/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/accelerators/media_image_arg_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/api/additional_extensions_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/api_tests_wrapper1.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/api_tests_wrapper2.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/api_tests_wrapper3.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_add_comment_to_aub_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_api_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_api_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_build_program_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_clone_kernel_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_compile_program_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_command_queue_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_command_queue_with_properties_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_context_from_type_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_context_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_kernel_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_kernels_in_program_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_perf_counters_command_queue_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_pipe_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_program_with_binary_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_program_with_built_in_kernels_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_sampler_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_sampler_with_properties_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_sub_buffer_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_sub_devices_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_user_event_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_create_user_event_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_barrier_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_barrier_with_wait_list_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_copy_buffer_rect_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_copy_buffer_to_image_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_copy_image_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_copy_image_to_buffer_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_fill_buffer_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_fill_image_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_image_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_map_buffer_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_map_image_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_marker_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_marker_with_wait_list_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_migrate_mem_objects_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_native_kernel_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_nd_range_kernel_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_read_buffer_rect_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_read_buffer_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_read_image_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_svm_free_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_svm_map_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_svm_mem_fill_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_svm_memcpy_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_svm_migrate_mem_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_svm_unmap_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_task_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_unmap_mem_object_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_verify_memory.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_wait_for_events_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_write_buffer_rect_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_write_buffer_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_enqueue_write_image_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_finish_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_flush_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_function_pointers_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_context_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_device_and_host_timer.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_device_ids_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_device_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_event_profiling_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_extension_function_address_for_platform_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_extension_function_address_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_image_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_image_params_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_kernel_arg_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_kernel_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_kernel_sub_group_info_khr_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_kernel_sub_group_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_kernel_work_group_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_mem_object_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_pipe_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_platform_ids_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_platform_ids_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_platform_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_program_build_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_program_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_get_supported_image_formats_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_icd_get_platform_ids_khr_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_intel_accelerator_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_intel_motion_estimation.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_intel_tracing_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_intel_tracing_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_link_program_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_mem_locally_uncached_resource_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_release_command_queue_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_release_context_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_release_event_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_release_kernel_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_release_mem_obj_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_release_program_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_retain_mem_obj_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_retain_release_command_queue_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_retain_release_context_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_retain_release_device_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_retain_release_sampler_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_set_default_device_command_queue_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_set_event_callback_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_set_kernel_arg_svm_pointer_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_set_kernel_exec_info_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_set_mem_object_destructor_callback_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_set_mem_object_destructor_callback_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_set_performance_configuration_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_set_program_specialization_constant_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_svm_alloc_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_svm_free_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_unified_shared_memory_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_unload_compiler_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/cl_unload_platform_compiler_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_create_from_gl_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_create_from_gl_renderbuffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_create_from_gl_texture2d_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_create_from_gl_texture3d_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_create_from_gl_texture_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_enqueue_release_gl_objects_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_get_gl_context_info_khr_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_get_gl_device_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_get_gl_object_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_get_gl_texture_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/api/gl/cl_gl_intel_tracing_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub/aub_center_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub/aub_center_using_aubstream_stubs_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub/aub_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub/aub_helper_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/aub_mem_dump/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_mem_dump/aub_alloc_dump_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_mem_dump/lrca_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_stream_mocks/aub_stream_interface_mock.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/aub_tests_configuration.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/aub_tests_configuration.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/aub_tests_configuration.inl (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/command_enqueue_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_stream/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_stream/aub_command_stream_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_stream/aub_command_stream_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_stream/aub_command_stream_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_stream/aub_mem_dump_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/command_stream/aub_mem_dump_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/common.cmake (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/fixtures/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/fixtures/aub_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/fixtures/aub_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/fixtures/aub_parent_kernel_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/fixtures/fixture_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/fixtures/hello_world_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/fixtures/run_kernel_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/fixtures/simple_arg_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/fixtures/unified_memory_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen11/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen11/aub_tests_configuration_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen11/batch_buffer/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen11/execution_model/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen12lp/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen12lp/batch_buffer/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen12lp/execution_model/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen12lp/execution_model/enqueue_parent_kernel_tests_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen8/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen8/aub_tests_configuration_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen8/execution_model/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/aub_tests_configuration_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/batch_buffer/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/execution_model/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/skl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/skl/command_queue/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/mem_obj/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/mem_obj/create_image_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/test_mode.h (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/unified_memory/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/unified_memory/unified_memory_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/built_ins/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/built_ins/built_in_kernels_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/built_ins/built_in_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/built_ins/built_ins_file_names.cpp (100%) rename {unit_tests => opencl/test/unit_test}/built_ins/built_ins_file_names.h (100%) rename {unit_tests => opencl/test/unit_test}/built_ins/get_built_ins_file_names.cpp (100%) rename {unit_tests => opencl/test/unit_test}/built_ins/sip_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/blit_enqueue_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/buffer_operations_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/command_enqueue_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/command_queue_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/command_queue_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/command_queue_hw_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/command_queue_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/dispatch_walker_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_barrier_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_command_without_kernel_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_buffer_event_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_buffer_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_buffer_rect_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_buffer_rect_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_buffer_to_image_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_buffer_to_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_image_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_image_to_buffer_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_copy_image_to_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_debug_kernel_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_fill_buffer_event_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_fill_buffer_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_fill_buffer_negative_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_fill_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_fill_image_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_fill_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_handler_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_1_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_2_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_event_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_global_offset_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_local_work_size_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_mt_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_two_ioq_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_two_ooq_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_map_buffer_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_map_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_map_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_marker_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_media_kernel.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_migrate_mem_objects_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_read_buffer_event_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_read_buffer_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_read_buffer_rect_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_read_buffer_rect_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_read_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_read_image_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_read_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_resource_barier_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_svm_mem_copy_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_svm_mem_fill_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_svm_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_thread_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_unmap_memobject_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_waitlist_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_write_buffer_event_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_write_buffer_rect_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_write_buffer_rect_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_write_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_write_image_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/enqueue_write_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/finish_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/flattened_id_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/flush_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/get_command_queue_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/get_size_required_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/get_size_required_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/get_size_required_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/gl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/gl/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/ioq_task_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/ioq_task_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/local_id_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/local_work_size_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/multi_dispatch_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/multiple_map_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/multiple_map_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/oom_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/oom_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/oom_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/ooq_task_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/ooq_task_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/read_write_buffer_cpu_copy.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/sync_buffer_handler_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/work_group_size_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_queue/zero_size_enqueue_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/aub_command_stream_receiver_1_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/aub_command_stream_receiver_2_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/aub_file_stream_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/aub_subcapture_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/cmd_parse_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/command_stream_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/command_stream_receiver_flush_task_1_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/command_stream_receiver_flush_task_2_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/command_stream_receiver_flush_task_3_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/command_stream_receiver_hw_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/command_stream_receiver_hw_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/command_stream_receiver_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/command_stream_receiver_with_aub_dump_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/compute_mode_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/create_command_stream_receiver_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/experimental_command_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/get_devices_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/linear_stream_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/linear_stream_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/submissions_aggregator_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/tbx_command_stream_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/tbx_command_stream_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/tbx_command_stream_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/tbx_stream_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/thread_arbitration_policy_helper.cpp (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/thread_arbitration_policy_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/command_stream/thread_arbitration_policy_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/compiler_interface/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/compiler_interface/default_cl_cache_config_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/context/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/context/context_get_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/context/context_multi_device_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/context/context_negative_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/context/context_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/context/driver_diagnostics_enqueue_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/context/driver_diagnostics_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/context/driver_diagnostics_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/context/get_supported_image_formats_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/context/gl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/context/gl/context_gl_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/context/gl/context_gl_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/context/gl/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/context/gl/windows/context_gl_tests_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/core_unit_tests_files.cmake (100%) rename {unit_tests => opencl/test/unit_test}/custom_event_listener.h (100%) rename {unit_tests => opencl/test/unit_test}/d3d_sharing/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/d3d_sharing/cl_dx_sharing_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/d3d_sharing/d3d9_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/d3d_sharing/d3d_aux_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/d3d_sharing/d3d_tests_part1.cpp (100%) rename {unit_tests => opencl/test/unit_test}/d3d_sharing/d3d_tests_part2.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/device/device_caps_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device/device_get_engine_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device/device_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device/device_timers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device/device_win_timers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device/get_device_info_size_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device/get_device_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device/gl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/device/gl/device_caps_gl_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device/sub_device_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device_queue/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/device_queue/device_queue_hw_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device_queue/device_queue_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/device_queue/get_device_queue_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/event/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/event/async_events_handler_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/event/event_builder_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/event/event_callbacks_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/event/event_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/event/event_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/event/event_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/event/event_tracker_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/event/user_events_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/event/user_events_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/execution_environment/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/execution_environment/execution_environment_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/execution_model/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/execution_model/enqueue_execution_model_kernel_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/execution_model/parent_kernel_dispatch_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/execution_model/scheduler_dispatch_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/execution_model/submit_blocked_parent_kernel_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/aub_command_stream_receiver_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/buffer_enqueue_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/buffer_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/buffer_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/built_in_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/built_in_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/context_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/context_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/d3d_test_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/device_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/device_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/device_host_queue_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/device_host_queue_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/device_info_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/device_instrumentation_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/device_instrumentation_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/dispatch_flags_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/enqueue_handler_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/execution_model_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/execution_model_kernel_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/hello_world_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/hello_world_kernel_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/image_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/image_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/kernel_arg_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/kernel_arg_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/kernel_data_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/kernel_data_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/media_kernel_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/memory_allocator_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/memory_allocator_multi_device_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/memory_management_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/memory_management_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/memory_manager_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/memory_manager_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/mock_aub_center_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/multi_root_device_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/platform_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/platform_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/program_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/program_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/run_kernel_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/scenario_test_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/simple_arg_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/simple_arg_kernel_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/templated_fixture_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/two_walker_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/fixtures/ult_command_stream_receiver_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/gen11/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/coherency_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/command_stream_receiver_hw_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/ehl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/ehl/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/ehl/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/ehl/linux/dll/device_id_tests_ehl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/ehl/linux/hw_info_config_tests_ehl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/ehl/test_device_caps_ehl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/ehl/test_hw_info_config_ehl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/ehl/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/ehl/windows/hw_info_config_tests_ehl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/enqueue_kernel_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/enqueue_media_kernel_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/hw_helper_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/linux/dll/device_id_tests_icllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/linux/hw_info_config_tests_icllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/test_device_caps_icllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/test_hw_info_config_icllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/test_media_kernel_icllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/test_program_media_sampler_icllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/icllp/windows/hw_info_config_tests_icllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/image_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/kernel_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/lkf/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/lkf/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/lkf/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/lkf/linux/dll/device_id_tests_lkf.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/lkf/linux/hw_info_config_tests_lkf.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/lkf/test_device_caps_lkf.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/lkf/test_hw_info_config_lkf.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/lkf/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/lkf/windows/hw_info_config_tests_lkf.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/sampler_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/scheduler_source_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/tbx_command_stream_receiver_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/test_device_caps_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/test_device_queue_hw_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/test_platform_caps_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/test_sample_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/unit_test_helper_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen11/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen11/windows/gmm_callbacks_tests_gen11.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/cmd_parse/cmd_parse_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/coherency_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/compute_mode_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/device_queue_tests_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/enqueue_media_kernel_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/gen12lp_tests_wrapper.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/hw_helper_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/image_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/kernel_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/profiling_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/sampler_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/scheduler_source_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/special_ult_helper_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/special_ult_helper_gen12lp.h (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/test_device_caps_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/test_device_queue_hw_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/test_platform_caps_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/test_sample_gen12lp.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/kernel_tests_tgllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/linux/test_hw_info_config_tgllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/test_hw_helper_tgllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/test_hw_info_config_tgllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/unit_test_helper_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/windows/hw_info_config_tests_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen12lp/windows/wddm_tests_gen12lp.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/device_tests_bdw.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/linux/dll/device_id_tests_bdw.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/linux/hw_info_config_tests_bdw.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/test_device_caps_bdw.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/test_hw_info_config_bdw.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/windows/hw_info_config_tests_bdw.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/bdw/windows/test_device_caps_bdw_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/coherency_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/command_stream_receiver_hw_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/enqueue_media_kernel_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/hw_helper_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/image_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/kernel_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/sampler_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/scheduler_dispatch_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/scheduler_source_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/test_device_caps_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/test_device_queue_hw_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/test_platform_caps_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/test_sample_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/unit_test_helper_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen8/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen8/windows/gmm_callbacks_tests_gen8.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/device_tests_bxt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/linux/dll/device_id_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/linux/hw_info_config_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/test_device_caps_bxt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/test_hw_info_config_bxt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/windows/hw_info_config_tests_bxt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/bxt/windows/test_device_caps_bxt_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/linux/dll/device_id_tests_cfl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/linux/hw_info_config_tests_cfl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/test_device_caps_cfl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/test_hw_info_config_cfl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/windows/hw_info_config_tests_cfl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/cfl/windows/test_device_caps_cfl_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/coherency_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/command_stream_receiver_hw_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/enqueue_kernel_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/enqueue_media_kernel_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/linux/dll/device_id_tests_glk.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/linux/hw_info_config_tests_glk.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/test_device_caps_glk.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/test_hw_info_config_glk.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/windows/hw_info_config_tests_glk.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/glk/windows/test_device_caps_glk_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/hw_helper_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/image_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/linux/dll/device_id_tests_kbl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/linux/hw_info_config_tests_kbl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/test_device_caps_kbl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/test_hw_info_config_kbl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/windows/hw_info_config_tests_kbl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kbl/windows/test_device_caps_kbl_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/kernel_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/sampler_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/scheduler_source_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/sip_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/device_tests_skl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/linux/dll/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/linux/dll/device_id_tests_skl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/linux/hw_info_config_tests_skl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/test_device_caps_skl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/test_hw_info_config_skl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/test_sample_skl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/windows/hw_info_config_tests_skl.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/skl/windows/test_device_caps_skl_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/test_device_caps_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/test_device_queue_hw_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/test_platform_caps_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/test_sample_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/unit_test_helper_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen9/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen9/windows/gmm_callbacks_tests_gen9.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/cmd_parse_base.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/cmd_parse_base_mi_arb.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/cmd_parse_compute_mode.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/cmd_parse_gpgpu_walker.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/cmd_parse_mi_arb.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/cmd_parse_sip.inl (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/exclude_tests/exclude_test_declare.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/exclude_tests/exclude_test_exclude.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/gen_cmd_parse.h (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/gen_commands_common_validation.h (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/hw_cmds_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gen_common/matchers.h (100%) rename {unit_tests => opencl/test/unit_test}/global_environment.cpp (100%) rename {unit_tests => opencl/test/unit_test}/global_environment.h (100%) rename {unit_tests => opencl/test/unit_test}/gmm_helper/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gmm_helper/gmm_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/gtpin/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/gtpin/gtpin_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/helpers/array_count_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/base_object_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/base_object_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/basic_math_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/bit_helpers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/built_ins_helper.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/cl_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/cmd_buffer_validator.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/cmd_buffer_validator_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/debug_helpers.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/debug_helpers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/deferred_deleter_helpers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/dirty_state_helpers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/dispatch_flags_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/dispatch_info_builder_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/dispatch_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/execution_environment_helper.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/execution_environment_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/extendable_enum_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/flush_stamp_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/get_gpgpu_engines_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/helpers/get_info_status_mapper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/get_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/gtest_helpers.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/hardware_commands_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/hardware_commands_helper_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/hw_helper_default_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/hw_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/hw_helper_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/hw_parse.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/hw_parse.inl (100%) rename {unit_tests => opencl/test/unit_test}/helpers/kernel_binary_helper.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/kernel_binary_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/kernel_binary_helper_hash_value.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/kernel_filename_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/kmd_notify_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/helpers/linux/kmd_notify_linux_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/mem_properties_parser_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/memory_management_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/memory_properties_flags_helpers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/mipmap_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/per_thread_data_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/ptr_math_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/queue_helpers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/raii_hw_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/sampler_helpers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/static_size3.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/task_information_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/test_debug_variables.inl (100%) rename {unit_tests => opencl/test/unit_test}/helpers/test_files.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/test_files.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/timestamp_packet_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/transfer_properties_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/uint16_sse4_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/ult_limits.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/unit_test_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/unit_test_helper.inl (100%) rename {unit_tests => opencl/test/unit_test}/helpers/validator_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/variable_backup.h (100%) rename {unit_tests => opencl/test/unit_test}/helpers/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/helpers/windows/gl_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/windows/kmd_notify_windows_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/windows/mock_function.cpp (100%) rename {unit_tests => opencl/test/unit_test}/helpers/windows/mock_function.h (100%) rename {unit_tests => opencl/test/unit_test}/igdrcl_tests_pch.cpp (100%) rename {unit_tests => opencl/test/unit_test}/igdrcl_tests_pch.h (100%) rename {unit_tests => opencl/test/unit_test}/indirect_heap/indirect_heap_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/indirect_heap/indirect_heap_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/kernel/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/kernel/clone_kernel_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/debug_kernel_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/gl/kernel_arg_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/image_transformer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_accelerator_arg_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_arg_buffer_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_arg_buffer_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_arg_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_arg_dev_queue_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_arg_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_arg_pipe_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_arg_svm_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_cache_flush_requirements_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_image_arg_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_immediate_arg_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_info_cl_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_is_patched_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_reflection_surface_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_slm_arg_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_slm_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/kernel_transformable_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/parent_kernel_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/kernel/substitute_kernel_heap_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/libult/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/libult/create_command_stream.cpp (100%) rename {unit_tests => opencl/test/unit_test}/libult/create_command_stream.h (100%) rename {unit_tests => opencl/test/unit_test}/libult/create_tbx_sockets.cpp (100%) rename {unit_tests => opencl/test/unit_test}/libult/debug_manager.cpp (100%) rename {unit_tests => opencl/test/unit_test}/libult/os_interface.cpp (100%) rename {unit_tests => opencl/test/unit_test}/libult/source_level_debugger.cpp (100%) rename {unit_tests => opencl/test/unit_test}/libult/source_level_debugger_library.cpp (100%) rename {unit_tests => opencl/test/unit_test}/libult/source_level_debugger_library.h (100%) rename {unit_tests => opencl/test/unit_test}/libult/ult_aub_command_stream_receiver.h (100%) rename {unit_tests => opencl/test/unit_test}/libult/ult_command_stream_receiver.h (100%) rename {unit_tests => opencl/test/unit_test}/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/linux/drm_null_device_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/linux/drm_other_requests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/linux/drm_wrap.h (100%) rename {unit_tests => opencl/test/unit_test}/linux/linux_tests_configuration.cpp (100%) rename {unit_tests => opencl/test/unit_test}/linux/main_linux_dll.cpp (100%) rename {unit_tests => opencl/test/unit_test}/linux/mock_os_layer.cpp (100%) rename {unit_tests => opencl/test/unit_test}/linux/mock_os_layer.h (100%) rename {unit_tests => opencl/test/unit_test}/linux/test_mode.h (100%) rename {unit_tests => opencl/test/unit_test}/linux/va_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/main.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/buffer_pin_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/buffer_set_arg_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/create_image_format_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/destructor_callback_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/get_mem_object_info_subbuffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/get_mem_object_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image1d_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image2d_from_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image2d_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image3d_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_array_size_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_compression_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_format_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_from_subbuffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_redescribe_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_release_mapped_ptr_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_set_arg_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_snorm_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_tests_tgllp_plus.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_tiled_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_transfer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/image_validate_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/map_operations_handler_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/mem_obj_destruction_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/mem_obj_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/mem_obj_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/nv12_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/packed_yuv_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/pipe_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/sub_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mem_obj/zero_copy_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/address_mapper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/deferrable_allocation_deletion_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/deferred_deleter_mt_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/gfx_partition_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/gfx_partition_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/graphics_allocation_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/host_ptr_manager_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/internal_allocation_storage_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/local_memory_usage_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/memory_manager_allocate_in_device_pool_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/memory_manager_multi_device_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/memory_manager_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/memory_pool_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/page_table_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/physical_address_allocator_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/surface_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/unified_memory_manager_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/memory_manager/unified_memory_token_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mock_gdi/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mock_gdi/gdi32_mock.def (100%) rename {unit_tests => opencl/test/unit_test}/mock_gdi/mock_gdi.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mock_gdi/mock_gdi.h (100%) rename {unit_tests => opencl/test/unit_test}/mock_gdi/mock_gdi_gfx_partition.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mock_gl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mock_gl/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mock_gl/windows/mock_opengl32.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mock_gl/windows/mock_opengl32.def (100%) rename {unit_tests => opencl/test/unit_test}/mock_gmm/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mock_gmm/mock_gmm.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mocks/gl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mocks/gl/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mocks/gl/windows/mock_gl_arb_sync_event_windows.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/gl/windows/mock_gl_sharing_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/gl/windows/mock_gl_sharing_windows.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/gmm_memory/mock_gmm_memory.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/linux/mock_drm_allocation.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/linux/mock_drm_command_stream_receiver.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/linux/mock_drm_memory_manager.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/linux/mock_drm_memory_manager.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_allocation_properties.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_async_event_handler.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_async_event_handler.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_aub_center.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_aub_csr.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_aub_file_stream.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_aub_manager.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_aub_stream.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_aub_subcapture_manager.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_block_kernel_manager.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_buffer.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_builtin_dispatch_info_builder.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_builtins.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_builtins.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_cif.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_cif.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_command_queue.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_compilers.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_compilers.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_context.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_context.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_csr.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_csr.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_d3d_objects.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_deferrable_deletion.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_deferrable_deletion.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_deferred_deleter.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_deferred_deleter.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_device.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_device.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_device_queue.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_event.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_execution_environment.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_experimental_command_buffer.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gfx_partition.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gfx_partition.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_client_context.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_client_context.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_client_context_base.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_client_context_base.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_memory_base.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_memory_base.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_page_table_mngr.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_page_table_mngr.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_resource_info.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_gmm_resource_info.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_graphics_allocation.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_host_ptr_manager.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_hw_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_image.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_internal_allocation_storage.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_kernel.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_kernel.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_lrca_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_mdi.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_memory_manager.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_memory_manager.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_memory_operations_handler.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_os_context.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_ostime.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_ostime_win.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_physical_address_allocator.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_pipe.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_platform.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_platform.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_program.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_program.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_sampler.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_sharing_factory.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_sip.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_sip.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_source_level_debugger.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_submissions_aggregator.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_svm_manager.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_tbx_csr.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_tbx_sockets.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_tbx_stream.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_timestamp_container.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_wddm.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_wddm.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_wddm_interface20.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_wddm_interface23.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/mock_wddm_residency_allocations_container.h (100%) rename {unit_tests => opencl/test/unit_test}/mocks/wddm_mock_helpers.h (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/api/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/command_queue/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/device_queue/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/device_queue/device_queue_mt_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/event/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/fixtures/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/helpers/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/helpers/interlocked_max_mt_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/memory_manager/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/os_interface/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/test_mode.h (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/utilities/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/mt_tests/utilities/reference_tracked_object_tests_mt.cpp (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/decoder/decoder_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/decoder/encoder_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/decoder/mock/mock_decoder.h (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/decoder/mock/mock_encoder.h (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/decoder/mock/mock_iga_wrapper.h (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/environment.h (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/main.cpp (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/mock/mock_offline_compiler.h (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/mock/mock_sip_ocloc_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/ocloc_fatbinary_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/offline_compiler_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/offline_compiler_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/segfault_test/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/segfault_test/linux/safety_guard_caller_linux.cpp (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/segfault_test/main.cpp (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/segfault_test/segfault_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/offline_compiler/segfault_test/windows/safety_guard_caller_windows.cpp (100%) rename {unit_tests => opencl/test/unit_test}/options_unit_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/device_factory_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/hw_info_config_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/hw_info_config_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/.clang-tidy (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/allocator_helper.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/allocator_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/create_drm_memory_manager.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/debug_env_reader.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/device_command_stream_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/device_command_stream_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/device_factory_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/device_factory_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/device_os_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/driver_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_buffer_object_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_command_stream_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_command_stream_mm_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_command_stream_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_engine_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_gem_close_worker_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_mapper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_memory_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_memory_manager_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_memory_manager_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_mock.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_mock.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_neo_create.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_os_memory_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_residency_handler_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/drm_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/file_logger_linux_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/hw_info_config_linux_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/hw_info_config_linux_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/mock_os_time_linux.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/mock_performance_counters_linux.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/mock_performance_counters_linux.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/options.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/os_interface_linux_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/os_time_test.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/performance_counters_linux_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/self_lib_lin.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/linux/sys_calls_linux_ult.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/mock_performance_counters.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/mock_performance_counters.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/os_context_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/os_interface_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/os_library_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/os_memory_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/performance_counters_gen_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/performance_counters_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/create_wddm_memory_manager.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/deferrable_deletion_win_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/device_command_stream_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/device_os_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/driver_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/file_logger_win_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/gdi_dll_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/gl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/gl/gl_dll_helper.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/gl/gl_options.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/gl/gl_os_sharing_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/hw_info_config_win_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/hw_info_config_win_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/mock_environment_variables.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/mock_environment_variables.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/mock_kmdaf_listener.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/mock_os_time_win.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/mock_performance_counters_win.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/mock_performance_counters_win.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/mock_registry_reader.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/mock_wddm_allocation.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/mock_wddm_memory_manager.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/options.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/os_context_win_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/os_interface_win_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/os_interface_win_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/os_library_win_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/os_time_win_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/performance_counters_win_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/registry_reader_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/registry_reader_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/self_lib_win.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/sys_calls.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/ult_dxgi_factory.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/ult_dxgi_factory.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm20_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm23_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_address_space_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_calls.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_create.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_kmdaf_listener_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_mapper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_memory_manager_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_memory_manager_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_residency_controller_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/os_interface/windows/wddm_residency_handler_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/page_fault_manager_tests/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/api/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/api/api_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/api/api_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/api/context_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/fixtures/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/fixtures/command_queue_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/fixtures/command_queue_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/fixtures/device_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/fixtures/device_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/fixtures/platform_fixture.cpp (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/fixtures/platform_fixture.h (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/options_perf_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/perf_test_utils.cpp (100%) rename {unit_tests => opencl/test/unit_test}/perf_tests/perf_test_utils.h (100%) rename {unit_tests => opencl/test/unit_test}/platform/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/platform/platform_icd_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/platform/platform_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/profiling/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/profiling/profiling_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/program/block_kernel_manager_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/evaluate_unhandled_token_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/kernel_data.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/kernel_data_OCL2_0.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/kernel_info_from_patchtokens_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/kernel_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/printf_handler_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/printf_helper_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/process_debug_data_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/process_elf_binary_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/process_spir_binary_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/program_data_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/program_from_binary.h (100%) rename {unit_tests => opencl/test/unit_test}/program/program_nonuniform.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/program_spec_constants_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/program_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/program_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/program/program_with_block_kernels_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/program_with_kernel_debug_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/program/program_with_source.h (100%) rename {unit_tests => opencl/test/unit_test}/sampler/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/sampler/get_sampler_info_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sampler/sampler_set_arg_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sampler/sampler_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/scenarios/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/scenarios/blocked_enqueue_barrier_scenario_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/scenarios/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/scheduler/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/scheduler/scheduler_kernel_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/scheduler/scheduler_source_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/scheduler/scheduler_source_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/scheduler/scheduler_source_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/sharings/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/sharings/d3d/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/sharings/d3d/context_d3d_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/gl/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/sharings/gl/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/sharings/gl/windows/gl_arb_sync_event_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/gl/windows/gl_create_from_texture_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/gl/windows/gl_reused_buffers_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/gl/windows/gl_sharing_enable_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/gl/windows/gl_sharing_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/gl/windows/gl_texture_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/gl/windows/gl_types_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/sharing_factory_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/sharing_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/unified/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/sharings/unified/unified_sharing_buffer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/unified/unified_sharing_fixtures.h (100%) rename {unit_tests => opencl/test/unit_test}/sharings/unified/unified_sharing_image_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/unified/unified_sharing_mocks.h (100%) rename {unit_tests => opencl/test/unit_test}/sharings/unified/unified_sharing_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/cl_create_from_va_media_surface_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/cl_enqueue_acquire_va_media_surfaces_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/cl_enqueue_release_va_media_surfaces_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/cl_get_extension_function_address_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/context_va_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/kernel_va_image_arg_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/mock_va_sharing.h (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/va_base_object_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/va_sharing_enable_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/va_sharing_linux_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sharings/va/va_sharing_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sku_info/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/sku_info/sku_info_base_reference.h (100%) rename {unit_tests => opencl/test/unit_test}/sku_info/sku_info_receiver_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/sku_info/sku_info_transfer_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/source_level_debugger/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/source_level_debugger/source_level_debugger_csr_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/source_level_debugger/source_level_debugger_device_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/source_level_debugger/source_level_debugger_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/test_dynamic_lib/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/test_dynamic_lib/test_dynamic_lib_lin.cpp (100%) rename {unit_tests => opencl/test/unit_test}/test_dynamic_lib/test_dynamic_lib_win.cpp (100%) rename {unit_tests => opencl/test/unit_test}/test_files/7030307152995455603.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/7030307152995455603_options.txt (100%) rename {unit_tests => opencl/test/unit_test}/test_files/CopyBuffer_simd16.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/CopyBuffer_simd32.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/CopyBuffer_simd8.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/binary_with_zeroes (100%) rename {unit_tests => opencl/test/unit_test}/test_files/copybuffer.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/copybuffer_with_header.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/devices/config (100%) rename {unit_tests => opencl/test/unit_test}/test_files/devices/drm/card0/gt_max_freq_mhz (100%) rename {unit_tests => opencl/test/unit_test}/test_files/emptykernel.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/igdrcl.config (100%) rename {unit_tests => opencl/test/unit_test}/test_files/igdrcl_string.config (100%) rename {unit_tests => opencl/test/unit_test}/test_files/kernel_data_param.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/kernel_num_args.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/media_kernels_backend.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/media_kernels_backend_options.txt (100%) rename {unit_tests => opencl/test/unit_test}/test_files/media_kernels_frontend.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/media_kernels_frontend_options.txt (100%) rename {unit_tests => opencl/test/unit_test}/test_files/patch_list.h (100%) rename {unit_tests => opencl/test/unit_test}/test_files/printf.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/required_work_group.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/shouldfail.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/shouldfail_internal_options.txt (100%) rename {unit_tests => opencl/test/unit_test}/test_files/shouldfail_options.txt (100%) rename {unit_tests => opencl/test/unit_test}/test_files/simple_arg_int.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/simple_block_kernel.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/simple_header.h (100%) rename {unit_tests => opencl/test/unit_test}/test_files/simple_kernels.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/simple_kernels_opts.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/simple_kernels_opts_options.txt (100%) rename {unit_tests => opencl/test/unit_test}/test_files/simple_nonuniform.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/stateful_copy_buffer.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/stateful_copy_buffer_ocloc_options.txt (100%) rename {unit_tests => opencl/test/unit_test}/test_files/stateless_kernel.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/test_basic_constant.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/test_basic_kernel_memory_alignment_private.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/test_constant_memory.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/vme_kernels.cl (100%) rename {unit_tests => opencl/test/unit_test}/test_files/vme_kernels_options.txt (100%) rename {unit_tests => opencl/test/unit_test}/test_mode.h (100%) rename {unit_tests => opencl/test/unit_test}/tests_configuration.h (100%) rename {unit_tests => opencl/test/unit_test}/ult_config_listener.cpp (100%) rename {unit_tests => opencl/test/unit_test}/ult_config_listener.h (100%) rename {unit_tests => opencl/test/unit_test}/ult_configuration.cpp (100%) rename {unit_tests => opencl/test/unit_test}/user_settings_32.user (100%) rename {unit_tests => opencl/test/unit_test}/user_settings_64.user (100%) rename {unit_tests => opencl/test/unit_test}/utilities/.clang-tidy (100%) rename {unit_tests => opencl/test/unit_test}/utilities/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/utilities/debug_file_reader_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/utilities/debug_file_reader_tests.inl (100%) rename {unit_tests => opencl/test/unit_test}/utilities/debug_settings_reader_creator.cpp (100%) rename {unit_tests => opencl/test/unit_test}/utilities/debug_settings_reader_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/utilities/file_logger_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/utilities/file_logger_tests.h (100%) rename {unit_tests => opencl/test/unit_test}/utilities/tag_allocator_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/verify.bat (100%) rename {unit_tests => opencl/test/unit_test}/windows/CMakeLists.txt (100%) rename {unit_tests => opencl/test/unit_test}/windows/get_devices_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/windows/os_interface_tests.cpp (100%) rename {unit_tests => opencl/test/unit_test}/windows/test_mode.h (100%) rename {unit_tests => opencl/test/unit_test}/windows/wddm_create_tests.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 429c0af801..c5587a6c40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,7 +106,7 @@ endif() set(NEO_RUNTIME_SUB_DIR "opencl/source") set(NEO_RUNTIME_SOURCE_DIR "${NEO_SOURCE_DIR}/${NEO_RUNTIME_SUB_DIR}") -set(NEO_RUNTIME_TESTS_SUB_DIR "unit_tests") +set(NEO_RUNTIME_TESTS_SUB_DIR "opencl/test/unit_test") set(NEO_RUNTIME_TESTS_DIR "${NEO_SOURCE_DIR}/${NEO_RUNTIME_TESTS_SUB_DIR}") # Set the core source directory @@ -562,6 +562,8 @@ add_definitions(-DGMM_OCL) # We want to organize our IDE targets into folders set_property(GLOBAL PROPERTY USE_FOLDERS ON) +include_directories(${NEO_RUNTIME_TESTS_SUB_DIR}) + # determine Neo version include(version.cmake) @@ -885,9 +887,9 @@ else() endif() if(DEFAULT_TESTED_PLATFORM AND NOT SKIP_NEO_UNIT_TESTS) - add_subdirectory_unique(unit_tests ${NEO_BUILD_DIR}/unit_tests) + add_subdirectory_unique(${NEO_RUNTIME_TESTS_SUB_DIR} ${NEO_BUILD_DIR}/${NEO_RUNTIME_TESTS_SUB_DIR}) else() - hide_subdir(unit_tests) + hide_subdir(${NEO_RUNTIME_TESTS_SUB_DIR}) endif() set(DONT_LINK_ELF_STATICALLY TRUE) diff --git a/core/unit_tests/command_container/command_container_tests.cpp b/core/unit_tests/command_container/command_container_tests.cpp index ac5518459b..6ef29d09c6 100644 --- a/core/unit_tests/command_container/command_container_tests.cpp +++ b/core/unit_tests/command_container/command_container_tests.cpp @@ -7,8 +7,9 @@ #include "core/command_container/cmdcontainer.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/mocks/mock_graphics_allocation.h" + +#include "fixtures/device_fixture.h" +#include "mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/core/unit_tests/command_container/command_encoder_tests.cpp b/core/unit_tests/command_container/command_encoder_tests.cpp index c150bb2c43..b9092b3add 100644 --- a/core/unit_tests/command_container/command_encoder_tests.cpp +++ b/core/unit_tests/command_container/command_encoder_tests.cpp @@ -7,7 +7,8 @@ #include "core/command_container/command_encoder.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" + +#include "fixtures/device_fixture.h" using namespace NEO; diff --git a/core/unit_tests/compiler_interface/compiler_cache_tests.cpp b/core/unit_tests/compiler_interface/compiler_cache_tests.cpp index 7ffa867472..a4cf38bee1 100644 --- a/core/unit_tests/compiler_interface/compiler_cache_tests.cpp +++ b/core/unit_tests/compiler_interface/compiler_cache_tests.cpp @@ -13,10 +13,11 @@ #include "core/helpers/string.h" #include "opencl/source/compiler_interface/default_cl_cache_config.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/global_environment.h" -#include "unit_tests/mocks/mock_context.h" -#include "unit_tests/mocks/mock_program.h" + +#include "fixtures/device_fixture.h" +#include "global_environment.h" +#include "mocks/mock_context.h" +#include "mocks/mock_program.h" #include #include diff --git a/core/unit_tests/compiler_interface/compiler_interface_tests.cpp b/core/unit_tests/compiler_interface/compiler_interface_tests.cpp index 74dcf8efae..6c9fc91928 100644 --- a/core/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/core/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -10,13 +10,13 @@ #include "core/helpers/file_io.h" #include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/global_environment.h" -#include "unit_tests/helpers/test_files.h" -#include "unit_tests/mocks/mock_cif.h" -#include "unit_tests/mocks/mock_compilers.h" +#include "fixtures/device_fixture.h" +#include "global_environment.h" #include "gmock/gmock.h" +#include "helpers/test_files.h" +#include "mocks/mock_cif.h" +#include "mocks/mock_compilers.h" #include diff --git a/core/unit_tests/direct_submission/direct_submission_tests.cpp b/core/unit_tests/direct_submission/direct_submission_tests.cpp index d851c2fda2..18bddc20dc 100644 --- a/core/unit_tests/direct_submission/direct_submission_tests.cpp +++ b/core/unit_tests/direct_submission/direct_submission_tests.cpp @@ -14,10 +14,11 @@ #include "core/unit_tests/helpers/ult_hw_config.h" #include "core/unit_tests/mocks/mock_direct_submission_hw.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/helpers/dispatch_flags_helper.h" -#include "unit_tests/helpers/variable_backup.h" -#include "unit_tests/mocks/mock_csr.h" + +#include "fixtures/device_fixture.h" +#include "helpers/dispatch_flags_helper.h" +#include "helpers/variable_backup.h" +#include "mocks/mock_csr.h" #include #include diff --git a/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h b/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h index c080ecf9a7..63470d1df4 100644 --- a/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h +++ b/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h @@ -6,7 +6,8 @@ */ #include "core/command_stream/linear_stream.h" -#include "unit_tests/fixtures/device_fixture.h" + +#include "fixtures/device_fixture.h" class DispatcherFixture : public DeviceFixture { public: diff --git a/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp b/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp index 7d80ccdc07..6308ab1649 100644 --- a/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp +++ b/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp @@ -9,7 +9,8 @@ #include "core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h" #include "core/unit_tests/fixtures/preemption_fixture.h" #include "test.h" -#include "unit_tests/helpers/hw_parse.h" + +#include "helpers/hw_parse.h" using RenderDispatcheTest = Test; diff --git a/core/unit_tests/direct_submission/linux/drm_direct_submission_tests.cpp b/core/unit_tests/direct_submission/linux/drm_direct_submission_tests.cpp index 74107ae5b7..21b44eef63 100644 --- a/core/unit_tests/direct_submission/linux/drm_direct_submission_tests.cpp +++ b/core/unit_tests/direct_submission/linux/drm_direct_submission_tests.cpp @@ -9,8 +9,9 @@ #include "core/direct_submission/linux/drm_direct_submission.h" #include "core/os_interface/linux/os_context_linux.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/os_interface/linux/drm_mock.h" + +#include "fixtures/device_fixture.h" +#include "os_interface/linux/drm_mock.h" #include diff --git a/core/unit_tests/direct_submission/windows/wddm_direct_submission_tests.cpp b/core/unit_tests/direct_submission/windows/wddm_direct_submission_tests.cpp index 85604ce7ee..58ddd78c99 100644 --- a/core/unit_tests/direct_submission/windows/wddm_direct_submission_tests.cpp +++ b/core/unit_tests/direct_submission/windows/wddm_direct_submission_tests.cpp @@ -9,9 +9,10 @@ #include "core/direct_submission/windows/wddm_direct_submission.h" #include "core/os_interface/windows/os_context_win.h" #include "core/os_interface/windows/wddm/wddm.h" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/mocks/mock_device.h" -#include "unit_tests/os_interface/windows/wddm_fixture.h" + +#include "helpers/hw_parse.h" +#include "mocks/mock_device.h" +#include "os_interface/windows/wddm_fixture.h" struct WddmDirectSubmissionFixture : public WddmFixture { void SetUp() override { diff --git a/core/unit_tests/encoders/test_encode_atomic.cpp b/core/unit_tests/encoders/test_encode_atomic.cpp index 962dd0bdf7..67042d08f2 100644 --- a/core/unit_tests/encoders/test_encode_atomic.cpp +++ b/core/unit_tests/encoders/test_encode_atomic.cpp @@ -7,7 +7,8 @@ #include "core/helpers/ptr_math.h" #include "core/unit_tests/fixtures/command_container_fixture.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" + +#include "gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_command_buffer.cpp b/core/unit_tests/encoders/test_encode_command_buffer.cpp index ad5c58c570..7a1bf95bc8 100644 --- a/core/unit_tests/encoders/test_encode_command_buffer.cpp +++ b/core/unit_tests/encoders/test_encode_command_buffer.cpp @@ -8,8 +8,9 @@ #include "core/command_container/cmdcontainer.h" #include "core/command_container/command_encoder.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" + +#include "fixtures/device_fixture.h" +#include "gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp b/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp index a04f2a6a71..bf28a904af 100644 --- a/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp +++ b/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp @@ -9,7 +9,8 @@ #include "core/unit_tests/fixtures/command_container_fixture.h" #include "core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h" #include "opencl/source/helpers/hardware_commands_helper.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" + +#include "gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_math.cpp b/core/unit_tests/encoders/test_encode_math.cpp index 16fa7ff415..1050c206d0 100644 --- a/core/unit_tests/encoders/test_encode_math.cpp +++ b/core/unit_tests/encoders/test_encode_math.cpp @@ -8,8 +8,9 @@ #include "core/command_container/command_encoder.h" #include "core/helpers/register_offsets.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" + +#include "fixtures/device_fixture.h" +#include "gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp b/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp index 875366faf9..f6b10b8db4 100644 --- a/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp +++ b/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp @@ -7,7 +7,8 @@ #include "core/helpers/ptr_math.h" #include "core/unit_tests/fixtures/command_container_fixture.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" + +#include "gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_semaphore.cpp b/core/unit_tests/encoders/test_encode_semaphore.cpp index 26e8a29d5d..645f12e31b 100644 --- a/core/unit_tests/encoders/test_encode_semaphore.cpp +++ b/core/unit_tests/encoders/test_encode_semaphore.cpp @@ -8,7 +8,8 @@ #include "core/command_stream/linear_stream.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/fixtures/command_container_fixture.h" -#include "unit_tests/helpers/hw_parse.h" + +#include "helpers/hw_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_set_mmio.cpp b/core/unit_tests/encoders/test_encode_set_mmio.cpp index 3a9b3fdb83..f68186934f 100644 --- a/core/unit_tests/encoders/test_encode_set_mmio.cpp +++ b/core/unit_tests/encoders/test_encode_set_mmio.cpp @@ -7,8 +7,9 @@ #include "core/command_container/command_encoder.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" + +#include "fixtures/device_fixture.h" +#include "gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_states.cpp b/core/unit_tests/encoders/test_encode_states.cpp index 5680759766..3d2cdb7107 100644 --- a/core/unit_tests/encoders/test_encode_states.cpp +++ b/core/unit_tests/encoders/test_encode_states.cpp @@ -7,7 +7,8 @@ #include "core/helpers/ptr_math.h" #include "core/unit_tests/fixtures/command_container_fixture.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" + +#include "gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/fixtures/command_container_fixture.h b/core/unit_tests/fixtures/command_container_fixture.h index f20a190515..c799125014 100644 --- a/core/unit_tests/fixtures/command_container_fixture.h +++ b/core/unit_tests/fixtures/command_container_fixture.h @@ -8,7 +8,8 @@ #pragma once #include "core/command_container/command_encoder.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" + +#include "fixtures/device_fixture.h" class CommandEncodeStatesFixture : public DeviceFixture { public: diff --git a/core/unit_tests/fixtures/preemption_fixture.cpp b/core/unit_tests/fixtures/preemption_fixture.cpp index 02652afabc..3bc58975ed 100644 --- a/core/unit_tests/fixtures/preemption_fixture.cpp +++ b/core/unit_tests/fixtures/preemption_fixture.cpp @@ -15,14 +15,14 @@ #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/scheduler/scheduler_kernel.h" #include "test.h" -#include "unit_tests/fixtures/hello_world_fixture.h" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/mocks/mock_command_queue.h" -#include "unit_tests/mocks/mock_context.h" -#include "unit_tests/mocks/mock_device.h" -#include "unit_tests/mocks/mock_kernel.h" +#include "fixtures/hello_world_fixture.h" #include "gtest/gtest.h" +#include "helpers/hw_parse.h" +#include "mocks/mock_command_queue.h" +#include "mocks/mock_context.h" +#include "mocks/mock_device.h" +#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/core/unit_tests/fixtures/preemption_fixture.h b/core/unit_tests/fixtures/preemption_fixture.h index 84d3b86258..1e405e1541 100644 --- a/core/unit_tests/fixtures/preemption_fixture.h +++ b/core/unit_tests/fixtures/preemption_fixture.h @@ -9,8 +9,8 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "test.h" -#include "unit_tests/fixtures/hello_world_fixture.h" +#include "fixtures/hello_world_fixture.h" #include "gtest/gtest.h" #include diff --git a/core/unit_tests/gen11/cmd_parse_gen11.cpp b/core/unit_tests/gen11/cmd_parse_gen11.cpp index 043c83981c..3cf6f622bd 100644 --- a/core/unit_tests/gen11/cmd_parse_gen11.cpp +++ b/core/unit_tests/gen11/cmd_parse_gen11.cpp @@ -5,17 +5,16 @@ * */ -#include "unit_tests/gen_common/gen_cmd_parse.h" - +#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" using GenStruct = NEO::GEN11; using GenGfxFamily = NEO::ICLFamily; -#include "unit_tests/gen_common/cmd_parse_base.inl" -#include "unit_tests/gen_common/cmd_parse_base_mi_arb.inl" -#include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl" -#include "unit_tests/gen_common/cmd_parse_sip.inl" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/helpers/hw_parse.inl" +#include "gen_common/cmd_parse_base.inl" +#include "gen_common/cmd_parse_base_mi_arb.inl" +#include "gen_common/cmd_parse_gpgpu_walker.inl" +#include "gen_common/cmd_parse_sip.inl" +#include "helpers/hw_parse.h" +#include "helpers/hw_parse.inl" template <> size_t CmdParse::getCommandLengthHwSpecific(void *cmd) { diff --git a/core/unit_tests/gen11/test_preemption_gen11.cpp b/core/unit_tests/gen11/test_preemption_gen11.cpp index c47fa1a216..be8a9c0e0a 100644 --- a/core/unit_tests/gen11/test_preemption_gen11.cpp +++ b/core/unit_tests/gen11/test_preemption_gen11.cpp @@ -8,10 +8,11 @@ #include "core/helpers/hw_helper.h" #include "core/unit_tests/fixtures/preemption_fixture.h" #include "opencl/source/built_ins/built_ins.h" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/mocks/mock_buffer.h" -#include "unit_tests/mocks/mock_command_queue.h" -#include "unit_tests/mocks/mock_csr.h" + +#include "helpers/hw_parse.h" +#include "mocks/mock_buffer.h" +#include "mocks/mock_command_queue.h" +#include "mocks/mock_csr.h" using namespace NEO; diff --git a/core/unit_tests/gen12lp/cmd_parse_gen12lp.cpp b/core/unit_tests/gen12lp/cmd_parse_gen12lp.cpp index 5257b7abe7..04726e8ac6 100644 --- a/core/unit_tests/gen12lp/cmd_parse_gen12lp.cpp +++ b/core/unit_tests/gen12lp/cmd_parse_gen12lp.cpp @@ -5,20 +5,18 @@ * */ -#include "unit_tests/gen_common/gen_cmd_parse.h" - +#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" using GenStruct = NEO::GEN12LP; using GenGfxFamily = NEO::TGLLPFamily; -#include "unit_tests/gen_common/cmd_parse_base.inl" -#include "unit_tests/gen_common/cmd_parse_compute_mode.inl" -#include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl" -#include "unit_tests/gen_common/cmd_parse_mi_arb.inl" -#include "unit_tests/gen_common/cmd_parse_sip.inl" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/helpers/hw_parse.inl" - #include "cmd_parse_gen12lp.inl" +#include "gen_common/cmd_parse_base.inl" +#include "gen_common/cmd_parse_compute_mode.inl" +#include "gen_common/cmd_parse_gpgpu_walker.inl" +#include "gen_common/cmd_parse_mi_arb.inl" +#include "gen_common/cmd_parse_sip.inl" +#include "helpers/hw_parse.h" +#include "helpers/hw_parse.inl" template <> size_t CmdParse::getCommandLengthHwSpecific(void *cmd) { diff --git a/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp b/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp index 8ea1a25d73..962ba0b760 100644 --- a/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp +++ b/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp @@ -8,9 +8,9 @@ #include "core/command_container/cmdcontainer.h" #include "core/command_container/command_encoder.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" +#include "fixtures/device_fixture.h" +#include "gen_common/gen_cmd_parse.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/core/unit_tests/gen12lp/test_preemption_gen12lp.inl b/core/unit_tests/gen12lp/test_preemption_gen12lp.inl index 6302cbfac7..93e84a2e37 100644 --- a/core/unit_tests/gen12lp/test_preemption_gen12lp.inl +++ b/core/unit_tests/gen12lp/test_preemption_gen12lp.inl @@ -6,9 +6,10 @@ */ #include "core/unit_tests/fixtures/preemption_fixture.h" -#include "unit_tests/mocks/mock_buffer.h" -#include "unit_tests/mocks/mock_command_queue.h" -#include "unit_tests/mocks/mock_csr.h" + +#include "mocks/mock_buffer.h" +#include "mocks/mock_command_queue.h" +#include "mocks/mock_csr.h" using namespace NEO; diff --git a/core/unit_tests/gen8/cmd_parse_gen8.cpp b/core/unit_tests/gen8/cmd_parse_gen8.cpp index d562fe3bc6..49cb318ee6 100644 --- a/core/unit_tests/gen8/cmd_parse_gen8.cpp +++ b/core/unit_tests/gen8/cmd_parse_gen8.cpp @@ -5,17 +5,16 @@ * */ -#include "unit_tests/gen_common/gen_cmd_parse.h" - +#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" using GenStruct = NEO::GEN8; using GenGfxFamily = NEO::BDWFamily; -#include "unit_tests/gen_common/cmd_parse_base.inl" -#include "unit_tests/gen_common/cmd_parse_base_mi_arb.inl" -#include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl" -#include "unit_tests/gen_common/cmd_parse_sip.inl" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/helpers/hw_parse.inl" +#include "gen_common/cmd_parse_base.inl" +#include "gen_common/cmd_parse_base_mi_arb.inl" +#include "gen_common/cmd_parse_gpgpu_walker.inl" +#include "gen_common/cmd_parse_sip.inl" +#include "helpers/hw_parse.h" +#include "helpers/hw_parse.inl" template <> size_t CmdParse::getCommandLengthHwSpecific(void *cmd) { diff --git a/core/unit_tests/gen8/test_preamble_gen8.cpp b/core/unit_tests/gen8/test_preamble_gen8.cpp index 64e90d1834..6e996cff1d 100644 --- a/core/unit_tests/gen8/test_preamble_gen8.cpp +++ b/core/unit_tests/gen8/test_preamble_gen8.cpp @@ -9,7 +9,8 @@ #include "core/helpers/preamble.h" #include "core/unit_tests/preamble/preamble_fixture.h" #include "opencl/source/gen8/reg_configs.h" -#include "unit_tests/fixtures/platform_fixture.h" + +#include "fixtures/platform_fixture.h" using namespace NEO; diff --git a/core/unit_tests/gen8/test_preemption_gen8.cpp b/core/unit_tests/gen8/test_preemption_gen8.cpp index 6ccf1c1dfc..0b6fbf1f34 100644 --- a/core/unit_tests/gen8/test_preemption_gen8.cpp +++ b/core/unit_tests/gen8/test_preemption_gen8.cpp @@ -10,13 +10,14 @@ #include "core/helpers/hw_helper.h" #include "core/memory_manager/memory_constants.h" #include "core/unit_tests/fixtures/preemption_fixture.h" -#include "unit_tests/command_queue/enqueue_fixture.h" -#include "unit_tests/fixtures/hello_world_fixture.h" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/mocks/mock_buffer.h" -#include "unit_tests/mocks/mock_command_queue.h" -#include "unit_tests/mocks/mock_csr.h" -#include "unit_tests/mocks/mock_submissions_aggregator.h" + +#include "command_queue/enqueue_fixture.h" +#include "fixtures/hello_world_fixture.h" +#include "helpers/hw_parse.h" +#include "mocks/mock_buffer.h" +#include "mocks/mock_command_queue.h" +#include "mocks/mock_csr.h" +#include "mocks/mock_submissions_aggregator.h" using namespace NEO; diff --git a/core/unit_tests/gen9/cmd_parse_gen9.cpp b/core/unit_tests/gen9/cmd_parse_gen9.cpp index 961a01c5e5..0f57423316 100644 --- a/core/unit_tests/gen9/cmd_parse_gen9.cpp +++ b/core/unit_tests/gen9/cmd_parse_gen9.cpp @@ -5,17 +5,16 @@ * */ -#include "unit_tests/gen_common/gen_cmd_parse.h" - +#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" using GenStruct = NEO::GEN9; using GenGfxFamily = NEO::SKLFamily; -#include "unit_tests/gen_common/cmd_parse_base.inl" -#include "unit_tests/gen_common/cmd_parse_base_mi_arb.inl" -#include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl" -#include "unit_tests/gen_common/cmd_parse_sip.inl" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/helpers/hw_parse.inl" +#include "gen_common/cmd_parse_base.inl" +#include "gen_common/cmd_parse_base_mi_arb.inl" +#include "gen_common/cmd_parse_gpgpu_walker.inl" +#include "gen_common/cmd_parse_sip.inl" +#include "helpers/hw_parse.h" +#include "helpers/hw_parse.inl" template <> size_t CmdParse::getCommandLengthHwSpecific(void *cmd) { diff --git a/core/unit_tests/gen9/skl/test_preamble_skl.cpp b/core/unit_tests/gen9/skl/test_preamble_skl.cpp index c91ab6d51d..f0d17b8924 100644 --- a/core/unit_tests/gen9/skl/test_preamble_skl.cpp +++ b/core/unit_tests/gen9/skl/test_preamble_skl.cpp @@ -11,7 +11,8 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/preamble/preamble_fixture.h" #include "opencl/source/gen9/reg_configs.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" + +#include "gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/gen9/test_command_encoder_gen9.cpp b/core/unit_tests/gen9/test_command_encoder_gen9.cpp index 8f194b5c40..c5aa56a693 100644 --- a/core/unit_tests/gen9/test_command_encoder_gen9.cpp +++ b/core/unit_tests/gen9/test_command_encoder_gen9.cpp @@ -8,9 +8,9 @@ #include "core/command_container/cmdcontainer.h" #include "core/command_container/command_encoder.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/gen_common/gen_cmd_parse.h" +#include "fixtures/device_fixture.h" +#include "gen_common/gen_cmd_parse.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/core/unit_tests/gen9/test_preemption_gen9.cpp b/core/unit_tests/gen9/test_preemption_gen9.cpp index 1eb05de3a2..cef55105dc 100644 --- a/core/unit_tests/gen9/test_preemption_gen9.cpp +++ b/core/unit_tests/gen9/test_preemption_gen9.cpp @@ -9,12 +9,13 @@ #include "core/helpers/hw_helper.h" #include "core/unit_tests/fixtures/preemption_fixture.h" #include "opencl/source/built_ins/built_ins.h" -#include "unit_tests/command_queue/enqueue_fixture.h" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/mocks/mock_buffer.h" -#include "unit_tests/mocks/mock_command_queue.h" -#include "unit_tests/mocks/mock_csr.h" -#include "unit_tests/mocks/mock_submissions_aggregator.h" + +#include "command_queue/enqueue_fixture.h" +#include "helpers/hw_parse.h" +#include "mocks/mock_buffer.h" +#include "mocks/mock_command_queue.h" +#include "mocks/mock_csr.h" +#include "mocks/mock_submissions_aggregator.h" namespace NEO { diff --git a/core/unit_tests/image/image_surface_state_fixture.h b/core/unit_tests/image/image_surface_state_fixture.h index 0c4eb52d00..1bb8f9c526 100644 --- a/core/unit_tests/image/image_surface_state_fixture.h +++ b/core/unit_tests/image/image_surface_state_fixture.h @@ -16,11 +16,12 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/image.h" #include "test.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/mocks/mock_gmm.h" -#include "unit_tests/mocks/mock_gmm_resource_info.h" -#include "unit_tests/mocks/mock_graphics_allocation.h" + +#include "fixtures/device_fixture.h" +#include "fixtures/image_fixture.h" +#include "mocks/mock_gmm.h" +#include "mocks/mock_gmm_resource_info.h" +#include "mocks/mock_graphics_allocation.h" #include diff --git a/core/unit_tests/libult/gen11.cpp b/core/unit_tests/libult/gen11.cpp index 5d53d0fec0..6458bd0fe5 100644 --- a/core/unit_tests/libult/gen11.cpp +++ b/core/unit_tests/libult/gen11.cpp @@ -6,7 +6,8 @@ */ #include "opencl/source/helpers/base_object.h" -#include "unit_tests/libult/ult_command_stream_receiver.h" + +#include "libult/ult_command_stream_receiver.h" namespace NEO { diff --git a/core/unit_tests/libult/gen12lp.cpp b/core/unit_tests/libult/gen12lp.cpp index b44ea58b69..b9f67eb753 100644 --- a/core/unit_tests/libult/gen12lp.cpp +++ b/core/unit_tests/libult/gen12lp.cpp @@ -6,7 +6,8 @@ */ #include "opencl/source/helpers/base_object.h" -#include "unit_tests/libult/ult_command_stream_receiver.h" + +#include "libult/ult_command_stream_receiver.h" namespace NEO { diff --git a/core/unit_tests/libult/gen8.cpp b/core/unit_tests/libult/gen8.cpp index 375d5bddc5..763c60046c 100644 --- a/core/unit_tests/libult/gen8.cpp +++ b/core/unit_tests/libult/gen8.cpp @@ -6,7 +6,8 @@ */ #include "opencl/source/helpers/base_object.h" -#include "unit_tests/libult/ult_command_stream_receiver.h" + +#include "libult/ult_command_stream_receiver.h" namespace NEO { diff --git a/core/unit_tests/libult/gen9.cpp b/core/unit_tests/libult/gen9.cpp index 5571019176..46c8376f9a 100644 --- a/core/unit_tests/libult/gen9.cpp +++ b/core/unit_tests/libult/gen9.cpp @@ -6,7 +6,8 @@ */ #include "opencl/source/helpers/base_object.h" -#include "unit_tests/libult/ult_command_stream_receiver.h" + +#include "libult/ult_command_stream_receiver.h" namespace NEO { diff --git a/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h b/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h index dd82c15370..45cd02e003 100644 --- a/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h +++ b/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h @@ -7,9 +7,9 @@ #pragma once #include "core/kernel/dispatch_kernel_encoder_interface.h" -#include "unit_tests/mocks/mock_graphics_allocation.h" #include "gmock/gmock.h" +#include "mocks/mock_graphics_allocation.h" #include diff --git a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp index 2974720d68..9c1d23feb7 100644 --- a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp +++ b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp @@ -8,7 +8,8 @@ #include "core/unit_tests/os_interface/aub_memory_operations_handler_tests.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" -#include "unit_tests/mocks/mock_aub_manager.h" + +#include "mocks/mock_aub_manager.h" TEST_F(AubMemoryOperationsHandlerTests, givenNullPtrAsAubManagerWhenMakeResidentCalledThenFalseReturned) { getMemoryOperationsHandler()->setAubManager(nullptr); diff --git a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h index 4c0670fd1f..f4376af8b3 100644 --- a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h +++ b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h @@ -11,9 +11,9 @@ #include "core/os_interface/aub_memory_operations_handler.h" #include "core/os_interface/device_factory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "unit_tests/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" +#include "mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/core/unit_tests/os_interface/linux/gmm_helper_tests_linux.cpp b/core/unit_tests/os_interface/linux/gmm_helper_tests_linux.cpp index dcf7affb24..76b17cb0c3 100644 --- a/core/unit_tests/os_interface/linux/gmm_helper_tests_linux.cpp +++ b/core/unit_tests/os_interface/linux/gmm_helper_tests_linux.cpp @@ -7,9 +7,9 @@ #include "core/gmm_helper/gmm_helper.h" #include "core/unit_tests/helpers/default_hw_info.h" -#include "unit_tests/helpers/variable_backup.h" #include "gtest/gtest.h" +#include "helpers/variable_backup.h" namespace NEO { diff --git a/core/unit_tests/os_interface/windows/gmm_helper_tests_win.cpp b/core/unit_tests/os_interface/windows/gmm_helper_tests_win.cpp index 5fdd14ab54..aa15be9ba1 100644 --- a/core/unit_tests/os_interface/windows/gmm_helper_tests_win.cpp +++ b/core/unit_tests/os_interface/windows/gmm_helper_tests_win.cpp @@ -7,9 +7,9 @@ #include "core/gmm_helper/gmm_helper.h" #include "core/unit_tests/helpers/default_hw_info.h" -#include "unit_tests/helpers/variable_backup.h" #include "gtest/gtest.h" +#include "helpers/variable_backup.h" namespace NEO { diff --git a/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp b/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp index debfdae4ef..0cb5d4b3ff 100644 --- a/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp +++ b/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp @@ -10,7 +10,8 @@ #include "core/helpers/hw_helper.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "test.h" -#include "unit_tests/os_interface/windows/wddm_fixture.h" + +#include "os_interface/windows/wddm_fixture.h" using namespace NEO; diff --git a/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests.cpp b/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests.cpp index 8bb0e3236b..77e5d26361 100644 --- a/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests.cpp +++ b/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests.cpp @@ -9,7 +9,8 @@ #include "core/memory_manager/unified_memory_manager.h" #include "core/unified_memory/unified_memory.h" #include "core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests_fixture.h" -#include "unit_tests/mocks/mock_memory_manager.h" + +#include "mocks/mock_memory_manager.h" using namespace NEO; diff --git a/core/unit_tests/preamble/preamble_fixture.h b/core/unit_tests/preamble/preamble_fixture.h index 42f88a3a0e..4cd1c892d2 100644 --- a/core/unit_tests/preamble/preamble_fixture.h +++ b/core/unit_tests/preamble/preamble_fixture.h @@ -7,10 +7,11 @@ #pragma once #include "core/helpers/preamble.h" -#include "unit_tests/command_stream/linear_stream_fixture.h" -#include "unit_tests/fixtures/device_fixture.h" -#include "unit_tests/fixtures/platform_fixture.h" -#include "unit_tests/helpers/hw_parse.h" + +#include "command_stream/linear_stream_fixture.h" +#include "fixtures/device_fixture.h" +#include "fixtures/platform_fixture.h" +#include "helpers/hw_parse.h" using namespace NEO; diff --git a/core/unit_tests/preamble/preamble_tests.cpp b/core/unit_tests/preamble/preamble_tests.cpp index d55d52dee6..b6ab9bb0be 100644 --- a/core/unit_tests/preamble/preamble_tests.cpp +++ b/core/unit_tests/preamble/preamble_tests.cpp @@ -12,10 +12,10 @@ #include "core/utilities/stackvec.h" #include "opencl/source/gen11/reg_configs.h" #include "test.h" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/mocks/mock_device.h" -#include "unit_tests/mocks/mock_graphics_allocation.h" +#include "helpers/hw_parse.h" +#include "mocks/mock_device.h" +#include "mocks/mock_graphics_allocation.h" #include #include diff --git a/core/unit_tests/preemption/preemption_tests.cpp b/core/unit_tests/preemption/preemption_tests.cpp index 722344cea5..7ed1279484 100644 --- a/core/unit_tests/preemption/preemption_tests.cpp +++ b/core/unit_tests/preemption/preemption_tests.cpp @@ -11,14 +11,14 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/dispatch_info.h" -#include "unit_tests/helpers/dispatch_flags_helper.h" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/mocks/mock_builtins.h" -#include "unit_tests/mocks/mock_device.h" -#include "unit_tests/mocks/mock_graphics_allocation.h" -#include "unit_tests/mocks/mock_kernel.h" #include "gmock/gmock.h" +#include "helpers/dispatch_flags_helper.h" +#include "helpers/hw_parse.h" +#include "mocks/mock_builtins.h" +#include "mocks/mock_device.h" +#include "mocks/mock_graphics_allocation.h" +#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/core/unit_tests/program/program_initialization_tests.cpp b/core/unit_tests/program/program_initialization_tests.cpp index dd2f09493e..9a4a3b072a 100644 --- a/core/unit_tests/program/program_initialization_tests.cpp +++ b/core/unit_tests/program/program_initialization_tests.cpp @@ -7,12 +7,12 @@ #include "core/program/program_initialization.h" #include "core/unit_tests/compiler_interface/linker_mock.h" -#include "unit_tests/mocks/mock_device.h" -#include "unit_tests/mocks/mock_memory_manager.h" -#include "unit_tests/mocks/mock_svm_manager.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "mocks/mock_device.h" +#include "mocks/mock_memory_manager.h" +#include "mocks/mock_svm_manager.h" #include diff --git a/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h b/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h index ff95f02a58..400b4ed9f5 100644 --- a/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h +++ b/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h @@ -10,10 +10,10 @@ #include "core/helpers/preamble.h" #include "opencl/source/built_ins/built_ins.h" #include "test.h" -#include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/mocks/mock_device.h" -#include "unit_tests/mocks/mock_graphics_allocation.h" +#include "helpers/hw_parse.h" +#include "mocks/mock_device.h" +#include "mocks/mock_graphics_allocation.h" #include template diff --git a/manifests/manifest.yml b/manifests/manifest.yml index 82f94a0826..058281c9e8 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -14,7 +14,7 @@ components: infra: branch: infra dest_dir: infra - revision: 36b37dcf299f8c86dac87d621da41bd2b6eb6517 + revision: a0b04a1678e59383351e967ea1c69fcd5d535a9c type: git internal: branch: master diff --git a/unit_tests/.clang-tidy b/opencl/test/unit_test/.clang-tidy similarity index 100% rename from unit_tests/.clang-tidy rename to opencl/test/unit_test/.clang-tidy diff --git a/unit_tests/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt similarity index 100% rename from unit_tests/CMakeLists.txt rename to opencl/test/unit_test/CMakeLists.txt diff --git a/unit_tests/abort.cpp b/opencl/test/unit_test/abort.cpp similarity index 100% rename from unit_tests/abort.cpp rename to opencl/test/unit_test/abort.cpp diff --git a/unit_tests/accelerators/CMakeLists.txt b/opencl/test/unit_test/accelerators/CMakeLists.txt similarity index 100% rename from unit_tests/accelerators/CMakeLists.txt rename to opencl/test/unit_test/accelerators/CMakeLists.txt diff --git a/unit_tests/accelerators/media_image_arg_tests.cpp b/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp similarity index 100% rename from unit_tests/accelerators/media_image_arg_tests.cpp rename to opencl/test/unit_test/accelerators/media_image_arg_tests.cpp diff --git a/unit_tests/api/CMakeLists.txt b/opencl/test/unit_test/api/CMakeLists.txt similarity index 100% rename from unit_tests/api/CMakeLists.txt rename to opencl/test/unit_test/api/CMakeLists.txt diff --git a/unit_tests/api/additional_extensions_tests.cpp b/opencl/test/unit_test/api/additional_extensions_tests.cpp similarity index 100% rename from unit_tests/api/additional_extensions_tests.cpp rename to opencl/test/unit_test/api/additional_extensions_tests.cpp diff --git a/unit_tests/api/api_tests_wrapper1.cpp b/opencl/test/unit_test/api/api_tests_wrapper1.cpp similarity index 100% rename from unit_tests/api/api_tests_wrapper1.cpp rename to opencl/test/unit_test/api/api_tests_wrapper1.cpp diff --git a/unit_tests/api/api_tests_wrapper2.cpp b/opencl/test/unit_test/api/api_tests_wrapper2.cpp similarity index 100% rename from unit_tests/api/api_tests_wrapper2.cpp rename to opencl/test/unit_test/api/api_tests_wrapper2.cpp diff --git a/unit_tests/api/api_tests_wrapper3.cpp b/opencl/test/unit_test/api/api_tests_wrapper3.cpp similarity index 100% rename from unit_tests/api/api_tests_wrapper3.cpp rename to opencl/test/unit_test/api/api_tests_wrapper3.cpp diff --git a/unit_tests/api/cl_add_comment_to_aub_tests.inl b/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl similarity index 100% rename from unit_tests/api/cl_add_comment_to_aub_tests.inl rename to opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl diff --git a/unit_tests/api/cl_api_tests.cpp b/opencl/test/unit_test/api/cl_api_tests.cpp similarity index 100% rename from unit_tests/api/cl_api_tests.cpp rename to opencl/test/unit_test/api/cl_api_tests.cpp diff --git a/unit_tests/api/cl_api_tests.h b/opencl/test/unit_test/api/cl_api_tests.h similarity index 100% rename from unit_tests/api/cl_api_tests.h rename to opencl/test/unit_test/api/cl_api_tests.h diff --git a/unit_tests/api/cl_build_program_tests.inl b/opencl/test/unit_test/api/cl_build_program_tests.inl similarity index 100% rename from unit_tests/api/cl_build_program_tests.inl rename to opencl/test/unit_test/api/cl_build_program_tests.inl diff --git a/unit_tests/api/cl_clone_kernel_tests.inl b/opencl/test/unit_test/api/cl_clone_kernel_tests.inl similarity index 100% rename from unit_tests/api/cl_clone_kernel_tests.inl rename to opencl/test/unit_test/api/cl_clone_kernel_tests.inl diff --git a/unit_tests/api/cl_compile_program_tests.inl b/opencl/test/unit_test/api/cl_compile_program_tests.inl similarity index 100% rename from unit_tests/api/cl_compile_program_tests.inl rename to opencl/test/unit_test/api/cl_compile_program_tests.inl diff --git a/unit_tests/api/cl_create_buffer_tests.cpp b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp similarity index 100% rename from unit_tests/api/cl_create_buffer_tests.cpp rename to opencl/test/unit_test/api/cl_create_buffer_tests.cpp diff --git a/unit_tests/api/cl_create_command_queue_tests.inl b/opencl/test/unit_test/api/cl_create_command_queue_tests.inl similarity index 100% rename from unit_tests/api/cl_create_command_queue_tests.inl rename to opencl/test/unit_test/api/cl_create_command_queue_tests.inl diff --git a/unit_tests/api/cl_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp similarity index 100% rename from unit_tests/api/cl_create_command_queue_with_properties_tests.cpp rename to opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp diff --git a/unit_tests/api/cl_create_context_from_type_tests.inl b/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl similarity index 100% rename from unit_tests/api/cl_create_context_from_type_tests.inl rename to opencl/test/unit_test/api/cl_create_context_from_type_tests.inl diff --git a/unit_tests/api/cl_create_context_tests.inl b/opencl/test/unit_test/api/cl_create_context_tests.inl similarity index 100% rename from unit_tests/api/cl_create_context_tests.inl rename to opencl/test/unit_test/api/cl_create_context_tests.inl diff --git a/unit_tests/api/cl_create_image_tests.cpp b/opencl/test/unit_test/api/cl_create_image_tests.cpp similarity index 100% rename from unit_tests/api/cl_create_image_tests.cpp rename to opencl/test/unit_test/api/cl_create_image_tests.cpp diff --git a/unit_tests/api/cl_create_kernel_tests.inl b/opencl/test/unit_test/api/cl_create_kernel_tests.inl similarity index 100% rename from unit_tests/api/cl_create_kernel_tests.inl rename to opencl/test/unit_test/api/cl_create_kernel_tests.inl diff --git a/unit_tests/api/cl_create_kernels_in_program_tests.inl b/opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl similarity index 100% rename from unit_tests/api/cl_create_kernels_in_program_tests.inl rename to opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl diff --git a/unit_tests/api/cl_create_perf_counters_command_queue_tests.inl b/opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl similarity index 100% rename from unit_tests/api/cl_create_perf_counters_command_queue_tests.inl rename to opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl diff --git a/unit_tests/api/cl_create_pipe_tests.inl b/opencl/test/unit_test/api/cl_create_pipe_tests.inl similarity index 100% rename from unit_tests/api/cl_create_pipe_tests.inl rename to opencl/test/unit_test/api/cl_create_pipe_tests.inl diff --git a/unit_tests/api/cl_create_program_with_binary_tests.inl b/opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl similarity index 100% rename from unit_tests/api/cl_create_program_with_binary_tests.inl rename to opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl diff --git a/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp b/opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp similarity index 100% rename from unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp rename to opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp diff --git a/unit_tests/api/cl_create_sampler_tests.inl b/opencl/test/unit_test/api/cl_create_sampler_tests.inl similarity index 100% rename from unit_tests/api/cl_create_sampler_tests.inl rename to opencl/test/unit_test/api/cl_create_sampler_tests.inl diff --git a/unit_tests/api/cl_create_sampler_with_properties_tests.inl b/opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl similarity index 100% rename from unit_tests/api/cl_create_sampler_with_properties_tests.inl rename to opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl diff --git a/unit_tests/api/cl_create_sub_buffer_tests.inl b/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl similarity index 100% rename from unit_tests/api/cl_create_sub_buffer_tests.inl rename to opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl diff --git a/unit_tests/api/cl_create_sub_devices_tests.inl b/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl similarity index 100% rename from unit_tests/api/cl_create_sub_devices_tests.inl rename to opencl/test/unit_test/api/cl_create_sub_devices_tests.inl diff --git a/unit_tests/api/cl_create_user_event_tests.inl b/opencl/test/unit_test/api/cl_create_user_event_tests.inl similarity index 100% rename from unit_tests/api/cl_create_user_event_tests.inl rename to opencl/test/unit_test/api/cl_create_user_event_tests.inl diff --git a/unit_tests/api/cl_create_user_event_tests_mt.cpp b/opencl/test/unit_test/api/cl_create_user_event_tests_mt.cpp similarity index 100% rename from unit_tests/api/cl_create_user_event_tests_mt.cpp rename to opencl/test/unit_test/api/cl_create_user_event_tests_mt.cpp diff --git a/unit_tests/api/cl_enqueue_barrier_tests.inl b/opencl/test/unit_test/api/cl_enqueue_barrier_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_barrier_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_barrier_tests.inl diff --git a/unit_tests/api/cl_enqueue_barrier_with_wait_list_tests.inl b/opencl/test/unit_test/api/cl_enqueue_barrier_with_wait_list_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_barrier_with_wait_list_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_barrier_with_wait_list_tests.inl diff --git a/unit_tests/api/cl_enqueue_copy_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_copy_buffer_rect_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl diff --git a/unit_tests/api/cl_enqueue_copy_buffer_to_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_copy_buffer_to_image_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl diff --git a/unit_tests/api/cl_enqueue_copy_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_copy_image_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl diff --git a/unit_tests/api/cl_enqueue_copy_image_to_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_copy_image_to_buffer_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl diff --git a/unit_tests/api/cl_enqueue_fill_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_fill_buffer_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_fill_buffer_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_fill_buffer_tests.inl diff --git a/unit_tests/api/cl_enqueue_fill_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_fill_image_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl diff --git a/unit_tests/api/cl_enqueue_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_image_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_image_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_image_tests.inl diff --git a/unit_tests/api/cl_enqueue_map_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_map_buffer_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl diff --git a/unit_tests/api/cl_enqueue_map_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_map_image_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl diff --git a/unit_tests/api/cl_enqueue_marker_tests.inl b/opencl/test/unit_test/api/cl_enqueue_marker_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_marker_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_marker_tests.inl diff --git a/unit_tests/api/cl_enqueue_marker_with_wait_list_tests.inl b/opencl/test/unit_test/api/cl_enqueue_marker_with_wait_list_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_marker_with_wait_list_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_marker_with_wait_list_tests.inl diff --git a/unit_tests/api/cl_enqueue_migrate_mem_objects_tests.inl b/opencl/test/unit_test/api/cl_enqueue_migrate_mem_objects_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_migrate_mem_objects_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_migrate_mem_objects_tests.inl diff --git a/unit_tests/api/cl_enqueue_native_kernel_tests.inl b/opencl/test/unit_test/api/cl_enqueue_native_kernel_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_native_kernel_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_native_kernel_tests.inl diff --git a/unit_tests/api/cl_enqueue_nd_range_kernel_tests.inl b/opencl/test/unit_test/api/cl_enqueue_nd_range_kernel_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_nd_range_kernel_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_nd_range_kernel_tests.inl diff --git a/unit_tests/api/cl_enqueue_read_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_read_buffer_rect_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl diff --git a/unit_tests/api/cl_enqueue_read_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_read_buffer_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl diff --git a/unit_tests/api/cl_enqueue_read_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_image_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_read_image_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_read_image_tests.inl diff --git a/unit_tests/api/cl_enqueue_svm_free_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_svm_free_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl diff --git a/unit_tests/api/cl_enqueue_svm_map_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_svm_map_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl diff --git a/unit_tests/api/cl_enqueue_svm_mem_fill_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_svm_mem_fill_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl diff --git a/unit_tests/api/cl_enqueue_svm_memcpy_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_svm_memcpy_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl diff --git a/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp similarity index 100% rename from unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp rename to opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp diff --git a/unit_tests/api/cl_enqueue_svm_unmap_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_svm_unmap_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl diff --git a/unit_tests/api/cl_enqueue_task_tests.inl b/opencl/test/unit_test/api/cl_enqueue_task_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_task_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_task_tests.inl diff --git a/unit_tests/api/cl_enqueue_unmap_mem_object_tests.inl b/opencl/test/unit_test/api/cl_enqueue_unmap_mem_object_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_unmap_mem_object_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_unmap_mem_object_tests.inl diff --git a/unit_tests/api/cl_enqueue_verify_memory.inl b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl similarity index 100% rename from unit_tests/api/cl_enqueue_verify_memory.inl rename to opencl/test/unit_test/api/cl_enqueue_verify_memory.inl diff --git a/unit_tests/api/cl_enqueue_wait_for_events_tests.inl b/opencl/test/unit_test/api/cl_enqueue_wait_for_events_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_wait_for_events_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_wait_for_events_tests.inl diff --git a/unit_tests/api/cl_enqueue_write_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_write_buffer_rect_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_write_buffer_rect_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_write_buffer_rect_tests.inl diff --git a/unit_tests/api/cl_enqueue_write_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_write_buffer_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_write_buffer_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_write_buffer_tests.inl diff --git a/unit_tests/api/cl_enqueue_write_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_write_image_tests.inl similarity index 100% rename from unit_tests/api/cl_enqueue_write_image_tests.inl rename to opencl/test/unit_test/api/cl_enqueue_write_image_tests.inl diff --git a/unit_tests/api/cl_finish_tests.inl b/opencl/test/unit_test/api/cl_finish_tests.inl similarity index 100% rename from unit_tests/api/cl_finish_tests.inl rename to opencl/test/unit_test/api/cl_finish_tests.inl diff --git a/unit_tests/api/cl_flush_tests.inl b/opencl/test/unit_test/api/cl_flush_tests.inl similarity index 100% rename from unit_tests/api/cl_flush_tests.inl rename to opencl/test/unit_test/api/cl_flush_tests.inl diff --git a/unit_tests/api/cl_function_pointers_tests.inl b/opencl/test/unit_test/api/cl_function_pointers_tests.inl similarity index 100% rename from unit_tests/api/cl_function_pointers_tests.inl rename to opencl/test/unit_test/api/cl_function_pointers_tests.inl diff --git a/unit_tests/api/cl_get_context_info_tests.inl b/opencl/test/unit_test/api/cl_get_context_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_context_info_tests.inl rename to opencl/test/unit_test/api/cl_get_context_info_tests.inl diff --git a/unit_tests/api/cl_get_device_and_host_timer.inl b/opencl/test/unit_test/api/cl_get_device_and_host_timer.inl similarity index 100% rename from unit_tests/api/cl_get_device_and_host_timer.inl rename to opencl/test/unit_test/api/cl_get_device_and_host_timer.inl diff --git a/unit_tests/api/cl_get_device_ids_tests.inl b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl similarity index 100% rename from unit_tests/api/cl_get_device_ids_tests.inl rename to opencl/test/unit_test/api/cl_get_device_ids_tests.inl diff --git a/unit_tests/api/cl_get_device_info_tests.inl b/opencl/test/unit_test/api/cl_get_device_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_device_info_tests.inl rename to opencl/test/unit_test/api/cl_get_device_info_tests.inl diff --git a/unit_tests/api/cl_get_event_profiling_info_tests.inl b/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_event_profiling_info_tests.inl rename to opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl diff --git a/unit_tests/api/cl_get_extension_function_address_for_platform_tests.inl b/opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl similarity index 100% rename from unit_tests/api/cl_get_extension_function_address_for_platform_tests.inl rename to opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl diff --git a/unit_tests/api/cl_get_extension_function_address_tests.inl b/opencl/test/unit_test/api/cl_get_extension_function_address_tests.inl similarity index 100% rename from unit_tests/api/cl_get_extension_function_address_tests.inl rename to opencl/test/unit_test/api/cl_get_extension_function_address_tests.inl diff --git a/unit_tests/api/cl_get_image_info_tests.inl b/opencl/test/unit_test/api/cl_get_image_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_image_info_tests.inl rename to opencl/test/unit_test/api/cl_get_image_info_tests.inl diff --git a/unit_tests/api/cl_get_image_params_tests.inl b/opencl/test/unit_test/api/cl_get_image_params_tests.inl similarity index 100% rename from unit_tests/api/cl_get_image_params_tests.inl rename to opencl/test/unit_test/api/cl_get_image_params_tests.inl diff --git a/unit_tests/api/cl_get_kernel_arg_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_kernel_arg_info_tests.inl rename to opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl diff --git a/unit_tests/api/cl_get_kernel_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_kernel_info_tests.inl rename to opencl/test/unit_test/api/cl_get_kernel_info_tests.inl diff --git a/unit_tests/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl similarity index 100% rename from unit_tests/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl rename to opencl/test/unit_test/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl diff --git a/unit_tests/api/cl_get_kernel_sub_group_info_khr_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl similarity index 100% rename from unit_tests/api/cl_get_kernel_sub_group_info_khr_tests.inl rename to opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl diff --git a/unit_tests/api/cl_get_kernel_sub_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_kernel_sub_group_info_tests.inl rename to opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl diff --git a/unit_tests/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl similarity index 100% rename from unit_tests/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl rename to opencl/test/unit_test/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl diff --git a/unit_tests/api/cl_get_kernel_work_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_kernel_work_group_info_tests.inl rename to opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl diff --git a/unit_tests/api/cl_get_mem_object_info_tests.inl b/opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_mem_object_info_tests.inl rename to opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl diff --git a/unit_tests/api/cl_get_pipe_info_tests.inl b/opencl/test/unit_test/api/cl_get_pipe_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_pipe_info_tests.inl rename to opencl/test/unit_test/api/cl_get_pipe_info_tests.inl diff --git a/unit_tests/api/cl_get_platform_ids_tests.inl b/opencl/test/unit_test/api/cl_get_platform_ids_tests.inl similarity index 100% rename from unit_tests/api/cl_get_platform_ids_tests.inl rename to opencl/test/unit_test/api/cl_get_platform_ids_tests.inl diff --git a/unit_tests/api/cl_get_platform_ids_tests_mt.cpp b/opencl/test/unit_test/api/cl_get_platform_ids_tests_mt.cpp similarity index 100% rename from unit_tests/api/cl_get_platform_ids_tests_mt.cpp rename to opencl/test/unit_test/api/cl_get_platform_ids_tests_mt.cpp diff --git a/unit_tests/api/cl_get_platform_info_tests.inl b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_platform_info_tests.inl rename to opencl/test/unit_test/api/cl_get_platform_info_tests.inl diff --git a/unit_tests/api/cl_get_program_build_info_tests.inl b/opencl/test/unit_test/api/cl_get_program_build_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_program_build_info_tests.inl rename to opencl/test/unit_test/api/cl_get_program_build_info_tests.inl diff --git a/unit_tests/api/cl_get_program_info_tests.inl b/opencl/test/unit_test/api/cl_get_program_info_tests.inl similarity index 100% rename from unit_tests/api/cl_get_program_info_tests.inl rename to opencl/test/unit_test/api/cl_get_program_info_tests.inl diff --git a/unit_tests/api/cl_get_supported_image_formats_tests.inl b/opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl similarity index 100% rename from unit_tests/api/cl_get_supported_image_formats_tests.inl rename to opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl diff --git a/unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl similarity index 100% rename from unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl rename to opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl diff --git a/unit_tests/api/cl_intel_accelerator_tests.inl b/opencl/test/unit_test/api/cl_intel_accelerator_tests.inl similarity index 100% rename from unit_tests/api/cl_intel_accelerator_tests.inl rename to opencl/test/unit_test/api/cl_intel_accelerator_tests.inl diff --git a/unit_tests/api/cl_intel_motion_estimation.cpp b/opencl/test/unit_test/api/cl_intel_motion_estimation.cpp similarity index 100% rename from unit_tests/api/cl_intel_motion_estimation.cpp rename to opencl/test/unit_test/api/cl_intel_motion_estimation.cpp diff --git a/unit_tests/api/cl_intel_tracing_tests.inl b/opencl/test/unit_test/api/cl_intel_tracing_tests.inl similarity index 100% rename from unit_tests/api/cl_intel_tracing_tests.inl rename to opencl/test/unit_test/api/cl_intel_tracing_tests.inl diff --git a/unit_tests/api/cl_intel_tracing_tests_mt.cpp b/opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp similarity index 100% rename from unit_tests/api/cl_intel_tracing_tests_mt.cpp rename to opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp diff --git a/unit_tests/api/cl_link_program_tests.inl b/opencl/test/unit_test/api/cl_link_program_tests.inl similarity index 100% rename from unit_tests/api/cl_link_program_tests.inl rename to opencl/test/unit_test/api/cl_link_program_tests.inl diff --git a/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp similarity index 100% rename from unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp rename to opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp diff --git a/unit_tests/api/cl_release_command_queue_tests.inl b/opencl/test/unit_test/api/cl_release_command_queue_tests.inl similarity index 100% rename from unit_tests/api/cl_release_command_queue_tests.inl rename to opencl/test/unit_test/api/cl_release_command_queue_tests.inl diff --git a/unit_tests/api/cl_release_context_tests.inl b/opencl/test/unit_test/api/cl_release_context_tests.inl similarity index 100% rename from unit_tests/api/cl_release_context_tests.inl rename to opencl/test/unit_test/api/cl_release_context_tests.inl diff --git a/unit_tests/api/cl_release_event_tests.inl b/opencl/test/unit_test/api/cl_release_event_tests.inl similarity index 100% rename from unit_tests/api/cl_release_event_tests.inl rename to opencl/test/unit_test/api/cl_release_event_tests.inl diff --git a/unit_tests/api/cl_release_kernel_tests.inl b/opencl/test/unit_test/api/cl_release_kernel_tests.inl similarity index 100% rename from unit_tests/api/cl_release_kernel_tests.inl rename to opencl/test/unit_test/api/cl_release_kernel_tests.inl diff --git a/unit_tests/api/cl_release_mem_obj_tests.inl b/opencl/test/unit_test/api/cl_release_mem_obj_tests.inl similarity index 100% rename from unit_tests/api/cl_release_mem_obj_tests.inl rename to opencl/test/unit_test/api/cl_release_mem_obj_tests.inl diff --git a/unit_tests/api/cl_release_program_tests.inl b/opencl/test/unit_test/api/cl_release_program_tests.inl similarity index 100% rename from unit_tests/api/cl_release_program_tests.inl rename to opencl/test/unit_test/api/cl_release_program_tests.inl diff --git a/unit_tests/api/cl_retain_mem_obj_tests.inl b/opencl/test/unit_test/api/cl_retain_mem_obj_tests.inl similarity index 100% rename from unit_tests/api/cl_retain_mem_obj_tests.inl rename to opencl/test/unit_test/api/cl_retain_mem_obj_tests.inl diff --git a/unit_tests/api/cl_retain_release_command_queue_tests.inl b/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl similarity index 100% rename from unit_tests/api/cl_retain_release_command_queue_tests.inl rename to opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl diff --git a/unit_tests/api/cl_retain_release_context_tests.inl b/opencl/test/unit_test/api/cl_retain_release_context_tests.inl similarity index 100% rename from unit_tests/api/cl_retain_release_context_tests.inl rename to opencl/test/unit_test/api/cl_retain_release_context_tests.inl diff --git a/unit_tests/api/cl_retain_release_device_tests.inl b/opencl/test/unit_test/api/cl_retain_release_device_tests.inl similarity index 100% rename from unit_tests/api/cl_retain_release_device_tests.inl rename to opencl/test/unit_test/api/cl_retain_release_device_tests.inl diff --git a/unit_tests/api/cl_retain_release_sampler_tests.inl b/opencl/test/unit_test/api/cl_retain_release_sampler_tests.inl similarity index 100% rename from unit_tests/api/cl_retain_release_sampler_tests.inl rename to opencl/test/unit_test/api/cl_retain_release_sampler_tests.inl diff --git a/unit_tests/api/cl_set_default_device_command_queue_tests.inl b/opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl similarity index 100% rename from unit_tests/api/cl_set_default_device_command_queue_tests.inl rename to opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl diff --git a/unit_tests/api/cl_set_event_callback_tests.inl b/opencl/test/unit_test/api/cl_set_event_callback_tests.inl similarity index 100% rename from unit_tests/api/cl_set_event_callback_tests.inl rename to opencl/test/unit_test/api/cl_set_event_callback_tests.inl diff --git a/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl similarity index 100% rename from unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl rename to opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl diff --git a/unit_tests/api/cl_set_kernel_exec_info_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl similarity index 100% rename from unit_tests/api/cl_set_kernel_exec_info_tests.inl rename to opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl diff --git a/unit_tests/api/cl_set_mem_object_destructor_callback_tests.inl b/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests.inl similarity index 100% rename from unit_tests/api/cl_set_mem_object_destructor_callback_tests.inl rename to opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests.inl diff --git a/unit_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp b/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests_mt.cpp similarity index 100% rename from unit_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp rename to opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests_mt.cpp diff --git a/unit_tests/api/cl_set_performance_configuration_tests.inl b/opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl similarity index 100% rename from unit_tests/api/cl_set_performance_configuration_tests.inl rename to opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl diff --git a/unit_tests/api/cl_set_program_specialization_constant_tests.inl b/opencl/test/unit_test/api/cl_set_program_specialization_constant_tests.inl similarity index 100% rename from unit_tests/api/cl_set_program_specialization_constant_tests.inl rename to opencl/test/unit_test/api/cl_set_program_specialization_constant_tests.inl diff --git a/unit_tests/api/cl_svm_alloc_tests.inl b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl similarity index 100% rename from unit_tests/api/cl_svm_alloc_tests.inl rename to opencl/test/unit_test/api/cl_svm_alloc_tests.inl diff --git a/unit_tests/api/cl_svm_free_tests.inl b/opencl/test/unit_test/api/cl_svm_free_tests.inl similarity index 100% rename from unit_tests/api/cl_svm_free_tests.inl rename to opencl/test/unit_test/api/cl_svm_free_tests.inl diff --git a/unit_tests/api/cl_unified_shared_memory_tests.inl b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl similarity index 100% rename from unit_tests/api/cl_unified_shared_memory_tests.inl rename to opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl diff --git a/unit_tests/api/cl_unload_compiler_tests.inl b/opencl/test/unit_test/api/cl_unload_compiler_tests.inl similarity index 100% rename from unit_tests/api/cl_unload_compiler_tests.inl rename to opencl/test/unit_test/api/cl_unload_compiler_tests.inl diff --git a/unit_tests/api/cl_unload_platform_compiler_tests.inl b/opencl/test/unit_test/api/cl_unload_platform_compiler_tests.inl similarity index 100% rename from unit_tests/api/cl_unload_platform_compiler_tests.inl rename to opencl/test/unit_test/api/cl_unload_platform_compiler_tests.inl diff --git a/unit_tests/api/gl/CMakeLists.txt b/opencl/test/unit_test/api/gl/CMakeLists.txt similarity index 100% rename from unit_tests/api/gl/CMakeLists.txt rename to opencl/test/unit_test/api/gl/CMakeLists.txt diff --git a/unit_tests/api/gl/cl_create_from_gl_buffer_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_buffer_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_create_from_gl_buffer_tests.cpp rename to opencl/test/unit_test/api/gl/cl_create_from_gl_buffer_tests.cpp diff --git a/unit_tests/api/gl/cl_create_from_gl_renderbuffer_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_renderbuffer_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_create_from_gl_renderbuffer_tests.cpp rename to opencl/test/unit_test/api/gl/cl_create_from_gl_renderbuffer_tests.cpp diff --git a/unit_tests/api/gl/cl_create_from_gl_texture2d_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_texture2d_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_create_from_gl_texture2d_tests.cpp rename to opencl/test/unit_test/api/gl/cl_create_from_gl_texture2d_tests.cpp diff --git a/unit_tests/api/gl/cl_create_from_gl_texture3d_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_texture3d_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_create_from_gl_texture3d_tests.cpp rename to opencl/test/unit_test/api/gl/cl_create_from_gl_texture3d_tests.cpp diff --git a/unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_texture_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp rename to opencl/test/unit_test/api/gl/cl_create_from_gl_texture_tests.cpp diff --git a/unit_tests/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp b/opencl/test/unit_test/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp rename to opencl/test/unit_test/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp diff --git a/unit_tests/api/gl/cl_enqueue_release_gl_objects_tests.cpp b/opencl/test/unit_test/api/gl/cl_enqueue_release_gl_objects_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_enqueue_release_gl_objects_tests.cpp rename to opencl/test/unit_test/api/gl/cl_enqueue_release_gl_objects_tests.cpp diff --git a/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp rename to opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp diff --git a/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_get_gl_device_info_tests.cpp rename to opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp diff --git a/unit_tests/api/gl/cl_get_gl_object_info_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_object_info_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_get_gl_object_info_tests.cpp rename to opencl/test/unit_test/api/gl/cl_get_gl_object_info_tests.cpp diff --git a/unit_tests/api/gl/cl_get_gl_texture_info_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_texture_info_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_get_gl_texture_info_tests.cpp rename to opencl/test/unit_test/api/gl/cl_get_gl_texture_info_tests.cpp diff --git a/unit_tests/api/gl/cl_gl_intel_tracing_tests.cpp b/opencl/test/unit_test/api/gl/cl_gl_intel_tracing_tests.cpp similarity index 100% rename from unit_tests/api/gl/cl_gl_intel_tracing_tests.cpp rename to opencl/test/unit_test/api/gl/cl_gl_intel_tracing_tests.cpp diff --git a/unit_tests/aub/CMakeLists.txt b/opencl/test/unit_test/aub/CMakeLists.txt similarity index 100% rename from unit_tests/aub/CMakeLists.txt rename to opencl/test/unit_test/aub/CMakeLists.txt diff --git a/unit_tests/aub/aub_center_tests.cpp b/opencl/test/unit_test/aub/aub_center_tests.cpp similarity index 100% rename from unit_tests/aub/aub_center_tests.cpp rename to opencl/test/unit_test/aub/aub_center_tests.cpp diff --git a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp b/opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp similarity index 100% rename from unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp rename to opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp diff --git a/unit_tests/aub/aub_helper_tests.cpp b/opencl/test/unit_test/aub/aub_helper_tests.cpp similarity index 100% rename from unit_tests/aub/aub_helper_tests.cpp rename to opencl/test/unit_test/aub/aub_helper_tests.cpp diff --git a/unit_tests/aub/aub_helper_tests.inl b/opencl/test/unit_test/aub/aub_helper_tests.inl similarity index 100% rename from unit_tests/aub/aub_helper_tests.inl rename to opencl/test/unit_test/aub/aub_helper_tests.inl diff --git a/unit_tests/aub_mem_dump/CMakeLists.txt b/opencl/test/unit_test/aub_mem_dump/CMakeLists.txt similarity index 100% rename from unit_tests/aub_mem_dump/CMakeLists.txt rename to opencl/test/unit_test/aub_mem_dump/CMakeLists.txt diff --git a/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp similarity index 100% rename from unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp rename to opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp diff --git a/unit_tests/aub_mem_dump/lrca_helper_tests.cpp b/opencl/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp similarity index 100% rename from unit_tests/aub_mem_dump/lrca_helper_tests.cpp rename to opencl/test/unit_test/aub_mem_dump/lrca_helper_tests.cpp diff --git a/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp b/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp similarity index 100% rename from unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp rename to opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp diff --git a/unit_tests/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/CMakeLists.txt diff --git a/unit_tests/aub_tests/aub_tests_configuration.cpp b/opencl/test/unit_test/aub_tests/aub_tests_configuration.cpp similarity index 100% rename from unit_tests/aub_tests/aub_tests_configuration.cpp rename to opencl/test/unit_test/aub_tests/aub_tests_configuration.cpp diff --git a/unit_tests/aub_tests/aub_tests_configuration.h b/opencl/test/unit_test/aub_tests/aub_tests_configuration.h similarity index 100% rename from unit_tests/aub_tests/aub_tests_configuration.h rename to opencl/test/unit_test/aub_tests/aub_tests_configuration.h diff --git a/unit_tests/aub_tests/aub_tests_configuration.inl b/opencl/test/unit_test/aub_tests/aub_tests_configuration.inl similarity index 100% rename from unit_tests/aub_tests/aub_tests_configuration.inl rename to opencl/test/unit_test/aub_tests/aub_tests_configuration.inl diff --git a/unit_tests/aub_tests/command_queue/CMakeLists.txt b/opencl/test/unit_test/aub_tests/command_queue/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/command_queue/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/command_queue/CMakeLists.txt diff --git a/unit_tests/aub_tests/command_queue/command_enqueue_fixture.h b/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h similarity index 100% rename from unit_tests/aub_tests/command_queue/command_enqueue_fixture.h rename to opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h diff --git a/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h diff --git a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp diff --git a/unit_tests/aub_tests/command_stream/CMakeLists.txt b/opencl/test/unit_test/aub_tests/command_stream/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/command_stream/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/command_stream/CMakeLists.txt diff --git a/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp similarity index 100% rename from unit_tests/aub_tests/command_stream/aub_command_stream_fixture.cpp rename to opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp diff --git a/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h similarity index 100% rename from unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h rename to opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h diff --git a/unit_tests/aub_tests/command_stream/aub_command_stream_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_stream/aub_command_stream_tests.cpp rename to opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp diff --git a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp similarity index 100% rename from unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp rename to opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp diff --git a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h similarity index 100% rename from unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h rename to opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h diff --git a/unit_tests/aub_tests/common.cmake b/opencl/test/unit_test/aub_tests/common.cmake similarity index 100% rename from unit_tests/aub_tests/common.cmake rename to opencl/test/unit_test/aub_tests/common.cmake diff --git a/unit_tests/aub_tests/fixtures/CMakeLists.txt b/opencl/test/unit_test/aub_tests/fixtures/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/fixtures/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/fixtures/CMakeLists.txt diff --git a/unit_tests/aub_tests/fixtures/aub_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp similarity index 100% rename from unit_tests/aub_tests/fixtures/aub_fixture.cpp rename to opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp diff --git a/unit_tests/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h similarity index 100% rename from unit_tests/aub_tests/fixtures/aub_fixture.h rename to opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h diff --git a/unit_tests/aub_tests/fixtures/aub_parent_kernel_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h similarity index 100% rename from unit_tests/aub_tests/fixtures/aub_parent_kernel_fixture.h rename to opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h diff --git a/unit_tests/aub_tests/fixtures/fixture_tests.cpp b/opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp similarity index 100% rename from unit_tests/aub_tests/fixtures/fixture_tests.cpp rename to opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp diff --git a/unit_tests/aub_tests/fixtures/hello_world_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h similarity index 100% rename from unit_tests/aub_tests/fixtures/hello_world_fixture.h rename to opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h diff --git a/unit_tests/aub_tests/fixtures/run_kernel_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h similarity index 100% rename from unit_tests/aub_tests/fixtures/run_kernel_fixture.h rename to opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h diff --git a/unit_tests/aub_tests/fixtures/simple_arg_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h similarity index 100% rename from unit_tests/aub_tests/fixtures/simple_arg_fixture.h rename to opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h diff --git a/unit_tests/aub_tests/fixtures/unified_memory_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h similarity index 100% rename from unit_tests/aub_tests/fixtures/unified_memory_fixture.h rename to opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h diff --git a/unit_tests/aub_tests/gen11/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen11/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen11/aub_tests_configuration_gen11.cpp b/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp similarity index 100% rename from unit_tests/aub_tests/gen11/aub_tests_configuration_gen11.cpp rename to opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp diff --git a/unit_tests/aub_tests/gen11/batch_buffer/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen11/batch_buffer/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen11/batch_buffer/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp similarity index 100% rename from unit_tests/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp rename to opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp diff --git a/unit_tests/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h similarity index 100% rename from unit_tests/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h rename to opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h diff --git a/unit_tests/aub_tests/gen11/execution_model/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen11/execution_model/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen11/execution_model/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen11/execution_model/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp b/opencl/test/unit_test/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp similarity index 100% rename from unit_tests/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp rename to opencl/test/unit_test/aub_tests/gen11/execution_model/enqueue_parent_kernel_tests_gen11.cpp diff --git a/unit_tests/aub_tests/gen12lp/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen12lp/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp similarity index 100% rename from unit_tests/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp rename to opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp diff --git a/unit_tests/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp similarity index 100% rename from unit_tests/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp rename to opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp diff --git a/unit_tests/aub_tests/gen12lp/batch_buffer/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen12lp/batch_buffer/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp similarity index 100% rename from unit_tests/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp rename to opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp diff --git a/unit_tests/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h similarity index 100% rename from unit_tests/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h rename to opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h diff --git a/unit_tests/aub_tests/gen12lp/execution_model/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen12lp/execution_model/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen12lp/execution_model/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen12lp/execution_model/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen12lp/execution_model/enqueue_parent_kernel_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/execution_model/enqueue_parent_kernel_tests_gen12lp.cpp similarity index 100% rename from unit_tests/aub_tests/gen12lp/execution_model/enqueue_parent_kernel_tests_gen12lp.cpp rename to opencl/test/unit_test/aub_tests/gen12lp/execution_model/enqueue_parent_kernel_tests_gen12lp.cpp diff --git a/unit_tests/aub_tests/gen8/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen8/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp b/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp similarity index 100% rename from unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp rename to opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp diff --git a/unit_tests/aub_tests/gen8/execution_model/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen8/execution_model/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen8/execution_model/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen8/execution_model/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp b/opencl/test/unit_test/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp similarity index 100% rename from unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp rename to opencl/test/unit_test/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp diff --git a/unit_tests/aub_tests/gen9/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen9/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp b/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp similarity index 100% rename from unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp rename to opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp diff --git a/unit_tests/aub_tests/gen9/batch_buffer/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen9/batch_buffer/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen9/batch_buffer/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp similarity index 100% rename from unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp rename to opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp diff --git a/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h similarity index 100% rename from unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h rename to opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h diff --git a/unit_tests/aub_tests/gen9/execution_model/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen9/execution_model/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen9/execution_model/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen9/execution_model/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp b/opencl/test/unit_test/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp similarity index 100% rename from unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp rename to opencl/test/unit_test/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp diff --git a/unit_tests/aub_tests/gen9/skl/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen9/skl/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen9/skl/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen9/skl/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen9/skl/command_queue/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen9/skl/command_queue/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/gen9/skl/command_queue/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/gen9/skl/command_queue/CMakeLists.txt diff --git a/unit_tests/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp b/opencl/test/unit_test/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp similarity index 100% rename from unit_tests/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp rename to opencl/test/unit_test/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp diff --git a/unit_tests/aub_tests/mem_obj/CMakeLists.txt b/opencl/test/unit_test/aub_tests/mem_obj/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/mem_obj/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/mem_obj/CMakeLists.txt diff --git a/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp diff --git a/unit_tests/aub_tests/test_mode.h b/opencl/test/unit_test/aub_tests/test_mode.h similarity index 100% rename from unit_tests/aub_tests/test_mode.h rename to opencl/test/unit_test/aub_tests/test_mode.h diff --git a/unit_tests/aub_tests/unified_memory/CMakeLists.txt b/opencl/test/unit_test/aub_tests/unified_memory/CMakeLists.txt similarity index 100% rename from unit_tests/aub_tests/unified_memory/CMakeLists.txt rename to opencl/test/unit_test/aub_tests/unified_memory/CMakeLists.txt diff --git a/unit_tests/aub_tests/unified_memory/unified_memory_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/unified_memory/unified_memory_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp diff --git a/unit_tests/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp similarity index 100% rename from unit_tests/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp rename to opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp diff --git a/unit_tests/built_ins/CMakeLists.txt b/opencl/test/unit_test/built_ins/CMakeLists.txt similarity index 100% rename from unit_tests/built_ins/CMakeLists.txt rename to opencl/test/unit_test/built_ins/CMakeLists.txt diff --git a/unit_tests/built_ins/built_in_kernels_tests.cpp b/opencl/test/unit_test/built_ins/built_in_kernels_tests.cpp similarity index 100% rename from unit_tests/built_ins/built_in_kernels_tests.cpp rename to opencl/test/unit_test/built_ins/built_in_kernels_tests.cpp diff --git a/unit_tests/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp similarity index 100% rename from unit_tests/built_ins/built_in_tests.cpp rename to opencl/test/unit_test/built_ins/built_in_tests.cpp diff --git a/unit_tests/built_ins/built_ins_file_names.cpp b/opencl/test/unit_test/built_ins/built_ins_file_names.cpp similarity index 100% rename from unit_tests/built_ins/built_ins_file_names.cpp rename to opencl/test/unit_test/built_ins/built_ins_file_names.cpp diff --git a/unit_tests/built_ins/built_ins_file_names.h b/opencl/test/unit_test/built_ins/built_ins_file_names.h similarity index 100% rename from unit_tests/built_ins/built_ins_file_names.h rename to opencl/test/unit_test/built_ins/built_ins_file_names.h diff --git a/unit_tests/built_ins/get_built_ins_file_names.cpp b/opencl/test/unit_test/built_ins/get_built_ins_file_names.cpp similarity index 100% rename from unit_tests/built_ins/get_built_ins_file_names.cpp rename to opencl/test/unit_test/built_ins/get_built_ins_file_names.cpp diff --git a/unit_tests/built_ins/sip_tests.cpp b/opencl/test/unit_test/built_ins/sip_tests.cpp similarity index 100% rename from unit_tests/built_ins/sip_tests.cpp rename to opencl/test/unit_test/built_ins/sip_tests.cpp diff --git a/unit_tests/command_queue/CMakeLists.txt b/opencl/test/unit_test/command_queue/CMakeLists.txt similarity index 100% rename from unit_tests/command_queue/CMakeLists.txt rename to opencl/test/unit_test/command_queue/CMakeLists.txt diff --git a/unit_tests/command_queue/blit_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp similarity index 100% rename from unit_tests/command_queue/blit_enqueue_tests.cpp rename to opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp diff --git a/unit_tests/command_queue/buffer_operations_fixture.h b/opencl/test/unit_test/command_queue/buffer_operations_fixture.h similarity index 100% rename from unit_tests/command_queue/buffer_operations_fixture.h rename to opencl/test/unit_test/command_queue/buffer_operations_fixture.h diff --git a/unit_tests/command_queue/command_enqueue_fixture.h b/opencl/test/unit_test/command_queue/command_enqueue_fixture.h similarity index 100% rename from unit_tests/command_queue/command_enqueue_fixture.h rename to opencl/test/unit_test/command_queue/command_enqueue_fixture.h diff --git a/unit_tests/command_queue/command_queue_fixture.cpp b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp similarity index 100% rename from unit_tests/command_queue/command_queue_fixture.cpp rename to opencl/test/unit_test/command_queue/command_queue_fixture.cpp diff --git a/unit_tests/command_queue/command_queue_fixture.h b/opencl/test/unit_test/command_queue/command_queue_fixture.h similarity index 100% rename from unit_tests/command_queue/command_queue_fixture.h rename to opencl/test/unit_test/command_queue/command_queue_fixture.h diff --git a/unit_tests/command_queue/command_queue_hw_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp similarity index 100% rename from unit_tests/command_queue/command_queue_hw_tests.cpp rename to opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp diff --git a/unit_tests/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp similarity index 100% rename from unit_tests/command_queue/command_queue_tests.cpp rename to opencl/test/unit_test/command_queue/command_queue_tests.cpp diff --git a/unit_tests/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp similarity index 100% rename from unit_tests/command_queue/dispatch_walker_tests.cpp rename to opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp diff --git a/unit_tests/command_queue/enqueue_barrier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_barrier_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp diff --git a/unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_event_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_copy_buffer_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h diff --git a/unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h diff --git a/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_buffer_to_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_to_image_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h diff --git a/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_copy_image_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h diff --git a/unit_tests/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_image_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_copy_image_to_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_copy_image_to_buffer_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h diff --git a/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_debug_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_debug_kernel_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp diff --git a/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_fill_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_fill_buffer_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h diff --git a/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp diff --git a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_fill_buffer_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_fill_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_fill_image_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h diff --git a/unit_tests/command_queue/enqueue_fill_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_fill_image_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_fixture.cpp b/opencl/test/unit_test/command_queue/enqueue_fixture.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_fixture.cpp rename to opencl/test/unit_test/command_queue/enqueue_fixture.cpp diff --git a/unit_tests/command_queue/enqueue_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_fixture.h diff --git a/unit_tests/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_handler_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_1_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_1_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_2_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_event_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_global_offset_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_global_offset_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_global_offset_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_global_offset_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_local_work_size_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_local_work_size_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_local_work_size_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_local_work_size_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_mt_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_mt_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_two_ioq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_two_ioq_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_two_ooq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_two_ooq_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp diff --git a/unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp diff --git a/unit_tests/command_queue/enqueue_map_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_map_buffer_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h diff --git a/unit_tests/command_queue/enqueue_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_map_buffer_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_map_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_map_image_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_marker_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_marker_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp diff --git a/unit_tests/command_queue/enqueue_media_kernel.cpp b/opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_media_kernel.cpp rename to opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp diff --git a/unit_tests/command_queue/enqueue_migrate_mem_objects_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_migrate_mem_objects_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp diff --git a/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_read_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_read_buffer_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h diff --git a/unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h diff --git a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp diff --git a/unit_tests/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_read_buffer_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_read_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_read_image_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h diff --git a/unit_tests/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_read_image_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp diff --git a/unit_tests/command_queue/enqueue_resource_barier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_resource_barier_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp diff --git a/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp diff --git a/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp diff --git a/unit_tests/command_queue/enqueue_svm_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_svm_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp diff --git a/unit_tests/command_queue/enqueue_thread_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_thread_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp diff --git a/unit_tests/command_queue/enqueue_unmap_memobject_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_unmap_memobject_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp diff --git a/unit_tests/command_queue/enqueue_waitlist_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_waitlist_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp diff --git a/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp diff --git a/unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h diff --git a/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp diff --git a/unit_tests/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_write_buffer_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp diff --git a/unit_tests/command_queue/enqueue_write_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h similarity index 100% rename from unit_tests/command_queue/enqueue_write_image_fixture.h rename to opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h diff --git a/unit_tests/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/enqueue_write_image_tests.cpp rename to opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp diff --git a/unit_tests/command_queue/finish_tests.cpp b/opencl/test/unit_test/command_queue/finish_tests.cpp similarity index 100% rename from unit_tests/command_queue/finish_tests.cpp rename to opencl/test/unit_test/command_queue/finish_tests.cpp diff --git a/unit_tests/command_queue/flattened_id_tests.cpp b/opencl/test/unit_test/command_queue/flattened_id_tests.cpp similarity index 100% rename from unit_tests/command_queue/flattened_id_tests.cpp rename to opencl/test/unit_test/command_queue/flattened_id_tests.cpp diff --git a/unit_tests/command_queue/flush_tests.cpp b/opencl/test/unit_test/command_queue/flush_tests.cpp similarity index 100% rename from unit_tests/command_queue/flush_tests.cpp rename to opencl/test/unit_test/command_queue/flush_tests.cpp diff --git a/unit_tests/command_queue/get_command_queue_info_tests.cpp b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp similarity index 100% rename from unit_tests/command_queue/get_command_queue_info_tests.cpp rename to opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp diff --git a/unit_tests/command_queue/get_size_required_buffer_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/get_size_required_buffer_tests.cpp rename to opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp diff --git a/unit_tests/command_queue/get_size_required_image_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/get_size_required_image_tests.cpp rename to opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp diff --git a/unit_tests/command_queue/get_size_required_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_tests.cpp similarity index 100% rename from unit_tests/command_queue/get_size_required_tests.cpp rename to opencl/test/unit_test/command_queue/get_size_required_tests.cpp diff --git a/unit_tests/command_queue/gl/CMakeLists.txt b/opencl/test/unit_test/command_queue/gl/CMakeLists.txt similarity index 100% rename from unit_tests/command_queue/gl/CMakeLists.txt rename to opencl/test/unit_test/command_queue/gl/CMakeLists.txt diff --git a/unit_tests/command_queue/gl/windows/CMakeLists.txt b/opencl/test/unit_test/command_queue/gl/windows/CMakeLists.txt similarity index 100% rename from unit_tests/command_queue/gl/windows/CMakeLists.txt rename to opencl/test/unit_test/command_queue/gl/windows/CMakeLists.txt diff --git a/unit_tests/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp b/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp similarity index 100% rename from unit_tests/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp rename to opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp diff --git a/unit_tests/command_queue/ioq_task_tests.cpp b/opencl/test/unit_test/command_queue/ioq_task_tests.cpp similarity index 100% rename from unit_tests/command_queue/ioq_task_tests.cpp rename to opencl/test/unit_test/command_queue/ioq_task_tests.cpp diff --git a/unit_tests/command_queue/ioq_task_tests_mt.cpp b/opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp similarity index 100% rename from unit_tests/command_queue/ioq_task_tests_mt.cpp rename to opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp diff --git a/unit_tests/command_queue/local_id_tests.cpp b/opencl/test/unit_test/command_queue/local_id_tests.cpp similarity index 100% rename from unit_tests/command_queue/local_id_tests.cpp rename to opencl/test/unit_test/command_queue/local_id_tests.cpp diff --git a/unit_tests/command_queue/local_work_size_tests.cpp b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp similarity index 100% rename from unit_tests/command_queue/local_work_size_tests.cpp rename to opencl/test/unit_test/command_queue/local_work_size_tests.cpp diff --git a/unit_tests/command_queue/multi_dispatch_info_tests.cpp b/opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp similarity index 100% rename from unit_tests/command_queue/multi_dispatch_info_tests.cpp rename to opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp diff --git a/unit_tests/command_queue/multiple_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/multiple_map_buffer_tests.cpp rename to opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp diff --git a/unit_tests/command_queue/multiple_map_image_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/multiple_map_image_tests.cpp rename to opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp diff --git a/unit_tests/command_queue/oom_buffer_tests.cpp b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp similarity index 100% rename from unit_tests/command_queue/oom_buffer_tests.cpp rename to opencl/test/unit_test/command_queue/oom_buffer_tests.cpp diff --git a/unit_tests/command_queue/oom_image_tests.cpp b/opencl/test/unit_test/command_queue/oom_image_tests.cpp similarity index 100% rename from unit_tests/command_queue/oom_image_tests.cpp rename to opencl/test/unit_test/command_queue/oom_image_tests.cpp diff --git a/unit_tests/command_queue/oom_tests.cpp b/opencl/test/unit_test/command_queue/oom_tests.cpp similarity index 100% rename from unit_tests/command_queue/oom_tests.cpp rename to opencl/test/unit_test/command_queue/oom_tests.cpp diff --git a/unit_tests/command_queue/ooq_task_tests.cpp b/opencl/test/unit_test/command_queue/ooq_task_tests.cpp similarity index 100% rename from unit_tests/command_queue/ooq_task_tests.cpp rename to opencl/test/unit_test/command_queue/ooq_task_tests.cpp diff --git a/unit_tests/command_queue/ooq_task_tests_mt.cpp b/opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp similarity index 100% rename from unit_tests/command_queue/ooq_task_tests_mt.cpp rename to opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp diff --git a/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp b/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp similarity index 100% rename from unit_tests/command_queue/read_write_buffer_cpu_copy.cpp rename to opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp diff --git a/unit_tests/command_queue/sync_buffer_handler_tests.cpp b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp similarity index 100% rename from unit_tests/command_queue/sync_buffer_handler_tests.cpp rename to opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp diff --git a/unit_tests/command_queue/work_group_size_tests.cpp b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp similarity index 100% rename from unit_tests/command_queue/work_group_size_tests.cpp rename to opencl/test/unit_test/command_queue/work_group_size_tests.cpp diff --git a/unit_tests/command_queue/zero_size_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp similarity index 100% rename from unit_tests/command_queue/zero_size_enqueue_tests.cpp rename to opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp diff --git a/unit_tests/command_stream/CMakeLists.txt b/opencl/test/unit_test/command_stream/CMakeLists.txt similarity index 100% rename from unit_tests/command_stream/CMakeLists.txt rename to opencl/test/unit_test/command_stream/CMakeLists.txt diff --git a/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp similarity index 100% rename from unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp rename to opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp diff --git a/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp similarity index 100% rename from unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp rename to opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp diff --git a/unit_tests/command_stream/aub_file_stream_tests.cpp b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp similarity index 100% rename from unit_tests/command_stream/aub_file_stream_tests.cpp rename to opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp diff --git a/unit_tests/command_stream/aub_subcapture_tests.cpp b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp similarity index 100% rename from unit_tests/command_stream/aub_subcapture_tests.cpp rename to opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp diff --git a/unit_tests/command_stream/cmd_parse_tests.cpp b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp similarity index 100% rename from unit_tests/command_stream/cmd_parse_tests.cpp rename to opencl/test/unit_test/command_stream/cmd_parse_tests.cpp diff --git a/unit_tests/command_stream/command_stream_fixture.h b/opencl/test/unit_test/command_stream/command_stream_fixture.h similarity index 100% rename from unit_tests/command_stream/command_stream_fixture.h rename to opencl/test/unit_test/command_stream/command_stream_fixture.h diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp similarity index 100% rename from unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp rename to opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp similarity index 100% rename from unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp rename to opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp similarity index 100% rename from unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp rename to opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp similarity index 100% rename from unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp rename to opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp similarity index 100% rename from unit_tests/command_stream/command_stream_receiver_hw_tests.cpp rename to opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.inl b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl similarity index 100% rename from unit_tests/command_stream/command_stream_receiver_hw_tests.inl rename to opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl diff --git a/unit_tests/command_stream/command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp similarity index 100% rename from unit_tests/command_stream/command_stream_receiver_tests.cpp rename to opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp diff --git a/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp similarity index 100% rename from unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp rename to opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp diff --git a/unit_tests/command_stream/compute_mode_tests.h b/opencl/test/unit_test/command_stream/compute_mode_tests.h similarity index 100% rename from unit_tests/command_stream/compute_mode_tests.h rename to opencl/test/unit_test/command_stream/compute_mode_tests.h diff --git a/unit_tests/command_stream/create_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp similarity index 100% rename from unit_tests/command_stream/create_command_stream_receiver_tests.cpp rename to opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp diff --git a/unit_tests/command_stream/experimental_command_buffer_tests.cpp b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp similarity index 100% rename from unit_tests/command_stream/experimental_command_buffer_tests.cpp rename to opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp diff --git a/unit_tests/command_stream/get_devices_tests.cpp b/opencl/test/unit_test/command_stream/get_devices_tests.cpp similarity index 100% rename from unit_tests/command_stream/get_devices_tests.cpp rename to opencl/test/unit_test/command_stream/get_devices_tests.cpp diff --git a/unit_tests/command_stream/linear_stream_fixture.h b/opencl/test/unit_test/command_stream/linear_stream_fixture.h similarity index 100% rename from unit_tests/command_stream/linear_stream_fixture.h rename to opencl/test/unit_test/command_stream/linear_stream_fixture.h diff --git a/unit_tests/command_stream/linear_stream_tests.cpp b/opencl/test/unit_test/command_stream/linear_stream_tests.cpp similarity index 100% rename from unit_tests/command_stream/linear_stream_tests.cpp rename to opencl/test/unit_test/command_stream/linear_stream_tests.cpp diff --git a/unit_tests/command_stream/submissions_aggregator_tests.cpp b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp similarity index 100% rename from unit_tests/command_stream/submissions_aggregator_tests.cpp rename to opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp diff --git a/unit_tests/command_stream/tbx_command_stream_fixture.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp similarity index 100% rename from unit_tests/command_stream/tbx_command_stream_fixture.cpp rename to opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp diff --git a/unit_tests/command_stream/tbx_command_stream_fixture.h b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h similarity index 100% rename from unit_tests/command_stream/tbx_command_stream_fixture.h rename to opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h diff --git a/unit_tests/command_stream/tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp similarity index 100% rename from unit_tests/command_stream/tbx_command_stream_tests.cpp rename to opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp diff --git a/unit_tests/command_stream/tbx_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp similarity index 100% rename from unit_tests/command_stream/tbx_stream_tests.cpp rename to opencl/test/unit_test/command_stream/tbx_stream_tests.cpp diff --git a/unit_tests/command_stream/thread_arbitration_policy_helper.cpp b/opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.cpp similarity index 100% rename from unit_tests/command_stream/thread_arbitration_policy_helper.cpp rename to opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.cpp diff --git a/unit_tests/command_stream/thread_arbitration_policy_helper.h b/opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h similarity index 100% rename from unit_tests/command_stream/thread_arbitration_policy_helper.h rename to opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h diff --git a/unit_tests/command_stream/thread_arbitration_policy_helper_tests.cpp b/opencl/test/unit_test/command_stream/thread_arbitration_policy_helper_tests.cpp similarity index 100% rename from unit_tests/command_stream/thread_arbitration_policy_helper_tests.cpp rename to opencl/test/unit_test/command_stream/thread_arbitration_policy_helper_tests.cpp diff --git a/unit_tests/compiler_interface/CMakeLists.txt b/opencl/test/unit_test/compiler_interface/CMakeLists.txt similarity index 100% rename from unit_tests/compiler_interface/CMakeLists.txt rename to opencl/test/unit_test/compiler_interface/CMakeLists.txt diff --git a/unit_tests/compiler_interface/default_cl_cache_config_tests.cpp b/opencl/test/unit_test/compiler_interface/default_cl_cache_config_tests.cpp similarity index 100% rename from unit_tests/compiler_interface/default_cl_cache_config_tests.cpp rename to opencl/test/unit_test/compiler_interface/default_cl_cache_config_tests.cpp diff --git a/unit_tests/context/CMakeLists.txt b/opencl/test/unit_test/context/CMakeLists.txt similarity index 100% rename from unit_tests/context/CMakeLists.txt rename to opencl/test/unit_test/context/CMakeLists.txt diff --git a/unit_tests/context/context_get_info_tests.cpp b/opencl/test/unit_test/context/context_get_info_tests.cpp similarity index 100% rename from unit_tests/context/context_get_info_tests.cpp rename to opencl/test/unit_test/context/context_get_info_tests.cpp diff --git a/unit_tests/context/context_multi_device_tests.cpp b/opencl/test/unit_test/context/context_multi_device_tests.cpp similarity index 100% rename from unit_tests/context/context_multi_device_tests.cpp rename to opencl/test/unit_test/context/context_multi_device_tests.cpp diff --git a/unit_tests/context/context_negative_tests.cpp b/opencl/test/unit_test/context/context_negative_tests.cpp similarity index 100% rename from unit_tests/context/context_negative_tests.cpp rename to opencl/test/unit_test/context/context_negative_tests.cpp diff --git a/unit_tests/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp similarity index 100% rename from unit_tests/context/context_tests.cpp rename to opencl/test/unit_test/context/context_tests.cpp diff --git a/unit_tests/context/driver_diagnostics_enqueue_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp similarity index 100% rename from unit_tests/context/driver_diagnostics_enqueue_tests.cpp rename to opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp diff --git a/unit_tests/context/driver_diagnostics_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_tests.cpp similarity index 100% rename from unit_tests/context/driver_diagnostics_tests.cpp rename to opencl/test/unit_test/context/driver_diagnostics_tests.cpp diff --git a/unit_tests/context/driver_diagnostics_tests.h b/opencl/test/unit_test/context/driver_diagnostics_tests.h similarity index 100% rename from unit_tests/context/driver_diagnostics_tests.h rename to opencl/test/unit_test/context/driver_diagnostics_tests.h diff --git a/unit_tests/context/get_supported_image_formats_tests.cpp b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp similarity index 100% rename from unit_tests/context/get_supported_image_formats_tests.cpp rename to opencl/test/unit_test/context/get_supported_image_formats_tests.cpp diff --git a/unit_tests/context/gl/CMakeLists.txt b/opencl/test/unit_test/context/gl/CMakeLists.txt similarity index 100% rename from unit_tests/context/gl/CMakeLists.txt rename to opencl/test/unit_test/context/gl/CMakeLists.txt diff --git a/unit_tests/context/gl/context_gl_tests.cpp b/opencl/test/unit_test/context/gl/context_gl_tests.cpp similarity index 100% rename from unit_tests/context/gl/context_gl_tests.cpp rename to opencl/test/unit_test/context/gl/context_gl_tests.cpp diff --git a/unit_tests/context/gl/context_gl_tests.h b/opencl/test/unit_test/context/gl/context_gl_tests.h similarity index 100% rename from unit_tests/context/gl/context_gl_tests.h rename to opencl/test/unit_test/context/gl/context_gl_tests.h diff --git a/unit_tests/context/gl/windows/CMakeLists.txt b/opencl/test/unit_test/context/gl/windows/CMakeLists.txt similarity index 100% rename from unit_tests/context/gl/windows/CMakeLists.txt rename to opencl/test/unit_test/context/gl/windows/CMakeLists.txt diff --git a/unit_tests/context/gl/windows/context_gl_tests_windows.cpp b/opencl/test/unit_test/context/gl/windows/context_gl_tests_windows.cpp similarity index 100% rename from unit_tests/context/gl/windows/context_gl_tests_windows.cpp rename to opencl/test/unit_test/context/gl/windows/context_gl_tests_windows.cpp diff --git a/unit_tests/core_unit_tests_files.cmake b/opencl/test/unit_test/core_unit_tests_files.cmake similarity index 100% rename from unit_tests/core_unit_tests_files.cmake rename to opencl/test/unit_test/core_unit_tests_files.cmake diff --git a/unit_tests/custom_event_listener.h b/opencl/test/unit_test/custom_event_listener.h similarity index 100% rename from unit_tests/custom_event_listener.h rename to opencl/test/unit_test/custom_event_listener.h diff --git a/unit_tests/d3d_sharing/CMakeLists.txt b/opencl/test/unit_test/d3d_sharing/CMakeLists.txt similarity index 100% rename from unit_tests/d3d_sharing/CMakeLists.txt rename to opencl/test/unit_test/d3d_sharing/CMakeLists.txt diff --git a/unit_tests/d3d_sharing/cl_dx_sharing_tests.cpp b/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp similarity index 100% rename from unit_tests/d3d_sharing/cl_dx_sharing_tests.cpp rename to opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp diff --git a/unit_tests/d3d_sharing/d3d9_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp similarity index 100% rename from unit_tests/d3d_sharing/d3d9_tests.cpp rename to opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp diff --git a/unit_tests/d3d_sharing/d3d_aux_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp similarity index 100% rename from unit_tests/d3d_sharing/d3d_aux_tests.cpp rename to opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp diff --git a/unit_tests/d3d_sharing/d3d_tests_part1.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp similarity index 100% rename from unit_tests/d3d_sharing/d3d_tests_part1.cpp rename to opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp diff --git a/unit_tests/d3d_sharing/d3d_tests_part2.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp similarity index 100% rename from unit_tests/d3d_sharing/d3d_tests_part2.cpp rename to opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp diff --git a/unit_tests/device/CMakeLists.txt b/opencl/test/unit_test/device/CMakeLists.txt similarity index 100% rename from unit_tests/device/CMakeLists.txt rename to opencl/test/unit_test/device/CMakeLists.txt diff --git a/unit_tests/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp similarity index 100% rename from unit_tests/device/device_caps_tests.cpp rename to opencl/test/unit_test/device/device_caps_tests.cpp diff --git a/unit_tests/device/device_get_engine_tests.cpp b/opencl/test/unit_test/device/device_get_engine_tests.cpp similarity index 100% rename from unit_tests/device/device_get_engine_tests.cpp rename to opencl/test/unit_test/device/device_get_engine_tests.cpp diff --git a/unit_tests/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp similarity index 100% rename from unit_tests/device/device_tests.cpp rename to opencl/test/unit_test/device/device_tests.cpp diff --git a/unit_tests/device/device_timers_tests.cpp b/opencl/test/unit_test/device/device_timers_tests.cpp similarity index 100% rename from unit_tests/device/device_timers_tests.cpp rename to opencl/test/unit_test/device/device_timers_tests.cpp diff --git a/unit_tests/device/device_win_timers_tests.cpp b/opencl/test/unit_test/device/device_win_timers_tests.cpp similarity index 100% rename from unit_tests/device/device_win_timers_tests.cpp rename to opencl/test/unit_test/device/device_win_timers_tests.cpp diff --git a/unit_tests/device/get_device_info_size_tests.cpp b/opencl/test/unit_test/device/get_device_info_size_tests.cpp similarity index 100% rename from unit_tests/device/get_device_info_size_tests.cpp rename to opencl/test/unit_test/device/get_device_info_size_tests.cpp diff --git a/unit_tests/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp similarity index 100% rename from unit_tests/device/get_device_info_tests.cpp rename to opencl/test/unit_test/device/get_device_info_tests.cpp diff --git a/unit_tests/device/gl/CMakeLists.txt b/opencl/test/unit_test/device/gl/CMakeLists.txt similarity index 100% rename from unit_tests/device/gl/CMakeLists.txt rename to opencl/test/unit_test/device/gl/CMakeLists.txt diff --git a/unit_tests/device/gl/device_caps_gl_tests.cpp b/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp similarity index 100% rename from unit_tests/device/gl/device_caps_gl_tests.cpp rename to opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp diff --git a/unit_tests/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp similarity index 100% rename from unit_tests/device/sub_device_tests.cpp rename to opencl/test/unit_test/device/sub_device_tests.cpp diff --git a/unit_tests/device_queue/CMakeLists.txt b/opencl/test/unit_test/device_queue/CMakeLists.txt similarity index 100% rename from unit_tests/device_queue/CMakeLists.txt rename to opencl/test/unit_test/device_queue/CMakeLists.txt diff --git a/unit_tests/device_queue/device_queue_hw_tests.cpp b/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp similarity index 100% rename from unit_tests/device_queue/device_queue_hw_tests.cpp rename to opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp diff --git a/unit_tests/device_queue/device_queue_tests.cpp b/opencl/test/unit_test/device_queue/device_queue_tests.cpp similarity index 100% rename from unit_tests/device_queue/device_queue_tests.cpp rename to opencl/test/unit_test/device_queue/device_queue_tests.cpp diff --git a/unit_tests/device_queue/get_device_queue_info_tests.cpp b/opencl/test/unit_test/device_queue/get_device_queue_info_tests.cpp similarity index 100% rename from unit_tests/device_queue/get_device_queue_info_tests.cpp rename to opencl/test/unit_test/device_queue/get_device_queue_info_tests.cpp diff --git a/unit_tests/event/CMakeLists.txt b/opencl/test/unit_test/event/CMakeLists.txt similarity index 100% rename from unit_tests/event/CMakeLists.txt rename to opencl/test/unit_test/event/CMakeLists.txt diff --git a/unit_tests/event/async_events_handler_tests.cpp b/opencl/test/unit_test/event/async_events_handler_tests.cpp similarity index 100% rename from unit_tests/event/async_events_handler_tests.cpp rename to opencl/test/unit_test/event/async_events_handler_tests.cpp diff --git a/unit_tests/event/event_builder_tests.cpp b/opencl/test/unit_test/event/event_builder_tests.cpp similarity index 100% rename from unit_tests/event/event_builder_tests.cpp rename to opencl/test/unit_test/event/event_builder_tests.cpp diff --git a/unit_tests/event/event_callbacks_tests.cpp b/opencl/test/unit_test/event/event_callbacks_tests.cpp similarity index 100% rename from unit_tests/event/event_callbacks_tests.cpp rename to opencl/test/unit_test/event/event_callbacks_tests.cpp diff --git a/unit_tests/event/event_fixture.h b/opencl/test/unit_test/event/event_fixture.h similarity index 100% rename from unit_tests/event/event_fixture.h rename to opencl/test/unit_test/event/event_fixture.h diff --git a/unit_tests/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp similarity index 100% rename from unit_tests/event/event_tests.cpp rename to opencl/test/unit_test/event/event_tests.cpp diff --git a/unit_tests/event/event_tests_mt.cpp b/opencl/test/unit_test/event/event_tests_mt.cpp similarity index 100% rename from unit_tests/event/event_tests_mt.cpp rename to opencl/test/unit_test/event/event_tests_mt.cpp diff --git a/unit_tests/event/event_tracker_tests.cpp b/opencl/test/unit_test/event/event_tracker_tests.cpp similarity index 100% rename from unit_tests/event/event_tracker_tests.cpp rename to opencl/test/unit_test/event/event_tracker_tests.cpp diff --git a/unit_tests/event/user_events_tests.cpp b/opencl/test/unit_test/event/user_events_tests.cpp similarity index 100% rename from unit_tests/event/user_events_tests.cpp rename to opencl/test/unit_test/event/user_events_tests.cpp diff --git a/unit_tests/event/user_events_tests_mt.cpp b/opencl/test/unit_test/event/user_events_tests_mt.cpp similarity index 100% rename from unit_tests/event/user_events_tests_mt.cpp rename to opencl/test/unit_test/event/user_events_tests_mt.cpp diff --git a/unit_tests/execution_environment/CMakeLists.txt b/opencl/test/unit_test/execution_environment/CMakeLists.txt similarity index 100% rename from unit_tests/execution_environment/CMakeLists.txt rename to opencl/test/unit_test/execution_environment/CMakeLists.txt diff --git a/unit_tests/execution_environment/execution_environment_tests.cpp b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp similarity index 100% rename from unit_tests/execution_environment/execution_environment_tests.cpp rename to opencl/test/unit_test/execution_environment/execution_environment_tests.cpp diff --git a/unit_tests/execution_model/CMakeLists.txt b/opencl/test/unit_test/execution_model/CMakeLists.txt similarity index 100% rename from unit_tests/execution_model/CMakeLists.txt rename to opencl/test/unit_test/execution_model/CMakeLists.txt diff --git a/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp similarity index 100% rename from unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp rename to opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp diff --git a/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp b/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp similarity index 100% rename from unit_tests/execution_model/parent_kernel_dispatch_tests.cpp rename to opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp diff --git a/unit_tests/execution_model/scheduler_dispatch_tests.cpp b/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp similarity index 100% rename from unit_tests/execution_model/scheduler_dispatch_tests.cpp rename to opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp diff --git a/unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp b/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp similarity index 100% rename from unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp rename to opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp diff --git a/unit_tests/fixtures/CMakeLists.txt b/opencl/test/unit_test/fixtures/CMakeLists.txt similarity index 100% rename from unit_tests/fixtures/CMakeLists.txt rename to opencl/test/unit_test/fixtures/CMakeLists.txt diff --git a/unit_tests/fixtures/aub_command_stream_receiver_fixture.h b/opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h similarity index 100% rename from unit_tests/fixtures/aub_command_stream_receiver_fixture.h rename to opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h diff --git a/unit_tests/fixtures/buffer_enqueue_fixture.h b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h similarity index 100% rename from unit_tests/fixtures/buffer_enqueue_fixture.h rename to opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h diff --git a/unit_tests/fixtures/buffer_fixture.cpp b/opencl/test/unit_test/fixtures/buffer_fixture.cpp similarity index 100% rename from unit_tests/fixtures/buffer_fixture.cpp rename to opencl/test/unit_test/fixtures/buffer_fixture.cpp diff --git a/unit_tests/fixtures/buffer_fixture.h b/opencl/test/unit_test/fixtures/buffer_fixture.h similarity index 100% rename from unit_tests/fixtures/buffer_fixture.h rename to opencl/test/unit_test/fixtures/buffer_fixture.h diff --git a/unit_tests/fixtures/built_in_fixture.cpp b/opencl/test/unit_test/fixtures/built_in_fixture.cpp similarity index 100% rename from unit_tests/fixtures/built_in_fixture.cpp rename to opencl/test/unit_test/fixtures/built_in_fixture.cpp diff --git a/unit_tests/fixtures/built_in_fixture.h b/opencl/test/unit_test/fixtures/built_in_fixture.h similarity index 100% rename from unit_tests/fixtures/built_in_fixture.h rename to opencl/test/unit_test/fixtures/built_in_fixture.h diff --git a/unit_tests/fixtures/context_fixture.cpp b/opencl/test/unit_test/fixtures/context_fixture.cpp similarity index 100% rename from unit_tests/fixtures/context_fixture.cpp rename to opencl/test/unit_test/fixtures/context_fixture.cpp diff --git a/unit_tests/fixtures/context_fixture.h b/opencl/test/unit_test/fixtures/context_fixture.h similarity index 100% rename from unit_tests/fixtures/context_fixture.h rename to opencl/test/unit_test/fixtures/context_fixture.h diff --git a/unit_tests/fixtures/d3d_test_fixture.h b/opencl/test/unit_test/fixtures/d3d_test_fixture.h similarity index 100% rename from unit_tests/fixtures/d3d_test_fixture.h rename to opencl/test/unit_test/fixtures/d3d_test_fixture.h diff --git a/unit_tests/fixtures/device_fixture.cpp b/opencl/test/unit_test/fixtures/device_fixture.cpp similarity index 100% rename from unit_tests/fixtures/device_fixture.cpp rename to opencl/test/unit_test/fixtures/device_fixture.cpp diff --git a/unit_tests/fixtures/device_fixture.h b/opencl/test/unit_test/fixtures/device_fixture.h similarity index 100% rename from unit_tests/fixtures/device_fixture.h rename to opencl/test/unit_test/fixtures/device_fixture.h diff --git a/unit_tests/fixtures/device_host_queue_fixture.cpp b/opencl/test/unit_test/fixtures/device_host_queue_fixture.cpp similarity index 100% rename from unit_tests/fixtures/device_host_queue_fixture.cpp rename to opencl/test/unit_test/fixtures/device_host_queue_fixture.cpp diff --git a/unit_tests/fixtures/device_host_queue_fixture.h b/opencl/test/unit_test/fixtures/device_host_queue_fixture.h similarity index 100% rename from unit_tests/fixtures/device_host_queue_fixture.h rename to opencl/test/unit_test/fixtures/device_host_queue_fixture.h diff --git a/unit_tests/fixtures/device_info_fixture.h b/opencl/test/unit_test/fixtures/device_info_fixture.h similarity index 100% rename from unit_tests/fixtures/device_info_fixture.h rename to opencl/test/unit_test/fixtures/device_info_fixture.h diff --git a/unit_tests/fixtures/device_instrumentation_fixture.cpp b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp similarity index 100% rename from unit_tests/fixtures/device_instrumentation_fixture.cpp rename to opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp diff --git a/unit_tests/fixtures/device_instrumentation_fixture.h b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.h similarity index 100% rename from unit_tests/fixtures/device_instrumentation_fixture.h rename to opencl/test/unit_test/fixtures/device_instrumentation_fixture.h diff --git a/unit_tests/fixtures/dispatch_flags_fixture.h b/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h similarity index 100% rename from unit_tests/fixtures/dispatch_flags_fixture.h rename to opencl/test/unit_test/fixtures/dispatch_flags_fixture.h diff --git a/unit_tests/fixtures/enqueue_handler_fixture.h b/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h similarity index 100% rename from unit_tests/fixtures/enqueue_handler_fixture.h rename to opencl/test/unit_test/fixtures/enqueue_handler_fixture.h diff --git a/unit_tests/fixtures/execution_model_fixture.h b/opencl/test/unit_test/fixtures/execution_model_fixture.h similarity index 100% rename from unit_tests/fixtures/execution_model_fixture.h rename to opencl/test/unit_test/fixtures/execution_model_fixture.h diff --git a/unit_tests/fixtures/execution_model_kernel_fixture.h b/opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h similarity index 100% rename from unit_tests/fixtures/execution_model_kernel_fixture.h rename to opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h diff --git a/unit_tests/fixtures/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h similarity index 100% rename from unit_tests/fixtures/hello_world_fixture.h rename to opencl/test/unit_test/fixtures/hello_world_fixture.h diff --git a/unit_tests/fixtures/hello_world_kernel_fixture.h b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h similarity index 100% rename from unit_tests/fixtures/hello_world_kernel_fixture.h rename to opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h diff --git a/unit_tests/fixtures/image_fixture.cpp b/opencl/test/unit_test/fixtures/image_fixture.cpp similarity index 100% rename from unit_tests/fixtures/image_fixture.cpp rename to opencl/test/unit_test/fixtures/image_fixture.cpp diff --git a/unit_tests/fixtures/image_fixture.h b/opencl/test/unit_test/fixtures/image_fixture.h similarity index 100% rename from unit_tests/fixtures/image_fixture.h rename to opencl/test/unit_test/fixtures/image_fixture.h diff --git a/unit_tests/fixtures/kernel_arg_fixture.cpp b/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp similarity index 100% rename from unit_tests/fixtures/kernel_arg_fixture.cpp rename to opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp diff --git a/unit_tests/fixtures/kernel_arg_fixture.h b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h similarity index 100% rename from unit_tests/fixtures/kernel_arg_fixture.h rename to opencl/test/unit_test/fixtures/kernel_arg_fixture.h diff --git a/unit_tests/fixtures/kernel_data_fixture.cpp b/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp similarity index 100% rename from unit_tests/fixtures/kernel_data_fixture.cpp rename to opencl/test/unit_test/fixtures/kernel_data_fixture.cpp diff --git a/unit_tests/fixtures/kernel_data_fixture.h b/opencl/test/unit_test/fixtures/kernel_data_fixture.h similarity index 100% rename from unit_tests/fixtures/kernel_data_fixture.h rename to opencl/test/unit_test/fixtures/kernel_data_fixture.h diff --git a/unit_tests/fixtures/media_kernel_fixture.h b/opencl/test/unit_test/fixtures/media_kernel_fixture.h similarity index 100% rename from unit_tests/fixtures/media_kernel_fixture.h rename to opencl/test/unit_test/fixtures/media_kernel_fixture.h diff --git a/unit_tests/fixtures/memory_allocator_fixture.h b/opencl/test/unit_test/fixtures/memory_allocator_fixture.h similarity index 100% rename from unit_tests/fixtures/memory_allocator_fixture.h rename to opencl/test/unit_test/fixtures/memory_allocator_fixture.h diff --git a/unit_tests/fixtures/memory_allocator_multi_device_fixture.h b/opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h similarity index 100% rename from unit_tests/fixtures/memory_allocator_multi_device_fixture.h rename to opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h diff --git a/unit_tests/fixtures/memory_management_fixture.cpp b/opencl/test/unit_test/fixtures/memory_management_fixture.cpp similarity index 100% rename from unit_tests/fixtures/memory_management_fixture.cpp rename to opencl/test/unit_test/fixtures/memory_management_fixture.cpp diff --git a/unit_tests/fixtures/memory_management_fixture.h b/opencl/test/unit_test/fixtures/memory_management_fixture.h similarity index 100% rename from unit_tests/fixtures/memory_management_fixture.h rename to opencl/test/unit_test/fixtures/memory_management_fixture.h diff --git a/unit_tests/fixtures/memory_manager_fixture.cpp b/opencl/test/unit_test/fixtures/memory_manager_fixture.cpp similarity index 100% rename from unit_tests/fixtures/memory_manager_fixture.cpp rename to opencl/test/unit_test/fixtures/memory_manager_fixture.cpp diff --git a/unit_tests/fixtures/memory_manager_fixture.h b/opencl/test/unit_test/fixtures/memory_manager_fixture.h similarity index 100% rename from unit_tests/fixtures/memory_manager_fixture.h rename to opencl/test/unit_test/fixtures/memory_manager_fixture.h diff --git a/unit_tests/fixtures/mock_aub_center_fixture.h b/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h similarity index 100% rename from unit_tests/fixtures/mock_aub_center_fixture.h rename to opencl/test/unit_test/fixtures/mock_aub_center_fixture.h diff --git a/unit_tests/fixtures/multi_root_device_fixture.h b/opencl/test/unit_test/fixtures/multi_root_device_fixture.h similarity index 100% rename from unit_tests/fixtures/multi_root_device_fixture.h rename to opencl/test/unit_test/fixtures/multi_root_device_fixture.h diff --git a/unit_tests/fixtures/platform_fixture.cpp b/opencl/test/unit_test/fixtures/platform_fixture.cpp similarity index 100% rename from unit_tests/fixtures/platform_fixture.cpp rename to opencl/test/unit_test/fixtures/platform_fixture.cpp diff --git a/unit_tests/fixtures/platform_fixture.h b/opencl/test/unit_test/fixtures/platform_fixture.h similarity index 100% rename from unit_tests/fixtures/platform_fixture.h rename to opencl/test/unit_test/fixtures/platform_fixture.h diff --git a/unit_tests/fixtures/program_fixture.cpp b/opencl/test/unit_test/fixtures/program_fixture.cpp similarity index 100% rename from unit_tests/fixtures/program_fixture.cpp rename to opencl/test/unit_test/fixtures/program_fixture.cpp diff --git a/unit_tests/fixtures/program_fixture.h b/opencl/test/unit_test/fixtures/program_fixture.h similarity index 100% rename from unit_tests/fixtures/program_fixture.h rename to opencl/test/unit_test/fixtures/program_fixture.h diff --git a/unit_tests/fixtures/run_kernel_fixture.h b/opencl/test/unit_test/fixtures/run_kernel_fixture.h similarity index 100% rename from unit_tests/fixtures/run_kernel_fixture.h rename to opencl/test/unit_test/fixtures/run_kernel_fixture.h diff --git a/unit_tests/fixtures/scenario_test_fixture.h b/opencl/test/unit_test/fixtures/scenario_test_fixture.h similarity index 100% rename from unit_tests/fixtures/scenario_test_fixture.h rename to opencl/test/unit_test/fixtures/scenario_test_fixture.h diff --git a/unit_tests/fixtures/simple_arg_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_fixture.h similarity index 100% rename from unit_tests/fixtures/simple_arg_fixture.h rename to opencl/test/unit_test/fixtures/simple_arg_fixture.h diff --git a/unit_tests/fixtures/simple_arg_kernel_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h similarity index 100% rename from unit_tests/fixtures/simple_arg_kernel_fixture.h rename to opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h diff --git a/unit_tests/fixtures/templated_fixture_tests.cpp b/opencl/test/unit_test/fixtures/templated_fixture_tests.cpp similarity index 100% rename from unit_tests/fixtures/templated_fixture_tests.cpp rename to opencl/test/unit_test/fixtures/templated_fixture_tests.cpp diff --git a/unit_tests/fixtures/two_walker_fixture.h b/opencl/test/unit_test/fixtures/two_walker_fixture.h similarity index 100% rename from unit_tests/fixtures/two_walker_fixture.h rename to opencl/test/unit_test/fixtures/two_walker_fixture.h diff --git a/unit_tests/fixtures/ult_command_stream_receiver_fixture.h b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h similarity index 100% rename from unit_tests/fixtures/ult_command_stream_receiver_fixture.h rename to opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h diff --git a/unit_tests/gen11/CMakeLists.txt b/opencl/test/unit_test/gen11/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/CMakeLists.txt rename to opencl/test/unit_test/gen11/CMakeLists.txt diff --git a/unit_tests/gen11/coherency_tests_gen11.cpp b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp similarity index 100% rename from unit_tests/gen11/coherency_tests_gen11.cpp rename to opencl/test/unit_test/gen11/coherency_tests_gen11.cpp diff --git a/unit_tests/gen11/command_stream_receiver_hw_tests_gen11.cpp b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp similarity index 100% rename from unit_tests/gen11/command_stream_receiver_hw_tests_gen11.cpp rename to opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp diff --git a/unit_tests/gen11/ehl/CMakeLists.txt b/opencl/test/unit_test/gen11/ehl/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/ehl/CMakeLists.txt rename to opencl/test/unit_test/gen11/ehl/CMakeLists.txt diff --git a/unit_tests/gen11/ehl/linux/CMakeLists.txt b/opencl/test/unit_test/gen11/ehl/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/ehl/linux/CMakeLists.txt rename to opencl/test/unit_test/gen11/ehl/linux/CMakeLists.txt diff --git a/unit_tests/gen11/ehl/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen11/ehl/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/ehl/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen11/ehl/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen11/ehl/linux/dll/device_id_tests_ehl.cpp b/opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp similarity index 100% rename from unit_tests/gen11/ehl/linux/dll/device_id_tests_ehl.cpp rename to opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp diff --git a/unit_tests/gen11/ehl/linux/hw_info_config_tests_ehl.cpp b/opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp similarity index 100% rename from unit_tests/gen11/ehl/linux/hw_info_config_tests_ehl.cpp rename to opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp diff --git a/unit_tests/gen11/ehl/test_device_caps_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp similarity index 100% rename from unit_tests/gen11/ehl/test_device_caps_ehl.cpp rename to opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp diff --git a/unit_tests/gen11/ehl/test_hw_info_config_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp similarity index 100% rename from unit_tests/gen11/ehl/test_hw_info_config_ehl.cpp rename to opencl/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp diff --git a/unit_tests/gen11/ehl/windows/CMakeLists.txt b/opencl/test/unit_test/gen11/ehl/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/ehl/windows/CMakeLists.txt rename to opencl/test/unit_test/gen11/ehl/windows/CMakeLists.txt diff --git a/unit_tests/gen11/ehl/windows/hw_info_config_tests_ehl.cpp b/opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp similarity index 100% rename from unit_tests/gen11/ehl/windows/hw_info_config_tests_ehl.cpp rename to opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp diff --git a/unit_tests/gen11/enqueue_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp similarity index 100% rename from unit_tests/gen11/enqueue_kernel_gen11.cpp rename to opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp diff --git a/unit_tests/gen11/enqueue_media_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp similarity index 100% rename from unit_tests/gen11/enqueue_media_kernel_gen11.cpp rename to opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp diff --git a/unit_tests/gen11/hw_helper_tests_gen11.cpp b/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp similarity index 100% rename from unit_tests/gen11/hw_helper_tests_gen11.cpp rename to opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp diff --git a/unit_tests/gen11/icllp/CMakeLists.txt b/opencl/test/unit_test/gen11/icllp/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/icllp/CMakeLists.txt rename to opencl/test/unit_test/gen11/icllp/CMakeLists.txt diff --git a/unit_tests/gen11/icllp/linux/CMakeLists.txt b/opencl/test/unit_test/gen11/icllp/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/icllp/linux/CMakeLists.txt rename to opencl/test/unit_test/gen11/icllp/linux/CMakeLists.txt diff --git a/unit_tests/gen11/icllp/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen11/icllp/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/icllp/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen11/icllp/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen11/icllp/linux/dll/device_id_tests_icllp.cpp b/opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp similarity index 100% rename from unit_tests/gen11/icllp/linux/dll/device_id_tests_icllp.cpp rename to opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp diff --git a/unit_tests/gen11/icllp/linux/hw_info_config_tests_icllp.cpp b/opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp similarity index 100% rename from unit_tests/gen11/icllp/linux/hw_info_config_tests_icllp.cpp rename to opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp diff --git a/unit_tests/gen11/icllp/test_device_caps_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp similarity index 100% rename from unit_tests/gen11/icllp/test_device_caps_icllp.cpp rename to opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp diff --git a/unit_tests/gen11/icllp/test_hw_info_config_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp similarity index 100% rename from unit_tests/gen11/icllp/test_hw_info_config_icllp.cpp rename to opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp diff --git a/unit_tests/gen11/icllp/test_media_kernel_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp similarity index 100% rename from unit_tests/gen11/icllp/test_media_kernel_icllp.cpp rename to opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp diff --git a/unit_tests/gen11/icllp/test_program_media_sampler_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp similarity index 100% rename from unit_tests/gen11/icllp/test_program_media_sampler_icllp.cpp rename to opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp diff --git a/unit_tests/gen11/icllp/windows/CMakeLists.txt b/opencl/test/unit_test/gen11/icllp/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/icllp/windows/CMakeLists.txt rename to opencl/test/unit_test/gen11/icllp/windows/CMakeLists.txt diff --git a/unit_tests/gen11/icllp/windows/hw_info_config_tests_icllp.cpp b/opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp similarity index 100% rename from unit_tests/gen11/icllp/windows/hw_info_config_tests_icllp.cpp rename to opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp diff --git a/unit_tests/gen11/image_tests_gen11.cpp b/opencl/test/unit_test/gen11/image_tests_gen11.cpp similarity index 100% rename from unit_tests/gen11/image_tests_gen11.cpp rename to opencl/test/unit_test/gen11/image_tests_gen11.cpp diff --git a/unit_tests/gen11/kernel_tests_gen11.cpp b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp similarity index 100% rename from unit_tests/gen11/kernel_tests_gen11.cpp rename to opencl/test/unit_test/gen11/kernel_tests_gen11.cpp diff --git a/unit_tests/gen11/lkf/CMakeLists.txt b/opencl/test/unit_test/gen11/lkf/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/lkf/CMakeLists.txt rename to opencl/test/unit_test/gen11/lkf/CMakeLists.txt diff --git a/unit_tests/gen11/lkf/linux/CMakeLists.txt b/opencl/test/unit_test/gen11/lkf/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/lkf/linux/CMakeLists.txt rename to opencl/test/unit_test/gen11/lkf/linux/CMakeLists.txt diff --git a/unit_tests/gen11/lkf/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen11/lkf/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/lkf/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen11/lkf/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen11/lkf/linux/dll/device_id_tests_lkf.cpp b/opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp similarity index 100% rename from unit_tests/gen11/lkf/linux/dll/device_id_tests_lkf.cpp rename to opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp diff --git a/unit_tests/gen11/lkf/linux/hw_info_config_tests_lkf.cpp b/opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp similarity index 100% rename from unit_tests/gen11/lkf/linux/hw_info_config_tests_lkf.cpp rename to opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp diff --git a/unit_tests/gen11/lkf/test_device_caps_lkf.cpp b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp similarity index 100% rename from unit_tests/gen11/lkf/test_device_caps_lkf.cpp rename to opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp diff --git a/unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp b/opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp similarity index 100% rename from unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp rename to opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp diff --git a/unit_tests/gen11/lkf/windows/CMakeLists.txt b/opencl/test/unit_test/gen11/lkf/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/lkf/windows/CMakeLists.txt rename to opencl/test/unit_test/gen11/lkf/windows/CMakeLists.txt diff --git a/unit_tests/gen11/lkf/windows/hw_info_config_tests_lkf.cpp b/opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp similarity index 100% rename from unit_tests/gen11/lkf/windows/hw_info_config_tests_lkf.cpp rename to opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp diff --git a/unit_tests/gen11/sampler_tests_gen11.cpp b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp similarity index 100% rename from unit_tests/gen11/sampler_tests_gen11.cpp rename to opencl/test/unit_test/gen11/sampler_tests_gen11.cpp diff --git a/unit_tests/gen11/scheduler_source_tests_gen11.cpp b/opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp similarity index 100% rename from unit_tests/gen11/scheduler_source_tests_gen11.cpp rename to opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp diff --git a/unit_tests/gen11/tbx_command_stream_receiver_tests_gen11.cpp b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp similarity index 100% rename from unit_tests/gen11/tbx_command_stream_receiver_tests_gen11.cpp rename to opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp diff --git a/unit_tests/gen11/test_device_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp similarity index 100% rename from unit_tests/gen11/test_device_caps_gen11.cpp rename to opencl/test/unit_test/gen11/test_device_caps_gen11.cpp diff --git a/unit_tests/gen11/test_device_queue_hw_gen11.cpp b/opencl/test/unit_test/gen11/test_device_queue_hw_gen11.cpp similarity index 100% rename from unit_tests/gen11/test_device_queue_hw_gen11.cpp rename to opencl/test/unit_test/gen11/test_device_queue_hw_gen11.cpp diff --git a/unit_tests/gen11/test_platform_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp similarity index 100% rename from unit_tests/gen11/test_platform_caps_gen11.cpp rename to opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp diff --git a/unit_tests/gen11/test_sample_gen11.cpp b/opencl/test/unit_test/gen11/test_sample_gen11.cpp similarity index 100% rename from unit_tests/gen11/test_sample_gen11.cpp rename to opencl/test/unit_test/gen11/test_sample_gen11.cpp diff --git a/unit_tests/gen11/unit_test_helper_gen11.cpp b/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp similarity index 100% rename from unit_tests/gen11/unit_test_helper_gen11.cpp rename to opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp diff --git a/unit_tests/gen11/windows/CMakeLists.txt b/opencl/test/unit_test/gen11/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen11/windows/CMakeLists.txt rename to opencl/test/unit_test/gen11/windows/CMakeLists.txt diff --git a/unit_tests/gen11/windows/gmm_callbacks_tests_gen11.cpp b/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp similarity index 100% rename from unit_tests/gen11/windows/gmm_callbacks_tests_gen11.cpp rename to opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp diff --git a/unit_tests/gen12lp/CMakeLists.txt b/opencl/test/unit_test/gen12lp/CMakeLists.txt similarity index 100% rename from unit_tests/gen12lp/CMakeLists.txt rename to opencl/test/unit_test/gen12lp/CMakeLists.txt diff --git a/unit_tests/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/cmd_parse/cmd_parse_gen12lp.inl b/opencl/test/unit_test/gen12lp/cmd_parse/cmd_parse_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/cmd_parse/cmd_parse_gen12lp.inl rename to opencl/test/unit_test/gen12lp/cmd_parse/cmd_parse_gen12lp.inl diff --git a/unit_tests/gen12lp/coherency_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/coherency_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/compute_mode_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/compute_mode_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/device_queue_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp similarity index 100% rename from unit_tests/gen12lp/device_queue_tests_gen12lp.cpp rename to opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp diff --git a/unit_tests/gen12lp/enqueue_media_kernel_gen12lp.inl b/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/enqueue_media_kernel_gen12lp.inl rename to opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl diff --git a/unit_tests/gen12lp/gen12lp_tests_wrapper.cpp b/opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp similarity index 100% rename from unit_tests/gen12lp/gen12lp_tests_wrapper.cpp rename to opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp diff --git a/unit_tests/gen12lp/hw_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/hw_helper_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/image_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/image_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/kernel_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/kernel_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/profiling_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/profiling_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/sampler_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/sampler_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/scheduler_source_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/scheduler_source_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/special_ult_helper_gen12lp.cpp b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp similarity index 100% rename from unit_tests/gen12lp/special_ult_helper_gen12lp.cpp rename to opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp diff --git a/unit_tests/gen12lp/special_ult_helper_gen12lp.h b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h similarity index 100% rename from unit_tests/gen12lp/special_ult_helper_gen12lp.h rename to opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h diff --git a/unit_tests/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl rename to opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl diff --git a/unit_tests/gen12lp/test_device_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/test_device_caps_gen12lp.inl rename to opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl diff --git a/unit_tests/gen12lp/test_device_queue_hw_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/test_device_queue_hw_gen12lp.inl rename to opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl diff --git a/unit_tests/gen12lp/test_platform_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/test_platform_caps_gen12lp.inl rename to opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl diff --git a/unit_tests/gen12lp/test_sample_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl similarity index 100% rename from unit_tests/gen12lp/test_sample_gen12lp.inl rename to opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl diff --git a/unit_tests/gen12lp/tgllp/CMakeLists.txt b/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt similarity index 100% rename from unit_tests/gen12lp/tgllp/CMakeLists.txt rename to opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt diff --git a/unit_tests/gen12lp/tgllp/kernel_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp similarity index 100% rename from unit_tests/gen12lp/tgllp/kernel_tests_tgllp.cpp rename to opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp diff --git a/unit_tests/gen12lp/tgllp/linux/CMakeLists.txt b/opencl/test/unit_test/gen12lp/tgllp/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen12lp/tgllp/linux/CMakeLists.txt rename to opencl/test/unit_test/gen12lp/tgllp/linux/CMakeLists.txt diff --git a/unit_tests/gen12lp/tgllp/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen12lp/tgllp/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen12lp/tgllp/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen12lp/tgllp/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp similarity index 100% rename from unit_tests/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp rename to opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp diff --git a/unit_tests/gen12lp/tgllp/linux/test_hw_info_config_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/linux/test_hw_info_config_tgllp.cpp similarity index 100% rename from unit_tests/gen12lp/tgllp/linux/test_hw_info_config_tgllp.cpp rename to opencl/test/unit_test/gen12lp/tgllp/linux/test_hw_info_config_tgllp.cpp diff --git a/unit_tests/gen12lp/tgllp/test_hw_helper_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp similarity index 100% rename from unit_tests/gen12lp/tgllp/test_hw_helper_tgllp.cpp rename to opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp diff --git a/unit_tests/gen12lp/tgllp/test_hw_info_config_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp similarity index 100% rename from unit_tests/gen12lp/tgllp/test_hw_info_config_tgllp.cpp rename to opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp diff --git a/unit_tests/gen12lp/tgllp/windows/CMakeLists.txt b/opencl/test/unit_test/gen12lp/tgllp/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen12lp/tgllp/windows/CMakeLists.txt rename to opencl/test/unit_test/gen12lp/tgllp/windows/CMakeLists.txt diff --git a/unit_tests/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp similarity index 100% rename from unit_tests/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp rename to opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp diff --git a/unit_tests/gen12lp/unit_test_helper_gen12lp.cpp b/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp similarity index 100% rename from unit_tests/gen12lp/unit_test_helper_gen12lp.cpp rename to opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp diff --git a/unit_tests/gen12lp/windows/CMakeLists.txt b/opencl/test/unit_test/gen12lp/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen12lp/windows/CMakeLists.txt rename to opencl/test/unit_test/gen12lp/windows/CMakeLists.txt diff --git a/unit_tests/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp similarity index 100% rename from unit_tests/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp rename to opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp diff --git a/unit_tests/gen12lp/windows/hw_info_config_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp similarity index 100% rename from unit_tests/gen12lp/windows/hw_info_config_tests_gen12lp.cpp rename to opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp diff --git a/unit_tests/gen12lp/windows/wddm_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp similarity index 100% rename from unit_tests/gen12lp/windows/wddm_tests_gen12lp.cpp rename to opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp diff --git a/unit_tests/gen8/CMakeLists.txt b/opencl/test/unit_test/gen8/CMakeLists.txt similarity index 100% rename from unit_tests/gen8/CMakeLists.txt rename to opencl/test/unit_test/gen8/CMakeLists.txt diff --git a/unit_tests/gen8/bdw/CMakeLists.txt b/opencl/test/unit_test/gen8/bdw/CMakeLists.txt similarity index 100% rename from unit_tests/gen8/bdw/CMakeLists.txt rename to opencl/test/unit_test/gen8/bdw/CMakeLists.txt diff --git a/unit_tests/gen8/bdw/device_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp similarity index 100% rename from unit_tests/gen8/bdw/device_tests_bdw.cpp rename to opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp diff --git a/unit_tests/gen8/bdw/linux/CMakeLists.txt b/opencl/test/unit_test/gen8/bdw/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen8/bdw/linux/CMakeLists.txt rename to opencl/test/unit_test/gen8/bdw/linux/CMakeLists.txt diff --git a/unit_tests/gen8/bdw/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen8/bdw/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen8/bdw/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen8/bdw/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp similarity index 100% rename from unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp rename to opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp diff --git a/unit_tests/gen8/bdw/linux/hw_info_config_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp similarity index 100% rename from unit_tests/gen8/bdw/linux/hw_info_config_tests_bdw.cpp rename to opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp diff --git a/unit_tests/gen8/bdw/test_device_caps_bdw.cpp b/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp similarity index 100% rename from unit_tests/gen8/bdw/test_device_caps_bdw.cpp rename to opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp diff --git a/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp b/opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp similarity index 100% rename from unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp rename to opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp diff --git a/unit_tests/gen8/bdw/windows/CMakeLists.txt b/opencl/test/unit_test/gen8/bdw/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen8/bdw/windows/CMakeLists.txt rename to opencl/test/unit_test/gen8/bdw/windows/CMakeLists.txt diff --git a/unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp similarity index 100% rename from unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp rename to opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp diff --git a/unit_tests/gen8/bdw/windows/test_device_caps_bdw_windows.cpp b/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp similarity index 100% rename from unit_tests/gen8/bdw/windows/test_device_caps_bdw_windows.cpp rename to opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp diff --git a/unit_tests/gen8/coherency_tests_gen8.cpp b/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp similarity index 100% rename from unit_tests/gen8/coherency_tests_gen8.cpp rename to opencl/test/unit_test/gen8/coherency_tests_gen8.cpp diff --git a/unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp similarity index 100% rename from unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp rename to opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp diff --git a/unit_tests/gen8/enqueue_media_kernel_gen8.cpp b/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp similarity index 100% rename from unit_tests/gen8/enqueue_media_kernel_gen8.cpp rename to opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp diff --git a/unit_tests/gen8/hw_helper_tests_gen8.cpp b/opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp similarity index 100% rename from unit_tests/gen8/hw_helper_tests_gen8.cpp rename to opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp diff --git a/unit_tests/gen8/image_tests_gen8.cpp b/opencl/test/unit_test/gen8/image_tests_gen8.cpp similarity index 100% rename from unit_tests/gen8/image_tests_gen8.cpp rename to opencl/test/unit_test/gen8/image_tests_gen8.cpp diff --git a/unit_tests/gen8/kernel_tests_gen8.cpp b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp similarity index 100% rename from unit_tests/gen8/kernel_tests_gen8.cpp rename to opencl/test/unit_test/gen8/kernel_tests_gen8.cpp diff --git a/unit_tests/gen8/sampler_tests_gen8.cpp b/opencl/test/unit_test/gen8/sampler_tests_gen8.cpp similarity index 100% rename from unit_tests/gen8/sampler_tests_gen8.cpp rename to opencl/test/unit_test/gen8/sampler_tests_gen8.cpp diff --git a/unit_tests/gen8/scheduler_dispatch_tests_gen8.cpp b/opencl/test/unit_test/gen8/scheduler_dispatch_tests_gen8.cpp similarity index 100% rename from unit_tests/gen8/scheduler_dispatch_tests_gen8.cpp rename to opencl/test/unit_test/gen8/scheduler_dispatch_tests_gen8.cpp diff --git a/unit_tests/gen8/scheduler_source_tests_gen8.cpp b/opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp similarity index 100% rename from unit_tests/gen8/scheduler_source_tests_gen8.cpp rename to opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp diff --git a/unit_tests/gen8/test_device_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp similarity index 100% rename from unit_tests/gen8/test_device_caps_gen8.cpp rename to opencl/test/unit_test/gen8/test_device_caps_gen8.cpp diff --git a/unit_tests/gen8/test_device_queue_hw_gen8.cpp b/opencl/test/unit_test/gen8/test_device_queue_hw_gen8.cpp similarity index 100% rename from unit_tests/gen8/test_device_queue_hw_gen8.cpp rename to opencl/test/unit_test/gen8/test_device_queue_hw_gen8.cpp diff --git a/unit_tests/gen8/test_platform_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp similarity index 100% rename from unit_tests/gen8/test_platform_caps_gen8.cpp rename to opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp diff --git a/unit_tests/gen8/test_sample_gen8.cpp b/opencl/test/unit_test/gen8/test_sample_gen8.cpp similarity index 100% rename from unit_tests/gen8/test_sample_gen8.cpp rename to opencl/test/unit_test/gen8/test_sample_gen8.cpp diff --git a/unit_tests/gen8/unit_test_helper_gen8.cpp b/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp similarity index 100% rename from unit_tests/gen8/unit_test_helper_gen8.cpp rename to opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp diff --git a/unit_tests/gen8/windows/CMakeLists.txt b/opencl/test/unit_test/gen8/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen8/windows/CMakeLists.txt rename to opencl/test/unit_test/gen8/windows/CMakeLists.txt diff --git a/unit_tests/gen8/windows/gmm_callbacks_tests_gen8.cpp b/opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp similarity index 100% rename from unit_tests/gen8/windows/gmm_callbacks_tests_gen8.cpp rename to opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp diff --git a/unit_tests/gen9/CMakeLists.txt b/opencl/test/unit_test/gen9/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/CMakeLists.txt rename to opencl/test/unit_test/gen9/CMakeLists.txt diff --git a/unit_tests/gen9/bxt/CMakeLists.txt b/opencl/test/unit_test/gen9/bxt/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/bxt/CMakeLists.txt rename to opencl/test/unit_test/gen9/bxt/CMakeLists.txt diff --git a/unit_tests/gen9/bxt/device_tests_bxt.cpp b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp similarity index 100% rename from unit_tests/gen9/bxt/device_tests_bxt.cpp rename to opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp diff --git a/unit_tests/gen9/bxt/linux/CMakeLists.txt b/opencl/test/unit_test/gen9/bxt/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/bxt/linux/CMakeLists.txt rename to opencl/test/unit_test/gen9/bxt/linux/CMakeLists.txt diff --git a/unit_tests/gen9/bxt/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen9/bxt/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/bxt/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen9/bxt/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp b/opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp similarity index 100% rename from unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp rename to opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp diff --git a/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp b/opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp similarity index 100% rename from unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp rename to opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp diff --git a/unit_tests/gen9/bxt/test_device_caps_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp similarity index 100% rename from unit_tests/gen9/bxt/test_device_caps_bxt.cpp rename to opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp diff --git a/unit_tests/gen9/bxt/test_hw_info_config_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp similarity index 100% rename from unit_tests/gen9/bxt/test_hw_info_config_bxt.cpp rename to opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp diff --git a/unit_tests/gen9/bxt/windows/CMakeLists.txt b/opencl/test/unit_test/gen9/bxt/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/bxt/windows/CMakeLists.txt rename to opencl/test/unit_test/gen9/bxt/windows/CMakeLists.txt diff --git a/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp b/opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp similarity index 100% rename from unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp rename to opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp diff --git a/unit_tests/gen9/bxt/windows/test_device_caps_bxt_windows.cpp b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp similarity index 100% rename from unit_tests/gen9/bxt/windows/test_device_caps_bxt_windows.cpp rename to opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp diff --git a/unit_tests/gen9/cfl/CMakeLists.txt b/opencl/test/unit_test/gen9/cfl/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/cfl/CMakeLists.txt rename to opencl/test/unit_test/gen9/cfl/CMakeLists.txt diff --git a/unit_tests/gen9/cfl/linux/CMakeLists.txt b/opencl/test/unit_test/gen9/cfl/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/cfl/linux/CMakeLists.txt rename to opencl/test/unit_test/gen9/cfl/linux/CMakeLists.txt diff --git a/unit_tests/gen9/cfl/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen9/cfl/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/cfl/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen9/cfl/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp similarity index 100% rename from unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp rename to opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp diff --git a/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp similarity index 100% rename from unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp rename to opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp diff --git a/unit_tests/gen9/cfl/test_device_caps_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp similarity index 100% rename from unit_tests/gen9/cfl/test_device_caps_cfl.cpp rename to opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp diff --git a/unit_tests/gen9/cfl/test_hw_info_config_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp similarity index 100% rename from unit_tests/gen9/cfl/test_hw_info_config_cfl.cpp rename to opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp diff --git a/unit_tests/gen9/cfl/windows/CMakeLists.txt b/opencl/test/unit_test/gen9/cfl/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/cfl/windows/CMakeLists.txt rename to opencl/test/unit_test/gen9/cfl/windows/CMakeLists.txt diff --git a/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp similarity index 100% rename from unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp rename to opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp diff --git a/unit_tests/gen9/cfl/windows/test_device_caps_cfl_windows.cpp b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp similarity index 100% rename from unit_tests/gen9/cfl/windows/test_device_caps_cfl_windows.cpp rename to opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp diff --git a/unit_tests/gen9/coherency_tests_gen9.cpp b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp similarity index 100% rename from unit_tests/gen9/coherency_tests_gen9.cpp rename to opencl/test/unit_test/gen9/coherency_tests_gen9.cpp diff --git a/unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp similarity index 100% rename from unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp rename to opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp diff --git a/unit_tests/gen9/enqueue_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp similarity index 100% rename from unit_tests/gen9/enqueue_kernel_gen9.cpp rename to opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp diff --git a/unit_tests/gen9/enqueue_media_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp similarity index 100% rename from unit_tests/gen9/enqueue_media_kernel_gen9.cpp rename to opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp diff --git a/unit_tests/gen9/glk/CMakeLists.txt b/opencl/test/unit_test/gen9/glk/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/glk/CMakeLists.txt rename to opencl/test/unit_test/gen9/glk/CMakeLists.txt diff --git a/unit_tests/gen9/glk/linux/CMakeLists.txt b/opencl/test/unit_test/gen9/glk/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/glk/linux/CMakeLists.txt rename to opencl/test/unit_test/gen9/glk/linux/CMakeLists.txt diff --git a/unit_tests/gen9/glk/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen9/glk/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/glk/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen9/glk/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp b/opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp similarity index 100% rename from unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp rename to opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp diff --git a/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp b/opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp similarity index 100% rename from unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp rename to opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp diff --git a/unit_tests/gen9/glk/test_device_caps_glk.cpp b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp similarity index 100% rename from unit_tests/gen9/glk/test_device_caps_glk.cpp rename to opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp diff --git a/unit_tests/gen9/glk/test_hw_info_config_glk.cpp b/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp similarity index 100% rename from unit_tests/gen9/glk/test_hw_info_config_glk.cpp rename to opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp diff --git a/unit_tests/gen9/glk/windows/CMakeLists.txt b/opencl/test/unit_test/gen9/glk/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/glk/windows/CMakeLists.txt rename to opencl/test/unit_test/gen9/glk/windows/CMakeLists.txt diff --git a/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp b/opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp similarity index 100% rename from unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp rename to opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp diff --git a/unit_tests/gen9/glk/windows/test_device_caps_glk_windows.cpp b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp similarity index 100% rename from unit_tests/gen9/glk/windows/test_device_caps_glk_windows.cpp rename to opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp diff --git a/unit_tests/gen9/hw_helper_tests_gen9.cpp b/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp similarity index 100% rename from unit_tests/gen9/hw_helper_tests_gen9.cpp rename to opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp diff --git a/unit_tests/gen9/image_tests_gen9.cpp b/opencl/test/unit_test/gen9/image_tests_gen9.cpp similarity index 100% rename from unit_tests/gen9/image_tests_gen9.cpp rename to opencl/test/unit_test/gen9/image_tests_gen9.cpp diff --git a/unit_tests/gen9/kbl/CMakeLists.txt b/opencl/test/unit_test/gen9/kbl/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/kbl/CMakeLists.txt rename to opencl/test/unit_test/gen9/kbl/CMakeLists.txt diff --git a/unit_tests/gen9/kbl/linux/CMakeLists.txt b/opencl/test/unit_test/gen9/kbl/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/kbl/linux/CMakeLists.txt rename to opencl/test/unit_test/gen9/kbl/linux/CMakeLists.txt diff --git a/unit_tests/gen9/kbl/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen9/kbl/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/kbl/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen9/kbl/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp b/opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp similarity index 100% rename from unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp rename to opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp diff --git a/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp b/opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp similarity index 100% rename from unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp rename to opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp diff --git a/unit_tests/gen9/kbl/test_device_caps_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp similarity index 100% rename from unit_tests/gen9/kbl/test_device_caps_kbl.cpp rename to opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp diff --git a/unit_tests/gen9/kbl/test_hw_info_config_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp similarity index 100% rename from unit_tests/gen9/kbl/test_hw_info_config_kbl.cpp rename to opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp diff --git a/unit_tests/gen9/kbl/windows/CMakeLists.txt b/opencl/test/unit_test/gen9/kbl/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/kbl/windows/CMakeLists.txt rename to opencl/test/unit_test/gen9/kbl/windows/CMakeLists.txt diff --git a/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp b/opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp similarity index 100% rename from unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp rename to opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp diff --git a/unit_tests/gen9/kbl/windows/test_device_caps_kbl_windows.cpp b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp similarity index 100% rename from unit_tests/gen9/kbl/windows/test_device_caps_kbl_windows.cpp rename to opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp diff --git a/unit_tests/gen9/kernel_tests_gen9.cpp b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp similarity index 100% rename from unit_tests/gen9/kernel_tests_gen9.cpp rename to opencl/test/unit_test/gen9/kernel_tests_gen9.cpp diff --git a/unit_tests/gen9/sampler_tests_gen9.cpp b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp similarity index 100% rename from unit_tests/gen9/sampler_tests_gen9.cpp rename to opencl/test/unit_test/gen9/sampler_tests_gen9.cpp diff --git a/unit_tests/gen9/scheduler_source_tests_gen9.cpp b/opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp similarity index 100% rename from unit_tests/gen9/scheduler_source_tests_gen9.cpp rename to opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp diff --git a/unit_tests/gen9/sip_tests_gen9.cpp b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp similarity index 100% rename from unit_tests/gen9/sip_tests_gen9.cpp rename to opencl/test/unit_test/gen9/sip_tests_gen9.cpp diff --git a/unit_tests/gen9/skl/CMakeLists.txt b/opencl/test/unit_test/gen9/skl/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/skl/CMakeLists.txt rename to opencl/test/unit_test/gen9/skl/CMakeLists.txt diff --git a/unit_tests/gen9/skl/device_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp similarity index 100% rename from unit_tests/gen9/skl/device_tests_skl.cpp rename to opencl/test/unit_test/gen9/skl/device_tests_skl.cpp diff --git a/unit_tests/gen9/skl/linux/CMakeLists.txt b/opencl/test/unit_test/gen9/skl/linux/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/skl/linux/CMakeLists.txt rename to opencl/test/unit_test/gen9/skl/linux/CMakeLists.txt diff --git a/unit_tests/gen9/skl/linux/dll/CMakeLists.txt b/opencl/test/unit_test/gen9/skl/linux/dll/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/skl/linux/dll/CMakeLists.txt rename to opencl/test/unit_test/gen9/skl/linux/dll/CMakeLists.txt diff --git a/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp similarity index 100% rename from unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp rename to opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp diff --git a/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp similarity index 100% rename from unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp rename to opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp diff --git a/unit_tests/gen9/skl/test_device_caps_skl.cpp b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp similarity index 100% rename from unit_tests/gen9/skl/test_device_caps_skl.cpp rename to opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp diff --git a/unit_tests/gen9/skl/test_hw_info_config_skl.cpp b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp similarity index 100% rename from unit_tests/gen9/skl/test_hw_info_config_skl.cpp rename to opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp diff --git a/unit_tests/gen9/skl/test_sample_skl.cpp b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp similarity index 100% rename from unit_tests/gen9/skl/test_sample_skl.cpp rename to opencl/test/unit_test/gen9/skl/test_sample_skl.cpp diff --git a/unit_tests/gen9/skl/windows/CMakeLists.txt b/opencl/test/unit_test/gen9/skl/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/skl/windows/CMakeLists.txt rename to opencl/test/unit_test/gen9/skl/windows/CMakeLists.txt diff --git a/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp similarity index 100% rename from unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp rename to opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp diff --git a/unit_tests/gen9/skl/windows/test_device_caps_skl_windows.cpp b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp similarity index 100% rename from unit_tests/gen9/skl/windows/test_device_caps_skl_windows.cpp rename to opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp diff --git a/unit_tests/gen9/test_device_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp similarity index 100% rename from unit_tests/gen9/test_device_caps_gen9.cpp rename to opencl/test/unit_test/gen9/test_device_caps_gen9.cpp diff --git a/unit_tests/gen9/test_device_queue_hw_gen9.cpp b/opencl/test/unit_test/gen9/test_device_queue_hw_gen9.cpp similarity index 100% rename from unit_tests/gen9/test_device_queue_hw_gen9.cpp rename to opencl/test/unit_test/gen9/test_device_queue_hw_gen9.cpp diff --git a/unit_tests/gen9/test_platform_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp similarity index 100% rename from unit_tests/gen9/test_platform_caps_gen9.cpp rename to opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp diff --git a/unit_tests/gen9/test_sample_gen9.cpp b/opencl/test/unit_test/gen9/test_sample_gen9.cpp similarity index 100% rename from unit_tests/gen9/test_sample_gen9.cpp rename to opencl/test/unit_test/gen9/test_sample_gen9.cpp diff --git a/unit_tests/gen9/unit_test_helper_gen9.cpp b/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp similarity index 100% rename from unit_tests/gen9/unit_test_helper_gen9.cpp rename to opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp diff --git a/unit_tests/gen9/windows/CMakeLists.txt b/opencl/test/unit_test/gen9/windows/CMakeLists.txt similarity index 100% rename from unit_tests/gen9/windows/CMakeLists.txt rename to opencl/test/unit_test/gen9/windows/CMakeLists.txt diff --git a/unit_tests/gen9/windows/gmm_callbacks_tests_gen9.cpp b/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp similarity index 100% rename from unit_tests/gen9/windows/gmm_callbacks_tests_gen9.cpp rename to opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp diff --git a/unit_tests/gen_common/CMakeLists.txt b/opencl/test/unit_test/gen_common/CMakeLists.txt similarity index 100% rename from unit_tests/gen_common/CMakeLists.txt rename to opencl/test/unit_test/gen_common/CMakeLists.txt diff --git a/unit_tests/gen_common/cmd_parse_base.inl b/opencl/test/unit_test/gen_common/cmd_parse_base.inl similarity index 100% rename from unit_tests/gen_common/cmd_parse_base.inl rename to opencl/test/unit_test/gen_common/cmd_parse_base.inl diff --git a/unit_tests/gen_common/cmd_parse_base_mi_arb.inl b/opencl/test/unit_test/gen_common/cmd_parse_base_mi_arb.inl similarity index 100% rename from unit_tests/gen_common/cmd_parse_base_mi_arb.inl rename to opencl/test/unit_test/gen_common/cmd_parse_base_mi_arb.inl diff --git a/unit_tests/gen_common/cmd_parse_compute_mode.inl b/opencl/test/unit_test/gen_common/cmd_parse_compute_mode.inl similarity index 100% rename from unit_tests/gen_common/cmd_parse_compute_mode.inl rename to opencl/test/unit_test/gen_common/cmd_parse_compute_mode.inl diff --git a/unit_tests/gen_common/cmd_parse_gpgpu_walker.inl b/opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl similarity index 100% rename from unit_tests/gen_common/cmd_parse_gpgpu_walker.inl rename to opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl diff --git a/unit_tests/gen_common/cmd_parse_mi_arb.inl b/opencl/test/unit_test/gen_common/cmd_parse_mi_arb.inl similarity index 100% rename from unit_tests/gen_common/cmd_parse_mi_arb.inl rename to opencl/test/unit_test/gen_common/cmd_parse_mi_arb.inl diff --git a/unit_tests/gen_common/cmd_parse_sip.inl b/opencl/test/unit_test/gen_common/cmd_parse_sip.inl similarity index 100% rename from unit_tests/gen_common/cmd_parse_sip.inl rename to opencl/test/unit_test/gen_common/cmd_parse_sip.inl diff --git a/unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp similarity index 100% rename from unit_tests/gen_common/exclude_tests/exclude_test_declare.cpp rename to opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp diff --git a/unit_tests/gen_common/exclude_tests/exclude_test_exclude.cpp b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp similarity index 100% rename from unit_tests/gen_common/exclude_tests/exclude_test_exclude.cpp rename to opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp diff --git a/unit_tests/gen_common/gen_cmd_parse.h b/opencl/test/unit_test/gen_common/gen_cmd_parse.h similarity index 100% rename from unit_tests/gen_common/gen_cmd_parse.h rename to opencl/test/unit_test/gen_common/gen_cmd_parse.h diff --git a/unit_tests/gen_common/gen_commands_common_validation.h b/opencl/test/unit_test/gen_common/gen_commands_common_validation.h similarity index 100% rename from unit_tests/gen_common/gen_commands_common_validation.h rename to opencl/test/unit_test/gen_common/gen_commands_common_validation.h diff --git a/unit_tests/gen_common/hw_cmds_tests.cpp b/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp similarity index 100% rename from unit_tests/gen_common/hw_cmds_tests.cpp rename to opencl/test/unit_test/gen_common/hw_cmds_tests.cpp diff --git a/unit_tests/gen_common/matchers.h b/opencl/test/unit_test/gen_common/matchers.h similarity index 100% rename from unit_tests/gen_common/matchers.h rename to opencl/test/unit_test/gen_common/matchers.h diff --git a/unit_tests/global_environment.cpp b/opencl/test/unit_test/global_environment.cpp similarity index 100% rename from unit_tests/global_environment.cpp rename to opencl/test/unit_test/global_environment.cpp diff --git a/unit_tests/global_environment.h b/opencl/test/unit_test/global_environment.h similarity index 100% rename from unit_tests/global_environment.h rename to opencl/test/unit_test/global_environment.h diff --git a/unit_tests/gmm_helper/CMakeLists.txt b/opencl/test/unit_test/gmm_helper/CMakeLists.txt similarity index 100% rename from unit_tests/gmm_helper/CMakeLists.txt rename to opencl/test/unit_test/gmm_helper/CMakeLists.txt diff --git a/unit_tests/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp similarity index 100% rename from unit_tests/gmm_helper/gmm_helper_tests.cpp rename to opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp diff --git a/unit_tests/gtpin/CMakeLists.txt b/opencl/test/unit_test/gtpin/CMakeLists.txt similarity index 100% rename from unit_tests/gtpin/CMakeLists.txt rename to opencl/test/unit_test/gtpin/CMakeLists.txt diff --git a/unit_tests/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp similarity index 100% rename from unit_tests/gtpin/gtpin_tests.cpp rename to opencl/test/unit_test/gtpin/gtpin_tests.cpp diff --git a/unit_tests/helpers/CMakeLists.txt b/opencl/test/unit_test/helpers/CMakeLists.txt similarity index 100% rename from unit_tests/helpers/CMakeLists.txt rename to opencl/test/unit_test/helpers/CMakeLists.txt diff --git a/unit_tests/helpers/array_count_tests.cpp b/opencl/test/unit_test/helpers/array_count_tests.cpp similarity index 100% rename from unit_tests/helpers/array_count_tests.cpp rename to opencl/test/unit_test/helpers/array_count_tests.cpp diff --git a/unit_tests/helpers/base_object_tests.cpp b/opencl/test/unit_test/helpers/base_object_tests.cpp similarity index 100% rename from unit_tests/helpers/base_object_tests.cpp rename to opencl/test/unit_test/helpers/base_object_tests.cpp diff --git a/unit_tests/helpers/base_object_tests_mt.cpp b/opencl/test/unit_test/helpers/base_object_tests_mt.cpp similarity index 100% rename from unit_tests/helpers/base_object_tests_mt.cpp rename to opencl/test/unit_test/helpers/base_object_tests_mt.cpp diff --git a/unit_tests/helpers/basic_math_tests.cpp b/opencl/test/unit_test/helpers/basic_math_tests.cpp similarity index 100% rename from unit_tests/helpers/basic_math_tests.cpp rename to opencl/test/unit_test/helpers/basic_math_tests.cpp diff --git a/unit_tests/helpers/bit_helpers_tests.cpp b/opencl/test/unit_test/helpers/bit_helpers_tests.cpp similarity index 100% rename from unit_tests/helpers/bit_helpers_tests.cpp rename to opencl/test/unit_test/helpers/bit_helpers_tests.cpp diff --git a/unit_tests/helpers/built_ins_helper.cpp b/opencl/test/unit_test/helpers/built_ins_helper.cpp similarity index 100% rename from unit_tests/helpers/built_ins_helper.cpp rename to opencl/test/unit_test/helpers/built_ins_helper.cpp diff --git a/unit_tests/helpers/cl_helper_tests.cpp b/opencl/test/unit_test/helpers/cl_helper_tests.cpp similarity index 100% rename from unit_tests/helpers/cl_helper_tests.cpp rename to opencl/test/unit_test/helpers/cl_helper_tests.cpp diff --git a/unit_tests/helpers/cmd_buffer_validator.h b/opencl/test/unit_test/helpers/cmd_buffer_validator.h similarity index 100% rename from unit_tests/helpers/cmd_buffer_validator.h rename to opencl/test/unit_test/helpers/cmd_buffer_validator.h diff --git a/unit_tests/helpers/cmd_buffer_validator_tests.cpp b/opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp similarity index 100% rename from unit_tests/helpers/cmd_buffer_validator_tests.cpp rename to opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp diff --git a/unit_tests/helpers/debug_helpers.cpp b/opencl/test/unit_test/helpers/debug_helpers.cpp similarity index 100% rename from unit_tests/helpers/debug_helpers.cpp rename to opencl/test/unit_test/helpers/debug_helpers.cpp diff --git a/unit_tests/helpers/debug_helpers_tests.cpp b/opencl/test/unit_test/helpers/debug_helpers_tests.cpp similarity index 100% rename from unit_tests/helpers/debug_helpers_tests.cpp rename to opencl/test/unit_test/helpers/debug_helpers_tests.cpp diff --git a/unit_tests/helpers/deferred_deleter_helpers_tests.cpp b/opencl/test/unit_test/helpers/deferred_deleter_helpers_tests.cpp similarity index 100% rename from unit_tests/helpers/deferred_deleter_helpers_tests.cpp rename to opencl/test/unit_test/helpers/deferred_deleter_helpers_tests.cpp diff --git a/unit_tests/helpers/dirty_state_helpers_tests.cpp b/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp similarity index 100% rename from unit_tests/helpers/dirty_state_helpers_tests.cpp rename to opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp diff --git a/unit_tests/helpers/dispatch_flags_helper.h b/opencl/test/unit_test/helpers/dispatch_flags_helper.h similarity index 100% rename from unit_tests/helpers/dispatch_flags_helper.h rename to opencl/test/unit_test/helpers/dispatch_flags_helper.h diff --git a/unit_tests/helpers/dispatch_info_builder_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp similarity index 100% rename from unit_tests/helpers/dispatch_info_builder_tests.cpp rename to opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp diff --git a/unit_tests/helpers/dispatch_info_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_tests.cpp similarity index 100% rename from unit_tests/helpers/dispatch_info_tests.cpp rename to opencl/test/unit_test/helpers/dispatch_info_tests.cpp diff --git a/unit_tests/helpers/execution_environment_helper.cpp b/opencl/test/unit_test/helpers/execution_environment_helper.cpp similarity index 100% rename from unit_tests/helpers/execution_environment_helper.cpp rename to opencl/test/unit_test/helpers/execution_environment_helper.cpp diff --git a/unit_tests/helpers/execution_environment_helper.h b/opencl/test/unit_test/helpers/execution_environment_helper.h similarity index 100% rename from unit_tests/helpers/execution_environment_helper.h rename to opencl/test/unit_test/helpers/execution_environment_helper.h diff --git a/unit_tests/helpers/extendable_enum_tests.cpp b/opencl/test/unit_test/helpers/extendable_enum_tests.cpp similarity index 100% rename from unit_tests/helpers/extendable_enum_tests.cpp rename to opencl/test/unit_test/helpers/extendable_enum_tests.cpp diff --git a/unit_tests/helpers/flush_stamp_tests.cpp b/opencl/test/unit_test/helpers/flush_stamp_tests.cpp similarity index 100% rename from unit_tests/helpers/flush_stamp_tests.cpp rename to opencl/test/unit_test/helpers/flush_stamp_tests.cpp diff --git a/unit_tests/helpers/get_gpgpu_engines_tests.inl b/opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl similarity index 100% rename from unit_tests/helpers/get_gpgpu_engines_tests.inl rename to opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl diff --git a/unit_tests/helpers/get_info_status_mapper_tests.cpp b/opencl/test/unit_test/helpers/get_info_status_mapper_tests.cpp similarity index 100% rename from unit_tests/helpers/get_info_status_mapper_tests.cpp rename to opencl/test/unit_test/helpers/get_info_status_mapper_tests.cpp diff --git a/unit_tests/helpers/get_info_tests.cpp b/opencl/test/unit_test/helpers/get_info_tests.cpp similarity index 100% rename from unit_tests/helpers/get_info_tests.cpp rename to opencl/test/unit_test/helpers/get_info_tests.cpp diff --git a/unit_tests/helpers/gtest_helpers.h b/opencl/test/unit_test/helpers/gtest_helpers.h similarity index 100% rename from unit_tests/helpers/gtest_helpers.h rename to opencl/test/unit_test/helpers/gtest_helpers.h diff --git a/unit_tests/helpers/hardware_commands_helper_tests.cpp b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp similarity index 100% rename from unit_tests/helpers/hardware_commands_helper_tests.cpp rename to opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp diff --git a/unit_tests/helpers/hardware_commands_helper_tests.h b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h similarity index 100% rename from unit_tests/helpers/hardware_commands_helper_tests.h rename to opencl/test/unit_test/helpers/hardware_commands_helper_tests.h diff --git a/unit_tests/helpers/hw_helper_default_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp similarity index 100% rename from unit_tests/helpers/hw_helper_default_tests.cpp rename to opencl/test/unit_test/helpers/hw_helper_default_tests.cpp diff --git a/unit_tests/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp similarity index 100% rename from unit_tests/helpers/hw_helper_tests.cpp rename to opencl/test/unit_test/helpers/hw_helper_tests.cpp diff --git a/unit_tests/helpers/hw_helper_tests.h b/opencl/test/unit_test/helpers/hw_helper_tests.h similarity index 100% rename from unit_tests/helpers/hw_helper_tests.h rename to opencl/test/unit_test/helpers/hw_helper_tests.h diff --git a/unit_tests/helpers/hw_parse.h b/opencl/test/unit_test/helpers/hw_parse.h similarity index 100% rename from unit_tests/helpers/hw_parse.h rename to opencl/test/unit_test/helpers/hw_parse.h diff --git a/unit_tests/helpers/hw_parse.inl b/opencl/test/unit_test/helpers/hw_parse.inl similarity index 100% rename from unit_tests/helpers/hw_parse.inl rename to opencl/test/unit_test/helpers/hw_parse.inl diff --git a/unit_tests/helpers/kernel_binary_helper.cpp b/opencl/test/unit_test/helpers/kernel_binary_helper.cpp similarity index 100% rename from unit_tests/helpers/kernel_binary_helper.cpp rename to opencl/test/unit_test/helpers/kernel_binary_helper.cpp diff --git a/unit_tests/helpers/kernel_binary_helper.h b/opencl/test/unit_test/helpers/kernel_binary_helper.h similarity index 100% rename from unit_tests/helpers/kernel_binary_helper.h rename to opencl/test/unit_test/helpers/kernel_binary_helper.h diff --git a/unit_tests/helpers/kernel_binary_helper_hash_value.cpp b/opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp similarity index 100% rename from unit_tests/helpers/kernel_binary_helper_hash_value.cpp rename to opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp diff --git a/unit_tests/helpers/kernel_filename_helper.h b/opencl/test/unit_test/helpers/kernel_filename_helper.h similarity index 100% rename from unit_tests/helpers/kernel_filename_helper.h rename to opencl/test/unit_test/helpers/kernel_filename_helper.h diff --git a/unit_tests/helpers/kmd_notify_tests.cpp b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp similarity index 100% rename from unit_tests/helpers/kmd_notify_tests.cpp rename to opencl/test/unit_test/helpers/kmd_notify_tests.cpp diff --git a/unit_tests/helpers/linux/CMakeLists.txt b/opencl/test/unit_test/helpers/linux/CMakeLists.txt similarity index 100% rename from unit_tests/helpers/linux/CMakeLists.txt rename to opencl/test/unit_test/helpers/linux/CMakeLists.txt diff --git a/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp b/opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp similarity index 100% rename from unit_tests/helpers/linux/kmd_notify_linux_tests.cpp rename to opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp diff --git a/unit_tests/helpers/mem_properties_parser_helper_tests.cpp b/opencl/test/unit_test/helpers/mem_properties_parser_helper_tests.cpp similarity index 100% rename from unit_tests/helpers/mem_properties_parser_helper_tests.cpp rename to opencl/test/unit_test/helpers/mem_properties_parser_helper_tests.cpp diff --git a/unit_tests/helpers/memory_management_tests.cpp b/opencl/test/unit_test/helpers/memory_management_tests.cpp similarity index 100% rename from unit_tests/helpers/memory_management_tests.cpp rename to opencl/test/unit_test/helpers/memory_management_tests.cpp diff --git a/unit_tests/helpers/memory_properties_flags_helpers_tests.cpp b/opencl/test/unit_test/helpers/memory_properties_flags_helpers_tests.cpp similarity index 100% rename from unit_tests/helpers/memory_properties_flags_helpers_tests.cpp rename to opencl/test/unit_test/helpers/memory_properties_flags_helpers_tests.cpp diff --git a/unit_tests/helpers/mipmap_tests.cpp b/opencl/test/unit_test/helpers/mipmap_tests.cpp similarity index 100% rename from unit_tests/helpers/mipmap_tests.cpp rename to opencl/test/unit_test/helpers/mipmap_tests.cpp diff --git a/unit_tests/helpers/per_thread_data_tests.cpp b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp similarity index 100% rename from unit_tests/helpers/per_thread_data_tests.cpp rename to opencl/test/unit_test/helpers/per_thread_data_tests.cpp diff --git a/unit_tests/helpers/ptr_math_tests.cpp b/opencl/test/unit_test/helpers/ptr_math_tests.cpp similarity index 100% rename from unit_tests/helpers/ptr_math_tests.cpp rename to opencl/test/unit_test/helpers/ptr_math_tests.cpp diff --git a/unit_tests/helpers/queue_helpers_tests.cpp b/opencl/test/unit_test/helpers/queue_helpers_tests.cpp similarity index 100% rename from unit_tests/helpers/queue_helpers_tests.cpp rename to opencl/test/unit_test/helpers/queue_helpers_tests.cpp diff --git a/unit_tests/helpers/raii_hw_helper.h b/opencl/test/unit_test/helpers/raii_hw_helper.h similarity index 100% rename from unit_tests/helpers/raii_hw_helper.h rename to opencl/test/unit_test/helpers/raii_hw_helper.h diff --git a/unit_tests/helpers/sampler_helpers_tests.cpp b/opencl/test/unit_test/helpers/sampler_helpers_tests.cpp similarity index 100% rename from unit_tests/helpers/sampler_helpers_tests.cpp rename to opencl/test/unit_test/helpers/sampler_helpers_tests.cpp diff --git a/unit_tests/helpers/static_size3.h b/opencl/test/unit_test/helpers/static_size3.h similarity index 100% rename from unit_tests/helpers/static_size3.h rename to opencl/test/unit_test/helpers/static_size3.h diff --git a/unit_tests/helpers/task_information_tests.cpp b/opencl/test/unit_test/helpers/task_information_tests.cpp similarity index 100% rename from unit_tests/helpers/task_information_tests.cpp rename to opencl/test/unit_test/helpers/task_information_tests.cpp diff --git a/unit_tests/helpers/test_debug_variables.inl b/opencl/test/unit_test/helpers/test_debug_variables.inl similarity index 100% rename from unit_tests/helpers/test_debug_variables.inl rename to opencl/test/unit_test/helpers/test_debug_variables.inl diff --git a/unit_tests/helpers/test_files.cpp b/opencl/test/unit_test/helpers/test_files.cpp similarity index 100% rename from unit_tests/helpers/test_files.cpp rename to opencl/test/unit_test/helpers/test_files.cpp diff --git a/unit_tests/helpers/test_files.h b/opencl/test/unit_test/helpers/test_files.h similarity index 100% rename from unit_tests/helpers/test_files.h rename to opencl/test/unit_test/helpers/test_files.h diff --git a/unit_tests/helpers/timestamp_packet_tests.cpp b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp similarity index 100% rename from unit_tests/helpers/timestamp_packet_tests.cpp rename to opencl/test/unit_test/helpers/timestamp_packet_tests.cpp diff --git a/unit_tests/helpers/transfer_properties_tests.cpp b/opencl/test/unit_test/helpers/transfer_properties_tests.cpp similarity index 100% rename from unit_tests/helpers/transfer_properties_tests.cpp rename to opencl/test/unit_test/helpers/transfer_properties_tests.cpp diff --git a/unit_tests/helpers/uint16_sse4_tests.cpp b/opencl/test/unit_test/helpers/uint16_sse4_tests.cpp similarity index 100% rename from unit_tests/helpers/uint16_sse4_tests.cpp rename to opencl/test/unit_test/helpers/uint16_sse4_tests.cpp diff --git a/unit_tests/helpers/ult_limits.h b/opencl/test/unit_test/helpers/ult_limits.h similarity index 100% rename from unit_tests/helpers/ult_limits.h rename to opencl/test/unit_test/helpers/ult_limits.h diff --git a/unit_tests/helpers/unit_test_helper.h b/opencl/test/unit_test/helpers/unit_test_helper.h similarity index 100% rename from unit_tests/helpers/unit_test_helper.h rename to opencl/test/unit_test/helpers/unit_test_helper.h diff --git a/unit_tests/helpers/unit_test_helper.inl b/opencl/test/unit_test/helpers/unit_test_helper.inl similarity index 100% rename from unit_tests/helpers/unit_test_helper.inl rename to opencl/test/unit_test/helpers/unit_test_helper.inl diff --git a/unit_tests/helpers/validator_tests.cpp b/opencl/test/unit_test/helpers/validator_tests.cpp similarity index 100% rename from unit_tests/helpers/validator_tests.cpp rename to opencl/test/unit_test/helpers/validator_tests.cpp diff --git a/unit_tests/helpers/variable_backup.h b/opencl/test/unit_test/helpers/variable_backup.h similarity index 100% rename from unit_tests/helpers/variable_backup.h rename to opencl/test/unit_test/helpers/variable_backup.h diff --git a/unit_tests/helpers/windows/CMakeLists.txt b/opencl/test/unit_test/helpers/windows/CMakeLists.txt similarity index 100% rename from unit_tests/helpers/windows/CMakeLists.txt rename to opencl/test/unit_test/helpers/windows/CMakeLists.txt diff --git a/unit_tests/helpers/windows/gl_helper_tests.cpp b/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp similarity index 100% rename from unit_tests/helpers/windows/gl_helper_tests.cpp rename to opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp diff --git a/unit_tests/helpers/windows/kmd_notify_windows_tests.cpp b/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp similarity index 100% rename from unit_tests/helpers/windows/kmd_notify_windows_tests.cpp rename to opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp diff --git a/unit_tests/helpers/windows/mock_function.cpp b/opencl/test/unit_test/helpers/windows/mock_function.cpp similarity index 100% rename from unit_tests/helpers/windows/mock_function.cpp rename to opencl/test/unit_test/helpers/windows/mock_function.cpp diff --git a/unit_tests/helpers/windows/mock_function.h b/opencl/test/unit_test/helpers/windows/mock_function.h similarity index 100% rename from unit_tests/helpers/windows/mock_function.h rename to opencl/test/unit_test/helpers/windows/mock_function.h diff --git a/unit_tests/igdrcl_tests_pch.cpp b/opencl/test/unit_test/igdrcl_tests_pch.cpp similarity index 100% rename from unit_tests/igdrcl_tests_pch.cpp rename to opencl/test/unit_test/igdrcl_tests_pch.cpp diff --git a/unit_tests/igdrcl_tests_pch.h b/opencl/test/unit_test/igdrcl_tests_pch.h similarity index 100% rename from unit_tests/igdrcl_tests_pch.h rename to opencl/test/unit_test/igdrcl_tests_pch.h diff --git a/unit_tests/indirect_heap/indirect_heap_fixture.cpp b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp similarity index 100% rename from unit_tests/indirect_heap/indirect_heap_fixture.cpp rename to opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp diff --git a/unit_tests/indirect_heap/indirect_heap_fixture.h b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h similarity index 100% rename from unit_tests/indirect_heap/indirect_heap_fixture.h rename to opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h diff --git a/unit_tests/kernel/CMakeLists.txt b/opencl/test/unit_test/kernel/CMakeLists.txt similarity index 100% rename from unit_tests/kernel/CMakeLists.txt rename to opencl/test/unit_test/kernel/CMakeLists.txt diff --git a/unit_tests/kernel/clone_kernel_tests.cpp b/opencl/test/unit_test/kernel/clone_kernel_tests.cpp similarity index 100% rename from unit_tests/kernel/clone_kernel_tests.cpp rename to opencl/test/unit_test/kernel/clone_kernel_tests.cpp diff --git a/unit_tests/kernel/debug_kernel_tests.cpp b/opencl/test/unit_test/kernel/debug_kernel_tests.cpp similarity index 100% rename from unit_tests/kernel/debug_kernel_tests.cpp rename to opencl/test/unit_test/kernel/debug_kernel_tests.cpp diff --git a/unit_tests/kernel/gl/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp similarity index 100% rename from unit_tests/kernel/gl/kernel_arg_buffer_tests.cpp rename to opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp diff --git a/unit_tests/kernel/image_transformer_tests.cpp b/opencl/test/unit_test/kernel/image_transformer_tests.cpp similarity index 100% rename from unit_tests/kernel/image_transformer_tests.cpp rename to opencl/test/unit_test/kernel/image_transformer_tests.cpp diff --git a/unit_tests/kernel/kernel_accelerator_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_accelerator_arg_tests.cpp rename to opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp diff --git a/unit_tests/kernel/kernel_arg_buffer_fixture.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp similarity index 100% rename from unit_tests/kernel/kernel_arg_buffer_fixture.cpp rename to opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp diff --git a/unit_tests/kernel/kernel_arg_buffer_fixture.h b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h similarity index 100% rename from unit_tests/kernel/kernel_arg_buffer_fixture.h rename to opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h diff --git a/unit_tests/kernel/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_arg_buffer_tests.cpp rename to opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp diff --git a/unit_tests/kernel/kernel_arg_dev_queue_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_dev_queue_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_arg_dev_queue_tests.cpp rename to opencl/test/unit_test/kernel/kernel_arg_dev_queue_tests.cpp diff --git a/unit_tests/kernel/kernel_arg_info_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_arg_info_tests.cpp rename to opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp diff --git a/unit_tests/kernel/kernel_arg_pipe_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_arg_pipe_tests.cpp rename to opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp diff --git a/unit_tests/kernel/kernel_arg_svm_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_arg_svm_tests.cpp rename to opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp diff --git a/unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp rename to opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp diff --git a/unit_tests/kernel/kernel_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_image_arg_tests.cpp rename to opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp diff --git a/unit_tests/kernel/kernel_immediate_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_immediate_arg_tests.cpp rename to opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp diff --git a/unit_tests/kernel/kernel_info_cl_tests.cpp b/opencl/test/unit_test/kernel/kernel_info_cl_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_info_cl_tests.cpp rename to opencl/test/unit_test/kernel/kernel_info_cl_tests.cpp diff --git a/unit_tests/kernel/kernel_is_patched_tests.cpp b/opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_is_patched_tests.cpp rename to opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp diff --git a/unit_tests/kernel/kernel_reflection_surface_tests.cpp b/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_reflection_surface_tests.cpp rename to opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp diff --git a/unit_tests/kernel/kernel_slm_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_slm_arg_tests.cpp rename to opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp diff --git a/unit_tests/kernel/kernel_slm_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_slm_tests.cpp rename to opencl/test/unit_test/kernel/kernel_slm_tests.cpp diff --git a/unit_tests/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_tests.cpp rename to opencl/test/unit_test/kernel/kernel_tests.cpp diff --git a/unit_tests/kernel/kernel_transformable_tests.cpp b/opencl/test/unit_test/kernel/kernel_transformable_tests.cpp similarity index 100% rename from unit_tests/kernel/kernel_transformable_tests.cpp rename to opencl/test/unit_test/kernel/kernel_transformable_tests.cpp diff --git a/unit_tests/kernel/parent_kernel_tests.cpp b/opencl/test/unit_test/kernel/parent_kernel_tests.cpp similarity index 100% rename from unit_tests/kernel/parent_kernel_tests.cpp rename to opencl/test/unit_test/kernel/parent_kernel_tests.cpp diff --git a/unit_tests/kernel/substitute_kernel_heap_tests.cpp b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp similarity index 100% rename from unit_tests/kernel/substitute_kernel_heap_tests.cpp rename to opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp diff --git a/unit_tests/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt similarity index 100% rename from unit_tests/libult/CMakeLists.txt rename to opencl/test/unit_test/libult/CMakeLists.txt diff --git a/unit_tests/libult/create_command_stream.cpp b/opencl/test/unit_test/libult/create_command_stream.cpp similarity index 100% rename from unit_tests/libult/create_command_stream.cpp rename to opencl/test/unit_test/libult/create_command_stream.cpp diff --git a/unit_tests/libult/create_command_stream.h b/opencl/test/unit_test/libult/create_command_stream.h similarity index 100% rename from unit_tests/libult/create_command_stream.h rename to opencl/test/unit_test/libult/create_command_stream.h diff --git a/unit_tests/libult/create_tbx_sockets.cpp b/opencl/test/unit_test/libult/create_tbx_sockets.cpp similarity index 100% rename from unit_tests/libult/create_tbx_sockets.cpp rename to opencl/test/unit_test/libult/create_tbx_sockets.cpp diff --git a/unit_tests/libult/debug_manager.cpp b/opencl/test/unit_test/libult/debug_manager.cpp similarity index 100% rename from unit_tests/libult/debug_manager.cpp rename to opencl/test/unit_test/libult/debug_manager.cpp diff --git a/unit_tests/libult/os_interface.cpp b/opencl/test/unit_test/libult/os_interface.cpp similarity index 100% rename from unit_tests/libult/os_interface.cpp rename to opencl/test/unit_test/libult/os_interface.cpp diff --git a/unit_tests/libult/source_level_debugger.cpp b/opencl/test/unit_test/libult/source_level_debugger.cpp similarity index 100% rename from unit_tests/libult/source_level_debugger.cpp rename to opencl/test/unit_test/libult/source_level_debugger.cpp diff --git a/unit_tests/libult/source_level_debugger_library.cpp b/opencl/test/unit_test/libult/source_level_debugger_library.cpp similarity index 100% rename from unit_tests/libult/source_level_debugger_library.cpp rename to opencl/test/unit_test/libult/source_level_debugger_library.cpp diff --git a/unit_tests/libult/source_level_debugger_library.h b/opencl/test/unit_test/libult/source_level_debugger_library.h similarity index 100% rename from unit_tests/libult/source_level_debugger_library.h rename to opencl/test/unit_test/libult/source_level_debugger_library.h diff --git a/unit_tests/libult/ult_aub_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h similarity index 100% rename from unit_tests/libult/ult_aub_command_stream_receiver.h rename to opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h diff --git a/unit_tests/libult/ult_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_command_stream_receiver.h similarity index 100% rename from unit_tests/libult/ult_command_stream_receiver.h rename to opencl/test/unit_test/libult/ult_command_stream_receiver.h diff --git a/unit_tests/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt similarity index 100% rename from unit_tests/linux/CMakeLists.txt rename to opencl/test/unit_test/linux/CMakeLists.txt diff --git a/unit_tests/linux/drm_null_device_tests.cpp b/opencl/test/unit_test/linux/drm_null_device_tests.cpp similarity index 100% rename from unit_tests/linux/drm_null_device_tests.cpp rename to opencl/test/unit_test/linux/drm_null_device_tests.cpp diff --git a/unit_tests/linux/drm_other_requests.cpp b/opencl/test/unit_test/linux/drm_other_requests.cpp similarity index 100% rename from unit_tests/linux/drm_other_requests.cpp rename to opencl/test/unit_test/linux/drm_other_requests.cpp diff --git a/unit_tests/linux/drm_wrap.h b/opencl/test/unit_test/linux/drm_wrap.h similarity index 100% rename from unit_tests/linux/drm_wrap.h rename to opencl/test/unit_test/linux/drm_wrap.h diff --git a/unit_tests/linux/linux_tests_configuration.cpp b/opencl/test/unit_test/linux/linux_tests_configuration.cpp similarity index 100% rename from unit_tests/linux/linux_tests_configuration.cpp rename to opencl/test/unit_test/linux/linux_tests_configuration.cpp diff --git a/unit_tests/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp similarity index 100% rename from unit_tests/linux/main_linux_dll.cpp rename to opencl/test/unit_test/linux/main_linux_dll.cpp diff --git a/unit_tests/linux/mock_os_layer.cpp b/opencl/test/unit_test/linux/mock_os_layer.cpp similarity index 100% rename from unit_tests/linux/mock_os_layer.cpp rename to opencl/test/unit_test/linux/mock_os_layer.cpp diff --git a/unit_tests/linux/mock_os_layer.h b/opencl/test/unit_test/linux/mock_os_layer.h similarity index 100% rename from unit_tests/linux/mock_os_layer.h rename to opencl/test/unit_test/linux/mock_os_layer.h diff --git a/unit_tests/linux/test_mode.h b/opencl/test/unit_test/linux/test_mode.h similarity index 100% rename from unit_tests/linux/test_mode.h rename to opencl/test/unit_test/linux/test_mode.h diff --git a/unit_tests/linux/va_tests.cpp b/opencl/test/unit_test/linux/va_tests.cpp similarity index 100% rename from unit_tests/linux/va_tests.cpp rename to opencl/test/unit_test/linux/va_tests.cpp diff --git a/unit_tests/main.cpp b/opencl/test/unit_test/main.cpp similarity index 100% rename from unit_tests/main.cpp rename to opencl/test/unit_test/main.cpp diff --git a/unit_tests/mem_obj/CMakeLists.txt b/opencl/test/unit_test/mem_obj/CMakeLists.txt similarity index 100% rename from unit_tests/mem_obj/CMakeLists.txt rename to opencl/test/unit_test/mem_obj/CMakeLists.txt diff --git a/unit_tests/mem_obj/buffer_pin_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp similarity index 100% rename from unit_tests/mem_obj/buffer_pin_tests.cpp rename to opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp diff --git a/unit_tests/mem_obj/buffer_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp similarity index 100% rename from unit_tests/mem_obj/buffer_set_arg_tests.cpp rename to opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp diff --git a/unit_tests/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp similarity index 100% rename from unit_tests/mem_obj/buffer_tests.cpp rename to opencl/test/unit_test/mem_obj/buffer_tests.cpp diff --git a/unit_tests/mem_obj/create_image_format_tests.cpp b/opencl/test/unit_test/mem_obj/create_image_format_tests.cpp similarity index 100% rename from unit_tests/mem_obj/create_image_format_tests.cpp rename to opencl/test/unit_test/mem_obj/create_image_format_tests.cpp diff --git a/unit_tests/mem_obj/destructor_callback_tests.cpp b/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp similarity index 100% rename from unit_tests/mem_obj/destructor_callback_tests.cpp rename to opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp diff --git a/unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp b/opencl/test/unit_test/mem_obj/get_mem_object_info_subbuffer_tests.cpp similarity index 100% rename from unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp rename to opencl/test/unit_test/mem_obj/get_mem_object_info_subbuffer_tests.cpp diff --git a/unit_tests/mem_obj/get_mem_object_info_tests.cpp b/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp similarity index 100% rename from unit_tests/mem_obj/get_mem_object_info_tests.cpp rename to opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp diff --git a/unit_tests/mem_obj/image1d_tests.cpp b/opencl/test/unit_test/mem_obj/image1d_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image1d_tests.cpp rename to opencl/test/unit_test/mem_obj/image1d_tests.cpp diff --git a/unit_tests/mem_obj/image2d_from_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image2d_from_buffer_tests.cpp rename to opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp diff --git a/unit_tests/mem_obj/image2d_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image2d_tests.cpp rename to opencl/test/unit_test/mem_obj/image2d_tests.cpp diff --git a/unit_tests/mem_obj/image3d_tests.cpp b/opencl/test/unit_test/mem_obj/image3d_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image3d_tests.cpp rename to opencl/test/unit_test/mem_obj/image3d_tests.cpp diff --git a/unit_tests/mem_obj/image_array_size_tests.cpp b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_array_size_tests.cpp rename to opencl/test/unit_test/mem_obj/image_array_size_tests.cpp diff --git a/unit_tests/mem_obj/image_compression_fixture.h b/opencl/test/unit_test/mem_obj/image_compression_fixture.h similarity index 100% rename from unit_tests/mem_obj/image_compression_fixture.h rename to opencl/test/unit_test/mem_obj/image_compression_fixture.h diff --git a/unit_tests/mem_obj/image_format_tests.cpp b/opencl/test/unit_test/mem_obj/image_format_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_format_tests.cpp rename to opencl/test/unit_test/mem_obj/image_format_tests.cpp diff --git a/unit_tests/mem_obj/image_from_subbuffer_tests.cpp b/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_from_subbuffer_tests.cpp rename to opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp diff --git a/unit_tests/mem_obj/image_redescribe_tests.cpp b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_redescribe_tests.cpp rename to opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp diff --git a/unit_tests/mem_obj/image_release_mapped_ptr_tests.cpp b/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_release_mapped_ptr_tests.cpp rename to opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp diff --git a/unit_tests/mem_obj/image_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_set_arg_tests.cpp rename to opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp diff --git a/unit_tests/mem_obj/image_snorm_tests.cpp b/opencl/test/unit_test/mem_obj/image_snorm_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_snorm_tests.cpp rename to opencl/test/unit_test/mem_obj/image_snorm_tests.cpp diff --git a/unit_tests/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_tests.cpp rename to opencl/test/unit_test/mem_obj/image_tests.cpp diff --git a/unit_tests/mem_obj/image_tests_tgllp_plus.cpp b/opencl/test/unit_test/mem_obj/image_tests_tgllp_plus.cpp similarity index 100% rename from unit_tests/mem_obj/image_tests_tgllp_plus.cpp rename to opencl/test/unit_test/mem_obj/image_tests_tgllp_plus.cpp diff --git a/unit_tests/mem_obj/image_tiled_tests.cpp b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_tiled_tests.cpp rename to opencl/test/unit_test/mem_obj/image_tiled_tests.cpp diff --git a/unit_tests/mem_obj/image_transfer_tests.cpp b/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_transfer_tests.cpp rename to opencl/test/unit_test/mem_obj/image_transfer_tests.cpp diff --git a/unit_tests/mem_obj/image_validate_tests.cpp b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp similarity index 100% rename from unit_tests/mem_obj/image_validate_tests.cpp rename to opencl/test/unit_test/mem_obj/image_validate_tests.cpp diff --git a/unit_tests/mem_obj/map_operations_handler_tests.cpp b/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp similarity index 100% rename from unit_tests/mem_obj/map_operations_handler_tests.cpp rename to opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp diff --git a/unit_tests/mem_obj/mem_obj_destruction_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp similarity index 100% rename from unit_tests/mem_obj/mem_obj_destruction_tests.cpp rename to opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp diff --git a/unit_tests/mem_obj/mem_obj_helper_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp similarity index 100% rename from unit_tests/mem_obj/mem_obj_helper_tests.cpp rename to opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp diff --git a/unit_tests/mem_obj/mem_obj_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp similarity index 100% rename from unit_tests/mem_obj/mem_obj_tests.cpp rename to opencl/test/unit_test/mem_obj/mem_obj_tests.cpp diff --git a/unit_tests/mem_obj/nv12_image_tests.cpp b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp similarity index 100% rename from unit_tests/mem_obj/nv12_image_tests.cpp rename to opencl/test/unit_test/mem_obj/nv12_image_tests.cpp diff --git a/unit_tests/mem_obj/packed_yuv_image_tests.cpp b/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp similarity index 100% rename from unit_tests/mem_obj/packed_yuv_image_tests.cpp rename to opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp diff --git a/unit_tests/mem_obj/pipe_tests.cpp b/opencl/test/unit_test/mem_obj/pipe_tests.cpp similarity index 100% rename from unit_tests/mem_obj/pipe_tests.cpp rename to opencl/test/unit_test/mem_obj/pipe_tests.cpp diff --git a/unit_tests/mem_obj/sub_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp similarity index 100% rename from unit_tests/mem_obj/sub_buffer_tests.cpp rename to opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp diff --git a/unit_tests/mem_obj/zero_copy_tests.cpp b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp similarity index 100% rename from unit_tests/mem_obj/zero_copy_tests.cpp rename to opencl/test/unit_test/mem_obj/zero_copy_tests.cpp diff --git a/unit_tests/memory_manager/CMakeLists.txt b/opencl/test/unit_test/memory_manager/CMakeLists.txt similarity index 100% rename from unit_tests/memory_manager/CMakeLists.txt rename to opencl/test/unit_test/memory_manager/CMakeLists.txt diff --git a/unit_tests/memory_manager/address_mapper_tests.cpp b/opencl/test/unit_test/memory_manager/address_mapper_tests.cpp similarity index 100% rename from unit_tests/memory_manager/address_mapper_tests.cpp rename to opencl/test/unit_test/memory_manager/address_mapper_tests.cpp diff --git a/unit_tests/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp b/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp similarity index 100% rename from unit_tests/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp rename to opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp diff --git a/unit_tests/memory_manager/deferrable_allocation_deletion_tests.cpp b/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp similarity index 100% rename from unit_tests/memory_manager/deferrable_allocation_deletion_tests.cpp rename to opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp diff --git a/unit_tests/memory_manager/deferred_deleter_mt_tests.cpp b/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp similarity index 100% rename from unit_tests/memory_manager/deferred_deleter_mt_tests.cpp rename to opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp diff --git a/unit_tests/memory_manager/gfx_partition_tests.cpp b/opencl/test/unit_test/memory_manager/gfx_partition_tests.cpp similarity index 100% rename from unit_tests/memory_manager/gfx_partition_tests.cpp rename to opencl/test/unit_test/memory_manager/gfx_partition_tests.cpp diff --git a/unit_tests/memory_manager/gfx_partition_tests.inl b/opencl/test/unit_test/memory_manager/gfx_partition_tests.inl similarity index 100% rename from unit_tests/memory_manager/gfx_partition_tests.inl rename to opencl/test/unit_test/memory_manager/gfx_partition_tests.inl diff --git a/unit_tests/memory_manager/graphics_allocation_tests.cpp b/opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp similarity index 100% rename from unit_tests/memory_manager/graphics_allocation_tests.cpp rename to opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp diff --git a/unit_tests/memory_manager/host_ptr_manager_tests.cpp b/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp similarity index 100% rename from unit_tests/memory_manager/host_ptr_manager_tests.cpp rename to opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp diff --git a/unit_tests/memory_manager/internal_allocation_storage_tests.cpp b/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp similarity index 100% rename from unit_tests/memory_manager/internal_allocation_storage_tests.cpp rename to opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp diff --git a/unit_tests/memory_manager/local_memory_usage_tests.cpp b/opencl/test/unit_test/memory_manager/local_memory_usage_tests.cpp similarity index 100% rename from unit_tests/memory_manager/local_memory_usage_tests.cpp rename to opencl/test/unit_test/memory_manager/local_memory_usage_tests.cpp diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp similarity index 100% rename from unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp rename to opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl similarity index 100% rename from unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl rename to opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp similarity index 100% rename from unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp rename to opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl similarity index 100% rename from unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl rename to opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl diff --git a/unit_tests/memory_manager/memory_manager_multi_device_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp similarity index 100% rename from unit_tests/memory_manager/memory_manager_multi_device_tests.cpp rename to opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp similarity index 100% rename from unit_tests/memory_manager/memory_manager_tests.cpp rename to opencl/test/unit_test/memory_manager/memory_manager_tests.cpp diff --git a/unit_tests/memory_manager/memory_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_pool_tests.cpp similarity index 100% rename from unit_tests/memory_manager/memory_pool_tests.cpp rename to opencl/test/unit_test/memory_manager/memory_pool_tests.cpp diff --git a/unit_tests/memory_manager/page_table_tests.cpp b/opencl/test/unit_test/memory_manager/page_table_tests.cpp similarity index 100% rename from unit_tests/memory_manager/page_table_tests.cpp rename to opencl/test/unit_test/memory_manager/page_table_tests.cpp diff --git a/unit_tests/memory_manager/physical_address_allocator_tests.cpp b/opencl/test/unit_test/memory_manager/physical_address_allocator_tests.cpp similarity index 100% rename from unit_tests/memory_manager/physical_address_allocator_tests.cpp rename to opencl/test/unit_test/memory_manager/physical_address_allocator_tests.cpp diff --git a/unit_tests/memory_manager/surface_tests.cpp b/opencl/test/unit_test/memory_manager/surface_tests.cpp similarity index 100% rename from unit_tests/memory_manager/surface_tests.cpp rename to opencl/test/unit_test/memory_manager/surface_tests.cpp diff --git a/unit_tests/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp similarity index 100% rename from unit_tests/memory_manager/unified_memory_manager_tests.cpp rename to opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp diff --git a/unit_tests/memory_manager/unified_memory_token_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_token_tests.cpp similarity index 100% rename from unit_tests/memory_manager/unified_memory_token_tests.cpp rename to opencl/test/unit_test/memory_manager/unified_memory_token_tests.cpp diff --git a/unit_tests/mock_gdi/CMakeLists.txt b/opencl/test/unit_test/mock_gdi/CMakeLists.txt similarity index 100% rename from unit_tests/mock_gdi/CMakeLists.txt rename to opencl/test/unit_test/mock_gdi/CMakeLists.txt diff --git a/unit_tests/mock_gdi/gdi32_mock.def b/opencl/test/unit_test/mock_gdi/gdi32_mock.def similarity index 100% rename from unit_tests/mock_gdi/gdi32_mock.def rename to opencl/test/unit_test/mock_gdi/gdi32_mock.def diff --git a/unit_tests/mock_gdi/mock_gdi.cpp b/opencl/test/unit_test/mock_gdi/mock_gdi.cpp similarity index 100% rename from unit_tests/mock_gdi/mock_gdi.cpp rename to opencl/test/unit_test/mock_gdi/mock_gdi.cpp diff --git a/unit_tests/mock_gdi/mock_gdi.h b/opencl/test/unit_test/mock_gdi/mock_gdi.h similarity index 100% rename from unit_tests/mock_gdi/mock_gdi.h rename to opencl/test/unit_test/mock_gdi/mock_gdi.h diff --git a/unit_tests/mock_gdi/mock_gdi_gfx_partition.cpp b/opencl/test/unit_test/mock_gdi/mock_gdi_gfx_partition.cpp similarity index 100% rename from unit_tests/mock_gdi/mock_gdi_gfx_partition.cpp rename to opencl/test/unit_test/mock_gdi/mock_gdi_gfx_partition.cpp diff --git a/unit_tests/mock_gl/CMakeLists.txt b/opencl/test/unit_test/mock_gl/CMakeLists.txt similarity index 100% rename from unit_tests/mock_gl/CMakeLists.txt rename to opencl/test/unit_test/mock_gl/CMakeLists.txt diff --git a/unit_tests/mock_gl/windows/CMakeLists.txt b/opencl/test/unit_test/mock_gl/windows/CMakeLists.txt similarity index 100% rename from unit_tests/mock_gl/windows/CMakeLists.txt rename to opencl/test/unit_test/mock_gl/windows/CMakeLists.txt diff --git a/unit_tests/mock_gl/windows/mock_opengl32.cpp b/opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp similarity index 100% rename from unit_tests/mock_gl/windows/mock_opengl32.cpp rename to opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp diff --git a/unit_tests/mock_gl/windows/mock_opengl32.def b/opencl/test/unit_test/mock_gl/windows/mock_opengl32.def similarity index 100% rename from unit_tests/mock_gl/windows/mock_opengl32.def rename to opencl/test/unit_test/mock_gl/windows/mock_opengl32.def diff --git a/unit_tests/mock_gmm/CMakeLists.txt b/opencl/test/unit_test/mock_gmm/CMakeLists.txt similarity index 100% rename from unit_tests/mock_gmm/CMakeLists.txt rename to opencl/test/unit_test/mock_gmm/CMakeLists.txt diff --git a/unit_tests/mock_gmm/mock_gmm.cpp b/opencl/test/unit_test/mock_gmm/mock_gmm.cpp similarity index 100% rename from unit_tests/mock_gmm/mock_gmm.cpp rename to opencl/test/unit_test/mock_gmm/mock_gmm.cpp diff --git a/unit_tests/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt similarity index 100% rename from unit_tests/mocks/CMakeLists.txt rename to opencl/test/unit_test/mocks/CMakeLists.txt diff --git a/unit_tests/mocks/gl/CMakeLists.txt b/opencl/test/unit_test/mocks/gl/CMakeLists.txt similarity index 100% rename from unit_tests/mocks/gl/CMakeLists.txt rename to opencl/test/unit_test/mocks/gl/CMakeLists.txt diff --git a/unit_tests/mocks/gl/windows/CMakeLists.txt b/opencl/test/unit_test/mocks/gl/windows/CMakeLists.txt similarity index 100% rename from unit_tests/mocks/gl/windows/CMakeLists.txt rename to opencl/test/unit_test/mocks/gl/windows/CMakeLists.txt diff --git a/unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h b/opencl/test/unit_test/mocks/gl/windows/mock_gl_arb_sync_event_windows.h similarity index 100% rename from unit_tests/mocks/gl/windows/mock_gl_arb_sync_event_windows.h rename to opencl/test/unit_test/mocks/gl/windows/mock_gl_arb_sync_event_windows.h diff --git a/unit_tests/mocks/gl/windows/mock_gl_sharing_windows.cpp b/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.cpp similarity index 100% rename from unit_tests/mocks/gl/windows/mock_gl_sharing_windows.cpp rename to opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.cpp diff --git a/unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h b/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h similarity index 100% rename from unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h rename to opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h diff --git a/unit_tests/mocks/gmm_memory/mock_gmm_memory.h b/opencl/test/unit_test/mocks/gmm_memory/mock_gmm_memory.h similarity index 100% rename from unit_tests/mocks/gmm_memory/mock_gmm_memory.h rename to opencl/test/unit_test/mocks/gmm_memory/mock_gmm_memory.h diff --git a/unit_tests/mocks/linux/mock_drm_allocation.h b/opencl/test/unit_test/mocks/linux/mock_drm_allocation.h similarity index 100% rename from unit_tests/mocks/linux/mock_drm_allocation.h rename to opencl/test/unit_test/mocks/linux/mock_drm_allocation.h diff --git a/unit_tests/mocks/linux/mock_drm_command_stream_receiver.h b/opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h similarity index 100% rename from unit_tests/mocks/linux/mock_drm_command_stream_receiver.h rename to opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h diff --git a/unit_tests/mocks/linux/mock_drm_memory_manager.cpp b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp similarity index 100% rename from unit_tests/mocks/linux/mock_drm_memory_manager.cpp rename to opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp diff --git a/unit_tests/mocks/linux/mock_drm_memory_manager.h b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h similarity index 100% rename from unit_tests/mocks/linux/mock_drm_memory_manager.h rename to opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h diff --git a/unit_tests/mocks/mock_allocation_properties.h b/opencl/test/unit_test/mocks/mock_allocation_properties.h similarity index 100% rename from unit_tests/mocks/mock_allocation_properties.h rename to opencl/test/unit_test/mocks/mock_allocation_properties.h diff --git a/unit_tests/mocks/mock_async_event_handler.cpp b/opencl/test/unit_test/mocks/mock_async_event_handler.cpp similarity index 100% rename from unit_tests/mocks/mock_async_event_handler.cpp rename to opencl/test/unit_test/mocks/mock_async_event_handler.cpp diff --git a/unit_tests/mocks/mock_async_event_handler.h b/opencl/test/unit_test/mocks/mock_async_event_handler.h similarity index 100% rename from unit_tests/mocks/mock_async_event_handler.h rename to opencl/test/unit_test/mocks/mock_async_event_handler.h diff --git a/unit_tests/mocks/mock_aub_center.h b/opencl/test/unit_test/mocks/mock_aub_center.h similarity index 100% rename from unit_tests/mocks/mock_aub_center.h rename to opencl/test/unit_test/mocks/mock_aub_center.h diff --git a/unit_tests/mocks/mock_aub_csr.h b/opencl/test/unit_test/mocks/mock_aub_csr.h similarity index 100% rename from unit_tests/mocks/mock_aub_csr.h rename to opencl/test/unit_test/mocks/mock_aub_csr.h diff --git a/unit_tests/mocks/mock_aub_file_stream.h b/opencl/test/unit_test/mocks/mock_aub_file_stream.h similarity index 100% rename from unit_tests/mocks/mock_aub_file_stream.h rename to opencl/test/unit_test/mocks/mock_aub_file_stream.h diff --git a/unit_tests/mocks/mock_aub_manager.h b/opencl/test/unit_test/mocks/mock_aub_manager.h similarity index 100% rename from unit_tests/mocks/mock_aub_manager.h rename to opencl/test/unit_test/mocks/mock_aub_manager.h diff --git a/unit_tests/mocks/mock_aub_stream.h b/opencl/test/unit_test/mocks/mock_aub_stream.h similarity index 100% rename from unit_tests/mocks/mock_aub_stream.h rename to opencl/test/unit_test/mocks/mock_aub_stream.h diff --git a/unit_tests/mocks/mock_aub_subcapture_manager.h b/opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h similarity index 100% rename from unit_tests/mocks/mock_aub_subcapture_manager.h rename to opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h diff --git a/unit_tests/mocks/mock_block_kernel_manager.h b/opencl/test/unit_test/mocks/mock_block_kernel_manager.h similarity index 100% rename from unit_tests/mocks/mock_block_kernel_manager.h rename to opencl/test/unit_test/mocks/mock_block_kernel_manager.h diff --git a/unit_tests/mocks/mock_buffer.h b/opencl/test/unit_test/mocks/mock_buffer.h similarity index 100% rename from unit_tests/mocks/mock_buffer.h rename to opencl/test/unit_test/mocks/mock_buffer.h diff --git a/unit_tests/mocks/mock_builtin_dispatch_info_builder.h b/opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h similarity index 100% rename from unit_tests/mocks/mock_builtin_dispatch_info_builder.h rename to opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h diff --git a/unit_tests/mocks/mock_builtins.cpp b/opencl/test/unit_test/mocks/mock_builtins.cpp similarity index 100% rename from unit_tests/mocks/mock_builtins.cpp rename to opencl/test/unit_test/mocks/mock_builtins.cpp diff --git a/unit_tests/mocks/mock_builtins.h b/opencl/test/unit_test/mocks/mock_builtins.h similarity index 100% rename from unit_tests/mocks/mock_builtins.h rename to opencl/test/unit_test/mocks/mock_builtins.h diff --git a/unit_tests/mocks/mock_cif.cpp b/opencl/test/unit_test/mocks/mock_cif.cpp similarity index 100% rename from unit_tests/mocks/mock_cif.cpp rename to opencl/test/unit_test/mocks/mock_cif.cpp diff --git a/unit_tests/mocks/mock_cif.h b/opencl/test/unit_test/mocks/mock_cif.h similarity index 100% rename from unit_tests/mocks/mock_cif.h rename to opencl/test/unit_test/mocks/mock_cif.h diff --git a/unit_tests/mocks/mock_command_queue.h b/opencl/test/unit_test/mocks/mock_command_queue.h similarity index 100% rename from unit_tests/mocks/mock_command_queue.h rename to opencl/test/unit_test/mocks/mock_command_queue.h diff --git a/unit_tests/mocks/mock_compilers.cpp b/opencl/test/unit_test/mocks/mock_compilers.cpp similarity index 100% rename from unit_tests/mocks/mock_compilers.cpp rename to opencl/test/unit_test/mocks/mock_compilers.cpp diff --git a/unit_tests/mocks/mock_compilers.h b/opencl/test/unit_test/mocks/mock_compilers.h similarity index 100% rename from unit_tests/mocks/mock_compilers.h rename to opencl/test/unit_test/mocks/mock_compilers.h diff --git a/unit_tests/mocks/mock_context.cpp b/opencl/test/unit_test/mocks/mock_context.cpp similarity index 100% rename from unit_tests/mocks/mock_context.cpp rename to opencl/test/unit_test/mocks/mock_context.cpp diff --git a/unit_tests/mocks/mock_context.h b/opencl/test/unit_test/mocks/mock_context.h similarity index 100% rename from unit_tests/mocks/mock_context.h rename to opencl/test/unit_test/mocks/mock_context.h diff --git a/unit_tests/mocks/mock_csr.cpp b/opencl/test/unit_test/mocks/mock_csr.cpp similarity index 100% rename from unit_tests/mocks/mock_csr.cpp rename to opencl/test/unit_test/mocks/mock_csr.cpp diff --git a/unit_tests/mocks/mock_csr.h b/opencl/test/unit_test/mocks/mock_csr.h similarity index 100% rename from unit_tests/mocks/mock_csr.h rename to opencl/test/unit_test/mocks/mock_csr.h diff --git a/unit_tests/mocks/mock_d3d_objects.h b/opencl/test/unit_test/mocks/mock_d3d_objects.h similarity index 100% rename from unit_tests/mocks/mock_d3d_objects.h rename to opencl/test/unit_test/mocks/mock_d3d_objects.h diff --git a/unit_tests/mocks/mock_deferrable_deletion.cpp b/opencl/test/unit_test/mocks/mock_deferrable_deletion.cpp similarity index 100% rename from unit_tests/mocks/mock_deferrable_deletion.cpp rename to opencl/test/unit_test/mocks/mock_deferrable_deletion.cpp diff --git a/unit_tests/mocks/mock_deferrable_deletion.h b/opencl/test/unit_test/mocks/mock_deferrable_deletion.h similarity index 100% rename from unit_tests/mocks/mock_deferrable_deletion.h rename to opencl/test/unit_test/mocks/mock_deferrable_deletion.h diff --git a/unit_tests/mocks/mock_deferred_deleter.cpp b/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp similarity index 100% rename from unit_tests/mocks/mock_deferred_deleter.cpp rename to opencl/test/unit_test/mocks/mock_deferred_deleter.cpp diff --git a/unit_tests/mocks/mock_deferred_deleter.h b/opencl/test/unit_test/mocks/mock_deferred_deleter.h similarity index 100% rename from unit_tests/mocks/mock_deferred_deleter.h rename to opencl/test/unit_test/mocks/mock_deferred_deleter.h diff --git a/unit_tests/mocks/mock_device.cpp b/opencl/test/unit_test/mocks/mock_device.cpp similarity index 100% rename from unit_tests/mocks/mock_device.cpp rename to opencl/test/unit_test/mocks/mock_device.cpp diff --git a/unit_tests/mocks/mock_device.h b/opencl/test/unit_test/mocks/mock_device.h similarity index 100% rename from unit_tests/mocks/mock_device.h rename to opencl/test/unit_test/mocks/mock_device.h diff --git a/unit_tests/mocks/mock_device_queue.h b/opencl/test/unit_test/mocks/mock_device_queue.h similarity index 100% rename from unit_tests/mocks/mock_device_queue.h rename to opencl/test/unit_test/mocks/mock_device_queue.h diff --git a/unit_tests/mocks/mock_event.h b/opencl/test/unit_test/mocks/mock_event.h similarity index 100% rename from unit_tests/mocks/mock_event.h rename to opencl/test/unit_test/mocks/mock_event.h diff --git a/unit_tests/mocks/mock_execution_environment.h b/opencl/test/unit_test/mocks/mock_execution_environment.h similarity index 100% rename from unit_tests/mocks/mock_execution_environment.h rename to opencl/test/unit_test/mocks/mock_execution_environment.h diff --git a/unit_tests/mocks/mock_experimental_command_buffer.h b/opencl/test/unit_test/mocks/mock_experimental_command_buffer.h similarity index 100% rename from unit_tests/mocks/mock_experimental_command_buffer.h rename to opencl/test/unit_test/mocks/mock_experimental_command_buffer.h diff --git a/unit_tests/mocks/mock_gfx_partition.cpp b/opencl/test/unit_test/mocks/mock_gfx_partition.cpp similarity index 100% rename from unit_tests/mocks/mock_gfx_partition.cpp rename to opencl/test/unit_test/mocks/mock_gfx_partition.cpp diff --git a/unit_tests/mocks/mock_gfx_partition.h b/opencl/test/unit_test/mocks/mock_gfx_partition.h similarity index 100% rename from unit_tests/mocks/mock_gfx_partition.h rename to opencl/test/unit_test/mocks/mock_gfx_partition.h diff --git a/unit_tests/mocks/mock_gmm.h b/opencl/test/unit_test/mocks/mock_gmm.h similarity index 100% rename from unit_tests/mocks/mock_gmm.h rename to opencl/test/unit_test/mocks/mock_gmm.h diff --git a/unit_tests/mocks/mock_gmm_client_context.cpp b/opencl/test/unit_test/mocks/mock_gmm_client_context.cpp similarity index 100% rename from unit_tests/mocks/mock_gmm_client_context.cpp rename to opencl/test/unit_test/mocks/mock_gmm_client_context.cpp diff --git a/unit_tests/mocks/mock_gmm_client_context.h b/opencl/test/unit_test/mocks/mock_gmm_client_context.h similarity index 100% rename from unit_tests/mocks/mock_gmm_client_context.h rename to opencl/test/unit_test/mocks/mock_gmm_client_context.h diff --git a/unit_tests/mocks/mock_gmm_client_context_base.cpp b/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp similarity index 100% rename from unit_tests/mocks/mock_gmm_client_context_base.cpp rename to opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp diff --git a/unit_tests/mocks/mock_gmm_client_context_base.h b/opencl/test/unit_test/mocks/mock_gmm_client_context_base.h similarity index 100% rename from unit_tests/mocks/mock_gmm_client_context_base.h rename to opencl/test/unit_test/mocks/mock_gmm_client_context_base.h diff --git a/unit_tests/mocks/mock_gmm_memory_base.cpp b/opencl/test/unit_test/mocks/mock_gmm_memory_base.cpp similarity index 100% rename from unit_tests/mocks/mock_gmm_memory_base.cpp rename to opencl/test/unit_test/mocks/mock_gmm_memory_base.cpp diff --git a/unit_tests/mocks/mock_gmm_memory_base.h b/opencl/test/unit_test/mocks/mock_gmm_memory_base.h similarity index 100% rename from unit_tests/mocks/mock_gmm_memory_base.h rename to opencl/test/unit_test/mocks/mock_gmm_memory_base.h diff --git a/unit_tests/mocks/mock_gmm_page_table_mngr.cpp b/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp similarity index 100% rename from unit_tests/mocks/mock_gmm_page_table_mngr.cpp rename to opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp diff --git a/unit_tests/mocks/mock_gmm_page_table_mngr.h b/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h similarity index 100% rename from unit_tests/mocks/mock_gmm_page_table_mngr.h rename to opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h diff --git a/unit_tests/mocks/mock_gmm_resource_info.cpp b/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp similarity index 100% rename from unit_tests/mocks/mock_gmm_resource_info.cpp rename to opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp diff --git a/unit_tests/mocks/mock_gmm_resource_info.h b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h similarity index 100% rename from unit_tests/mocks/mock_gmm_resource_info.h rename to opencl/test/unit_test/mocks/mock_gmm_resource_info.h diff --git a/unit_tests/mocks/mock_graphics_allocation.h b/opencl/test/unit_test/mocks/mock_graphics_allocation.h similarity index 100% rename from unit_tests/mocks/mock_graphics_allocation.h rename to opencl/test/unit_test/mocks/mock_graphics_allocation.h diff --git a/unit_tests/mocks/mock_host_ptr_manager.h b/opencl/test/unit_test/mocks/mock_host_ptr_manager.h similarity index 100% rename from unit_tests/mocks/mock_host_ptr_manager.h rename to opencl/test/unit_test/mocks/mock_host_ptr_manager.h diff --git a/unit_tests/mocks/mock_hw_helper.h b/opencl/test/unit_test/mocks/mock_hw_helper.h similarity index 100% rename from unit_tests/mocks/mock_hw_helper.h rename to opencl/test/unit_test/mocks/mock_hw_helper.h diff --git a/unit_tests/mocks/mock_image.h b/opencl/test/unit_test/mocks/mock_image.h similarity index 100% rename from unit_tests/mocks/mock_image.h rename to opencl/test/unit_test/mocks/mock_image.h diff --git a/unit_tests/mocks/mock_internal_allocation_storage.h b/opencl/test/unit_test/mocks/mock_internal_allocation_storage.h similarity index 100% rename from unit_tests/mocks/mock_internal_allocation_storage.h rename to opencl/test/unit_test/mocks/mock_internal_allocation_storage.h diff --git a/unit_tests/mocks/mock_kernel.cpp b/opencl/test/unit_test/mocks/mock_kernel.cpp similarity index 100% rename from unit_tests/mocks/mock_kernel.cpp rename to opencl/test/unit_test/mocks/mock_kernel.cpp diff --git a/unit_tests/mocks/mock_kernel.h b/opencl/test/unit_test/mocks/mock_kernel.h similarity index 100% rename from unit_tests/mocks/mock_kernel.h rename to opencl/test/unit_test/mocks/mock_kernel.h diff --git a/unit_tests/mocks/mock_lrca_helper.h b/opencl/test/unit_test/mocks/mock_lrca_helper.h similarity index 100% rename from unit_tests/mocks/mock_lrca_helper.h rename to opencl/test/unit_test/mocks/mock_lrca_helper.h diff --git a/unit_tests/mocks/mock_mdi.h b/opencl/test/unit_test/mocks/mock_mdi.h similarity index 100% rename from unit_tests/mocks/mock_mdi.h rename to opencl/test/unit_test/mocks/mock_mdi.h diff --git a/unit_tests/mocks/mock_memory_manager.cpp b/opencl/test/unit_test/mocks/mock_memory_manager.cpp similarity index 100% rename from unit_tests/mocks/mock_memory_manager.cpp rename to opencl/test/unit_test/mocks/mock_memory_manager.cpp diff --git a/unit_tests/mocks/mock_memory_manager.h b/opencl/test/unit_test/mocks/mock_memory_manager.h similarity index 100% rename from unit_tests/mocks/mock_memory_manager.h rename to opencl/test/unit_test/mocks/mock_memory_manager.h diff --git a/unit_tests/mocks/mock_memory_operations_handler.h b/opencl/test/unit_test/mocks/mock_memory_operations_handler.h similarity index 100% rename from unit_tests/mocks/mock_memory_operations_handler.h rename to opencl/test/unit_test/mocks/mock_memory_operations_handler.h diff --git a/unit_tests/mocks/mock_os_context.h b/opencl/test/unit_test/mocks/mock_os_context.h similarity index 100% rename from unit_tests/mocks/mock_os_context.h rename to opencl/test/unit_test/mocks/mock_os_context.h diff --git a/unit_tests/mocks/mock_ostime.h b/opencl/test/unit_test/mocks/mock_ostime.h similarity index 100% rename from unit_tests/mocks/mock_ostime.h rename to opencl/test/unit_test/mocks/mock_ostime.h diff --git a/unit_tests/mocks/mock_ostime_win.h b/opencl/test/unit_test/mocks/mock_ostime_win.h similarity index 100% rename from unit_tests/mocks/mock_ostime_win.h rename to opencl/test/unit_test/mocks/mock_ostime_win.h diff --git a/unit_tests/mocks/mock_physical_address_allocator.h b/opencl/test/unit_test/mocks/mock_physical_address_allocator.h similarity index 100% rename from unit_tests/mocks/mock_physical_address_allocator.h rename to opencl/test/unit_test/mocks/mock_physical_address_allocator.h diff --git a/unit_tests/mocks/mock_pipe.h b/opencl/test/unit_test/mocks/mock_pipe.h similarity index 100% rename from unit_tests/mocks/mock_pipe.h rename to opencl/test/unit_test/mocks/mock_pipe.h diff --git a/unit_tests/mocks/mock_platform.cpp b/opencl/test/unit_test/mocks/mock_platform.cpp similarity index 100% rename from unit_tests/mocks/mock_platform.cpp rename to opencl/test/unit_test/mocks/mock_platform.cpp diff --git a/unit_tests/mocks/mock_platform.h b/opencl/test/unit_test/mocks/mock_platform.h similarity index 100% rename from unit_tests/mocks/mock_platform.h rename to opencl/test/unit_test/mocks/mock_platform.h diff --git a/unit_tests/mocks/mock_program.cpp b/opencl/test/unit_test/mocks/mock_program.cpp similarity index 100% rename from unit_tests/mocks/mock_program.cpp rename to opencl/test/unit_test/mocks/mock_program.cpp diff --git a/unit_tests/mocks/mock_program.h b/opencl/test/unit_test/mocks/mock_program.h similarity index 100% rename from unit_tests/mocks/mock_program.h rename to opencl/test/unit_test/mocks/mock_program.h diff --git a/unit_tests/mocks/mock_sampler.h b/opencl/test/unit_test/mocks/mock_sampler.h similarity index 100% rename from unit_tests/mocks/mock_sampler.h rename to opencl/test/unit_test/mocks/mock_sampler.h diff --git a/unit_tests/mocks/mock_sharing_factory.h b/opencl/test/unit_test/mocks/mock_sharing_factory.h similarity index 100% rename from unit_tests/mocks/mock_sharing_factory.h rename to opencl/test/unit_test/mocks/mock_sharing_factory.h diff --git a/unit_tests/mocks/mock_sip.cpp b/opencl/test/unit_test/mocks/mock_sip.cpp similarity index 100% rename from unit_tests/mocks/mock_sip.cpp rename to opencl/test/unit_test/mocks/mock_sip.cpp diff --git a/unit_tests/mocks/mock_sip.h b/opencl/test/unit_test/mocks/mock_sip.h similarity index 100% rename from unit_tests/mocks/mock_sip.h rename to opencl/test/unit_test/mocks/mock_sip.h diff --git a/unit_tests/mocks/mock_source_level_debugger.h b/opencl/test/unit_test/mocks/mock_source_level_debugger.h similarity index 100% rename from unit_tests/mocks/mock_source_level_debugger.h rename to opencl/test/unit_test/mocks/mock_source_level_debugger.h diff --git a/unit_tests/mocks/mock_submissions_aggregator.h b/opencl/test/unit_test/mocks/mock_submissions_aggregator.h similarity index 100% rename from unit_tests/mocks/mock_submissions_aggregator.h rename to opencl/test/unit_test/mocks/mock_submissions_aggregator.h diff --git a/unit_tests/mocks/mock_svm_manager.h b/opencl/test/unit_test/mocks/mock_svm_manager.h similarity index 100% rename from unit_tests/mocks/mock_svm_manager.h rename to opencl/test/unit_test/mocks/mock_svm_manager.h diff --git a/unit_tests/mocks/mock_tbx_csr.h b/opencl/test/unit_test/mocks/mock_tbx_csr.h similarity index 100% rename from unit_tests/mocks/mock_tbx_csr.h rename to opencl/test/unit_test/mocks/mock_tbx_csr.h diff --git a/unit_tests/mocks/mock_tbx_sockets.h b/opencl/test/unit_test/mocks/mock_tbx_sockets.h similarity index 100% rename from unit_tests/mocks/mock_tbx_sockets.h rename to opencl/test/unit_test/mocks/mock_tbx_sockets.h diff --git a/unit_tests/mocks/mock_tbx_stream.h b/opencl/test/unit_test/mocks/mock_tbx_stream.h similarity index 100% rename from unit_tests/mocks/mock_tbx_stream.h rename to opencl/test/unit_test/mocks/mock_tbx_stream.h diff --git a/unit_tests/mocks/mock_timestamp_container.h b/opencl/test/unit_test/mocks/mock_timestamp_container.h similarity index 100% rename from unit_tests/mocks/mock_timestamp_container.h rename to opencl/test/unit_test/mocks/mock_timestamp_container.h diff --git a/unit_tests/mocks/mock_wddm.cpp b/opencl/test/unit_test/mocks/mock_wddm.cpp similarity index 100% rename from unit_tests/mocks/mock_wddm.cpp rename to opencl/test/unit_test/mocks/mock_wddm.cpp diff --git a/unit_tests/mocks/mock_wddm.h b/opencl/test/unit_test/mocks/mock_wddm.h similarity index 100% rename from unit_tests/mocks/mock_wddm.h rename to opencl/test/unit_test/mocks/mock_wddm.h diff --git a/unit_tests/mocks/mock_wddm_interface20.h b/opencl/test/unit_test/mocks/mock_wddm_interface20.h similarity index 100% rename from unit_tests/mocks/mock_wddm_interface20.h rename to opencl/test/unit_test/mocks/mock_wddm_interface20.h diff --git a/unit_tests/mocks/mock_wddm_interface23.h b/opencl/test/unit_test/mocks/mock_wddm_interface23.h similarity index 100% rename from unit_tests/mocks/mock_wddm_interface23.h rename to opencl/test/unit_test/mocks/mock_wddm_interface23.h diff --git a/unit_tests/mocks/mock_wddm_residency_allocations_container.h b/opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h similarity index 100% rename from unit_tests/mocks/mock_wddm_residency_allocations_container.h rename to opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h diff --git a/unit_tests/mocks/wddm_mock_helpers.h b/opencl/test/unit_test/mocks/wddm_mock_helpers.h similarity index 100% rename from unit_tests/mocks/wddm_mock_helpers.h rename to opencl/test/unit_test/mocks/wddm_mock_helpers.h diff --git a/unit_tests/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/CMakeLists.txt diff --git a/unit_tests/mt_tests/api/CMakeLists.txt b/opencl/test/unit_test/mt_tests/api/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/api/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/api/CMakeLists.txt diff --git a/unit_tests/mt_tests/command_queue/CMakeLists.txt b/opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/command_queue/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt diff --git a/unit_tests/mt_tests/device_queue/CMakeLists.txt b/opencl/test/unit_test/mt_tests/device_queue/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/device_queue/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/device_queue/CMakeLists.txt diff --git a/unit_tests/mt_tests/device_queue/device_queue_mt_tests.cpp b/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp similarity index 100% rename from unit_tests/mt_tests/device_queue/device_queue_mt_tests.cpp rename to opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp diff --git a/unit_tests/mt_tests/event/CMakeLists.txt b/opencl/test/unit_test/mt_tests/event/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/event/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/event/CMakeLists.txt diff --git a/unit_tests/mt_tests/fixtures/CMakeLists.txt b/opencl/test/unit_test/mt_tests/fixtures/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/fixtures/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/fixtures/CMakeLists.txt diff --git a/unit_tests/mt_tests/helpers/CMakeLists.txt b/opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/helpers/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt diff --git a/unit_tests/mt_tests/helpers/interlocked_max_mt_tests.cpp b/opencl/test/unit_test/mt_tests/helpers/interlocked_max_mt_tests.cpp similarity index 100% rename from unit_tests/mt_tests/helpers/interlocked_max_mt_tests.cpp rename to opencl/test/unit_test/mt_tests/helpers/interlocked_max_mt_tests.cpp diff --git a/unit_tests/mt_tests/memory_manager/CMakeLists.txt b/opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/memory_manager/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt diff --git a/unit_tests/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp b/opencl/test/unit_test/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp similarity index 100% rename from unit_tests/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp rename to opencl/test/unit_test/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp diff --git a/unit_tests/mt_tests/os_interface/CMakeLists.txt b/opencl/test/unit_test/mt_tests/os_interface/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/os_interface/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/os_interface/CMakeLists.txt diff --git a/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp b/opencl/test/unit_test/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp similarity index 100% rename from unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp rename to opencl/test/unit_test/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp diff --git a/unit_tests/mt_tests/test_mode.h b/opencl/test/unit_test/mt_tests/test_mode.h similarity index 100% rename from unit_tests/mt_tests/test_mode.h rename to opencl/test/unit_test/mt_tests/test_mode.h diff --git a/unit_tests/mt_tests/utilities/CMakeLists.txt b/opencl/test/unit_test/mt_tests/utilities/CMakeLists.txt similarity index 100% rename from unit_tests/mt_tests/utilities/CMakeLists.txt rename to opencl/test/unit_test/mt_tests/utilities/CMakeLists.txt diff --git a/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp b/opencl/test/unit_test/mt_tests/utilities/reference_tracked_object_tests_mt.cpp similarity index 100% rename from unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp rename to opencl/test/unit_test/mt_tests/utilities/reference_tracked_object_tests_mt.cpp diff --git a/unit_tests/offline_compiler/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/CMakeLists.txt similarity index 100% rename from unit_tests/offline_compiler/CMakeLists.txt rename to opencl/test/unit_test/offline_compiler/CMakeLists.txt diff --git a/unit_tests/offline_compiler/decoder/decoder_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp similarity index 100% rename from unit_tests/offline_compiler/decoder/decoder_tests.cpp rename to opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp diff --git a/unit_tests/offline_compiler/decoder/encoder_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp similarity index 100% rename from unit_tests/offline_compiler/decoder/encoder_tests.cpp rename to opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp diff --git a/unit_tests/offline_compiler/decoder/mock/mock_decoder.h b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_decoder.h similarity index 100% rename from unit_tests/offline_compiler/decoder/mock/mock_decoder.h rename to opencl/test/unit_test/offline_compiler/decoder/mock/mock_decoder.h diff --git a/unit_tests/offline_compiler/decoder/mock/mock_encoder.h b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h similarity index 100% rename from unit_tests/offline_compiler/decoder/mock/mock_encoder.h rename to opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h diff --git a/unit_tests/offline_compiler/decoder/mock/mock_iga_wrapper.h b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_iga_wrapper.h similarity index 100% rename from unit_tests/offline_compiler/decoder/mock/mock_iga_wrapper.h rename to opencl/test/unit_test/offline_compiler/decoder/mock/mock_iga_wrapper.h diff --git a/unit_tests/offline_compiler/environment.h b/opencl/test/unit_test/offline_compiler/environment.h similarity index 100% rename from unit_tests/offline_compiler/environment.h rename to opencl/test/unit_test/offline_compiler/environment.h diff --git a/unit_tests/offline_compiler/main.cpp b/opencl/test/unit_test/offline_compiler/main.cpp similarity index 100% rename from unit_tests/offline_compiler/main.cpp rename to opencl/test/unit_test/offline_compiler/main.cpp diff --git a/unit_tests/offline_compiler/mock/mock_offline_compiler.h b/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h similarity index 100% rename from unit_tests/offline_compiler/mock/mock_offline_compiler.h rename to opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h diff --git a/unit_tests/offline_compiler/mock/mock_sip_ocloc_tests.cpp b/opencl/test/unit_test/offline_compiler/mock/mock_sip_ocloc_tests.cpp similarity index 100% rename from unit_tests/offline_compiler/mock/mock_sip_ocloc_tests.cpp rename to opencl/test/unit_test/offline_compiler/mock/mock_sip_ocloc_tests.cpp diff --git a/unit_tests/offline_compiler/ocloc_fatbinary_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp similarity index 100% rename from unit_tests/offline_compiler/ocloc_fatbinary_tests.cpp rename to opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp diff --git a/unit_tests/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp similarity index 100% rename from unit_tests/offline_compiler/offline_compiler_tests.cpp rename to opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp diff --git a/unit_tests/offline_compiler/offline_compiler_tests.h b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.h similarity index 100% rename from unit_tests/offline_compiler/offline_compiler_tests.h rename to opencl/test/unit_test/offline_compiler/offline_compiler_tests.h diff --git a/unit_tests/offline_compiler/segfault_test/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt similarity index 100% rename from unit_tests/offline_compiler/segfault_test/CMakeLists.txt rename to opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt diff --git a/unit_tests/offline_compiler/segfault_test/linux/safety_guard_caller_linux.cpp b/opencl/test/unit_test/offline_compiler/segfault_test/linux/safety_guard_caller_linux.cpp similarity index 100% rename from unit_tests/offline_compiler/segfault_test/linux/safety_guard_caller_linux.cpp rename to opencl/test/unit_test/offline_compiler/segfault_test/linux/safety_guard_caller_linux.cpp diff --git a/unit_tests/offline_compiler/segfault_test/main.cpp b/opencl/test/unit_test/offline_compiler/segfault_test/main.cpp similarity index 100% rename from unit_tests/offline_compiler/segfault_test/main.cpp rename to opencl/test/unit_test/offline_compiler/segfault_test/main.cpp diff --git a/unit_tests/offline_compiler/segfault_test/segfault_helper.h b/opencl/test/unit_test/offline_compiler/segfault_test/segfault_helper.h similarity index 100% rename from unit_tests/offline_compiler/segfault_test/segfault_helper.h rename to opencl/test/unit_test/offline_compiler/segfault_test/segfault_helper.h diff --git a/unit_tests/offline_compiler/segfault_test/windows/safety_guard_caller_windows.cpp b/opencl/test/unit_test/offline_compiler/segfault_test/windows/safety_guard_caller_windows.cpp similarity index 100% rename from unit_tests/offline_compiler/segfault_test/windows/safety_guard_caller_windows.cpp rename to opencl/test/unit_test/offline_compiler/segfault_test/windows/safety_guard_caller_windows.cpp diff --git a/unit_tests/options_unit_tests.cpp b/opencl/test/unit_test/options_unit_tests.cpp similarity index 100% rename from unit_tests/options_unit_tests.cpp rename to opencl/test/unit_test/options_unit_tests.cpp diff --git a/unit_tests/os_interface/CMakeLists.txt b/opencl/test/unit_test/os_interface/CMakeLists.txt similarity index 100% rename from unit_tests/os_interface/CMakeLists.txt rename to opencl/test/unit_test/os_interface/CMakeLists.txt diff --git a/unit_tests/os_interface/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/device_factory_tests.cpp similarity index 100% rename from unit_tests/os_interface/device_factory_tests.cpp rename to opencl/test/unit_test/os_interface/device_factory_tests.cpp diff --git a/unit_tests/os_interface/hw_info_config_tests.cpp b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp similarity index 100% rename from unit_tests/os_interface/hw_info_config_tests.cpp rename to opencl/test/unit_test/os_interface/hw_info_config_tests.cpp diff --git a/unit_tests/os_interface/hw_info_config_tests.h b/opencl/test/unit_test/os_interface/hw_info_config_tests.h similarity index 100% rename from unit_tests/os_interface/hw_info_config_tests.h rename to opencl/test/unit_test/os_interface/hw_info_config_tests.h diff --git a/unit_tests/os_interface/linux/.clang-tidy b/opencl/test/unit_test/os_interface/linux/.clang-tidy similarity index 100% rename from unit_tests/os_interface/linux/.clang-tidy rename to opencl/test/unit_test/os_interface/linux/.clang-tidy diff --git a/unit_tests/os_interface/linux/CMakeLists.txt b/opencl/test/unit_test/os_interface/linux/CMakeLists.txt similarity index 100% rename from unit_tests/os_interface/linux/CMakeLists.txt rename to opencl/test/unit_test/os_interface/linux/CMakeLists.txt diff --git a/unit_tests/os_interface/linux/allocator_helper.cpp b/opencl/test/unit_test/os_interface/linux/allocator_helper.cpp similarity index 100% rename from unit_tests/os_interface/linux/allocator_helper.cpp rename to opencl/test/unit_test/os_interface/linux/allocator_helper.cpp diff --git a/unit_tests/os_interface/linux/allocator_helper_tests.cpp b/opencl/test/unit_test/os_interface/linux/allocator_helper_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/allocator_helper_tests.cpp rename to opencl/test/unit_test/os_interface/linux/allocator_helper_tests.cpp diff --git a/unit_tests/os_interface/linux/create_drm_memory_manager.cpp b/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp similarity index 100% rename from unit_tests/os_interface/linux/create_drm_memory_manager.cpp rename to opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp diff --git a/unit_tests/os_interface/linux/debug_env_reader.cpp b/opencl/test/unit_test/os_interface/linux/debug_env_reader.cpp similarity index 100% rename from unit_tests/os_interface/linux/debug_env_reader.cpp rename to opencl/test/unit_test/os_interface/linux/debug_env_reader.cpp diff --git a/unit_tests/os_interface/linux/device_command_stream_fixture.h b/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h similarity index 100% rename from unit_tests/os_interface/linux/device_command_stream_fixture.h rename to opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h diff --git a/unit_tests/os_interface/linux/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/device_command_stream_tests.cpp rename to opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp diff --git a/unit_tests/os_interface/linux/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/device_factory_tests.cpp rename to opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp diff --git a/unit_tests/os_interface/linux/device_factory_tests.h b/opencl/test/unit_test/os_interface/linux/device_factory_tests.h similarity index 100% rename from unit_tests/os_interface/linux/device_factory_tests.h rename to opencl/test/unit_test/os_interface/linux/device_factory_tests.h diff --git a/unit_tests/os_interface/linux/device_os_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/device_os_tests.cpp rename to opencl/test/unit_test/os_interface/linux/device_os_tests.cpp diff --git a/unit_tests/os_interface/linux/driver_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/driver_info_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/driver_info_tests.cpp rename to opencl/test/unit_test/os_interface/linux/driver_info_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_buffer_object_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_buffer_object_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_command_stream_fixture.h b/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h similarity index 100% rename from unit_tests/os_interface/linux/drm_command_stream_fixture.h rename to opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h diff --git a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_command_stream_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_engine_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_engine_info_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_mapper_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_mapper_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_mapper_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_mapper_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_memory_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_memory_info_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_memory_manager_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h similarity index 100% rename from unit_tests/os_interface/linux/drm_memory_manager_tests.h rename to opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h diff --git a/unit_tests/os_interface/linux/drm_mock.cpp b/opencl/test/unit_test/os_interface/linux/drm_mock.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_mock.cpp rename to opencl/test/unit_test/os_interface/linux/drm_mock.cpp diff --git a/unit_tests/os_interface/linux/drm_mock.h b/opencl/test/unit_test/os_interface/linux/drm_mock.h similarity index 100% rename from unit_tests/os_interface/linux/drm_mock.h rename to opencl/test/unit_test/os_interface/linux/drm_mock.h diff --git a/unit_tests/os_interface/linux/drm_neo_create.cpp b/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_neo_create.cpp rename to opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp diff --git a/unit_tests/os_interface/linux/drm_os_memory_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_os_memory_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_os_memory_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_os_memory_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_residency_handler_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp diff --git a/unit_tests/os_interface/linux/drm_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/drm_tests.cpp rename to opencl/test/unit_test/os_interface/linux/drm_tests.cpp diff --git a/unit_tests/os_interface/linux/file_logger_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/file_logger_linux_tests.cpp rename to opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp diff --git a/unit_tests/os_interface/linux/hw_info_config_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/hw_info_config_linux_tests.cpp rename to opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp diff --git a/unit_tests/os_interface/linux/hw_info_config_linux_tests.h b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h similarity index 100% rename from unit_tests/os_interface/linux/hw_info_config_linux_tests.h rename to opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h diff --git a/unit_tests/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp rename to opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp diff --git a/unit_tests/os_interface/linux/mock_os_time_linux.h b/opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h similarity index 100% rename from unit_tests/os_interface/linux/mock_os_time_linux.h rename to opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h diff --git a/unit_tests/os_interface/linux/mock_performance_counters_linux.cpp b/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp similarity index 100% rename from unit_tests/os_interface/linux/mock_performance_counters_linux.cpp rename to opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp diff --git a/unit_tests/os_interface/linux/mock_performance_counters_linux.h b/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.h similarity index 100% rename from unit_tests/os_interface/linux/mock_performance_counters_linux.h rename to opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.h diff --git a/unit_tests/os_interface/linux/options.cpp b/opencl/test/unit_test/os_interface/linux/options.cpp similarity index 100% rename from unit_tests/os_interface/linux/options.cpp rename to opencl/test/unit_test/os_interface/linux/options.cpp diff --git a/unit_tests/os_interface/linux/os_interface_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/os_interface_linux_tests.cpp rename to opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp diff --git a/unit_tests/os_interface/linux/os_time_test.cpp b/opencl/test/unit_test/os_interface/linux/os_time_test.cpp similarity index 100% rename from unit_tests/os_interface/linux/os_time_test.cpp rename to opencl/test/unit_test/os_interface/linux/os_time_test.cpp diff --git a/unit_tests/os_interface/linux/performance_counters_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp similarity index 100% rename from unit_tests/os_interface/linux/performance_counters_linux_tests.cpp rename to opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp diff --git a/unit_tests/os_interface/linux/self_lib_lin.cpp b/opencl/test/unit_test/os_interface/linux/self_lib_lin.cpp similarity index 100% rename from unit_tests/os_interface/linux/self_lib_lin.cpp rename to opencl/test/unit_test/os_interface/linux/self_lib_lin.cpp diff --git a/unit_tests/os_interface/linux/sys_calls_linux_ult.cpp b/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp similarity index 100% rename from unit_tests/os_interface/linux/sys_calls_linux_ult.cpp rename to opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp diff --git a/unit_tests/os_interface/mock_performance_counters.cpp b/opencl/test/unit_test/os_interface/mock_performance_counters.cpp similarity index 100% rename from unit_tests/os_interface/mock_performance_counters.cpp rename to opencl/test/unit_test/os_interface/mock_performance_counters.cpp diff --git a/unit_tests/os_interface/mock_performance_counters.h b/opencl/test/unit_test/os_interface/mock_performance_counters.h similarity index 100% rename from unit_tests/os_interface/mock_performance_counters.h rename to opencl/test/unit_test/os_interface/mock_performance_counters.h diff --git a/unit_tests/os_interface/os_context_tests.cpp b/opencl/test/unit_test/os_interface/os_context_tests.cpp similarity index 100% rename from unit_tests/os_interface/os_context_tests.cpp rename to opencl/test/unit_test/os_interface/os_context_tests.cpp diff --git a/unit_tests/os_interface/os_interface_tests.cpp b/opencl/test/unit_test/os_interface/os_interface_tests.cpp similarity index 100% rename from unit_tests/os_interface/os_interface_tests.cpp rename to opencl/test/unit_test/os_interface/os_interface_tests.cpp diff --git a/unit_tests/os_interface/os_library_tests.cpp b/opencl/test/unit_test/os_interface/os_library_tests.cpp similarity index 100% rename from unit_tests/os_interface/os_library_tests.cpp rename to opencl/test/unit_test/os_interface/os_library_tests.cpp diff --git a/unit_tests/os_interface/os_memory_tests.cpp b/opencl/test/unit_test/os_interface/os_memory_tests.cpp similarity index 100% rename from unit_tests/os_interface/os_memory_tests.cpp rename to opencl/test/unit_test/os_interface/os_memory_tests.cpp diff --git a/unit_tests/os_interface/performance_counters_gen_tests.cpp b/opencl/test/unit_test/os_interface/performance_counters_gen_tests.cpp similarity index 100% rename from unit_tests/os_interface/performance_counters_gen_tests.cpp rename to opencl/test/unit_test/os_interface/performance_counters_gen_tests.cpp diff --git a/unit_tests/os_interface/performance_counters_tests.cpp b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp similarity index 100% rename from unit_tests/os_interface/performance_counters_tests.cpp rename to opencl/test/unit_test/os_interface/performance_counters_tests.cpp diff --git a/unit_tests/os_interface/windows/CMakeLists.txt b/opencl/test/unit_test/os_interface/windows/CMakeLists.txt similarity index 100% rename from unit_tests/os_interface/windows/CMakeLists.txt rename to opencl/test/unit_test/os_interface/windows/CMakeLists.txt diff --git a/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp b/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp similarity index 100% rename from unit_tests/os_interface/windows/create_wddm_memory_manager.cpp rename to opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp diff --git a/unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/deferrable_deletion_win_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp rename to opencl/test/unit_test/os_interface/windows/deferrable_deletion_win_tests.cpp diff --git a/unit_tests/os_interface/windows/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/device_command_stream_tests.cpp rename to opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp diff --git a/unit_tests/os_interface/windows/device_os_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_os_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/device_os_tests.cpp rename to opencl/test/unit_test/os_interface/windows/device_os_tests.cpp diff --git a/unit_tests/os_interface/windows/driver_info_tests.cpp b/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/driver_info_tests.cpp rename to opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp diff --git a/unit_tests/os_interface/windows/file_logger_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/file_logger_win_tests.cpp rename to opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp diff --git a/unit_tests/os_interface/windows/gdi_dll_fixture.h b/opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h similarity index 100% rename from unit_tests/os_interface/windows/gdi_dll_fixture.h rename to opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h diff --git a/unit_tests/os_interface/windows/gl/CMakeLists.txt b/opencl/test/unit_test/os_interface/windows/gl/CMakeLists.txt similarity index 100% rename from unit_tests/os_interface/windows/gl/CMakeLists.txt rename to opencl/test/unit_test/os_interface/windows/gl/CMakeLists.txt diff --git a/unit_tests/os_interface/windows/gl/gl_dll_helper.h b/opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h similarity index 100% rename from unit_tests/os_interface/windows/gl/gl_dll_helper.h rename to opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h diff --git a/unit_tests/os_interface/windows/gl/gl_options.cpp b/opencl/test/unit_test/os_interface/windows/gl/gl_options.cpp similarity index 100% rename from unit_tests/os_interface/windows/gl/gl_options.cpp rename to opencl/test/unit_test/os_interface/windows/gl/gl_options.cpp diff --git a/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp b/opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp rename to opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp diff --git a/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/hw_info_config_win_tests.cpp rename to opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp diff --git a/unit_tests/os_interface/windows/hw_info_config_win_tests.h b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h similarity index 100% rename from unit_tests/os_interface/windows/hw_info_config_win_tests.h rename to opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h diff --git a/unit_tests/os_interface/windows/mock_environment_variables.cpp b/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp similarity index 100% rename from unit_tests/os_interface/windows/mock_environment_variables.cpp rename to opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp diff --git a/unit_tests/os_interface/windows/mock_environment_variables.h b/opencl/test/unit_test/os_interface/windows/mock_environment_variables.h similarity index 100% rename from unit_tests/os_interface/windows/mock_environment_variables.h rename to opencl/test/unit_test/os_interface/windows/mock_environment_variables.h diff --git a/unit_tests/os_interface/windows/mock_kmdaf_listener.h b/opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h similarity index 100% rename from unit_tests/os_interface/windows/mock_kmdaf_listener.h rename to opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h diff --git a/unit_tests/os_interface/windows/mock_os_time_win.h b/opencl/test/unit_test/os_interface/windows/mock_os_time_win.h similarity index 100% rename from unit_tests/os_interface/windows/mock_os_time_win.h rename to opencl/test/unit_test/os_interface/windows/mock_os_time_win.h diff --git a/unit_tests/os_interface/windows/mock_performance_counters_win.cpp b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp similarity index 100% rename from unit_tests/os_interface/windows/mock_performance_counters_win.cpp rename to opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp diff --git a/unit_tests/os_interface/windows/mock_performance_counters_win.h b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.h similarity index 100% rename from unit_tests/os_interface/windows/mock_performance_counters_win.h rename to opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.h diff --git a/unit_tests/os_interface/windows/mock_registry_reader.cpp b/opencl/test/unit_test/os_interface/windows/mock_registry_reader.cpp similarity index 100% rename from unit_tests/os_interface/windows/mock_registry_reader.cpp rename to opencl/test/unit_test/os_interface/windows/mock_registry_reader.cpp diff --git a/unit_tests/os_interface/windows/mock_wddm_allocation.h b/opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h similarity index 100% rename from unit_tests/os_interface/windows/mock_wddm_allocation.h rename to opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h diff --git a/unit_tests/os_interface/windows/mock_wddm_memory_manager.h b/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h similarity index 100% rename from unit_tests/os_interface/windows/mock_wddm_memory_manager.h rename to opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h diff --git a/unit_tests/os_interface/windows/options.cpp b/opencl/test/unit_test/os_interface/windows/options.cpp similarity index 100% rename from unit_tests/os_interface/windows/options.cpp rename to opencl/test/unit_test/os_interface/windows/options.cpp index 38faaa2899..571dffe23f 100644 --- a/unit_tests/os_interface/windows/options.cpp +++ b/opencl/test/unit_test/os_interface/windows/options.cpp @@ -5,9 +5,9 @@ * */ -#include "common/gtsysinfo.h" #include "core/os_interface/os_library.h" +#include "common/gtsysinfo.h" #include "igfxfmid.h" namespace Os { diff --git a/unit_tests/os_interface/windows/os_context_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/os_context_win_tests.cpp rename to opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp diff --git a/unit_tests/os_interface/windows/os_interface_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/os_interface_win_tests.cpp rename to opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp diff --git a/unit_tests/os_interface/windows/os_interface_win_tests.h b/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.h similarity index 100% rename from unit_tests/os_interface/windows/os_interface_win_tests.h rename to opencl/test/unit_test/os_interface/windows/os_interface_win_tests.h diff --git a/unit_tests/os_interface/windows/os_library_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/os_library_win_tests.cpp rename to opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp diff --git a/unit_tests/os_interface/windows/os_time_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/os_time_win_tests.cpp rename to opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp diff --git a/unit_tests/os_interface/windows/performance_counters_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/performance_counters_win_tests.cpp rename to opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp diff --git a/unit_tests/os_interface/windows/registry_reader_tests.cpp b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/registry_reader_tests.cpp rename to opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp diff --git a/unit_tests/os_interface/windows/registry_reader_tests.h b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.h similarity index 100% rename from unit_tests/os_interface/windows/registry_reader_tests.h rename to opencl/test/unit_test/os_interface/windows/registry_reader_tests.h diff --git a/unit_tests/os_interface/windows/self_lib_win.cpp b/opencl/test/unit_test/os_interface/windows/self_lib_win.cpp similarity index 100% rename from unit_tests/os_interface/windows/self_lib_win.cpp rename to opencl/test/unit_test/os_interface/windows/self_lib_win.cpp diff --git a/unit_tests/os_interface/windows/sys_calls.cpp b/opencl/test/unit_test/os_interface/windows/sys_calls.cpp similarity index 100% rename from unit_tests/os_interface/windows/sys_calls.cpp rename to opencl/test/unit_test/os_interface/windows/sys_calls.cpp diff --git a/unit_tests/os_interface/windows/ult_dxgi_factory.cpp b/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp similarity index 100% rename from unit_tests/os_interface/windows/ult_dxgi_factory.cpp rename to opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp diff --git a/unit_tests/os_interface/windows/ult_dxgi_factory.h b/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h similarity index 100% rename from unit_tests/os_interface/windows/ult_dxgi_factory.h rename to opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm20_tests.cpp rename to opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp diff --git a/unit_tests/os_interface/windows/wddm23_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm23_tests.cpp rename to opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp diff --git a/unit_tests/os_interface/windows/wddm_address_space_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm_address_space_tests.cpp rename to opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp diff --git a/unit_tests/os_interface/windows/wddm_calls.cpp b/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm_calls.cpp rename to opencl/test/unit_test/os_interface/windows/wddm_calls.cpp diff --git a/unit_tests/os_interface/windows/wddm_create.cpp b/opencl/test/unit_test/os_interface/windows/wddm_create.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm_create.cpp rename to opencl/test/unit_test/os_interface/windows/wddm_create.cpp diff --git a/unit_tests/os_interface/windows/wddm_fixture.h b/opencl/test/unit_test/os_interface/windows/wddm_fixture.h similarity index 100% rename from unit_tests/os_interface/windows/wddm_fixture.h rename to opencl/test/unit_test/os_interface/windows/wddm_fixture.h diff --git a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp rename to opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp diff --git a/unit_tests/os_interface/windows/wddm_mapper_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm_mapper_tests.cpp rename to opencl/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp rename to opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl similarity index 100% rename from unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl rename to opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp rename to opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h similarity index 100% rename from unit_tests/os_interface/windows/wddm_memory_manager_tests.h rename to opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h diff --git a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp rename to opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp diff --git a/unit_tests/os_interface/windows/wddm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp similarity index 100% rename from unit_tests/os_interface/windows/wddm_residency_handler_tests.cpp rename to opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp diff --git a/unit_tests/page_fault_manager_tests/CMakeLists.txt b/opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt similarity index 100% rename from unit_tests/page_fault_manager_tests/CMakeLists.txt rename to opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt diff --git a/unit_tests/perf_tests/CMakeLists.txt b/opencl/test/unit_test/perf_tests/CMakeLists.txt similarity index 100% rename from unit_tests/perf_tests/CMakeLists.txt rename to opencl/test/unit_test/perf_tests/CMakeLists.txt diff --git a/unit_tests/perf_tests/api/CMakeLists.txt b/opencl/test/unit_test/perf_tests/api/CMakeLists.txt similarity index 100% rename from unit_tests/perf_tests/api/CMakeLists.txt rename to opencl/test/unit_test/perf_tests/api/CMakeLists.txt diff --git a/unit_tests/perf_tests/api/api_tests.cpp b/opencl/test/unit_test/perf_tests/api/api_tests.cpp similarity index 100% rename from unit_tests/perf_tests/api/api_tests.cpp rename to opencl/test/unit_test/perf_tests/api/api_tests.cpp diff --git a/unit_tests/perf_tests/api/api_tests.h b/opencl/test/unit_test/perf_tests/api/api_tests.h similarity index 100% rename from unit_tests/perf_tests/api/api_tests.h rename to opencl/test/unit_test/perf_tests/api/api_tests.h diff --git a/unit_tests/perf_tests/api/context_tests.cpp b/opencl/test/unit_test/perf_tests/api/context_tests.cpp similarity index 100% rename from unit_tests/perf_tests/api/context_tests.cpp rename to opencl/test/unit_test/perf_tests/api/context_tests.cpp diff --git a/unit_tests/perf_tests/fixtures/CMakeLists.txt b/opencl/test/unit_test/perf_tests/fixtures/CMakeLists.txt similarity index 100% rename from unit_tests/perf_tests/fixtures/CMakeLists.txt rename to opencl/test/unit_test/perf_tests/fixtures/CMakeLists.txt diff --git a/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp similarity index 100% rename from unit_tests/perf_tests/fixtures/command_queue_fixture.cpp rename to opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp diff --git a/unit_tests/perf_tests/fixtures/command_queue_fixture.h b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.h similarity index 100% rename from unit_tests/perf_tests/fixtures/command_queue_fixture.h rename to opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.h diff --git a/unit_tests/perf_tests/fixtures/device_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/device_fixture.cpp similarity index 100% rename from unit_tests/perf_tests/fixtures/device_fixture.cpp rename to opencl/test/unit_test/perf_tests/fixtures/device_fixture.cpp diff --git a/unit_tests/perf_tests/fixtures/device_fixture.h b/opencl/test/unit_test/perf_tests/fixtures/device_fixture.h similarity index 100% rename from unit_tests/perf_tests/fixtures/device_fixture.h rename to opencl/test/unit_test/perf_tests/fixtures/device_fixture.h diff --git a/unit_tests/perf_tests/fixtures/platform_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp similarity index 100% rename from unit_tests/perf_tests/fixtures/platform_fixture.cpp rename to opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp diff --git a/unit_tests/perf_tests/fixtures/platform_fixture.h b/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.h similarity index 100% rename from unit_tests/perf_tests/fixtures/platform_fixture.h rename to opencl/test/unit_test/perf_tests/fixtures/platform_fixture.h diff --git a/unit_tests/perf_tests/options_perf_tests.cpp b/opencl/test/unit_test/perf_tests/options_perf_tests.cpp similarity index 100% rename from unit_tests/perf_tests/options_perf_tests.cpp rename to opencl/test/unit_test/perf_tests/options_perf_tests.cpp diff --git a/unit_tests/perf_tests/perf_test_utils.cpp b/opencl/test/unit_test/perf_tests/perf_test_utils.cpp similarity index 100% rename from unit_tests/perf_tests/perf_test_utils.cpp rename to opencl/test/unit_test/perf_tests/perf_test_utils.cpp diff --git a/unit_tests/perf_tests/perf_test_utils.h b/opencl/test/unit_test/perf_tests/perf_test_utils.h similarity index 100% rename from unit_tests/perf_tests/perf_test_utils.h rename to opencl/test/unit_test/perf_tests/perf_test_utils.h diff --git a/unit_tests/platform/CMakeLists.txt b/opencl/test/unit_test/platform/CMakeLists.txt similarity index 100% rename from unit_tests/platform/CMakeLists.txt rename to opencl/test/unit_test/platform/CMakeLists.txt diff --git a/unit_tests/platform/platform_icd_tests.cpp b/opencl/test/unit_test/platform/platform_icd_tests.cpp similarity index 100% rename from unit_tests/platform/platform_icd_tests.cpp rename to opencl/test/unit_test/platform/platform_icd_tests.cpp diff --git a/unit_tests/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp similarity index 100% rename from unit_tests/platform/platform_tests.cpp rename to opencl/test/unit_test/platform/platform_tests.cpp diff --git a/unit_tests/profiling/CMakeLists.txt b/opencl/test/unit_test/profiling/CMakeLists.txt similarity index 100% rename from unit_tests/profiling/CMakeLists.txt rename to opencl/test/unit_test/profiling/CMakeLists.txt diff --git a/unit_tests/profiling/profiling_tests.cpp b/opencl/test/unit_test/profiling/profiling_tests.cpp similarity index 100% rename from unit_tests/profiling/profiling_tests.cpp rename to opencl/test/unit_test/profiling/profiling_tests.cpp diff --git a/unit_tests/program/CMakeLists.txt b/opencl/test/unit_test/program/CMakeLists.txt similarity index 100% rename from unit_tests/program/CMakeLists.txt rename to opencl/test/unit_test/program/CMakeLists.txt diff --git a/unit_tests/program/block_kernel_manager_tests.cpp b/opencl/test/unit_test/program/block_kernel_manager_tests.cpp similarity index 100% rename from unit_tests/program/block_kernel_manager_tests.cpp rename to opencl/test/unit_test/program/block_kernel_manager_tests.cpp diff --git a/unit_tests/program/evaluate_unhandled_token_tests.cpp b/opencl/test/unit_test/program/evaluate_unhandled_token_tests.cpp similarity index 100% rename from unit_tests/program/evaluate_unhandled_token_tests.cpp rename to opencl/test/unit_test/program/evaluate_unhandled_token_tests.cpp diff --git a/unit_tests/program/kernel_data.cpp b/opencl/test/unit_test/program/kernel_data.cpp similarity index 100% rename from unit_tests/program/kernel_data.cpp rename to opencl/test/unit_test/program/kernel_data.cpp diff --git a/unit_tests/program/kernel_data_OCL2_0.cpp b/opencl/test/unit_test/program/kernel_data_OCL2_0.cpp similarity index 100% rename from unit_tests/program/kernel_data_OCL2_0.cpp rename to opencl/test/unit_test/program/kernel_data_OCL2_0.cpp diff --git a/unit_tests/program/kernel_info_from_patchtokens_tests.cpp b/opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp similarity index 100% rename from unit_tests/program/kernel_info_from_patchtokens_tests.cpp rename to opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp diff --git a/unit_tests/program/kernel_info_tests.cpp b/opencl/test/unit_test/program/kernel_info_tests.cpp similarity index 100% rename from unit_tests/program/kernel_info_tests.cpp rename to opencl/test/unit_test/program/kernel_info_tests.cpp diff --git a/unit_tests/program/printf_handler_tests.cpp b/opencl/test/unit_test/program/printf_handler_tests.cpp similarity index 100% rename from unit_tests/program/printf_handler_tests.cpp rename to opencl/test/unit_test/program/printf_handler_tests.cpp diff --git a/unit_tests/program/printf_helper_tests.cpp b/opencl/test/unit_test/program/printf_helper_tests.cpp similarity index 100% rename from unit_tests/program/printf_helper_tests.cpp rename to opencl/test/unit_test/program/printf_helper_tests.cpp diff --git a/unit_tests/program/process_debug_data_tests.cpp b/opencl/test/unit_test/program/process_debug_data_tests.cpp similarity index 100% rename from unit_tests/program/process_debug_data_tests.cpp rename to opencl/test/unit_test/program/process_debug_data_tests.cpp diff --git a/unit_tests/program/process_elf_binary_tests.cpp b/opencl/test/unit_test/program/process_elf_binary_tests.cpp similarity index 100% rename from unit_tests/program/process_elf_binary_tests.cpp rename to opencl/test/unit_test/program/process_elf_binary_tests.cpp diff --git a/unit_tests/program/process_spir_binary_tests.cpp b/opencl/test/unit_test/program/process_spir_binary_tests.cpp similarity index 100% rename from unit_tests/program/process_spir_binary_tests.cpp rename to opencl/test/unit_test/program/process_spir_binary_tests.cpp diff --git a/unit_tests/program/program_data_tests.cpp b/opencl/test/unit_test/program/program_data_tests.cpp similarity index 100% rename from unit_tests/program/program_data_tests.cpp rename to opencl/test/unit_test/program/program_data_tests.cpp diff --git a/unit_tests/program/program_from_binary.h b/opencl/test/unit_test/program/program_from_binary.h similarity index 100% rename from unit_tests/program/program_from_binary.h rename to opencl/test/unit_test/program/program_from_binary.h diff --git a/unit_tests/program/program_nonuniform.cpp b/opencl/test/unit_test/program/program_nonuniform.cpp similarity index 100% rename from unit_tests/program/program_nonuniform.cpp rename to opencl/test/unit_test/program/program_nonuniform.cpp diff --git a/unit_tests/program/program_spec_constants_tests.cpp b/opencl/test/unit_test/program/program_spec_constants_tests.cpp similarity index 100% rename from unit_tests/program/program_spec_constants_tests.cpp rename to opencl/test/unit_test/program/program_spec_constants_tests.cpp diff --git a/unit_tests/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp similarity index 100% rename from unit_tests/program/program_tests.cpp rename to opencl/test/unit_test/program/program_tests.cpp diff --git a/unit_tests/program/program_tests.h b/opencl/test/unit_test/program/program_tests.h similarity index 100% rename from unit_tests/program/program_tests.h rename to opencl/test/unit_test/program/program_tests.h diff --git a/unit_tests/program/program_with_block_kernels_tests.cpp b/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp similarity index 100% rename from unit_tests/program/program_with_block_kernels_tests.cpp rename to opencl/test/unit_test/program/program_with_block_kernels_tests.cpp diff --git a/unit_tests/program/program_with_kernel_debug_tests.cpp b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp similarity index 100% rename from unit_tests/program/program_with_kernel_debug_tests.cpp rename to opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp diff --git a/unit_tests/program/program_with_source.h b/opencl/test/unit_test/program/program_with_source.h similarity index 100% rename from unit_tests/program/program_with_source.h rename to opencl/test/unit_test/program/program_with_source.h diff --git a/unit_tests/sampler/CMakeLists.txt b/opencl/test/unit_test/sampler/CMakeLists.txt similarity index 100% rename from unit_tests/sampler/CMakeLists.txt rename to opencl/test/unit_test/sampler/CMakeLists.txt diff --git a/unit_tests/sampler/get_sampler_info_tests.cpp b/opencl/test/unit_test/sampler/get_sampler_info_tests.cpp similarity index 100% rename from unit_tests/sampler/get_sampler_info_tests.cpp rename to opencl/test/unit_test/sampler/get_sampler_info_tests.cpp diff --git a/unit_tests/sampler/sampler_set_arg_tests.cpp b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp similarity index 100% rename from unit_tests/sampler/sampler_set_arg_tests.cpp rename to opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp diff --git a/unit_tests/sampler/sampler_tests.cpp b/opencl/test/unit_test/sampler/sampler_tests.cpp similarity index 100% rename from unit_tests/sampler/sampler_tests.cpp rename to opencl/test/unit_test/sampler/sampler_tests.cpp diff --git a/unit_tests/scenarios/CMakeLists.txt b/opencl/test/unit_test/scenarios/CMakeLists.txt similarity index 100% rename from unit_tests/scenarios/CMakeLists.txt rename to opencl/test/unit_test/scenarios/CMakeLists.txt diff --git a/unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp similarity index 100% rename from unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp rename to opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp diff --git a/unit_tests/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp b/opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp similarity index 100% rename from unit_tests/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp rename to opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp diff --git a/unit_tests/scenarios/windows/CMakeLists.txt b/opencl/test/unit_test/scenarios/windows/CMakeLists.txt similarity index 100% rename from unit_tests/scenarios/windows/CMakeLists.txt rename to opencl/test/unit_test/scenarios/windows/CMakeLists.txt diff --git a/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp similarity index 100% rename from unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp rename to opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp diff --git a/unit_tests/scheduler/CMakeLists.txt b/opencl/test/unit_test/scheduler/CMakeLists.txt similarity index 100% rename from unit_tests/scheduler/CMakeLists.txt rename to opencl/test/unit_test/scheduler/CMakeLists.txt diff --git a/unit_tests/scheduler/scheduler_kernel_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp similarity index 100% rename from unit_tests/scheduler/scheduler_kernel_tests.cpp rename to opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp diff --git a/unit_tests/scheduler/scheduler_source_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp similarity index 100% rename from unit_tests/scheduler/scheduler_source_tests.cpp rename to opencl/test/unit_test/scheduler/scheduler_source_tests.cpp diff --git a/unit_tests/scheduler/scheduler_source_tests.h b/opencl/test/unit_test/scheduler/scheduler_source_tests.h similarity index 100% rename from unit_tests/scheduler/scheduler_source_tests.h rename to opencl/test/unit_test/scheduler/scheduler_source_tests.h diff --git a/unit_tests/scheduler/scheduler_source_tests.inl b/opencl/test/unit_test/scheduler/scheduler_source_tests.inl similarity index 100% rename from unit_tests/scheduler/scheduler_source_tests.inl rename to opencl/test/unit_test/scheduler/scheduler_source_tests.inl diff --git a/unit_tests/sharings/CMakeLists.txt b/opencl/test/unit_test/sharings/CMakeLists.txt similarity index 100% rename from unit_tests/sharings/CMakeLists.txt rename to opencl/test/unit_test/sharings/CMakeLists.txt diff --git a/unit_tests/sharings/d3d/CMakeLists.txt b/opencl/test/unit_test/sharings/d3d/CMakeLists.txt similarity index 100% rename from unit_tests/sharings/d3d/CMakeLists.txt rename to opencl/test/unit_test/sharings/d3d/CMakeLists.txt diff --git a/unit_tests/sharings/d3d/context_d3d_tests.cpp b/opencl/test/unit_test/sharings/d3d/context_d3d_tests.cpp similarity index 100% rename from unit_tests/sharings/d3d/context_d3d_tests.cpp rename to opencl/test/unit_test/sharings/d3d/context_d3d_tests.cpp diff --git a/unit_tests/sharings/gl/CMakeLists.txt b/opencl/test/unit_test/sharings/gl/CMakeLists.txt similarity index 100% rename from unit_tests/sharings/gl/CMakeLists.txt rename to opencl/test/unit_test/sharings/gl/CMakeLists.txt diff --git a/unit_tests/sharings/gl/windows/CMakeLists.txt b/opencl/test/unit_test/sharings/gl/windows/CMakeLists.txt similarity index 100% rename from unit_tests/sharings/gl/windows/CMakeLists.txt rename to opencl/test/unit_test/sharings/gl/windows/CMakeLists.txt diff --git a/unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp similarity index 100% rename from unit_tests/sharings/gl/windows/gl_arb_sync_event_tests.cpp rename to opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp diff --git a/unit_tests/sharings/gl/windows/gl_create_from_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp similarity index 100% rename from unit_tests/sharings/gl/windows/gl_create_from_texture_tests.cpp rename to opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp diff --git a/unit_tests/sharings/gl/windows/gl_reused_buffers_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp similarity index 100% rename from unit_tests/sharings/gl/windows/gl_reused_buffers_tests.cpp rename to opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp diff --git a/unit_tests/sharings/gl/windows/gl_sharing_enable_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_enable_tests.cpp similarity index 100% rename from unit_tests/sharings/gl/windows/gl_sharing_enable_tests.cpp rename to opencl/test/unit_test/sharings/gl/windows/gl_sharing_enable_tests.cpp diff --git a/unit_tests/sharings/gl/windows/gl_sharing_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp similarity index 100% rename from unit_tests/sharings/gl/windows/gl_sharing_tests.cpp rename to opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp diff --git a/unit_tests/sharings/gl/windows/gl_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp similarity index 100% rename from unit_tests/sharings/gl/windows/gl_texture_tests.cpp rename to opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp diff --git a/unit_tests/sharings/gl/windows/gl_types_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_types_tests.cpp similarity index 100% rename from unit_tests/sharings/gl/windows/gl_types_tests.cpp rename to opencl/test/unit_test/sharings/gl/windows/gl_types_tests.cpp diff --git a/unit_tests/sharings/sharing_factory_tests.cpp b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp similarity index 100% rename from unit_tests/sharings/sharing_factory_tests.cpp rename to opencl/test/unit_test/sharings/sharing_factory_tests.cpp diff --git a/unit_tests/sharings/sharing_tests.cpp b/opencl/test/unit_test/sharings/sharing_tests.cpp similarity index 100% rename from unit_tests/sharings/sharing_tests.cpp rename to opencl/test/unit_test/sharings/sharing_tests.cpp diff --git a/unit_tests/sharings/unified/CMakeLists.txt b/opencl/test/unit_test/sharings/unified/CMakeLists.txt similarity index 100% rename from unit_tests/sharings/unified/CMakeLists.txt rename to opencl/test/unit_test/sharings/unified/CMakeLists.txt diff --git a/unit_tests/sharings/unified/unified_sharing_buffer_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp similarity index 100% rename from unit_tests/sharings/unified/unified_sharing_buffer_tests.cpp rename to opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp diff --git a/unit_tests/sharings/unified/unified_sharing_fixtures.h b/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h similarity index 100% rename from unit_tests/sharings/unified/unified_sharing_fixtures.h rename to opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h diff --git a/unit_tests/sharings/unified/unified_sharing_image_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp similarity index 100% rename from unit_tests/sharings/unified/unified_sharing_image_tests.cpp rename to opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp diff --git a/unit_tests/sharings/unified/unified_sharing_mocks.h b/opencl/test/unit_test/sharings/unified/unified_sharing_mocks.h similarity index 100% rename from unit_tests/sharings/unified/unified_sharing_mocks.h rename to opencl/test/unit_test/sharings/unified/unified_sharing_mocks.h diff --git a/unit_tests/sharings/unified/unified_sharing_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp similarity index 100% rename from unit_tests/sharings/unified/unified_sharing_tests.cpp rename to opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp diff --git a/unit_tests/sharings/va/CMakeLists.txt b/opencl/test/unit_test/sharings/va/CMakeLists.txt similarity index 100% rename from unit_tests/sharings/va/CMakeLists.txt rename to opencl/test/unit_test/sharings/va/CMakeLists.txt diff --git a/unit_tests/sharings/va/cl_create_from_va_media_surface_tests.cpp b/opencl/test/unit_test/sharings/va/cl_create_from_va_media_surface_tests.cpp similarity index 100% rename from unit_tests/sharings/va/cl_create_from_va_media_surface_tests.cpp rename to opencl/test/unit_test/sharings/va/cl_create_from_va_media_surface_tests.cpp diff --git a/unit_tests/sharings/va/cl_enqueue_acquire_va_media_surfaces_tests.cpp b/opencl/test/unit_test/sharings/va/cl_enqueue_acquire_va_media_surfaces_tests.cpp similarity index 100% rename from unit_tests/sharings/va/cl_enqueue_acquire_va_media_surfaces_tests.cpp rename to opencl/test/unit_test/sharings/va/cl_enqueue_acquire_va_media_surfaces_tests.cpp diff --git a/unit_tests/sharings/va/cl_enqueue_release_va_media_surfaces_tests.cpp b/opencl/test/unit_test/sharings/va/cl_enqueue_release_va_media_surfaces_tests.cpp similarity index 100% rename from unit_tests/sharings/va/cl_enqueue_release_va_media_surfaces_tests.cpp rename to opencl/test/unit_test/sharings/va/cl_enqueue_release_va_media_surfaces_tests.cpp diff --git a/unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp b/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp similarity index 100% rename from unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp rename to opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp diff --git a/unit_tests/sharings/va/context_va_tests.cpp b/opencl/test/unit_test/sharings/va/context_va_tests.cpp similarity index 100% rename from unit_tests/sharings/va/context_va_tests.cpp rename to opencl/test/unit_test/sharings/va/context_va_tests.cpp diff --git a/unit_tests/sharings/va/kernel_va_image_arg_tests.cpp b/opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp similarity index 100% rename from unit_tests/sharings/va/kernel_va_image_arg_tests.cpp rename to opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp diff --git a/unit_tests/sharings/va/mock_va_sharing.h b/opencl/test/unit_test/sharings/va/mock_va_sharing.h similarity index 100% rename from unit_tests/sharings/va/mock_va_sharing.h rename to opencl/test/unit_test/sharings/va/mock_va_sharing.h diff --git a/unit_tests/sharings/va/va_base_object_tests.cpp b/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp similarity index 100% rename from unit_tests/sharings/va/va_base_object_tests.cpp rename to opencl/test/unit_test/sharings/va/va_base_object_tests.cpp diff --git a/unit_tests/sharings/va/va_sharing_enable_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp similarity index 100% rename from unit_tests/sharings/va/va_sharing_enable_tests.cpp rename to opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp diff --git a/unit_tests/sharings/va/va_sharing_linux_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp similarity index 100% rename from unit_tests/sharings/va/va_sharing_linux_tests.cpp rename to opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp diff --git a/unit_tests/sharings/va/va_sharing_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp similarity index 100% rename from unit_tests/sharings/va/va_sharing_tests.cpp rename to opencl/test/unit_test/sharings/va/va_sharing_tests.cpp diff --git a/unit_tests/sku_info/CMakeLists.txt b/opencl/test/unit_test/sku_info/CMakeLists.txt similarity index 100% rename from unit_tests/sku_info/CMakeLists.txt rename to opencl/test/unit_test/sku_info/CMakeLists.txt diff --git a/unit_tests/sku_info/sku_info_base_reference.h b/opencl/test/unit_test/sku_info/sku_info_base_reference.h similarity index 100% rename from unit_tests/sku_info/sku_info_base_reference.h rename to opencl/test/unit_test/sku_info/sku_info_base_reference.h diff --git a/unit_tests/sku_info/sku_info_receiver_tests.cpp b/opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp similarity index 100% rename from unit_tests/sku_info/sku_info_receiver_tests.cpp rename to opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp diff --git a/unit_tests/sku_info/sku_info_transfer_tests.cpp b/opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp similarity index 100% rename from unit_tests/sku_info/sku_info_transfer_tests.cpp rename to opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp diff --git a/unit_tests/source_level_debugger/CMakeLists.txt b/opencl/test/unit_test/source_level_debugger/CMakeLists.txt similarity index 100% rename from unit_tests/source_level_debugger/CMakeLists.txt rename to opencl/test/unit_test/source_level_debugger/CMakeLists.txt diff --git a/unit_tests/source_level_debugger/source_level_debugger_csr_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp similarity index 100% rename from unit_tests/source_level_debugger/source_level_debugger_csr_tests.cpp rename to opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp diff --git a/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp similarity index 100% rename from unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp rename to opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp diff --git a/unit_tests/source_level_debugger/source_level_debugger_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp similarity index 100% rename from unit_tests/source_level_debugger/source_level_debugger_tests.cpp rename to opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp diff --git a/unit_tests/test_dynamic_lib/CMakeLists.txt b/opencl/test/unit_test/test_dynamic_lib/CMakeLists.txt similarity index 100% rename from unit_tests/test_dynamic_lib/CMakeLists.txt rename to opencl/test/unit_test/test_dynamic_lib/CMakeLists.txt diff --git a/unit_tests/test_dynamic_lib/test_dynamic_lib_lin.cpp b/opencl/test/unit_test/test_dynamic_lib/test_dynamic_lib_lin.cpp similarity index 100% rename from unit_tests/test_dynamic_lib/test_dynamic_lib_lin.cpp rename to opencl/test/unit_test/test_dynamic_lib/test_dynamic_lib_lin.cpp diff --git a/unit_tests/test_dynamic_lib/test_dynamic_lib_win.cpp b/opencl/test/unit_test/test_dynamic_lib/test_dynamic_lib_win.cpp similarity index 100% rename from unit_tests/test_dynamic_lib/test_dynamic_lib_win.cpp rename to opencl/test/unit_test/test_dynamic_lib/test_dynamic_lib_win.cpp diff --git a/unit_tests/test_files/7030307152995455603.cl b/opencl/test/unit_test/test_files/7030307152995455603.cl similarity index 100% rename from unit_tests/test_files/7030307152995455603.cl rename to opencl/test/unit_test/test_files/7030307152995455603.cl diff --git a/unit_tests/test_files/7030307152995455603_options.txt b/opencl/test/unit_test/test_files/7030307152995455603_options.txt similarity index 100% rename from unit_tests/test_files/7030307152995455603_options.txt rename to opencl/test/unit_test/test_files/7030307152995455603_options.txt diff --git a/unit_tests/test_files/CopyBuffer_simd16.cl b/opencl/test/unit_test/test_files/CopyBuffer_simd16.cl similarity index 100% rename from unit_tests/test_files/CopyBuffer_simd16.cl rename to opencl/test/unit_test/test_files/CopyBuffer_simd16.cl diff --git a/unit_tests/test_files/CopyBuffer_simd32.cl b/opencl/test/unit_test/test_files/CopyBuffer_simd32.cl similarity index 100% rename from unit_tests/test_files/CopyBuffer_simd32.cl rename to opencl/test/unit_test/test_files/CopyBuffer_simd32.cl diff --git a/unit_tests/test_files/CopyBuffer_simd8.cl b/opencl/test/unit_test/test_files/CopyBuffer_simd8.cl similarity index 100% rename from unit_tests/test_files/CopyBuffer_simd8.cl rename to opencl/test/unit_test/test_files/CopyBuffer_simd8.cl diff --git a/unit_tests/test_files/binary_with_zeroes b/opencl/test/unit_test/test_files/binary_with_zeroes similarity index 100% rename from unit_tests/test_files/binary_with_zeroes rename to opencl/test/unit_test/test_files/binary_with_zeroes diff --git a/unit_tests/test_files/copybuffer.cl b/opencl/test/unit_test/test_files/copybuffer.cl similarity index 100% rename from unit_tests/test_files/copybuffer.cl rename to opencl/test/unit_test/test_files/copybuffer.cl diff --git a/unit_tests/test_files/copybuffer_with_header.cl b/opencl/test/unit_test/test_files/copybuffer_with_header.cl similarity index 100% rename from unit_tests/test_files/copybuffer_with_header.cl rename to opencl/test/unit_test/test_files/copybuffer_with_header.cl diff --git a/unit_tests/test_files/devices/config b/opencl/test/unit_test/test_files/devices/config similarity index 100% rename from unit_tests/test_files/devices/config rename to opencl/test/unit_test/test_files/devices/config diff --git a/unit_tests/test_files/devices/drm/card0/gt_max_freq_mhz b/opencl/test/unit_test/test_files/devices/drm/card0/gt_max_freq_mhz similarity index 100% rename from unit_tests/test_files/devices/drm/card0/gt_max_freq_mhz rename to opencl/test/unit_test/test_files/devices/drm/card0/gt_max_freq_mhz diff --git a/unit_tests/test_files/emptykernel.cl b/opencl/test/unit_test/test_files/emptykernel.cl similarity index 100% rename from unit_tests/test_files/emptykernel.cl rename to opencl/test/unit_test/test_files/emptykernel.cl diff --git a/unit_tests/test_files/igdrcl.config b/opencl/test/unit_test/test_files/igdrcl.config similarity index 100% rename from unit_tests/test_files/igdrcl.config rename to opencl/test/unit_test/test_files/igdrcl.config diff --git a/unit_tests/test_files/igdrcl_string.config b/opencl/test/unit_test/test_files/igdrcl_string.config similarity index 100% rename from unit_tests/test_files/igdrcl_string.config rename to opencl/test/unit_test/test_files/igdrcl_string.config diff --git a/unit_tests/test_files/kernel_data_param.cl b/opencl/test/unit_test/test_files/kernel_data_param.cl similarity index 100% rename from unit_tests/test_files/kernel_data_param.cl rename to opencl/test/unit_test/test_files/kernel_data_param.cl diff --git a/unit_tests/test_files/kernel_num_args.cl b/opencl/test/unit_test/test_files/kernel_num_args.cl similarity index 100% rename from unit_tests/test_files/kernel_num_args.cl rename to opencl/test/unit_test/test_files/kernel_num_args.cl diff --git a/unit_tests/test_files/media_kernels_backend.cl b/opencl/test/unit_test/test_files/media_kernels_backend.cl similarity index 100% rename from unit_tests/test_files/media_kernels_backend.cl rename to opencl/test/unit_test/test_files/media_kernels_backend.cl diff --git a/unit_tests/test_files/media_kernels_backend_options.txt b/opencl/test/unit_test/test_files/media_kernels_backend_options.txt similarity index 100% rename from unit_tests/test_files/media_kernels_backend_options.txt rename to opencl/test/unit_test/test_files/media_kernels_backend_options.txt diff --git a/unit_tests/test_files/media_kernels_frontend.cl b/opencl/test/unit_test/test_files/media_kernels_frontend.cl similarity index 100% rename from unit_tests/test_files/media_kernels_frontend.cl rename to opencl/test/unit_test/test_files/media_kernels_frontend.cl diff --git a/unit_tests/test_files/media_kernels_frontend_options.txt b/opencl/test/unit_test/test_files/media_kernels_frontend_options.txt similarity index 100% rename from unit_tests/test_files/media_kernels_frontend_options.txt rename to opencl/test/unit_test/test_files/media_kernels_frontend_options.txt diff --git a/unit_tests/test_files/patch_list.h b/opencl/test/unit_test/test_files/patch_list.h similarity index 100% rename from unit_tests/test_files/patch_list.h rename to opencl/test/unit_test/test_files/patch_list.h diff --git a/unit_tests/test_files/printf.cl b/opencl/test/unit_test/test_files/printf.cl similarity index 100% rename from unit_tests/test_files/printf.cl rename to opencl/test/unit_test/test_files/printf.cl diff --git a/unit_tests/test_files/required_work_group.cl b/opencl/test/unit_test/test_files/required_work_group.cl similarity index 100% rename from unit_tests/test_files/required_work_group.cl rename to opencl/test/unit_test/test_files/required_work_group.cl diff --git a/unit_tests/test_files/shouldfail.cl b/opencl/test/unit_test/test_files/shouldfail.cl similarity index 100% rename from unit_tests/test_files/shouldfail.cl rename to opencl/test/unit_test/test_files/shouldfail.cl diff --git a/unit_tests/test_files/shouldfail_internal_options.txt b/opencl/test/unit_test/test_files/shouldfail_internal_options.txt similarity index 100% rename from unit_tests/test_files/shouldfail_internal_options.txt rename to opencl/test/unit_test/test_files/shouldfail_internal_options.txt diff --git a/unit_tests/test_files/shouldfail_options.txt b/opencl/test/unit_test/test_files/shouldfail_options.txt similarity index 100% rename from unit_tests/test_files/shouldfail_options.txt rename to opencl/test/unit_test/test_files/shouldfail_options.txt diff --git a/unit_tests/test_files/simple_arg_int.cl b/opencl/test/unit_test/test_files/simple_arg_int.cl similarity index 100% rename from unit_tests/test_files/simple_arg_int.cl rename to opencl/test/unit_test/test_files/simple_arg_int.cl diff --git a/unit_tests/test_files/simple_block_kernel.cl b/opencl/test/unit_test/test_files/simple_block_kernel.cl similarity index 100% rename from unit_tests/test_files/simple_block_kernel.cl rename to opencl/test/unit_test/test_files/simple_block_kernel.cl diff --git a/unit_tests/test_files/simple_header.h b/opencl/test/unit_test/test_files/simple_header.h similarity index 100% rename from unit_tests/test_files/simple_header.h rename to opencl/test/unit_test/test_files/simple_header.h diff --git a/unit_tests/test_files/simple_kernels.cl b/opencl/test/unit_test/test_files/simple_kernels.cl similarity index 100% rename from unit_tests/test_files/simple_kernels.cl rename to opencl/test/unit_test/test_files/simple_kernels.cl diff --git a/unit_tests/test_files/simple_kernels_opts.cl b/opencl/test/unit_test/test_files/simple_kernels_opts.cl similarity index 100% rename from unit_tests/test_files/simple_kernels_opts.cl rename to opencl/test/unit_test/test_files/simple_kernels_opts.cl diff --git a/unit_tests/test_files/simple_kernels_opts_options.txt b/opencl/test/unit_test/test_files/simple_kernels_opts_options.txt similarity index 100% rename from unit_tests/test_files/simple_kernels_opts_options.txt rename to opencl/test/unit_test/test_files/simple_kernels_opts_options.txt diff --git a/unit_tests/test_files/simple_nonuniform.cl b/opencl/test/unit_test/test_files/simple_nonuniform.cl similarity index 100% rename from unit_tests/test_files/simple_nonuniform.cl rename to opencl/test/unit_test/test_files/simple_nonuniform.cl diff --git a/unit_tests/test_files/stateful_copy_buffer.cl b/opencl/test/unit_test/test_files/stateful_copy_buffer.cl similarity index 100% rename from unit_tests/test_files/stateful_copy_buffer.cl rename to opencl/test/unit_test/test_files/stateful_copy_buffer.cl diff --git a/unit_tests/test_files/stateful_copy_buffer_ocloc_options.txt b/opencl/test/unit_test/test_files/stateful_copy_buffer_ocloc_options.txt similarity index 100% rename from unit_tests/test_files/stateful_copy_buffer_ocloc_options.txt rename to opencl/test/unit_test/test_files/stateful_copy_buffer_ocloc_options.txt diff --git a/unit_tests/test_files/stateless_kernel.cl b/opencl/test/unit_test/test_files/stateless_kernel.cl similarity index 100% rename from unit_tests/test_files/stateless_kernel.cl rename to opencl/test/unit_test/test_files/stateless_kernel.cl diff --git a/unit_tests/test_files/test_basic_constant.cl b/opencl/test/unit_test/test_files/test_basic_constant.cl similarity index 100% rename from unit_tests/test_files/test_basic_constant.cl rename to opencl/test/unit_test/test_files/test_basic_constant.cl diff --git a/unit_tests/test_files/test_basic_kernel_memory_alignment_private.cl b/opencl/test/unit_test/test_files/test_basic_kernel_memory_alignment_private.cl similarity index 100% rename from unit_tests/test_files/test_basic_kernel_memory_alignment_private.cl rename to opencl/test/unit_test/test_files/test_basic_kernel_memory_alignment_private.cl diff --git a/unit_tests/test_files/test_constant_memory.cl b/opencl/test/unit_test/test_files/test_constant_memory.cl similarity index 100% rename from unit_tests/test_files/test_constant_memory.cl rename to opencl/test/unit_test/test_files/test_constant_memory.cl diff --git a/unit_tests/test_files/vme_kernels.cl b/opencl/test/unit_test/test_files/vme_kernels.cl similarity index 100% rename from unit_tests/test_files/vme_kernels.cl rename to opencl/test/unit_test/test_files/vme_kernels.cl diff --git a/unit_tests/test_files/vme_kernels_options.txt b/opencl/test/unit_test/test_files/vme_kernels_options.txt similarity index 100% rename from unit_tests/test_files/vme_kernels_options.txt rename to opencl/test/unit_test/test_files/vme_kernels_options.txt diff --git a/unit_tests/test_mode.h b/opencl/test/unit_test/test_mode.h similarity index 100% rename from unit_tests/test_mode.h rename to opencl/test/unit_test/test_mode.h diff --git a/unit_tests/tests_configuration.h b/opencl/test/unit_test/tests_configuration.h similarity index 100% rename from unit_tests/tests_configuration.h rename to opencl/test/unit_test/tests_configuration.h diff --git a/unit_tests/ult_config_listener.cpp b/opencl/test/unit_test/ult_config_listener.cpp similarity index 100% rename from unit_tests/ult_config_listener.cpp rename to opencl/test/unit_test/ult_config_listener.cpp diff --git a/unit_tests/ult_config_listener.h b/opencl/test/unit_test/ult_config_listener.h similarity index 100% rename from unit_tests/ult_config_listener.h rename to opencl/test/unit_test/ult_config_listener.h diff --git a/unit_tests/ult_configuration.cpp b/opencl/test/unit_test/ult_configuration.cpp similarity index 100% rename from unit_tests/ult_configuration.cpp rename to opencl/test/unit_test/ult_configuration.cpp diff --git a/unit_tests/user_settings_32.user b/opencl/test/unit_test/user_settings_32.user similarity index 100% rename from unit_tests/user_settings_32.user rename to opencl/test/unit_test/user_settings_32.user diff --git a/unit_tests/user_settings_64.user b/opencl/test/unit_test/user_settings_64.user similarity index 100% rename from unit_tests/user_settings_64.user rename to opencl/test/unit_test/user_settings_64.user diff --git a/unit_tests/utilities/.clang-tidy b/opencl/test/unit_test/utilities/.clang-tidy similarity index 100% rename from unit_tests/utilities/.clang-tidy rename to opencl/test/unit_test/utilities/.clang-tidy diff --git a/unit_tests/utilities/CMakeLists.txt b/opencl/test/unit_test/utilities/CMakeLists.txt similarity index 100% rename from unit_tests/utilities/CMakeLists.txt rename to opencl/test/unit_test/utilities/CMakeLists.txt diff --git a/unit_tests/utilities/debug_file_reader_tests.cpp b/opencl/test/unit_test/utilities/debug_file_reader_tests.cpp similarity index 100% rename from unit_tests/utilities/debug_file_reader_tests.cpp rename to opencl/test/unit_test/utilities/debug_file_reader_tests.cpp diff --git a/unit_tests/utilities/debug_file_reader_tests.inl b/opencl/test/unit_test/utilities/debug_file_reader_tests.inl similarity index 100% rename from unit_tests/utilities/debug_file_reader_tests.inl rename to opencl/test/unit_test/utilities/debug_file_reader_tests.inl diff --git a/unit_tests/utilities/debug_settings_reader_creator.cpp b/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp similarity index 100% rename from unit_tests/utilities/debug_settings_reader_creator.cpp rename to opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp diff --git a/unit_tests/utilities/debug_settings_reader_tests.cpp b/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp similarity index 100% rename from unit_tests/utilities/debug_settings_reader_tests.cpp rename to opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp diff --git a/unit_tests/utilities/file_logger_tests.cpp b/opencl/test/unit_test/utilities/file_logger_tests.cpp similarity index 100% rename from unit_tests/utilities/file_logger_tests.cpp rename to opencl/test/unit_test/utilities/file_logger_tests.cpp diff --git a/unit_tests/utilities/file_logger_tests.h b/opencl/test/unit_test/utilities/file_logger_tests.h similarity index 100% rename from unit_tests/utilities/file_logger_tests.h rename to opencl/test/unit_test/utilities/file_logger_tests.h diff --git a/unit_tests/utilities/tag_allocator_tests.cpp b/opencl/test/unit_test/utilities/tag_allocator_tests.cpp similarity index 100% rename from unit_tests/utilities/tag_allocator_tests.cpp rename to opencl/test/unit_test/utilities/tag_allocator_tests.cpp diff --git a/unit_tests/verify.bat b/opencl/test/unit_test/verify.bat similarity index 100% rename from unit_tests/verify.bat rename to opencl/test/unit_test/verify.bat diff --git a/unit_tests/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt similarity index 100% rename from unit_tests/windows/CMakeLists.txt rename to opencl/test/unit_test/windows/CMakeLists.txt diff --git a/unit_tests/windows/get_devices_tests.cpp b/opencl/test/unit_test/windows/get_devices_tests.cpp similarity index 100% rename from unit_tests/windows/get_devices_tests.cpp rename to opencl/test/unit_test/windows/get_devices_tests.cpp diff --git a/unit_tests/windows/os_interface_tests.cpp b/opencl/test/unit_test/windows/os_interface_tests.cpp similarity index 100% rename from unit_tests/windows/os_interface_tests.cpp rename to opencl/test/unit_test/windows/os_interface_tests.cpp diff --git a/unit_tests/windows/test_mode.h b/opencl/test/unit_test/windows/test_mode.h similarity index 100% rename from unit_tests/windows/test_mode.h rename to opencl/test/unit_test/windows/test_mode.h diff --git a/unit_tests/windows/wddm_create_tests.cpp b/opencl/test/unit_test/windows/wddm_create_tests.cpp similarity index 100% rename from unit_tests/windows/wddm_create_tests.cpp rename to opencl/test/unit_test/windows/wddm_create_tests.cpp