From 87c5d2663bfbc9708fc0644739b698f5e0352a53 Mon Sep 17 00:00:00 2001 From: kamdiedrich Date: Sun, 23 Feb 2020 15:20:22 +0100 Subject: [PATCH] Add absolute path to unit_tests Change-Id: I7a64f79a39dff4f5fa4166244e71872bb614724f --- CMakeLists.txt | 2 - .../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 +- opencl/test/unit_test/CMakeLists.txt | 18 ++- .../accelerators/media_image_arg_tests.cpp | 9 +- .../test/unit_test/api/api_tests_wrapper1.cpp | 64 +++++------ .../test/unit_test/api/api_tests_wrapper2.cpp | 66 +++++------ .../test/unit_test/api/api_tests_wrapper3.cpp | 72 ++++++------ .../api/cl_add_comment_to_aub_tests.inl | 7 +- opencl/test/unit_test/api/cl_api_tests.cpp | 4 +- opencl/test/unit_test/api/cl_api_tests.h | 8 +- .../unit_test/api/cl_build_program_tests.inl | 6 +- .../unit_test/api/cl_clone_kernel_tests.inl | 2 +- .../api/cl_compile_program_tests.inl | 4 +- .../unit_test/api/cl_create_buffer_tests.cpp | 8 +- .../api/cl_create_command_queue_tests.inl | 4 +- ...te_command_queue_with_properties_tests.cpp | 10 +- .../api/cl_create_context_from_type_tests.inl | 3 +- .../unit_test/api/cl_create_context_tests.inl | 5 +- .../unit_test/api/cl_create_image_tests.cpp | 4 +- .../unit_test/api/cl_create_kernel_tests.inl | 4 +- .../cl_create_kernels_in_program_tests.inl | 2 +- ...eate_perf_counters_command_queue_tests.inl | 6 +- .../cl_create_program_with_binary_tests.inl | 2 +- ...te_program_with_built_in_kernels_tests.cpp | 2 +- .../api/cl_create_sub_devices_tests.inl | 3 +- .../api/cl_enqueue_copy_buffer_rect_tests.inl | 2 +- .../cl_enqueue_copy_buffer_to_image_tests.inl | 2 +- .../cl_enqueue_copy_image_to_buffer_tests.inl | 2 +- .../api/cl_enqueue_fill_image_tests.inl | 2 +- .../unit_test/api/cl_enqueue_image_tests.inl | 9 +- .../api/cl_enqueue_map_image_tests.inl | 2 +- .../api/cl_enqueue_nd_range_kernel_tests.inl | 2 +- .../api/cl_enqueue_svm_migrate_mem_tests.cpp | 2 +- .../unit_test/api/cl_enqueue_task_tests.inl | 4 +- .../api/cl_enqueue_unmap_mem_object_tests.inl | 5 +- .../api/cl_enqueue_verify_memory.inl | 5 +- .../api/cl_function_pointers_tests.inl | 3 +- .../api/cl_get_device_and_host_timer.inl | 5 +- .../unit_test/api/cl_get_device_ids_tests.inl | 2 +- .../api/cl_get_event_profiling_info_tests.inl | 9 +- .../unit_test/api/cl_get_image_info_tests.inl | 2 +- .../api/cl_get_image_params_tests.inl | 2 +- .../api/cl_get_kernel_arg_info_tests.inl | 4 +- .../api/cl_get_kernel_info_tests.inl | 4 +- ...oncurrent_work_group_count_intel_tests.inl | 2 +- ...cl_get_kernel_sub_group_info_khr_tests.inl | 2 +- .../cl_get_kernel_sub_group_info_tests.inl | 2 +- ..._suggested_local_work_size_intel_tests.inl | 2 +- .../cl_get_kernel_work_group_info_tests.inl | 6 +- .../api/cl_get_mem_object_info_tests.inl | 2 +- .../api/cl_get_platform_ids_tests.inl | 2 +- .../api/cl_get_program_build_info_tests.inl | 4 +- .../api/cl_get_program_info_tests.inl | 4 +- .../cl_get_supported_image_formats_tests.inl | 2 +- .../api/cl_icd_get_platform_ids_khr_tests.inl | 3 +- .../api/cl_intel_accelerator_tests.inl | 3 +- .../api/cl_intel_motion_estimation.cpp | 3 +- .../unit_test/api/cl_intel_tracing_tests.inl | 3 +- .../api/cl_intel_tracing_tests_mt.cpp | 3 +- .../unit_test/api/cl_link_program_tests.inl | 2 +- ...cl_mem_locally_uncached_resource_tests.cpp | 5 +- .../api/cl_release_command_queue_tests.inl | 6 +- .../unit_test/api/cl_release_kernel_tests.inl | 2 +- .../cl_retain_release_command_queue_tests.inl | 5 +- .../cl_set_kernel_arg_svm_pointer_tests.inl | 4 +- .../api/cl_set_kernel_exec_info_tests.inl | 4 +- ...cl_set_performance_configuration_tests.inl | 5 +- ..._program_specialization_constant_tests.inl | 2 +- .../api/cl_unified_shared_memory_tests.inl | 7 +- .../api/cl_unload_platform_compiler_tests.inl | 3 +- .../api/gl/cl_create_from_gl_buffer_tests.cpp | 2 +- .../cl_create_from_gl_renderbuffer_tests.cpp | 2 +- .../gl/cl_create_from_gl_texture2d_tests.cpp | 2 +- .../gl/cl_create_from_gl_texture3d_tests.cpp | 2 +- .../gl/cl_create_from_gl_texture_tests.cpp | 3 +- .../cl_enqueue_acquire_gl_objects_tests.cpp | 2 +- .../cl_enqueue_release_gl_objects_tests.cpp | 2 +- .../gl/cl_get_gl_context_info_khr_tests.cpp | 5 +- .../api/gl/cl_get_gl_device_info_tests.cpp | 3 +- .../api/gl/cl_get_gl_object_info_tests.cpp | 2 +- .../api/gl/cl_get_gl_texture_info_tests.cpp | 2 +- .../api/gl/cl_gl_intel_tracing_tests.cpp | 3 +- .../test/unit_test/aub/aub_center_tests.cpp | 4 +- ...aub_center_using_aubstream_stubs_tests.cpp | 4 +- .../test/unit_test/aub/aub_helper_tests.cpp | 2 +- .../test/unit_test/aub/aub_helper_tests.inl | 4 +- .../aub_mem_dump/aub_alloc_dump_tests.cpp | 11 +- .../aub_stream_interface_mock.cpp | 2 +- .../test/unit_test/aub_tests/CMakeLists.txt | 8 +- .../aub_tests/aub_tests_configuration.inl | 2 +- .../command_queue/command_enqueue_fixture.h | 14 +-- .../enqueue_copy_buffer_aub_tests.cpp | 5 +- .../enqueue_copy_buffer_rect_aub_tests.cpp | 5 +- .../enqueue_copy_image_aub_tests.cpp | 5 +- .../enqueue_fill_buffer_aub_tests.cpp | 5 +- .../enqueue_fill_image_aub_tests.cpp | 5 +- .../enqueue_kernel_aub_tests.cpp | 17 ++- .../enqueue_map_buffer_aub_tests.cpp | 5 +- .../enqueue_map_image_aub_tests.cpp | 5 +- .../enqueue_read_buffer_aub_tests.cpp | 9 +- .../enqueue_read_buffer_rect_aub_tests.cpp | 5 +- .../enqueue_read_image_aub_tests.cpp | 7 +- .../enqueue_read_write_image_aub_fixture.h | 5 +- ...enqueue_verify_memory_buffer_aub_tests.cpp | 7 +- .../enqueue_verify_memory_image_aub_tests.cpp | 7 +- .../enqueue_write_buffer_aub_tests.cpp | 5 +- .../enqueue_write_buffer_rect_aub_tests.cpp | 5 +- ...queue_write_copy_read_buffer_aub_tests.cpp | 2 +- ...enqueue_write_copy_read_buffer_aub_tests.h | 3 +- .../enqueue_write_image_aub_tests.cpp | 7 +- .../aub_command_stream_fixture.cpp | 8 +- .../aub_command_stream_fixture.h | 7 +- .../aub_command_stream_tests.cpp | 6 +- .../command_stream/aub_mem_dump_tests.cpp | 5 +- .../aub_tests/fixtures/aub_fixture.cpp | 2 +- .../aub_tests/fixtures/aub_fixture.h | 7 +- .../fixtures/aub_parent_kernel_fixture.h | 4 +- .../aub_tests/fixtures/fixture_tests.cpp | 6 +- .../aub_tests/fixtures/hello_world_fixture.h | 8 +- .../aub_tests/fixtures/run_kernel_fixture.h | 17 ++- .../aub_tests/fixtures/simple_arg_fixture.h | 13 +-- .../fixtures/unified_memory_fixture.h | 3 +- .../unit_test/aub_tests/gen11/CMakeLists.txt | 2 +- .../gen11/aub_tests_configuration_gen11.cpp | 3 +- .../aub_batch_buffer_tests_gen11.cpp | 2 +- .../aub_batch_buffer_tests_gen11.h | 3 +- .../enqueue_parent_kernel_tests_gen11.cpp | 5 +- .../aub_tests/gen12lp/CMakeLists.txt | 4 +- .../gen12lp/aub_mem_dump_tests_gen12lp.cpp | 4 +- .../aub_tests_configuration_gen12lp.cpp | 3 +- .../aub_batch_buffer_tests_gen12lp.cpp | 11 +- .../aub_batch_buffer_tests_gen12lp.h | 3 +- .../enqueue_parent_kernel_tests_gen12lp.cpp | 5 +- .../unit_test/aub_tests/gen8/CMakeLists.txt | 2 +- .../gen8/aub_tests_configuration_gen8.cpp | 3 +- .../enqueue_parent_kernel_tests_gen8.cpp | 5 +- .../unit_test/aub_tests/gen9/CMakeLists.txt | 2 +- .../gen9/aub_tests_configuration_gen9.cpp | 3 +- .../batch_buffer/aub_batch_buffer_tests.cpp | 2 +- .../batch_buffer/aub_batch_buffer_tests.h | 3 +- .../enqueue_parent_kernel_tests_gen9.cpp | 5 +- .../run_kernel_aub_tests_skl.cpp | 4 +- .../mem_obj/create_image_aub_tests.cpp | 7 +- opencl/test/unit_test/aub_tests/test_mode.h | 2 +- .../unified_memory_aub_tests.cpp | 3 +- .../unified_memory_copy_aub_tests.cpp | 3 +- .../unit_test/built_ins/built_in_tests.cpp | 24 ++-- .../built_ins/get_built_ins_file_names.cpp | 2 +- opencl/test/unit_test/built_ins/sip_tests.cpp | 8 +- .../command_queue/blit_enqueue_tests.cpp | 13 +-- .../command_queue/buffer_operations_fixture.h | 8 +- .../command_queue/command_enqueue_fixture.h | 17 ++- .../command_queue/command_queue_fixture.cpp | 4 +- .../command_queue/command_queue_fixture.h | 2 +- .../command_queue/command_queue_hw_tests.cpp | 25 ++--- .../command_queue/command_queue_tests.cpp | 36 +++--- .../command_queue/dispatch_walker_tests.cpp | 21 ++-- .../command_queue/enqueue_barrier_tests.cpp | 7 +- .../enqueue_command_without_kernel_tests.cpp | 15 ++- .../enqueue_copy_buffer_event_tests.cpp | 6 +- .../enqueue_copy_buffer_fixture.h | 8 +- .../enqueue_copy_buffer_rect_fixture.h | 8 +- .../enqueue_copy_buffer_rect_tests.cpp | 6 +- .../enqueue_copy_buffer_tests.cpp | 10 +- .../enqueue_copy_buffer_to_image_fixture.h | 8 +- .../enqueue_copy_buffer_to_image_tests.cpp | 12 +- .../enqueue_copy_image_fixture.h | 8 +- .../enqueue_copy_image_tests.cpp | 10 +- .../enqueue_copy_image_to_buffer_fixture.h | 8 +- .../enqueue_copy_image_to_buffer_tests.cpp | 12 +- .../enqueue_debug_kernel_tests.cpp | 14 +-- .../enqueue_fill_buffer_event_tests.cpp | 3 +- .../enqueue_fill_buffer_fixture.h | 8 +- .../enqueue_fill_buffer_negative_tests.cpp | 2 +- .../enqueue_fill_buffer_tests.cpp | 10 +- .../enqueue_fill_image_fixture.h | 7 +- .../enqueue_fill_image_tests.cpp | 6 +- .../command_queue/enqueue_fixture.cpp | 2 +- .../unit_test/command_queue/enqueue_fixture.h | 4 +- .../command_queue/enqueue_handler_tests.cpp | 23 ++-- .../command_queue/enqueue_kernel_1_tests.cpp | 13 +-- .../command_queue/enqueue_kernel_2_tests.cpp | 18 +-- .../enqueue_kernel_event_tests.cpp | 2 +- .../enqueue_kernel_global_offset_tests.cpp | 2 +- .../enqueue_kernel_local_work_size_tests.cpp | 2 +- .../command_queue/enqueue_kernel_mt_tests.cpp | 8 +- .../enqueue_kernel_two_ioq_tests.cpp | 5 +- .../enqueue_kernel_two_ooq_tests.cpp | 5 +- .../enqueue_kernel_two_walker_ioq_tests.cpp | 3 +- .../enqueue_kernel_two_walker_ooq_tests.cpp | 5 +- .../enqueue_map_buffer_fixture.h | 9 +- .../enqueue_map_buffer_tests.cpp | 16 +-- .../command_queue/enqueue_map_image_tests.cpp | 15 ++- .../command_queue/enqueue_marker_tests.cpp | 7 +- .../command_queue/enqueue_media_kernel.cpp | 3 +- .../enqueue_migrate_mem_objects_tests.cpp | 9 +- .../enqueue_read_buffer_event_tests.cpp | 4 +- .../enqueue_read_buffer_fixture.h | 9 +- .../enqueue_read_buffer_rect_fixture.h | 8 +- .../enqueue_read_buffer_rect_tests.cpp | 8 +- .../enqueue_read_buffer_tests.cpp | 14 +-- .../enqueue_read_image_fixture.h | 8 +- .../enqueue_read_image_tests.cpp | 12 +- .../enqueue_resource_barier_tests.cpp | 3 +- .../enqueue_svm_mem_copy_tests.cpp | 11 +- .../enqueue_svm_mem_fill_tests.cpp | 11 +- .../command_queue/enqueue_svm_tests.cpp | 21 ++-- .../command_queue/enqueue_thread_tests.cpp | 7 +- .../enqueue_unmap_memobject_tests.cpp | 11 +- .../command_queue/enqueue_waitlist_tests.cpp | 6 +- .../enqueue_write_buffer_event_tests.cpp | 4 +- .../enqueue_write_buffer_rect_fixture.h | 8 +- .../enqueue_write_buffer_rect_tests.cpp | 10 +- .../enqueue_write_buffer_tests.cpp | 14 +-- .../enqueue_write_image_fixture.h | 8 +- .../enqueue_write_image_tests.cpp | 10 +- .../unit_test/command_queue/finish_tests.cpp | 12 +- .../command_queue/flattened_id_tests.cpp | 3 +- .../unit_test/command_queue/flush_tests.cpp | 6 +- .../get_command_queue_info_tests.cpp | 7 +- .../get_size_required_buffer_tests.cpp | 13 +-- .../get_size_required_image_tests.cpp | 13 +-- .../command_queue/get_size_required_tests.cpp | 5 +- .../enqueue_kernel_gl_tests_windows.cpp | 17 ++- .../command_queue/ioq_task_tests.cpp | 4 +- .../command_queue/ioq_task_tests_mt.cpp | 8 +- .../command_queue/local_id_tests.cpp | 3 +- .../command_queue/local_work_size_tests.cpp | 4 +- .../multi_dispatch_info_tests.cpp | 3 +- .../multiple_map_buffer_tests.cpp | 5 +- .../multiple_map_image_tests.cpp | 11 +- .../command_queue/oom_buffer_tests.cpp | 15 ++- .../command_queue/oom_image_tests.cpp | 7 +- .../unit_test/command_queue/oom_tests.cpp | 7 +- .../command_queue/ooq_task_tests.cpp | 6 +- .../command_queue/ooq_task_tests_mt.cpp | 4 +- .../read_write_buffer_cpu_copy.cpp | 5 +- .../sync_buffer_handler_tests.cpp | 9 +- .../command_queue/work_group_size_tests.cpp | 2 +- .../command_queue/zero_size_enqueue_tests.cpp | 13 +-- .../aub_command_stream_receiver_1_tests.cpp | 29 +++-- .../aub_command_stream_receiver_2_tests.cpp | 30 ++--- .../command_stream/aub_file_stream_tests.cpp | 22 ++-- .../command_stream/aub_subcapture_tests.cpp | 9 +- .../command_stream/cmd_parse_tests.cpp | 5 +- ...and_stream_receiver_flush_task_1_tests.cpp | 17 ++- ...and_stream_receiver_flush_task_2_tests.cpp | 24 ++-- ...and_stream_receiver_flush_task_3_tests.cpp | 25 ++--- ...stream_receiver_flush_task_gmock_tests.cpp | 28 ++--- .../command_stream_receiver_hw_tests.cpp | 38 +++---- .../command_stream_receiver_tests.cpp | 28 ++--- ...nd_stream_receiver_with_aub_dump_tests.cpp | 17 ++- .../command_stream/compute_mode_tests.h | 5 +- .../create_command_stream_receiver_tests.cpp | 9 +- .../experimental_command_buffer_tests.cpp | 8 +- .../command_stream/get_devices_tests.cpp | 5 +- .../command_stream/linear_stream_fixture.h | 3 +- .../command_stream/linear_stream_tests.cpp | 5 +- .../submissions_aggregator_tests.cpp | 13 +-- .../tbx_command_stream_fixture.cpp | 6 +- .../tbx_command_stream_fixture.h | 3 +- .../tbx_command_stream_tests.cpp | 30 ++--- .../command_stream/tbx_stream_tests.cpp | 4 +- .../context/context_get_info_tests.cpp | 7 +- .../context/context_multi_device_tests.cpp | 2 +- .../context/context_negative_tests.cpp | 4 +- .../test/unit_test/context/context_tests.cpp | 14 +-- .../driver_diagnostics_enqueue_tests.cpp | 5 +- .../context/driver_diagnostics_tests.cpp | 3 +- .../context/driver_diagnostics_tests.h | 14 +-- .../get_supported_image_formats_tests.cpp | 8 +- .../unit_test/context/gl/context_gl_tests.cpp | 2 +- .../unit_test/context/gl/context_gl_tests.h | 5 +- .../gl/windows/context_gl_tests_windows.cpp | 2 +- .../unit_test/core_unit_tests_files.cmake | 2 +- .../d3d_sharing/cl_dx_sharing_tests.cpp | 6 +- .../test/unit_test/d3d_sharing/d3d9_tests.cpp | 13 +-- .../unit_test/d3d_sharing/d3d_aux_tests.cpp | 2 +- .../unit_test/d3d_sharing/d3d_tests_part1.cpp | 6 +- .../unit_test/d3d_sharing/d3d_tests_part2.cpp | 2 +- .../unit_test/device/device_caps_tests.cpp | 10 +- .../device/device_get_engine_tests.cpp | 4 +- opencl/test/unit_test/device/device_tests.cpp | 15 ++- .../unit_test/device/device_timers_tests.cpp | 5 +- .../device/device_win_timers_tests.cpp | 10 +- .../device/get_device_info_size_tests.cpp | 2 +- .../device/get_device_info_tests.cpp | 4 +- .../device/gl/device_caps_gl_tests.cpp | 2 +- .../unit_test/device/sub_device_tests.cpp | 9 +- .../device_queue/device_queue_hw_tests.cpp | 15 ++- .../device_queue/device_queue_tests.cpp | 11 +- .../get_device_queue_info_tests.cpp | 3 +- .../event/async_events_handler_tests.cpp | 2 +- .../unit_test/event/event_builder_tests.cpp | 12 +- .../unit_test/event/event_callbacks_tests.cpp | 9 +- opencl/test/unit_test/event/event_fixture.h | 12 +- opencl/test/unit_test/event/event_tests.cpp | 22 ++-- .../test/unit_test/event/event_tests_mt.cpp | 2 +- .../unit_test/event/user_events_tests.cpp | 4 +- .../unit_test/event/user_events_tests_mt.cpp | 4 +- .../execution_environment_tests.cpp | 9 +- .../enqueue_execution_model_kernel_tests.cpp | 19 ++-- .../parent_kernel_dispatch_tests.cpp | 15 ++- .../scheduler_dispatch_tests.cpp | 15 ++- .../submit_blocked_parent_kernel_tests.cpp | 7 +- .../aub_command_stream_receiver_fixture.h | 4 +- .../fixtures/buffer_enqueue_fixture.h | 15 ++- .../unit_test/fixtures/buffer_fixture.cpp | 4 +- .../test/unit_test/fixtures/buffer_fixture.h | 2 +- .../unit_test/fixtures/built_in_fixture.cpp | 9 +- .../unit_test/fixtures/context_fixture.cpp | 3 +- .../unit_test/fixtures/d3d_test_fixture.h | 11 +- .../unit_test/fixtures/device_fixture.cpp | 2 +- .../test/unit_test/fixtures/device_fixture.h | 2 +- .../fixtures/device_host_queue_fixture.cpp | 2 +- .../fixtures/device_host_queue_fixture.h | 3 +- .../unit_test/fixtures/device_info_fixture.h | 3 +- .../device_instrumentation_fixture.cpp | 6 +- .../fixtures/dispatch_flags_fixture.h | 9 +- .../fixtures/enqueue_handler_fixture.h | 5 +- .../fixtures/execution_model_fixture.h | 7 +- .../fixtures/execution_model_kernel_fixture.h | 7 +- .../unit_test/fixtures/hello_world_fixture.h | 13 +-- .../fixtures/hello_world_kernel_fixture.h | 12 +- .../test/unit_test/fixtures/image_fixture.cpp | 4 +- .../test/unit_test/fixtures/image_fixture.h | 4 +- .../unit_test/fixtures/kernel_arg_fixture.cpp | 13 +-- .../unit_test/fixtures/kernel_arg_fixture.h | 3 +- .../fixtures/kernel_data_fixture.cpp | 2 +- .../unit_test/fixtures/kernel_data_fixture.h | 4 +- .../unit_test/fixtures/media_kernel_fixture.h | 6 +- .../fixtures/memory_allocator_fixture.h | 7 +- .../memory_allocator_multi_device_fixture.h | 9 +- .../fixtures/memory_management_fixture.cpp | 2 +- .../fixtures/memory_manager_fixture.cpp | 7 +- .../fixtures/mock_aub_center_fixture.h | 7 +- .../fixtures/multi_root_device_fixture.h | 7 +- .../unit_test/fixtures/platform_fixture.cpp | 4 +- .../unit_test/fixtures/program_fixture.cpp | 5 +- .../test/unit_test/fixtures/program_fixture.h | 4 +- .../unit_test/fixtures/run_kernel_fixture.h | 4 +- .../fixtures/scenario_test_fixture.h | 6 +- .../unit_test/fixtures/simple_arg_fixture.h | 9 +- .../fixtures/simple_arg_kernel_fixture.h | 10 +- .../unit_test/fixtures/two_walker_fixture.h | 5 +- .../ult_command_stream_receiver_fixture.h | 11 +- .../unit_test/gen11/coherency_tests_gen11.cpp | 7 +- ...command_stream_receiver_hw_tests_gen11.cpp | 16 +-- .../ehl/linux/hw_info_config_tests_ehl.cpp | 4 +- .../gen11/ehl/test_device_caps_ehl.cpp | 3 +- .../ehl/windows/hw_info_config_tests_ehl.cpp | 3 +- .../unit_test/gen11/enqueue_kernel_gen11.cpp | 8 +- .../gen11/enqueue_media_kernel_gen11.cpp | 3 +- .../unit_test/gen11/hw_helper_tests_gen11.cpp | 4 +- .../linux/hw_info_config_tests_icllp.cpp | 4 +- .../gen11/icllp/test_device_caps_icllp.cpp | 3 +- .../gen11/icllp/test_media_kernel_icllp.cpp | 3 +- .../test_program_media_sampler_icllp.cpp | 7 +- .../windows/hw_info_config_tests_icllp.cpp | 3 +- .../unit_test/gen11/image_tests_gen11.cpp | 5 +- .../unit_test/gen11/kernel_tests_gen11.cpp | 5 +- .../lkf/linux/hw_info_config_tests_lkf.cpp | 4 +- .../gen11/lkf/test_device_caps_lkf.cpp | 3 +- .../lkf/windows/hw_info_config_tests_lkf.cpp | 3 +- .../unit_test/gen11/sampler_tests_gen11.cpp | 5 +- .../gen11/scheduler_source_tests_gen11.cpp | 5 +- ...bx_command_stream_receiver_tests_gen11.cpp | 3 +- .../gen11/test_device_caps_gen11.cpp | 3 +- .../gen11/test_device_queue_hw_gen11.cpp | 7 +- .../gen11/test_platform_caps_gen11.cpp | 3 +- .../unit_test/gen11/test_sample_gen11.cpp | 3 +- .../gen11/unit_test_helper_gen11.cpp | 5 +- ..._command_stream_receiver_tests_gen12lp.inl | 11 +- .../gen12lp/coherency_tests_gen12lp.inl | 5 +- ...mmand_stream_receiver_hw_tests_gen12lp.inl | 20 ++-- ...iver_simulated_common_hw_tests_gen12lp.inl | 4 +- .../gen12lp/compute_mode_tests_gen12lp.inl | 2 +- .../gen12lp/device_queue_tests_gen12lp.cpp | 10 +- .../gen12lp/enqueue_media_kernel_gen12lp.inl | 3 +- .../gen12lp/gen12lp_tests_wrapper.cpp | 35 +++--- .../gen12lp/hw_helper_tests_gen12lp.inl | 10 +- .../unit_test/gen12lp/image_tests_gen12lp.inl | 12 +- .../gen12lp/kernel_tests_gen12lp.inl | 5 +- .../gen12lp/profiling_tests_gen12lp.inl | 5 +- .../gen12lp/sampler_tests_gen12lp.inl | 5 +- .../scheduler_source_tests_gen12lp.inl | 5 +- .../gen12lp/special_ult_helper_gen12lp.cpp | 2 +- ..._command_stream_receiver_tests_gen12lp.inl | 5 +- .../gen12lp/test_device_caps_gen12lp.inl | 3 +- .../gen12lp/test_device_queue_hw_gen12lp.inl | 9 +- .../gen12lp/test_platform_caps_gen12lp.inl | 3 +- .../unit_test/gen12lp/test_sample_gen12lp.inl | 3 +- .../gen12lp/tgllp/kernel_tests_tgllp.cpp | 5 +- .../tgllp/linux/test_hw_info_config_tgllp.cpp | 2 +- .../gen12lp/tgllp/test_hw_helper_tgllp.cpp | 2 +- .../tgllp/test_hw_info_config_tgllp.cpp | 3 +- .../windows/hw_info_config_tests_tgllp.cpp | 3 +- .../gen12lp/unit_test_helper_gen12lp.cpp | 7 +- .../windows/gmm_callbacks_tests_gen12lp.cpp | 7 +- .../windows/hw_info_config_tests_gen12lp.cpp | 5 +- .../gen12lp/windows/wddm_tests_gen12lp.cpp | 6 +- .../unit_test/gen8/bdw/device_tests_bdw.cpp | 7 +- .../bdw/linux/hw_info_config_tests_bdw.cpp | 4 +- .../gen8/bdw/test_device_caps_bdw.cpp | 3 +- .../bdw/windows/hw_info_config_tests_bdw.cpp | 3 +- .../windows/test_device_caps_bdw_windows.cpp | 3 +- .../unit_test/gen8/coherency_tests_gen8.cpp | 3 +- .../command_stream_receiver_hw_tests_gen8.cpp | 18 +-- .../gen8/enqueue_media_kernel_gen8.cpp | 3 +- .../unit_test/gen8/hw_helper_tests_gen8.cpp | 5 +- .../test/unit_test/gen8/image_tests_gen8.cpp | 5 +- .../test/unit_test/gen8/kernel_tests_gen8.cpp | 5 +- .../unit_test/gen8/sampler_tests_gen8.cpp | 5 +- .../gen8/scheduler_dispatch_tests_gen8.cpp | 4 +- .../gen8/scheduler_source_tests_gen8.cpp | 5 +- .../unit_test/gen8/test_device_caps_gen8.cpp | 3 +- .../gen8/test_device_queue_hw_gen8.cpp | 7 +- .../gen8/test_platform_caps_gen8.cpp | 3 +- .../test/unit_test/gen8/test_sample_gen8.cpp | 3 +- .../unit_test/gen8/unit_test_helper_gen8.cpp | 5 +- .../unit_test/gen9/bxt/device_tests_bxt.cpp | 3 +- .../gen9/bxt/linux/hw_info_config_tests.cpp | 4 +- .../gen9/bxt/test_device_caps_bxt.cpp | 3 +- .../bxt/windows/hw_info_config_tests_bxt.cpp | 3 +- .../windows/test_device_caps_bxt_windows.cpp | 3 +- .../cfl/linux/hw_info_config_tests_cfl.cpp | 4 +- .../gen9/cfl/test_device_caps_cfl.cpp | 3 +- .../cfl/windows/hw_info_config_tests_cfl.cpp | 3 +- .../windows/test_device_caps_cfl_windows.cpp | 3 +- .../unit_test/gen9/coherency_tests_gen9.cpp | 3 +- .../command_stream_receiver_hw_tests_gen9.cpp | 22 ++-- .../unit_test/gen9/enqueue_kernel_gen9.cpp | 11 +- .../gen9/enqueue_media_kernel_gen9.cpp | 3 +- .../glk/linux/hw_info_config_tests_glk.cpp | 4 +- .../gen9/glk/test_device_caps_glk.cpp | 3 +- .../glk/windows/hw_info_config_tests_glk.cpp | 3 +- .../windows/test_device_caps_glk_windows.cpp | 3 +- .../unit_test/gen9/hw_helper_tests_gen9.cpp | 4 +- .../test/unit_test/gen9/image_tests_gen9.cpp | 5 +- .../kbl/linux/hw_info_config_tests_kbl.cpp | 4 +- .../gen9/kbl/test_device_caps_kbl.cpp | 3 +- .../kbl/windows/hw_info_config_tests_kbl.cpp | 3 +- .../windows/test_device_caps_kbl_windows.cpp | 3 +- .../test/unit_test/gen9/kernel_tests_gen9.cpp | 5 +- .../unit_test/gen9/sampler_tests_gen9.cpp | 5 +- .../gen9/scheduler_source_tests_gen9.cpp | 5 +- opencl/test/unit_test/gen9/sip_tests_gen9.cpp | 6 +- .../unit_test/gen9/skl/device_tests_skl.cpp | 3 +- .../skl/linux/hw_info_config_tests_skl.cpp | 4 +- .../gen9/skl/test_device_caps_skl.cpp | 3 +- .../unit_test/gen9/skl/test_sample_skl.cpp | 3 +- .../skl/windows/hw_info_config_tests_skl.cpp | 3 +- .../windows/test_device_caps_skl_windows.cpp | 3 +- .../unit_test/gen9/test_device_caps_gen9.cpp | 3 +- .../gen9/test_device_queue_hw_gen9.cpp | 7 +- .../gen9/test_platform_caps_gen9.cpp | 3 +- .../test/unit_test/gen9/test_sample_gen9.cpp | 3 +- .../unit_test/gen9/unit_test_helper_gen9.cpp | 5 +- .../unit_test/gen_common/cmd_parse_base.inl | 2 +- .../gen_commands_common_validation.h | 4 +- .../unit_test/gen_common/hw_cmds_tests.cpp | 3 +- opencl/test/unit_test/global_environment.cpp | 2 +- opencl/test/unit_test/global_environment.h | 2 +- .../unit_test/gmm_helper/gmm_helper_tests.cpp | 12 +- opencl/test/unit_test/gtpin/gtpin_tests.cpp | 26 ++--- .../unit_test/helpers/base_object_tests.cpp | 10 +- .../unit_test/helpers/built_ins_helper.cpp | 9 +- .../unit_test/helpers/cmd_buffer_validator.h | 3 +- .../helpers/cmd_buffer_validator_tests.cpp | 2 +- .../helpers/dirty_state_helpers_tests.cpp | 2 +- .../helpers/dispatch_info_builder_tests.cpp | 9 +- .../unit_test/helpers/dispatch_info_tests.cpp | 8 +- .../helpers/execution_environment_helper.cpp | 2 +- .../hardware_commands_helper_tests.cpp | 13 +-- .../helpers/hardware_commands_helper_tests.h | 15 ++- .../helpers/hw_helper_default_tests.cpp | 3 +- .../unit_test/helpers/hw_helper_tests.cpp | 11 +- .../test/unit_test/helpers/hw_helper_tests.h | 3 +- opencl/test/unit_test/helpers/hw_parse.h | 2 +- opencl/test/unit_test/helpers/hw_parse.inl | 2 +- .../helpers/kernel_binary_helper.cpp | 6 +- .../kernel_binary_helper_hash_value.cpp | 2 +- .../unit_test/helpers/kmd_notify_tests.cpp | 6 +- .../helpers/memory_management_tests.cpp | 2 +- .../test/unit_test/helpers/mipmap_tests.cpp | 6 +- .../helpers/per_thread_data_tests.cpp | 4 +- .../unit_test/helpers/queue_helpers_tests.cpp | 6 +- .../helpers/task_information_tests.cpp | 13 +-- .../helpers/timestamp_packet_tests.cpp | 24 ++-- .../helpers/transfer_properties_tests.cpp | 6 +- .../unit_test/helpers/validator_tests.cpp | 6 +- .../helpers/windows/gl_helper_tests.cpp | 2 +- .../windows/kmd_notify_windows_tests.cpp | 3 +- opencl/test/unit_test/igdrcl_tests_pch.cpp | 2 +- opencl/test/unit_test/igdrcl_tests_pch.h | 2 +- .../indirect_heap/indirect_heap_fixture.cpp | 2 +- .../unit_test/kernel/clone_kernel_tests.cpp | 18 +-- .../unit_test/kernel/debug_kernel_tests.cpp | 9 +- .../kernel/gl/kernel_arg_buffer_tests.cpp | 18 +-- .../kernel/image_transformer_tests.cpp | 3 +- .../kernel/kernel_accelerator_arg_tests.cpp | 12 +- .../kernel/kernel_arg_buffer_fixture.cpp | 12 +- .../kernel/kernel_arg_buffer_fixture.h | 12 +- .../kernel/kernel_arg_buffer_tests.cpp | 16 +-- .../kernel/kernel_arg_dev_queue_tests.cpp | 10 +- .../kernel/kernel_arg_info_tests.cpp | 15 ++- .../kernel/kernel_arg_pipe_tests.cpp | 14 +-- .../unit_test/kernel/kernel_arg_svm_tests.cpp | 12 +- .../kernel_cache_flush_requirements_tests.cpp | 15 ++- .../kernel/kernel_image_arg_tests.cpp | 14 +-- .../kernel/kernel_immediate_arg_tests.cpp | 8 +- .../kernel/kernel_is_patched_tests.cpp | 7 +- .../kernel_reflection_surface_tests.cpp | 24 ++-- .../unit_test/kernel/kernel_slm_arg_tests.cpp | 8 +- .../unit_test/kernel/kernel_slm_tests.cpp | 7 +- opencl/test/unit_test/kernel/kernel_tests.cpp | 31 +++-- .../kernel/kernel_transformable_tests.cpp | 11 +- .../unit_test/kernel/parent_kernel_tests.cpp | 9 +- .../kernel/substitute_kernel_heap_tests.cpp | 5 +- opencl/test/unit_test/libult/CMakeLists.txt | 106 +++++++++--------- .../libult/create_command_stream.cpp | 5 +- .../unit_test/libult/create_tbx_sockets.cpp | 5 +- .../libult/source_level_debugger.cpp | 2 +- .../libult/ult_aub_command_stream_receiver.h | 3 +- .../libult/ult_command_stream_receiver.h | 5 +- opencl/test/unit_test/linux/CMakeLists.txt | 8 +- .../unit_test/linux/drm_null_device_tests.cpp | 5 +- .../test/unit_test/linux/main_linux_dll.cpp | 12 +- opencl/test/unit_test/linux/test_mode.h | 2 +- opencl/test/unit_test/linux/va_tests.cpp | 3 +- opencl/test/unit_test/main.cpp | 18 +-- .../unit_test/mem_obj/buffer_pin_tests.cpp | 12 +- .../mem_obj/buffer_set_arg_tests.cpp | 10 +- .../test/unit_test/mem_obj/buffer_tests.cpp | 30 ++--- .../mem_obj/create_image_format_tests.cpp | 6 +- .../mem_obj/destructor_callback_tests.cpp | 4 +- .../get_mem_object_info_subbuffer_tests.cpp | 2 +- .../mem_obj/get_mem_object_info_tests.cpp | 8 +- .../test/unit_test/mem_obj/image1d_tests.cpp | 5 +- .../mem_obj/image2d_from_buffer_tests.cpp | 9 +- .../test/unit_test/mem_obj/image2d_tests.cpp | 7 +- .../test/unit_test/mem_obj/image3d_tests.cpp | 9 +- .../mem_obj/image_array_size_tests.cpp | 7 +- .../mem_obj/image_compression_fixture.h | 7 +- .../mem_obj/image_from_subbuffer_tests.cpp | 5 +- .../mem_obj/image_redescribe_tests.cpp | 4 +- .../image_release_mapped_ptr_tests.cpp | 11 +- .../unit_test/mem_obj/image_set_arg_tests.cpp | 14 +-- opencl/test/unit_test/mem_obj/image_tests.cpp | 23 ++-- .../mem_obj/image_tests_tgllp_plus.cpp | 7 +- .../unit_test/mem_obj/image_tiled_tests.cpp | 14 +-- .../mem_obj/image_transfer_tests.cpp | 6 +- .../mem_obj/image_validate_tests.cpp | 6 +- .../mem_obj/mem_obj_destruction_tests.cpp | 9 +- .../mem_obj/mem_obj_helper_tests.cpp | 2 +- .../test/unit_test/mem_obj/mem_obj_tests.cpp | 12 +- .../unit_test/mem_obj/nv12_image_tests.cpp | 14 +-- .../mem_obj/packed_yuv_image_tests.cpp | 8 +- opencl/test/unit_test/mem_obj/pipe_tests.cpp | 9 +- .../unit_test/mem_obj/sub_buffer_tests.cpp | 6 +- .../unit_test/mem_obj/zero_copy_tests.cpp | 6 +- .../deferrable_allocation_deletion_tests.cpp | 9 +- .../deferred_deleter_mt_tests.cpp | 4 +- .../memory_manager/gfx_partition_tests.cpp | 2 +- .../memory_manager/gfx_partition_tests.inl | 2 +- .../graphics_allocation_tests.cpp | 3 +- .../memory_manager/host_ptr_manager_tests.cpp | 13 +-- .../internal_allocation_storage_tests.cpp | 7 +- ..._manager_allocate_in_device_pool_tests.cpp | 2 +- ..._manager_allocate_in_device_pool_tests.inl | 4 +- ...nager_allocate_in_preferred_pool_tests.cpp | 2 +- ...nager_allocate_in_preferred_pool_tests.inl | 6 +- .../memory_manager_multi_device_tests.cpp | 15 ++- .../memory_manager/memory_manager_tests.cpp | 37 +++--- .../memory_manager/page_table_tests.cpp | 2 +- .../physical_address_allocator_tests.cpp | 2 +- .../memory_manager/surface_tests.cpp | 4 +- .../unified_memory_manager_tests.cpp | 10 +- .../unit_test/mock_gl/windows/CMakeLists.txt | 2 +- .../mock_gl/windows/mock_opengl32.cpp | 5 +- opencl/test/unit_test/mocks/CMakeLists.txt | 6 +- .../gl/windows/mock_gl_sharing_windows.cpp | 2 +- .../gl/windows/mock_gl_sharing_windows.h | 2 +- .../mocks/gmm_memory/mock_gmm_memory.h | 2 +- .../mocks/linux/mock_drm_memory_manager.cpp | 9 +- .../mocks/linux/mock_drm_memory_manager.h | 3 +- .../mocks/mock_async_event_handler.cpp | 2 +- opencl/test/unit_test/mocks/mock_aub_center.h | 3 +- opencl/test/unit_test/mocks/mock_aub_csr.h | 2 +- opencl/test/unit_test/mocks/mock_buffer.h | 7 +- opencl/test/unit_test/mocks/mock_builtins.cpp | 2 +- opencl/test/unit_test/mocks/mock_cif.cpp | 2 +- .../test/unit_test/mocks/mock_command_queue.h | 3 +- .../test/unit_test/mocks/mock_compilers.cpp | 6 +- opencl/test/unit_test/mocks/mock_compilers.h | 2 +- opencl/test/unit_test/mocks/mock_context.cpp | 4 +- opencl/test/unit_test/mocks/mock_csr.cpp | 2 +- opencl/test/unit_test/mocks/mock_csr.h | 2 +- .../mocks/mock_deferrable_deletion.cpp | 2 +- .../unit_test/mocks/mock_deferred_deleter.cpp | 2 +- opencl/test/unit_test/mocks/mock_device.cpp | 11 +- opencl/test/unit_test/mocks/mock_device.h | 9 +- .../mocks/mock_execution_environment.h | 3 +- .../unit_test/mocks/mock_gfx_partition.cpp | 2 +- opencl/test/unit_test/mocks/mock_gmm.h | 5 +- .../unit_test/mocks/mock_gmm_client_context.h | 2 +- .../mocks/mock_gmm_client_context_base.cpp | 2 +- .../mocks/mock_gmm_page_table_mngr.cpp | 2 +- .../mocks/mock_gmm_resource_info.cpp | 2 +- opencl/test/unit_test/mocks/mock_image.h | 3 +- opencl/test/unit_test/mocks/mock_kernel.cpp | 2 +- opencl/test/unit_test/mocks/mock_kernel.h | 5 +- .../unit_test/mocks/mock_memory_manager.cpp | 5 +- .../unit_test/mocks/mock_memory_manager.h | 4 +- opencl/test/unit_test/mocks/mock_pipe.h | 3 +- opencl/test/unit_test/mocks/mock_platform.cpp | 2 +- opencl/test/unit_test/mocks/mock_program.cpp | 9 +- opencl/test/unit_test/mocks/mock_sip.cpp | 8 +- opencl/test/unit_test/mocks/mock_sip.h | 3 +- opencl/test/unit_test/mocks/mock_wddm.cpp | 6 +- opencl/test/unit_test/mocks/mock_wddm.h | 2 +- ...ock_wddm_residency_allocations_container.h | 3 +- opencl/test/unit_test/mt_tests/CMakeLists.txt | 8 +- .../unit_test/mt_tests/api/CMakeLists.txt | 10 +- .../mt_tests/command_queue/CMakeLists.txt | 8 +- .../device_queue/device_queue_mt_tests.cpp | 7 +- .../unit_test/mt_tests/event/CMakeLists.txt | 2 +- .../mt_tests/fixtures/CMakeLists.txt | 4 +- .../unit_test/mt_tests/helpers/CMakeLists.txt | 2 +- .../mt_tests/memory_manager/CMakeLists.txt | 2 +- .../deferred_deleter_clear_queue_mt_tests.cpp | 5 +- .../linux/drm_memory_manager_mt_tests.cpp | 6 +- opencl/test/unit_test/mt_tests/test_mode.h | 2 +- .../unit_test/offline_compiler/CMakeLists.txt | 2 +- .../decoder/decoder_tests.cpp | 2 +- .../decoder/encoder_tests.cpp | 2 +- .../unit_test/offline_compiler/environment.h | 4 +- .../test/unit_test/offline_compiler/main.cpp | 4 +- .../mock/mock_sip_ocloc_tests.cpp | 2 +- .../offline_compiler_tests.cpp | 2 +- .../segfault_test/CMakeLists.txt | 2 +- .../windows/safety_guard_caller_windows.cpp | 2 +- .../os_interface/device_factory_tests.cpp | 2 +- .../os_interface/hw_info_config_tests.cpp | 2 +- .../os_interface/hw_info_config_tests.h | 2 +- .../linux/device_command_stream_fixture.h | 2 +- .../linux/device_command_stream_tests.cpp | 8 +- .../linux/device_factory_tests.cpp | 2 +- .../os_interface/linux/device_factory_tests.h | 6 +- .../os_interface/linux/device_os_tests.cpp | 8 +- .../linux/drm_buffer_object_tests.cpp | 2 +- .../linux/drm_command_stream_fixture.h | 6 +- .../linux/drm_command_stream_mm_tests.cpp | 7 +- .../linux/drm_command_stream_tests.cpp | 22 ++-- .../linux/drm_engine_info_tests.cpp | 3 +- .../linux/drm_gem_close_worker_tests.cpp | 4 +- .../linux/drm_memory_info_tests.cpp | 2 +- ..._manager_allocate_in_device_pool_tests.cpp | 6 +- .../linux/drm_memory_manager_tests.cpp | 12 +- .../linux/drm_memory_manager_tests.h | 11 +- .../unit_test/os_interface/linux/drm_mock.cpp | 2 +- .../os_interface/linux/drm_neo_create.cpp | 3 +- .../linux/drm_residency_handler_tests.cpp | 3 +- .../os_interface/linux/drm_tests.cpp | 4 +- .../linux/file_logger_linux_tests.cpp | 5 +- .../linux/hw_info_config_linux_tests.cpp | 2 +- .../linux/hw_info_config_linux_tests.h | 5 +- ...te_command_queue_with_properties_tests.cpp | 11 +- .../linux/mock_performance_counters_linux.cpp | 4 +- .../linux/os_interface_linux_tests.cpp | 2 +- .../os_interface/linux/os_time_test.cpp | 4 +- .../performance_counters_linux_tests.cpp | 5 +- .../mock_performance_counters.cpp | 3 +- .../os_interface/mock_performance_counters.h | 6 +- .../os_interface/os_library_tests.cpp | 2 +- .../performance_counters_tests.cpp | 8 +- .../windows/deferrable_deletion_win_tests.cpp | 4 +- .../windows/device_command_stream_tests.cpp | 31 +++-- .../os_interface/windows/device_os_tests.cpp | 2 +- .../windows/driver_info_tests.cpp | 12 +- .../windows/file_logger_win_tests.cpp | 5 +- .../os_interface/windows/gdi_dll_fixture.h | 3 +- .../windows/gl/gl_os_sharing_tests.cpp | 6 +- .../windows/hw_info_config_win_tests.cpp | 4 +- .../windows/hw_info_config_win_tests.h | 3 +- .../windows/mock_environment_variables.cpp | 2 +- .../windows/mock_performance_counters_win.cpp | 5 +- .../windows/mock_performance_counters_win.h | 3 +- .../windows/mock_wddm_memory_manager.h | 5 +- .../windows/os_context_win_tests.cpp | 5 +- .../windows/os_interface_win_tests.cpp | 7 +- .../windows/os_library_win_tests.cpp | 2 +- .../windows/os_time_win_tests.cpp | 4 +- .../performance_counters_win_tests.cpp | 3 +- .../windows/registry_reader_tests.cpp | 2 +- .../os_interface/windows/ult_dxgi_factory.cpp | 2 +- .../os_interface/windows/wddm20_tests.cpp | 16 +-- .../os_interface/windows/wddm23_tests.cpp | 7 +- .../windows/wddm_address_space_tests.cpp | 5 +- .../os_interface/windows/wddm_calls.cpp | 5 +- .../os_interface/windows/wddm_create.cpp | 2 +- .../os_interface/windows/wddm_fixture.h | 8 +- .../windows/wddm_kmdaf_listener_tests.cpp | 7 +- ..._manager_allocate_in_device_pool_tests.cpp | 2 +- ..._manager_allocate_in_device_pool_tests.inl | 4 +- .../windows/wddm_memory_manager_tests.cpp | 17 ++- .../windows/wddm_memory_manager_tests.h | 14 +-- .../wddm_residency_controller_tests.cpp | 12 +- .../windows/wddm_residency_handler_tests.cpp | 15 ++- .../page_fault_manager_tests/CMakeLists.txt | 8 +- .../test/unit_test/perf_tests/api/api_tests.h | 8 +- .../perf_tests/api/context_tests.cpp | 4 +- .../fixtures/command_queue_fixture.cpp | 2 +- .../perf_tests/fixtures/platform_fixture.cpp | 2 +- .../unit_test/platform/platform_icd_tests.cpp | 2 +- .../unit_test/platform/platform_tests.cpp | 20 ++-- .../unit_test/profiling/profiling_tests.cpp | 19 ++-- .../program/block_kernel_manager_tests.cpp | 4 +- opencl/test/unit_test/program/kernel_data.cpp | 5 +- .../unit_test/program/kernel_data_OCL2_0.cpp | 4 +- .../unit_test/program/kernel_info_tests.cpp | 4 +- .../program/printf_handler_tests.cpp | 16 +-- .../unit_test/program/printf_helper_tests.cpp | 8 +- .../program/process_debug_data_tests.cpp | 4 +- .../program/process_elf_binary_tests.cpp | 6 +- .../program/process_spir_binary_tests.cpp | 2 +- .../unit_test/program/program_data_tests.cpp | 13 +-- .../unit_test/program/program_from_binary.h | 9 +- .../unit_test/program/program_nonuniform.cpp | 25 ++--- .../program/program_spec_constants_tests.cpp | 12 +- .../test/unit_test/program/program_tests.cpp | 24 ++-- opencl/test/unit_test/program/program_tests.h | 5 +- .../program_with_block_kernels_tests.cpp | 13 +-- .../program_with_kernel_debug_tests.cpp | 16 +-- .../unit_test/program/program_with_source.h | 13 +-- .../sampler/get_sampler_info_tests.cpp | 4 +- .../sampler/sampler_set_arg_tests.cpp | 11 +- .../test/unit_test/sampler/sampler_tests.cpp | 6 +- ...blocked_enqueue_barrier_scenario_tests.cpp | 6 +- ...d_enqueue_with_callback_scenario_tests.cpp | 6 +- ...d_write_buffer_scenarios_windows_tests.cpp | 13 +-- .../scheduler/scheduler_kernel_tests.cpp | 12 +- .../scheduler/scheduler_source_tests.cpp | 10 +- .../scheduler/scheduler_source_tests.h | 4 +- .../scheduler/scheduler_source_tests.inl | 5 +- .../sharings/d3d/context_d3d_tests.cpp | 6 +- .../gl/windows/gl_arb_sync_event_tests.cpp | 15 ++- .../windows/gl_create_from_texture_tests.cpp | 10 +- .../gl/windows/gl_reused_buffers_tests.cpp | 7 +- .../gl/windows/gl_sharing_enable_tests.cpp | 4 +- .../sharings/gl/windows/gl_sharing_tests.cpp | 20 ++-- .../sharings/gl/windows/gl_texture_tests.cpp | 10 +- .../sharings/sharing_factory_tests.cpp | 8 +- .../test/unit_test/sharings/sharing_tests.cpp | 4 +- .../unified/unified_sharing_buffer_tests.cpp | 5 +- .../unified/unified_sharing_fixtures.h | 11 +- .../unified/unified_sharing_image_tests.cpp | 9 +- .../unified/unified_sharing_tests.cpp | 11 +- .../cl_create_from_va_media_surface_tests.cpp | 3 +- ...nqueue_acquire_va_media_surfaces_tests.cpp | 3 +- ...nqueue_release_va_media_surfaces_tests.cpp | 3 +- ...l_get_extension_function_address_tests.cpp | 3 +- .../sharings/va/context_va_tests.cpp | 4 +- .../sharings/va/kernel_va_image_arg_tests.cpp | 8 +- .../sharings/va/va_base_object_tests.cpp | 2 +- .../sharings/va/va_sharing_enable_tests.cpp | 6 +- .../sharings/va/va_sharing_linux_tests.cpp | 4 +- .../sharings/va/va_sharing_tests.cpp | 10 +- .../sku_info/sku_info_receiver_tests.cpp | 2 +- .../sku_info/sku_info_transfer_tests.cpp | 2 +- .../source_level_debugger_csr_tests.cpp | 19 ++-- .../source_level_debugger_device_tests.cpp | 9 +- .../source_level_debugger_tests.cpp | 12 +- opencl/test/unit_test/test_mode.h | 2 +- opencl/test/unit_test/ult_config_listener.cpp | 2 +- .../utilities/debug_file_reader_tests.cpp | 2 +- .../utilities/debug_file_reader_tests.inl | 2 +- .../unit_test/utilities/file_logger_tests.cpp | 17 ++- .../utilities/tag_allocator_tests.cpp | 2 +- opencl/test/unit_test/windows/CMakeLists.txt | 4 +- opencl/test/unit_test/windows/test_mode.h | 2 +- .../unit_test/windows/wddm_create_tests.cpp | 3 +- 830 files changed, 2740 insertions(+), 3072 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5587a6c40..ac7dec948f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -562,8 +562,6 @@ 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) diff --git a/core/unit_tests/command_container/command_container_tests.cpp b/core/unit_tests/command_container/command_container_tests.cpp index 6ef29d09c6..15bc487ef2 100644 --- a/core/unit_tests/command_container/command_container_tests.cpp +++ b/core/unit_tests/command_container/command_container_tests.cpp @@ -6,11 +6,10 @@ */ #include "core/command_container/cmdcontainer.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_graphics_allocation.h" - using namespace NEO; class CommandContainerTest : public DeviceFixture, diff --git a/core/unit_tests/command_container/command_encoder_tests.cpp b/core/unit_tests/command_container/command_encoder_tests.cpp index b9092b3add..7ba1761cbf 100644 --- a/core/unit_tests/command_container/command_encoder_tests.cpp +++ b/core/unit_tests/command_container/command_encoder_tests.cpp @@ -6,10 +6,9 @@ */ #include "core/command_container/command_encoder.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; class CommandEncoderTests : public DeviceFixture, diff --git a/core/unit_tests/compiler_interface/compiler_cache_tests.cpp b/core/unit_tests/compiler_interface/compiler_cache_tests.cpp index a4cf38bee1..7b23f1b137 100644 --- a/core/unit_tests/compiler_interface/compiler_cache_tests.cpp +++ b/core/unit_tests/compiler_interface/compiler_cache_tests.cpp @@ -12,13 +12,12 @@ #include "core/helpers/hw_info.h" #include "core/helpers/string.h" #include "opencl/source/compiler_interface/default_cl_cache_config.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "global_environment.h" -#include "mocks/mock_context.h" -#include "mocks/mock_program.h" - #include #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 6c9fc91928..b42eb24981 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 "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_cif.h" +#include "opencl/test/unit_test/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 18bddc20dc..2afbe7d0fa 100644 --- a/core/unit_tests/direct_submission/direct_submission_tests.cpp +++ b/core/unit_tests/direct_submission/direct_submission_tests.cpp @@ -13,13 +13,12 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/ult_hw_config.h" #include "core/unit_tests/mocks/mock_direct_submission_hw.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" #include "test.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 63470d1df4..3d228a1ae0 100644 --- a/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h +++ b/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h @@ -6,8 +6,7 @@ */ #include "core/command_stream/linear_stream.h" - -#include "fixtures/device_fixture.h" +#include "opencl/test/unit_test/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 6308ab1649..629ace6777 100644 --- a/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp +++ b/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp @@ -8,10 +8,9 @@ #include "core/direct_submission/dispatchers/render_dispatcher.h" #include "core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h" #include "core/unit_tests/fixtures/preemption_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" #include "test.h" -#include "helpers/hw_parse.h" - using RenderDispatcheTest = Test; using namespace NEO; 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 21b44eef63..8a6954a3df 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 @@ -8,11 +8,10 @@ #include "core/direct_submission/dispatchers/render_dispatcher.h" #include "core/direct_submission/linux/drm_direct_submission.h" #include "core/os_interface/linux/os_context_linux.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "os_interface/linux/drm_mock.h" - #include struct DrmDirectSubmissionFixture : public DeviceFixture { 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 58ddd78c99..ca638f30ca 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,10 +9,9 @@ #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 "helpers/hw_parse.h" -#include "mocks/mock_device.h" -#include "os_interface/windows/wddm_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/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 67042d08f2..b913494262 100644 --- a/core/unit_tests/encoders/test_encode_atomic.cpp +++ b/core/unit_tests/encoders/test_encode_atomic.cpp @@ -7,8 +7,7 @@ #include "core/helpers/ptr_math.h" #include "core/unit_tests/fixtures/command_container_fixture.h" - -#include "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/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 7a1bf95bc8..8fe3963e0f 100644 --- a/core/unit_tests/encoders/test_encode_command_buffer.cpp +++ b/core/unit_tests/encoders/test_encode_command_buffer.cpp @@ -7,11 +7,10 @@ #include "core/command_container/cmdcontainer.h" #include "core/command_container/command_encoder.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "gen_common/gen_cmd_parse.h" - using namespace NEO; using EncodeBatchBufferStartOrEndTest = Test; diff --git a/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp b/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp index bf28a904af..53496400ee 100644 --- a/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp +++ b/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp @@ -9,8 +9,7 @@ #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 "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/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 1050c206d0..166910ecba 100644 --- a/core/unit_tests/encoders/test_encode_math.cpp +++ b/core/unit_tests/encoders/test_encode_math.cpp @@ -7,11 +7,10 @@ #include "core/command_container/command_encoder.h" #include "core/helpers/register_offsets.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "gen_common/gen_cmd_parse.h" - using namespace NEO; using EncodeMathMMIOTest = testing::Test; 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 f6b10b8db4..07cf3200f7 100644 --- a/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp +++ b/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp @@ -7,8 +7,7 @@ #include "core/helpers/ptr_math.h" #include "core/unit_tests/fixtures/command_container_fixture.h" - -#include "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/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 645f12e31b..41eb90c9d5 100644 --- a/core/unit_tests/encoders/test_encode_semaphore.cpp +++ b/core/unit_tests/encoders/test_encode_semaphore.cpp @@ -8,8 +8,7 @@ #include "core/command_stream/linear_stream.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/fixtures/command_container_fixture.h" - -#include "helpers/hw_parse.h" +#include "opencl/test/unit_test/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 f68186934f..79301c3ce2 100644 --- a/core/unit_tests/encoders/test_encode_set_mmio.cpp +++ b/core/unit_tests/encoders/test_encode_set_mmio.cpp @@ -6,11 +6,10 @@ */ #include "core/command_container/command_encoder.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "gen_common/gen_cmd_parse.h" - using namespace NEO; class CommandSetMMIOFixture : public DeviceFixture { diff --git a/core/unit_tests/encoders/test_encode_states.cpp b/core/unit_tests/encoders/test_encode_states.cpp index 3d2cdb7107..daaf49ba38 100644 --- a/core/unit_tests/encoders/test_encode_states.cpp +++ b/core/unit_tests/encoders/test_encode_states.cpp @@ -7,8 +7,7 @@ #include "core/helpers/ptr_math.h" #include "core/unit_tests/fixtures/command_container_fixture.h" - -#include "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/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 c799125014..135e5da6d5 100644 --- a/core/unit_tests/fixtures/command_container_fixture.h +++ b/core/unit_tests/fixtures/command_container_fixture.h @@ -7,10 +7,9 @@ #pragma once #include "core/command_container/command_encoder.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - class CommandEncodeStatesFixture : public DeviceFixture { public: class MyMockCommandContainer : public CommandContainer { diff --git a/core/unit_tests/fixtures/preemption_fixture.cpp b/core/unit_tests/fixtures/preemption_fixture.cpp index 3bc58975ed..75942cffbb 100644 --- a/core/unit_tests/fixtures/preemption_fixture.cpp +++ b/core/unit_tests/fixtures/preemption_fixture.cpp @@ -14,15 +14,15 @@ #include "opencl/source/command_queue/enqueue_marker.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/scheduler/scheduler_kernel.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.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 1e405e1541..c6fb8f46eb 100644 --- a/core/unit_tests/fixtures/preemption_fixture.h +++ b/core/unit_tests/fixtures/preemption_fixture.h @@ -8,9 +8,9 @@ #pragma once #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "test.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 3cf6f622bd..c1c28cf8d2 100644 --- a/core/unit_tests/gen11/cmd_parse_gen11.cpp +++ b/core/unit_tests/gen11/cmd_parse_gen11.cpp @@ -5,16 +5,17 @@ * */ -#include "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" + #include "gtest/gtest.h" using GenStruct = NEO::GEN11; using GenGfxFamily = NEO::ICLFamily; -#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" +#include "opencl/test/unit_test/gen_common/cmd_parse_base.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_base_mi_arb.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_sip.inl" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/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 be8a9c0e0a..242f6a52bc 100644 --- a/core/unit_tests/gen11/test_preemption_gen11.cpp +++ b/core/unit_tests/gen11/test_preemption_gen11.cpp @@ -8,11 +8,10 @@ #include "core/helpers/hw_helper.h" #include "core/unit_tests/fixtures/preemption_fixture.h" #include "opencl/source/built_ins/built_ins.h" - -#include "helpers/hw_parse.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_csr.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/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 04726e8ac6..8251f01ad0 100644 --- a/core/unit_tests/gen12lp/cmd_parse_gen12lp.cpp +++ b/core/unit_tests/gen12lp/cmd_parse_gen12lp.cpp @@ -5,18 +5,20 @@ * */ -#include "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" + #include "gtest/gtest.h" using GenStruct = NEO::GEN12LP; using GenGfxFamily = NEO::TGLLPFamily; +#include "opencl/test/unit_test/gen_common/cmd_parse_base.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_compute_mode.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_mi_arb.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_sip.inl" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/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 962ba0b760..1714c4be99 100644 --- a/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp +++ b/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp @@ -7,10 +7,10 @@ #include "core/command_container/cmdcontainer.h" #include "core/command_container/command_encoder.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.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 93e84a2e37..928d25a93b 100644 --- a/core/unit_tests/gen12lp/test_preemption_gen12lp.inl +++ b/core/unit_tests/gen12lp/test_preemption_gen12lp.inl @@ -6,10 +6,9 @@ */ #include "core/unit_tests/fixtures/preemption_fixture.h" - -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/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 49cb318ee6..94685be80e 100644 --- a/core/unit_tests/gen8/cmd_parse_gen8.cpp +++ b/core/unit_tests/gen8/cmd_parse_gen8.cpp @@ -5,16 +5,17 @@ * */ -#include "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" + #include "gtest/gtest.h" using GenStruct = NEO::GEN8; using GenGfxFamily = NEO::BDWFamily; -#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" +#include "opencl/test/unit_test/gen_common/cmd_parse_base.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_base_mi_arb.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_sip.inl" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/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 6e996cff1d..7b922d9e3e 100644 --- a/core/unit_tests/gen8/test_preamble_gen8.cpp +++ b/core/unit_tests/gen8/test_preamble_gen8.cpp @@ -9,8 +9,7 @@ #include "core/helpers/preamble.h" #include "core/unit_tests/preamble/preamble_fixture.h" #include "opencl/source/gen8/reg_configs.h" - -#include "fixtures/platform_fixture.h" +#include "opencl/test/unit_test/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 0b6fbf1f34..6d628d7ded 100644 --- a/core/unit_tests/gen8/test_preemption_gen8.cpp +++ b/core/unit_tests/gen8/test_preemption_gen8.cpp @@ -10,14 +10,13 @@ #include "core/helpers/hw_helper.h" #include "core/memory_manager/memory_constants.h" #include "core/unit_tests/fixtures/preemption_fixture.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" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/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 0f57423316..34ad454750 100644 --- a/core/unit_tests/gen9/cmd_parse_gen9.cpp +++ b/core/unit_tests/gen9/cmd_parse_gen9.cpp @@ -5,16 +5,17 @@ * */ -#include "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" + #include "gtest/gtest.h" using GenStruct = NEO::GEN9; using GenGfxFamily = NEO::SKLFamily; -#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" +#include "opencl/test/unit_test/gen_common/cmd_parse_base.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_base_mi_arb.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_gpgpu_walker.inl" +#include "opencl/test/unit_test/gen_common/cmd_parse_sip.inl" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/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 f0d17b8924..03fcaf436d 100644 --- a/core/unit_tests/gen9/skl/test_preamble_skl.cpp +++ b/core/unit_tests/gen9/skl/test_preamble_skl.cpp @@ -11,8 +11,7 @@ #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 "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/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 c5aa56a693..46644b188c 100644 --- a/core/unit_tests/gen9/test_command_encoder_gen9.cpp +++ b/core/unit_tests/gen9/test_command_encoder_gen9.cpp @@ -7,10 +7,10 @@ #include "core/command_container/cmdcontainer.h" #include "core/command_container/command_encoder.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.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 cef55105dc..5d63e5fdfb 100644 --- a/core/unit_tests/gen9/test_preemption_gen9.cpp +++ b/core/unit_tests/gen9/test_preemption_gen9.cpp @@ -9,13 +9,12 @@ #include "core/helpers/hw_helper.h" #include "core/unit_tests/fixtures/preemption_fixture.h" #include "opencl/source/built_ins/built_ins.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" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/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 1bb8f9c526..31f69ff095 100644 --- a/core/unit_tests/image/image_surface_state_fixture.h +++ b/core/unit_tests/image/image_surface_state_fixture.h @@ -15,14 +15,13 @@ #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.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 class ImageSurfaceStateTests : public DeviceFixture, diff --git a/core/unit_tests/libult/gen11.cpp b/core/unit_tests/libult/gen11.cpp index 6458bd0fe5..2a7b3011bb 100644 --- a/core/unit_tests/libult/gen11.cpp +++ b/core/unit_tests/libult/gen11.cpp @@ -6,8 +6,7 @@ */ #include "opencl/source/helpers/base_object.h" - -#include "libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/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 b9f67eb753..44d3df267f 100644 --- a/core/unit_tests/libult/gen12lp.cpp +++ b/core/unit_tests/libult/gen12lp.cpp @@ -6,8 +6,7 @@ */ #include "opencl/source/helpers/base_object.h" - -#include "libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/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 763c60046c..31e8ca3acb 100644 --- a/core/unit_tests/libult/gen8.cpp +++ b/core/unit_tests/libult/gen8.cpp @@ -6,8 +6,7 @@ */ #include "opencl/source/helpers/base_object.h" - -#include "libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/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 46c8376f9a..4109007ad2 100644 --- a/core/unit_tests/libult/gen9.cpp +++ b/core/unit_tests/libult/gen9.cpp @@ -6,8 +6,7 @@ */ #include "opencl/source/helpers/base_object.h" - -#include "libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/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 45cd02e003..c49555393b 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 "opencl/test/unit_test/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 9c1d23feb7..742c96fbdd 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,8 +8,7 @@ #include "core/unit_tests/os_interface/aub_memory_operations_handler_tests.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" - -#include "mocks/mock_aub_manager.h" +#include "opencl/test/unit_test/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 f4376af8b3..dafd1373f9 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 "opencl/test/unit_test/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 76b17cb0c3..384ed7dc0b 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 "opencl/test/unit_test/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 aa15be9ba1..dc8921ab12 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 "opencl/test/unit_test/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 0cb5d4b3ff..517750dc02 100644 --- a/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp +++ b/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp @@ -9,10 +9,9 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/hw_helper.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "test.h" -#include "os_interface/windows/wddm_fixture.h" - using namespace NEO; class WddmPreemptionTests : public Test { 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 77e5d26361..f84e08be45 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,8 +9,7 @@ #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 "mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/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 4cd1c892d2..256473ad1f 100644 --- a/core/unit_tests/preamble/preamble_fixture.h +++ b/core/unit_tests/preamble/preamble_fixture.h @@ -7,11 +7,10 @@ #pragma once #include "core/helpers/preamble.h" - -#include "command_stream/linear_stream_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/platform_fixture.h" -#include "helpers/hw_parse.h" +#include "opencl/test/unit_test/command_stream/linear_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/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 b6ab9bb0be..3af5ee864f 100644 --- a/core/unit_tests/preamble/preamble_tests.cpp +++ b/core/unit_tests/preamble/preamble_tests.cpp @@ -11,11 +11,11 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/utilities/stackvec.h" #include "opencl/source/gen11/reg_configs.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.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 7ed1279484..bb6ec61fd6 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 "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/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 9a4a3b072a..71c0b5b4fb 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 "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/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 400b4ed9f5..d6d9ba1e7e 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 @@ -9,11 +9,11 @@ #include "core/command_stream/preemption.h" #include "core/helpers/preamble.h" #include "opencl/source/built_ins/built_ins.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device.h" -#include "mocks/mock_graphics_allocation.h" #include template diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index 959e58ae41..33966c6006 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -6,8 +6,6 @@ project(igdrcl_tests) -include_directories(${NEO_RUNTIME_TESTS_DIR}) - set(TEST_PROJECTS_FOLDER "opencl runtime") set(PLATFORM_SPECIFIC_TARGETS_FOLDER "${TEST_PROJECTS_FOLDER}/test platforms") @@ -52,7 +50,7 @@ set(IGDRCL_SRCS_tests_local ) if(WIN32) - list(APPEND IGDRCL_SRCS_tests_local ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/wddm_create.cpp) + list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp) endif() add_subdirectory(libult) @@ -93,7 +91,7 @@ set(NEO_IGDRCL_TESTS__TARGET_OBJECTS if(DEFINED AUB_STREAM_DIR) add_library (aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL - ${NEO_RUNTIME_TESTS_DIR}/aub_stream_mocks/aub_stream_interface_mock.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp ) list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS $ @@ -108,7 +106,7 @@ add_executable(igdrcl_tests ${IGDRCL_SRCS_tests_local} ) -include(${NEO_RUNTIME_TESTS_DIR}/core_unit_tests_files.cmake) +include(${NEO_SOURCE_DIR}/opencl/test/unit_test/core_unit_tests_files.cmake) hide_subdir(gen_common) add_subdirectory(gen_common) @@ -155,7 +153,7 @@ else() endif() target_include_directories(igdrcl_tests PRIVATE - ${NEO_RUNTIME_TESTS_DIR}/mocks${BRANCH_DIR_SUFFIX} + ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX} ${ENGINE_NODE_DIR} ${KHRONOS_GL_HEADERS_DIR} ${CMAKE_CURRENT_SOURCE_DIR} @@ -176,10 +174,10 @@ function(neo_copy_test_files target product) COMMAND ${CMAKE_COMMAND} -E make_directory ${outputdir}/cl_cache COMMAND echo copying built-in kernel files from ${BUILT_IN_KERNEL_DIR}/kernels to ${outputdir}/test_files COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILT_IN_KERNEL_DIR}/kernels ${outputdir}/test_files - COMMAND echo copying test files from ${NEO_RUNTIME_TESTS_DIR}/test_files to ${outputdir}/test_files - COMMAND ${CMAKE_COMMAND} -E copy_directory ${NEO_RUNTIME_TESTS_DIR}/test_files ${outputdir}/test_files + COMMAND echo copying test files from ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_files to ${outputdir}/test_files + COMMAND ${CMAKE_COMMAND} -E copy_directory ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_files ${outputdir}/test_files COMMAND WORKING_DIRECTORY ${TargetDir} - DEPENDS ${NEO_RUNTIME_TESTS_DIR}/test_files + DEPENDS ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_files ) add_dependencies(${target} copy_compiler_files) set_target_properties(${target} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TARGETS_FOLDER}/${product}") @@ -494,7 +492,7 @@ macro(macro_for_each_gen) set(sip_kernel_output_file) set(sip_debug_kernel_output_file) set(sip_debug_local_kernel_output_file) - list(APPEND sip_kernel_file_name "test_files/sip_dummy_kernel_${NEO_BITS}.ll") + list(APPEND sip_kernel_file_name "opencl/test/unit_test/test_files/sip_dummy_kernel_${NEO_BITS}.ll") list(APPEND sip_debug_kernel_output_file "sip_dummy_kernel_debug_${NEO_BITS}") list(APPEND sip_debug_local_kernel_output_file "sip_dummy_kernel_debug_local_${NEO_BITS}") diff --git a/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp b/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp index 3b94d586ff..6237f9b5b0 100644 --- a/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp +++ b/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp @@ -11,13 +11,12 @@ #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" - using namespace NEO; class MediaImageSetArgTest : public DeviceFixture, diff --git a/opencl/test/unit_test/api/api_tests_wrapper1.cpp b/opencl/test/unit_test/api/api_tests_wrapper1.cpp index 27159ed46b..35feaf54ed 100644 --- a/opencl/test/unit_test/api/api_tests_wrapper1.cpp +++ b/opencl/test/unit_test/api/api_tests_wrapper1.cpp @@ -5,35 +5,35 @@ * */ -#include "api/cl_add_comment_to_aub_tests.inl" -#include "api/cl_build_program_tests.inl" -#include "api/cl_clone_kernel_tests.inl" -#include "api/cl_compile_program_tests.inl" -#include "api/cl_create_command_queue_tests.inl" -#include "api/cl_create_context_from_type_tests.inl" -#include "api/cl_create_context_tests.inl" -#include "api/cl_create_kernel_tests.inl" -#include "api/cl_create_kernels_in_program_tests.inl" -#include "api/cl_create_perf_counters_command_queue_tests.inl" -#include "api/cl_create_pipe_tests.inl" -#include "api/cl_create_program_with_binary_tests.inl" -#include "api/cl_create_sampler_tests.inl" -#include "api/cl_create_sampler_with_properties_tests.inl" -#include "api/cl_create_sub_buffer_tests.inl" -#include "api/cl_create_sub_devices_tests.inl" -#include "api/cl_create_user_event_tests.inl" -#include "api/cl_enqueue_barrier_tests.inl" -#include "api/cl_enqueue_barrier_with_wait_list_tests.inl" -#include "api/cl_enqueue_copy_buffer_rect_tests.inl" -#include "api/cl_enqueue_copy_buffer_to_image_tests.inl" -#include "api/cl_enqueue_copy_image_tests.inl" -#include "api/cl_enqueue_copy_image_to_buffer_tests.inl" -#include "api/cl_enqueue_fill_buffer_tests.inl" -#include "api/cl_enqueue_fill_image_tests.inl" -#include "api/cl_enqueue_image_tests.inl" -#include "api/cl_enqueue_map_buffer_tests.inl" -#include "api/cl_enqueue_map_image_tests.inl" -#include "api/cl_enqueue_marker_tests.inl" -#include "api/cl_enqueue_marker_with_wait_list_tests.inl" -#include "api/cl_function_pointers_tests.inl" -#include "api/cl_unified_shared_memory_tests.inl" +#include "opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl" +#include "opencl/test/unit_test/api/cl_build_program_tests.inl" +#include "opencl/test/unit_test/api/cl_clone_kernel_tests.inl" +#include "opencl/test/unit_test/api/cl_compile_program_tests.inl" +#include "opencl/test/unit_test/api/cl_create_command_queue_tests.inl" +#include "opencl/test/unit_test/api/cl_create_context_from_type_tests.inl" +#include "opencl/test/unit_test/api/cl_create_context_tests.inl" +#include "opencl/test/unit_test/api/cl_create_kernel_tests.inl" +#include "opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl" +#include "opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl" +#include "opencl/test/unit_test/api/cl_create_pipe_tests.inl" +#include "opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl" +#include "opencl/test/unit_test/api/cl_create_sampler_tests.inl" +#include "opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl" +#include "opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl" +#include "opencl/test/unit_test/api/cl_create_sub_devices_tests.inl" +#include "opencl/test/unit_test/api/cl_create_user_event_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_barrier_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_barrier_with_wait_list_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_fill_buffer_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_image_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_marker_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_marker_with_wait_list_tests.inl" +#include "opencl/test/unit_test/api/cl_function_pointers_tests.inl" +#include "opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl" diff --git a/opencl/test/unit_test/api/api_tests_wrapper2.cpp b/opencl/test/unit_test/api/api_tests_wrapper2.cpp index 8ff14eef71..a15650c8df 100644 --- a/opencl/test/unit_test/api/api_tests_wrapper2.cpp +++ b/opencl/test/unit_test/api/api_tests_wrapper2.cpp @@ -5,36 +5,36 @@ * */ -#include "api/cl_enqueue_migrate_mem_objects_tests.inl" -#include "api/cl_enqueue_native_kernel_tests.inl" -#include "api/cl_enqueue_nd_range_kernel_tests.inl" -#include "api/cl_enqueue_read_buffer_rect_tests.inl" -#include "api/cl_enqueue_read_buffer_tests.inl" -#include "api/cl_enqueue_read_image_tests.inl" -#include "api/cl_enqueue_svm_free_tests.inl" -#include "api/cl_enqueue_svm_map_tests.inl" -#include "api/cl_enqueue_svm_mem_fill_tests.inl" -#include "api/cl_enqueue_svm_memcpy_tests.inl" -#include "api/cl_enqueue_svm_unmap_tests.inl" -#include "api/cl_enqueue_task_tests.inl" -#include "api/cl_enqueue_unmap_mem_object_tests.inl" -#include "api/cl_enqueue_verify_memory.inl" -#include "api/cl_enqueue_wait_for_events_tests.inl" -#include "api/cl_enqueue_write_buffer_rect_tests.inl" -#include "api/cl_enqueue_write_buffer_tests.inl" -#include "api/cl_enqueue_write_image_tests.inl" -#include "api/cl_finish_tests.inl" -#include "api/cl_flush_tests.inl" -#include "api/cl_get_context_info_tests.inl" -#include "api/cl_get_device_and_host_timer.inl" -#include "api/cl_get_device_ids_tests.inl" -#include "api/cl_get_device_info_tests.inl" -#include "api/cl_get_event_profiling_info_tests.inl" -#include "api/cl_get_extension_function_address_for_platform_tests.inl" -#include "api/cl_get_extension_function_address_tests.inl" -#include "api/cl_get_image_info_tests.inl" -#include "api/cl_get_image_params_tests.inl" -#include "api/cl_get_kernel_arg_info_tests.inl" -#include "api/cl_get_kernel_info_tests.inl" -#include "api/cl_get_kernel_sub_group_info_khr_tests.inl" -#include "api/cl_get_kernel_sub_group_info_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_migrate_mem_objects_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_native_kernel_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_nd_range_kernel_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_read_image_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_task_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_unmap_mem_object_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_verify_memory.inl" +#include "opencl/test/unit_test/api/cl_enqueue_wait_for_events_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_write_buffer_rect_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_write_buffer_tests.inl" +#include "opencl/test/unit_test/api/cl_enqueue_write_image_tests.inl" +#include "opencl/test/unit_test/api/cl_finish_tests.inl" +#include "opencl/test/unit_test/api/cl_flush_tests.inl" +#include "opencl/test/unit_test/api/cl_get_context_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_device_and_host_timer.inl" +#include "opencl/test/unit_test/api/cl_get_device_ids_tests.inl" +#include "opencl/test/unit_test/api/cl_get_device_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl" +#include "opencl/test/unit_test/api/cl_get_extension_function_address_tests.inl" +#include "opencl/test/unit_test/api/cl_get_image_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_image_params_tests.inl" +#include "opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_kernel_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl" +#include "opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl" diff --git a/opencl/test/unit_test/api/api_tests_wrapper3.cpp b/opencl/test/unit_test/api/api_tests_wrapper3.cpp index e5339dbc15..80a431ae99 100644 --- a/opencl/test/unit_test/api/api_tests_wrapper3.cpp +++ b/opencl/test/unit_test/api/api_tests_wrapper3.cpp @@ -5,39 +5,39 @@ * */ -#include "api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl" -#include "api/cl_get_kernel_suggested_local_work_size_intel_tests.inl" -#include "api/cl_get_kernel_work_group_info_tests.inl" -#include "api/cl_get_mem_object_info_tests.inl" -#include "api/cl_get_pipe_info_tests.inl" -#include "api/cl_get_platform_ids_tests.inl" -#include "api/cl_get_platform_info_tests.inl" -#include "api/cl_get_program_build_info_tests.inl" -#include "api/cl_get_program_info_tests.inl" -#include "api/cl_get_supported_image_formats_tests.inl" -#include "api/cl_icd_get_platform_ids_khr_tests.inl" -#include "api/cl_intel_accelerator_tests.inl" -#include "api/cl_intel_tracing_tests.inl" -#include "api/cl_link_program_tests.inl" -#include "api/cl_release_command_queue_tests.inl" -#include "api/cl_release_context_tests.inl" -#include "api/cl_release_event_tests.inl" -#include "api/cl_release_kernel_tests.inl" -#include "api/cl_release_mem_obj_tests.inl" -#include "api/cl_release_program_tests.inl" -#include "api/cl_retain_mem_obj_tests.inl" -#include "api/cl_retain_release_command_queue_tests.inl" -#include "api/cl_retain_release_context_tests.inl" -#include "api/cl_retain_release_device_tests.inl" -#include "api/cl_retain_release_sampler_tests.inl" -#include "api/cl_set_default_device_command_queue_tests.inl" -#include "api/cl_set_event_callback_tests.inl" -#include "api/cl_set_kernel_arg_svm_pointer_tests.inl" -#include "api/cl_set_kernel_exec_info_tests.inl" -#include "api/cl_set_mem_object_destructor_callback_tests.inl" -#include "api/cl_set_performance_configuration_tests.inl" -#include "api/cl_set_program_specialization_constant_tests.inl" -#include "api/cl_svm_alloc_tests.inl" -#include "api/cl_svm_free_tests.inl" -#include "api/cl_unload_compiler_tests.inl" -#include "api/cl_unload_platform_compiler_tests.inl" +#include "opencl/test/unit_test/api/cl_get_kernel_max_concurrent_work_group_count_intel_tests.inl" +#include "opencl/test/unit_test/api/cl_get_kernel_suggested_local_work_size_intel_tests.inl" +#include "opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_pipe_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_platform_ids_tests.inl" +#include "opencl/test/unit_test/api/cl_get_platform_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_program_build_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_program_info_tests.inl" +#include "opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl" +#include "opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl" +#include "opencl/test/unit_test/api/cl_intel_accelerator_tests.inl" +#include "opencl/test/unit_test/api/cl_intel_tracing_tests.inl" +#include "opencl/test/unit_test/api/cl_link_program_tests.inl" +#include "opencl/test/unit_test/api/cl_release_command_queue_tests.inl" +#include "opencl/test/unit_test/api/cl_release_context_tests.inl" +#include "opencl/test/unit_test/api/cl_release_event_tests.inl" +#include "opencl/test/unit_test/api/cl_release_kernel_tests.inl" +#include "opencl/test/unit_test/api/cl_release_mem_obj_tests.inl" +#include "opencl/test/unit_test/api/cl_release_program_tests.inl" +#include "opencl/test/unit_test/api/cl_retain_mem_obj_tests.inl" +#include "opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl" +#include "opencl/test/unit_test/api/cl_retain_release_context_tests.inl" +#include "opencl/test/unit_test/api/cl_retain_release_device_tests.inl" +#include "opencl/test/unit_test/api/cl_retain_release_sampler_tests.inl" +#include "opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl" +#include "opencl/test/unit_test/api/cl_set_event_callback_tests.inl" +#include "opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl" +#include "opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl" +#include "opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests.inl" +#include "opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl" +#include "opencl/test/unit_test/api/cl_set_program_specialization_constant_tests.inl" +#include "opencl/test/unit_test/api/cl_svm_alloc_tests.inl" +#include "opencl/test/unit_test/api/cl_svm_free_tests.inl" +#include "opencl/test/unit_test/api/cl_unload_compiler_tests.inl" +#include "opencl/test/unit_test/api/cl_unload_platform_compiler_tests.inl" diff --git a/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl b/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl index c409c9ac3b..20673b9e0c 100644 --- a/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl +++ b/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl @@ -10,10 +10,9 @@ #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/platform/platform.h" - -#include "api/cl_api_tests.h" -#include "mocks/mock_aub_center.h" -#include "mocks/mock_aub_manager.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" +#include "opencl/test/unit_test/mocks/mock_aub_center.h" +#include "opencl/test/unit_test/mocks/mock_aub_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_api_tests.cpp b/opencl/test/unit_test/api/cl_api_tests.cpp index f9face9eb7..cb4595da1e 100644 --- a/opencl/test/unit_test/api/cl_api_tests.cpp +++ b/opencl/test/unit_test/api/cl_api_tests.cpp @@ -7,8 +7,8 @@ #include "cl_api_tests.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" namespace NEO { diff --git a/opencl/test/unit_test/api/cl_api_tests.h b/opencl/test/unit_test/api/cl_api_tests.h index bd3b69dd42..131656d5b8 100644 --- a/opencl/test/unit_test/api/cl_api_tests.h +++ b/opencl/test/unit_test/api/cl_api_tests.h @@ -11,13 +11,13 @@ #include "opencl/source/api/api.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/tracing/tracing_api.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/helpers/ult_limits.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" -#include "helpers/ult_limits.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_kernel.h" #include diff --git a/opencl/test/unit_test/api/cl_build_program_tests.inl b/opencl/test/unit_test/api/cl_build_program_tests.inl index 6eaa7f96b9..780c1b286d 100644 --- a/opencl/test/unit_test/api/cl_build_program_tests.inl +++ b/opencl/test/unit_test/api/cl_build_program_tests.inl @@ -11,11 +11,11 @@ #include "opencl/source/context/context.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/program.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" #include "cl_api_tests.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" -#include "mocks/mock_compilers.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_clone_kernel_tests.inl b/opencl/test/unit_test/api/cl_clone_kernel_tests.inl index 3c52068f44..e0aef61d2f 100644 --- a/opencl/test/unit_test/api/cl_clone_kernel_tests.inl +++ b/opencl/test/unit_test/api/cl_clone_kernel_tests.inl @@ -7,9 +7,9 @@ #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_compile_program_tests.inl b/opencl/test/unit_test/api/cl_compile_program_tests.inl index a51bb90caa..da3cfccefc 100644 --- a/opencl/test/unit_test/api/cl_compile_program_tests.inl +++ b/opencl/test/unit_test/api/cl_compile_program_tests.inl @@ -8,10 +8,10 @@ #include "core/compiler_interface/compiler_interface.h" #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp index 28da08956c..38ba16b452 100644 --- a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp @@ -8,12 +8,12 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "cl_api_tests.h" -#include "mocks/mock_device.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_command_queue_tests.inl b/opencl/test/unit_test/api/cl_create_command_queue_tests.inl index 88fde1b14d..50c7be4f4d 100644 --- a/opencl/test/unit_test/api/cl_create_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_create_command_queue_tests.inl @@ -8,11 +8,11 @@ #include "core/device/device.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" #include "cl_api_tests.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp index c0f73e052c..b5be570919 100644 --- a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp @@ -11,14 +11,14 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/device_queue/device_queue.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "CL/cl_ext.h" #include "cl_api_tests.h" -#include "fixtures/memory_management_fixture.h" -#include "helpers/unit_test_helper.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl b/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl index 97fab0dda9..a0e961e9b2 100644 --- a/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl +++ b/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl @@ -5,8 +5,9 @@ * */ +#include "opencl/test/unit_test/mocks/mock_platform.h" + #include "cl_api_tests.h" -#include "mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_context_tests.inl b/opencl/test/unit_test/api/cl_create_context_tests.inl index d7f5d98601..03a2ab5100 100644 --- a/opencl/test/unit_test/api/cl_create_context_tests.inl +++ b/opencl/test/unit_test/api/cl_create_context_tests.inl @@ -6,9 +6,8 @@ */ #include "core/helpers/ptr_math.h" - -#include "api/cl_api_tests.h" -#include "mocks/mock_platform.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_image_tests.cpp b/opencl/test/unit_test/api/cl_create_image_tests.cpp index 1922393dfc..5a007ab6d2 100644 --- a/opencl/test/unit_test/api/cl_create_image_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_image_tests.cpp @@ -7,10 +7,10 @@ #include "core/helpers/hw_info.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_kernel_tests.inl b/opencl/test/unit_test/api/cl_create_kernel_tests.inl index c1de96cf4a..097501e593 100644 --- a/opencl/test/unit_test/api/cl_create_kernel_tests.inl +++ b/opencl/test/unit_test/api/cl_create_kernel_tests.inl @@ -8,10 +8,10 @@ #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/source/program/kernel_info.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "cl_api_tests.h" -#include "helpers/test_files.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl b/opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl index 111c6253da..434f2311bf 100644 --- a/opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl +++ b/opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl @@ -7,9 +7,9 @@ #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl b/opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl index 55274b4e21..6821ac7a5a 100644 --- a/opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl @@ -8,11 +8,11 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/os_interface/mock_performance_counters.h" #include "cl_api_tests.h" -#include "fixtures/device_instrumentation_fixture.h" -#include "mocks/mock_context.h" -#include "os_interface/mock_performance_counters.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl b/opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl index d9bcea5c90..dfd26aa949 100644 --- a/opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl +++ b/opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl @@ -7,9 +7,9 @@ #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 4989baf4e5..50add1e052 100644 --- a/opencl/test/unit_test/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 @@ -15,9 +15,9 @@ #include "opencl/source/helpers/base_object.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/program.h" +#include "opencl/test/unit_test/fixtures/run_kernel_fixture.h" #include "cl_api_tests.h" -#include "fixtures/run_kernel_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl b/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl index 3759519f4a..e798a620d7 100644 --- a/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl +++ b/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl @@ -7,10 +7,9 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" #include "test.h" -#include "helpers/variable_backup.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl index 1549f64f89..b4030b53f8 100644 --- a/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl @@ -7,9 +7,9 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "cl_api_tests.h" -#include "mocks/mock_buffer.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl index c9d0bf4d11..3ef1015e8a 100644 --- a/opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl @@ -7,9 +7,9 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/surface_formats.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "cl_api_tests.h" -#include "fixtures/buffer_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl index 12c559ebf0..0644fcde1f 100644 --- a/opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl @@ -7,9 +7,9 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/surface_formats.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "cl_api_tests.h" -#include "fixtures/buffer_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl index f07e21f449..253126eebf 100644 --- a/opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl @@ -7,9 +7,9 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" #include "cl_api_tests.h" -#include "fixtures/image_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_image_tests.inl index 9559ca0abb..5d2323c202 100644 --- a/opencl/test/unit_test/api/cl_enqueue_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_image_tests.inl @@ -5,13 +5,12 @@ * */ +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl index eaddc84f42..93d3afffd4 100644 --- a/opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl @@ -8,9 +8,9 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/surface_formats.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" #include "cl_api_tests.h" -#include "fixtures/image_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_nd_range_kernel_tests.inl b/opencl/test/unit_test/api/cl_enqueue_nd_range_kernel_tests.inl index 6c66c9cfb2..98a0b98617 100644 --- a/opencl/test/unit_test/api/cl_enqueue_nd_range_kernel_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_nd_range_kernel_tests.inl @@ -6,9 +6,9 @@ */ #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "cl_api_tests.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp index 04bcb7f1de..6ca044f6ab 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp +++ b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp @@ -10,9 +10,9 @@ #include "core/memory_manager/unified_memory_manager.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "cl_api_tests.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_task_tests.inl b/opencl/test/unit_test/api/cl_enqueue_task_tests.inl index cf086388e4..221297f7fe 100644 --- a/opencl/test/unit_test/api/cl_enqueue_task_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_task_tests.inl @@ -7,10 +7,10 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/base_object.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "cl_api_tests.h" -#include "fixtures/hello_world_fixture.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_enqueue_unmap_mem_object_tests.inl b/opencl/test/unit_test/api/cl_enqueue_unmap_mem_object_tests.inl index 5008b85195..319793340d 100644 --- a/opencl/test/unit_test/api/cl_enqueue_unmap_mem_object_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_unmap_mem_object_tests.inl @@ -6,9 +6,8 @@ */ #include "opencl/source/command_queue/command_queue.h" - -#include "api/cl_api_tests.h" -#include "fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include diff --git a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl index 48816ebbfc..2fb3debcd1 100644 --- a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl +++ b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl @@ -7,11 +7,10 @@ #include "opencl/source/aub_mem_dump/aub_services.h" #include "opencl/source/extensions/public/cl_ext_private.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" #include "test.h" -#include "api/cl_api_tests.h" -#include "mocks/mock_csr.h" - using namespace NEO; TEST(CheckVerifyMemoryRelatedApiConstants, givenVerifyMemoryRelatedApiConstantsWhenVerifyingTheirValueThenCorrectValuesAreReturned) { diff --git a/opencl/test/unit_test/api/cl_function_pointers_tests.inl b/opencl/test/unit_test/api/cl_function_pointers_tests.inl index 5f227aa153..f6ec996af6 100644 --- a/opencl/test/unit_test/api/cl_function_pointers_tests.inl +++ b/opencl/test/unit_test/api/cl_function_pointers_tests.inl @@ -5,8 +5,9 @@ * */ +#include "opencl/test/unit_test/mocks/mock_program.h" + #include "cl_api_tests.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_device_and_host_timer.inl b/opencl/test/unit_test/api/cl_get_device_and_host_timer.inl index 5822e72f37..5b926f9961 100644 --- a/opencl/test/unit_test/api/cl_get_device_and_host_timer.inl +++ b/opencl/test/unit_test/api/cl_get_device_and_host_timer.inl @@ -5,9 +5,10 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_ostime.h" + #include "cl_api_tests.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_ostime.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl index 162cf07a8a..a7f4de6f28 100644 --- a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl +++ b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl @@ -8,9 +8,9 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/ult_hw_config.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" #include "cl_api_tests.h" -#include "helpers/variable_backup.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl b/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl index 8e12e84705..a39b86d6fc 100644 --- a/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl @@ -9,13 +9,12 @@ #include "opencl/source/event/event.h" #include "opencl/source/event/user_event.h" #include "opencl/source/extensions/public/cl_ext_private.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" +#include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/os_interface/mock_performance_counters.h" #include "test.h" -#include "api/cl_api_tests.h" -#include "fixtures/device_instrumentation_fixture.h" -#include "mocks/mock_event.h" -#include "os_interface/mock_performance_counters.h" - using namespace NEO; template diff --git a/opencl/test/unit_test/api/cl_get_image_info_tests.inl b/opencl/test/unit_test/api/cl_get_image_info_tests.inl index 6be20949f7..31b5506400 100644 --- a/opencl/test/unit_test/api/cl_get_image_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_image_info_tests.inl @@ -8,9 +8,9 @@ #include "core/helpers/hw_info.h" #include "opencl/source/context/context.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" -#include "mocks/mock_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_image_params_tests.inl b/opencl/test/unit_test/api/cl_get_image_params_tests.inl index 7c25aab5b1..2469e5f659 100644 --- a/opencl/test/unit_test/api/cl_get_image_params_tests.inl +++ b/opencl/test/unit_test/api/cl_get_image_params_tests.inl @@ -7,9 +7,9 @@ #include "core/helpers/hw_info.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" -#include "mocks/mock_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl index 0dd49898f4..417947fa32 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl @@ -9,11 +9,11 @@ #include "core/device/device.h" #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" #include "compiler_options.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_kernel_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_info_tests.inl index fb5870f4f6..c39f22fe6a 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_info_tests.inl @@ -9,10 +9,10 @@ #include "core/device/device.h" #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index ac47ef1956..06724e18c0 100644 --- a/opencl/test/unit_test/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 @@ -6,9 +6,9 @@ */ #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "cl_api_tests.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 23325aca9a..70eb869623 100644 --- a/opencl/test/unit_test/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 @@ -5,7 +5,7 @@ * */ -#include "fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl index 6f18c77ae8..85fb56132c 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl @@ -5,7 +5,7 @@ * */ -#include "fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 9f55a4dcbd..7f8e6cb343 100644 --- a/opencl/test/unit_test/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 @@ -7,9 +7,9 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_queue/gpgpu_walker.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "cl_api_tests.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl index 79c1b02b43..c67e2295ae 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl @@ -8,11 +8,11 @@ #include "core/compiler_interface/compiler_interface.h" #include "core/device/device.h" #include "core/helpers/file_io.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "cl_api_tests.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl b/opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl index 2eda7080ab..7f4cd268ac 100644 --- a/opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl @@ -9,9 +9,9 @@ #include "core/device/device.h" #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_platform_ids_tests.inl b/opencl/test/unit_test/api/cl_get_platform_ids_tests.inl index 3f63834fd2..b531e9710f 100644 --- a/opencl/test/unit_test/api/cl_get_platform_ids_tests.inl +++ b/opencl/test/unit_test/api/cl_get_platform_ids_tests.inl @@ -8,9 +8,9 @@ #include "core/unit_tests/helpers/ult_hw_config.h" #include "opencl/source/context/context.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" #include "cl_api_tests.h" -#include "helpers/variable_backup.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_program_build_info_tests.inl b/opencl/test/unit_test/api/cl_get_program_build_info_tests.inl index 7641ec2e60..6310567003 100644 --- a/opencl/test/unit_test/api/cl_get_program_build_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_program_build_info_tests.inl @@ -13,10 +13,10 @@ #include "core/device_binary_format/elf/ocl_elf.h" #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_program_info_tests.inl b/opencl/test/unit_test/api/cl_get_program_info_tests.inl index 657ba3a0aa..8c2f24760c 100644 --- a/opencl/test/unit_test/api/cl_get_program_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_program_info_tests.inl @@ -9,10 +9,10 @@ #include "core/device/device.h" #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl b/opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl index 6ace72439b..706b9ffe5e 100644 --- a/opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl +++ b/opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl @@ -8,9 +8,9 @@ #include "core/device/device.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" -#include "mocks/mock_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl index 9a7abe84e1..2d1784d966 100644 --- a/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl +++ b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl @@ -11,8 +11,7 @@ #include "core/device/device.h" #include "opencl/source/platform/platform.h" - -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" #include diff --git a/opencl/test/unit_test/api/cl_intel_accelerator_tests.inl b/opencl/test/unit_test/api/cl_intel_accelerator_tests.inl index a49043fb04..e56c0f12a4 100644 --- a/opencl/test/unit_test/api/cl_intel_accelerator_tests.inl +++ b/opencl/test/unit_test/api/cl_intel_accelerator_tests.inl @@ -8,8 +8,7 @@ #include "opencl/source/accelerators/intel_accelerator.h" #include "opencl/source/accelerators/intel_motion_estimation.h" #include "opencl/source/context/context.h" - -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_intel_motion_estimation.cpp b/opencl/test/unit_test/api/cl_intel_motion_estimation.cpp index 1b9611fc7b..53d676495b 100644 --- a/opencl/test/unit_test/api/cl_intel_motion_estimation.cpp +++ b/opencl/test/unit_test/api/cl_intel_motion_estimation.cpp @@ -8,8 +8,7 @@ #include "opencl/source/accelerators/intel_accelerator.h" #include "opencl/source/accelerators/intel_motion_estimation.h" #include "opencl/source/context/context.h" - -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_intel_tracing_tests.inl b/opencl/test/unit_test/api/cl_intel_tracing_tests.inl index db179e3470..c225a08d87 100644 --- a/opencl/test/unit_test/api/cl_intel_tracing_tests.inl +++ b/opencl/test/unit_test/api/cl_intel_tracing_tests.inl @@ -7,8 +7,7 @@ #include "opencl/source/tracing/tracing_api.h" #include "opencl/source/tracing/tracing_notify.h" - -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp b/opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp index 07b6f845c6..3b2bd9a1ef 100644 --- a/opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp +++ b/opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp @@ -7,8 +7,7 @@ #include "opencl/source/tracing/tracing_api.h" #include "opencl/source/tracing/tracing_notify.h" - -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_link_program_tests.inl b/opencl/test/unit_test/api/cl_link_program_tests.inl index 97c126fe25..6d34911c8c 100644 --- a/opencl/test/unit_test/api/cl_link_program_tests.inl +++ b/opencl/test/unit_test/api/cl_link_program_tests.inl @@ -8,10 +8,10 @@ #include "core/compiler_interface/compiler_interface.h" #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" #include "compiler_options.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp index d9a2af55b4..b6047f358a 100644 --- a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp @@ -15,11 +15,10 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/extensions/public/cl_ext_private.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" #include "test.h" -#include "fixtures/hello_world_fixture.h" -#include "helpers/hw_parse.h" - using namespace NEO; namespace clMemLocallyUncachedResourceTests { diff --git a/opencl/test/unit_test/api/cl_release_command_queue_tests.inl b/opencl/test/unit_test/api/cl_release_command_queue_tests.inl index dcbd4d11ba..00794ed0f8 100644 --- a/opencl/test/unit_test/api/cl_release_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_release_command_queue_tests.inl @@ -6,11 +6,11 @@ */ #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "cl_api_tests.h" -#include "fixtures/device_host_queue_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_kernel.h" #include diff --git a/opencl/test/unit_test/api/cl_release_kernel_tests.inl b/opencl/test/unit_test/api/cl_release_kernel_tests.inl index 07be82ba79..6b2b50cdc5 100644 --- a/opencl/test/unit_test/api/cl_release_kernel_tests.inl +++ b/opencl/test/unit_test/api/cl_release_kernel_tests.inl @@ -7,9 +7,9 @@ #include "core/helpers/file_io.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl b/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl index 10e97f2002..f889042e4c 100644 --- a/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl @@ -6,9 +6,8 @@ */ #include "opencl/source/context/context.h" - -#include "fixtures/device_host_queue_fixture.h" -#include "helpers/unit_test_helper.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" using namespace NEO; namespace DeviceHostQueue { diff --git a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl index dd2029b866..3f1b504578 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl @@ -6,11 +6,11 @@ */ #include "core/memory_manager/unified_memory_manager.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" #include "cl_api_tests.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl index f4a1d0f1c9..da1f909832 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl @@ -5,11 +5,11 @@ * */ +#include "opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" #include "cl_api_tests.h" -#include "command_stream/thread_arbitration_policy_helper.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl b/opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl index 12aa619162..125780e126 100644 --- a/opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl +++ b/opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl @@ -5,9 +5,10 @@ * */ +#include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" +#include "opencl/test/unit_test/os_interface/mock_performance_counters.h" + #include "cl_api_tests.h" -#include "fixtures/device_instrumentation_fixture.h" -#include "os_interface/mock_performance_counters.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_set_program_specialization_constant_tests.inl b/opencl/test/unit_test/api/cl_set_program_specialization_constant_tests.inl index 85eb3676fe..52db1fddf7 100644 --- a/opencl/test/unit_test/api/cl_set_program_specialization_constant_tests.inl +++ b/opencl/test/unit_test/api/cl_set_program_specialization_constant_tests.inl @@ -5,7 +5,7 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl index 190b1d658a..fd0bb18eea 100644 --- a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl +++ b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl @@ -8,10 +8,9 @@ #include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" - -#include "command_queue/command_queue_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/cl_unload_platform_compiler_tests.inl b/opencl/test/unit_test/api/cl_unload_platform_compiler_tests.inl index 3cdcacc513..3b074cb90d 100644 --- a/opencl/test/unit_test/api/cl_unload_platform_compiler_tests.inl +++ b/opencl/test/unit_test/api/cl_unload_platform_compiler_tests.inl @@ -5,8 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" + #include "cl_api_tests.h" -#include "fixtures/buffer_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_create_from_gl_buffer_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_buffer_tests.cpp index ce679ec51d..8629308efa 100644 --- a/opencl/test/unit_test/api/gl/cl_create_from_gl_buffer_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_create_from_gl_buffer_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_create_from_gl_renderbuffer_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_renderbuffer_tests.cpp index fdc80f2db9..57db1e6b49 100644 --- a/opencl/test/unit_test/api/gl/cl_create_from_gl_renderbuffer_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_create_from_gl_renderbuffer_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_create_from_gl_texture2d_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_texture2d_tests.cpp index 6e96d24f72..08c077c9db 100644 --- a/opencl/test/unit_test/api/gl/cl_create_from_gl_texture2d_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_create_from_gl_texture2d_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_create_from_gl_texture3d_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_texture3d_tests.cpp index 61e2a9df0e..b529cae986 100644 --- a/opencl/test/unit_test/api/gl/cl_create_from_gl_texture3d_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_create_from_gl_texture3d_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_create_from_gl_texture_tests.cpp b/opencl/test/unit_test/api/gl/cl_create_from_gl_texture_tests.cpp index fb76925057..e496971e95 100644 --- a/opencl/test/unit_test/api/gl/cl_create_from_gl_texture_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_create_from_gl_texture_tests.cpp @@ -5,7 +5,8 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" + #include using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp b/opencl/test/unit_test/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp index 77ca616982..c524a63f3d 100644 --- a/opencl/test/unit_test/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_enqueue_release_gl_objects_tests.cpp b/opencl/test/unit_test/api/gl/cl_enqueue_release_gl_objects_tests.cpp index 7b5d6b81e9..d57f291369 100644 --- a/opencl/test/unit_test/api/gl/cl_enqueue_release_gl_objects_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_enqueue_release_gl_objects_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 6c58667f66..4a779c0b33 100644 --- a/opencl/test/unit_test/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 @@ -7,9 +7,8 @@ #include "core/helpers/hw_info.h" #include "opencl/source/device/cl_device.h" - -#include "api/cl_api_tests.h" -#include "os_interface/windows/gl/gl_dll_helper.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" +#include "opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp index a8ee3f1b48..1ae2f3d723 100644 --- a/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp @@ -7,8 +7,7 @@ #include "core/device/device.h" #include "core/helpers/hw_info.h" - -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" #include diff --git a/opencl/test/unit_test/api/gl/cl_get_gl_object_info_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_object_info_tests.cpp index 8e33257b59..406f358a26 100644 --- a/opencl/test/unit_test/api/gl/cl_get_gl_object_info_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_get_gl_object_info_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_get_gl_texture_info_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_texture_info_tests.cpp index b436b1a6f6..5a81425e54 100644 --- a/opencl/test/unit_test/api/gl/cl_get_gl_texture_info_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_get_gl_texture_info_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/api/gl/cl_gl_intel_tracing_tests.cpp b/opencl/test/unit_test/api/gl/cl_gl_intel_tracing_tests.cpp index 16be493a78..a5dda22484 100644 --- a/opencl/test/unit_test/api/gl/cl_gl_intel_tracing_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_gl_intel_tracing_tests.cpp @@ -7,8 +7,7 @@ #include "opencl/source/tracing/tracing_api.h" #include "opencl/source/tracing/tracing_notify.h" - -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub/aub_center_tests.cpp b/opencl/test/unit_test/aub/aub_center_tests.cpp index ab3b93c77a..1a95e2ba17 100644 --- a/opencl/test/unit_test/aub/aub_center_tests.cpp +++ b/opencl/test/unit_test/aub/aub_center_tests.cpp @@ -10,10 +10,10 @@ #include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/default_hw_info.h" +#include "opencl/test/unit_test/mocks/mock_aub_center.h" +#include "opencl/test/unit_test/mocks/mock_aub_manager.h" #include "gtest/gtest.h" -#include "mocks/mock_aub_center.h" -#include "mocks/mock_aub_manager.h" #include "third_party/aub_stream/headers/aubstream.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp b/opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp index 22db3860a7..baa21a2f4a 100644 --- a/opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp +++ b/opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp @@ -10,10 +10,10 @@ #include "core/helpers/options.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/default_hw_info.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_aub_center.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_aub_center.h" #include "third_party/aub_stream/headers/aubstream.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub/aub_helper_tests.cpp b/opencl/test/unit_test/aub/aub_helper_tests.cpp index 2caeff4e68..702bd29d9b 100644 --- a/opencl/test/unit_test/aub/aub_helper_tests.cpp +++ b/opencl/test/unit_test/aub/aub_helper_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "aub/aub_helper_tests.inl" +#include "opencl/test/unit_test/aub/aub_helper_tests.inl" TEST(AubHelper, GivenHwInfoWhenGetMemBankSizeIsCalledThenItReturnsCorrectValue) { EXPECT_EQ(2 * MemoryConstants::gigaByte, AubHelper::getMemBankSize(platformDevices[0])); diff --git a/opencl/test/unit_test/aub/aub_helper_tests.inl b/opencl/test/unit_test/aub/aub_helper_tests.inl index edbc788687..c894684ba7 100644 --- a/opencl/test/unit_test/aub/aub_helper_tests.inl +++ b/opencl/test/unit_test/aub/aub_helper_tests.inl @@ -11,11 +11,11 @@ #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_lrca_helper.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_lrca_helper.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp index c519464bb3..2a83fd8104 100644 --- a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp +++ b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp @@ -10,14 +10,13 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.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_memory_manager.h" - using namespace NEO; typedef Test AubAllocDumpTests; diff --git a/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp b/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp index 5c27bd4ada..8a8ec77122 100644 --- a/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp +++ b/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_aub_manager.h" +#include "opencl/test/unit_test/mocks/mock_aub_manager.h" namespace NEO { aub_stream::AubManager *createAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode) { diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt index 27b33fe9aa..005e78f20e 100644 --- a/opencl/test/unit_test/aub_tests/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt @@ -11,7 +11,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/common.cmake) list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration.cpp ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp - ${NEO_RUNTIME_TESTS_DIR}/libult/os_interface.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp $ $ $ @@ -40,7 +40,7 @@ set_target_properties(run_aub_tests PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER}) if(WIN32) target_include_directories(igdrcl_aub_tests PRIVATE - ${NEO_RUNTIME_TESTS_DIR}/mocks${BRANCH_DIR_SUFFIX} + ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX} ) endif() @@ -56,12 +56,12 @@ if(WIN32) target_sources(igdrcl_aub_tests PRIVATE ${NEO_SOURCE_DIR}/core/os_interface/windows/gmm_interface_win.cpp ${NEO_SOURCE_DIR}/core/gmm_helper/windows/gmm_memory.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/wddm_create.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp ) else() target_sources(igdrcl_aub_tests PRIVATE ${NEO_SOURCE_DIR}/core/os_interface/linux/gmm_interface_linux.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/drm_neo_create.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp ) endif() diff --git a/opencl/test/unit_test/aub_tests/aub_tests_configuration.inl b/opencl/test/unit_test/aub_tests/aub_tests_configuration.inl index a4ff00e595..fe64fa6dab 100644 --- a/opencl/test/unit_test/aub_tests/aub_tests_configuration.inl +++ b/opencl/test/unit_test/aub_tests/aub_tests_configuration.inl @@ -6,7 +6,7 @@ */ #pragma once -#include "aub_tests/aub_tests_configuration.h" +#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h" template AubTestsConfig GetAubTestsConfig() { diff --git a/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h b/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h index 96594789d4..96984b74e6 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h @@ -6,13 +6,13 @@ */ #pragma once -#include "aub_tests/command_stream/aub_command_stream_fixture.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/built_in_fixture.h" -#include "fixtures/device_fixture.h" -#include "helpers/hw_parse.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/built_in_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" namespace NEO { diff --git a/opencl/test/unit_test/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 index d105b33c40..8cd471f3b7 100644 --- a/opencl/test/unit_test/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 @@ -8,11 +8,10 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct CopyBufferHw diff --git a/opencl/test/unit_test/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 index 0eea4d932d..9a9840db2f 100644 --- a/opencl/test/unit_test/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 @@ -8,11 +8,10 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/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 index 2c94b7e5f7..df900bb80e 100644 --- a/opencl/test/unit_test/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 @@ -9,11 +9,10 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct AUBCopyImage diff --git a/opencl/test/unit_test/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 index 646df2e4fc..be4af78946 100644 --- a/opencl/test/unit_test/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 @@ -9,11 +9,10 @@ #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct FillBufferHw diff --git a/opencl/test/unit_test/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 index f59b80ff6d..576e58e5b5 100644 --- a/opencl/test/unit_test/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 @@ -10,11 +10,10 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp index 26effd2f7c..e65e654263 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp @@ -10,17 +10,16 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" +#include "opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/simple_arg_fixture.h" +#include "opencl/test/unit_test/fixtures/two_walker_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "test.h" -#include "aub_tests/fixtures/aub_fixture.h" -#include "aub_tests/fixtures/hello_world_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "fixtures/simple_arg_fixture.h" -#include "fixtures/two_walker_fixture.h" -#include "gen_common/gen_cmd_parse.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" - using namespace NEO; extern const HardwareInfo **platformDevices; diff --git a/opencl/test/unit_test/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 index 1ce8d46fb9..3bfe6766b2 100644 --- a/opencl/test/unit_test/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 @@ -6,11 +6,10 @@ */ #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct AUBMapBuffer diff --git a/opencl/test/unit_test/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 index 8f0f64aecb..2fd2f35c41 100644 --- a/opencl/test/unit_test/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 @@ -10,11 +10,10 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct MapImageParams { diff --git a/opencl/test/unit_test/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 index 2b0a17e399..bcdc991c11 100644 --- a/opencl/test/unit_test/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 @@ -8,13 +8,12 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" -#include "aub_tests/aub_tests_configuration.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_graphics_allocation.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/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 index c4f074fd0b..6b7d8f5106 100644 --- a/opencl/test/unit_test/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 @@ -9,11 +9,10 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct ReadBufferRectHw diff --git a/opencl/test/unit_test/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 index a7a65c89ea..e16a85d215 100644 --- a/opencl/test/unit_test/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 @@ -11,12 +11,11 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct ReadImageParams { diff --git a/opencl/test/unit_test/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 index f8f506b253..73018605d2 100644 --- a/opencl/test/unit_test/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 @@ -9,11 +9,10 @@ #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct AUBImageUnaligned diff --git a/opencl/test/unit_test/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 index 0f6a41eecf..131d4d096c 100644 --- a/opencl/test/unit_test/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 @@ -9,12 +9,11 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_context.h" - using namespace NEO; struct VerifyMemoryBufferHw diff --git a/opencl/test/unit_test/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 index ccd899c7b8..0d1a776c7c 100644 --- a/opencl/test/unit_test/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 @@ -11,12 +11,11 @@ #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_context.h" - using namespace NEO; struct TestOffset { diff --git a/opencl/test/unit_test/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 index c3824c0b5d..7436c1c790 100644 --- a/opencl/test/unit_test/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 @@ -9,11 +9,10 @@ #include "core/device/device.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct WriteBufferHw diff --git a/opencl/test/unit_test/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 index 0191811d10..4b46fd8bb0 100644 --- a/opencl/test/unit_test/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 @@ -10,11 +10,10 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct WriteBufferRectHw diff --git a/opencl/test/unit_test/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 index 8f67947d9d..121e489010 100644 --- a/opencl/test/unit_test/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 @@ -5,7 +5,7 @@ * */ -#include "aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h" +#include "opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h" #include "core/memory_manager/allocations_list.h" #include "test.h" diff --git a/opencl/test/unit_test/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 index 93ddc7e500..2ebe000806 100644 --- a/opencl/test/unit_test/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 @@ -8,8 +8,7 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" - -#include "aub_tests/fixtures/aub_fixture.h" +#include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 868a5104eb..e5465c7867 100644 --- a/opencl/test/unit_test/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 @@ -10,12 +10,11 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct WriteImageParams { diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp index 29c7f76de1..e34039ac07 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "aub_tests/command_stream/aub_command_stream_fixture.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "core/command_stream/command_stream_receiver.h" #include "core/device/device.h" @@ -14,11 +14,11 @@ #include "core/unit_tests/helpers/memory_management.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_stream/tbx_command_stream_receiver.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/tests_configuration.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -#include "mocks/mock_device.h" -#include "tests_configuration.h" namespace NEO { diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h index a2fdb7d0b4..b139cc3fc0 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h @@ -14,10 +14,9 @@ #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/memory_manager/memory_banks.h" - -#include "command_stream/command_stream_fixture.h" -#include "mocks/mock_allocation_properties.h" -#include "tests_configuration.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/tests_configuration.h" #include diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp index 2f72fb1a34..08e36cf45b 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp @@ -9,12 +9,12 @@ #include "core/helpers/ptr_math.h" #include "core/os_interface/os_context.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" #include "aub_command_stream_fixture.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/device_fixture.h" -#include "gen_common/gen_cmd_parse.h" #include diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp index b517f511ee..7a7ef0cae2 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp @@ -10,9 +10,8 @@ #include "core/helpers/hw_helper.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/aub/aub_helper.h" - -#include "fixtures/device_fixture.h" -#include "mocks/mock_aub_csr.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_aub_csr.h" using NEO::AUBCommandStreamReceiver; using NEO::AUBCommandStreamReceiverHw; diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp index dfa2261b1f..4331dab4d9 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "aub_tests/fixtures/aub_fixture.h" +#include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" #include "core/memory_manager/graphics_allocation.h" #include "core/memory_manager/internal_allocation_storage.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h index aaab6f8ea7..38d5f2d4a1 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h @@ -14,10 +14,9 @@ #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/platform/platform.h" - -#include "command_queue/command_queue_fixture.h" -#include "mocks/mock_device.h" -#include "tests_configuration.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/tests_configuration.h" #include diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h index 58619658ac..732c95ccd8 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "fixtures/hello_world_kernel_fixture.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h" namespace NEO { static const char programFile[] = "simple_block_kernel"; diff --git a/opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp b/opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp index 86d8e99d95..8b6d5a4823 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp +++ b/opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp @@ -8,11 +8,11 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "aub_tests/command_stream/aub_command_stream_fixture.h" -#include "command_queue/command_enqueue_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h index 4021ae0eba..b123c120a1 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h @@ -6,10 +6,10 @@ */ #pragma once -#include "aub_tests/command_stream/aub_command_stream_fixture.h" -#include "aub_tests/fixtures/simple_arg_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "fixtures/simple_arg_fixture.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" +#include "opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/simple_arg_fixture.h" namespace NEO { diff --git a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h index 63e48b4337..891950fa88 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h @@ -10,15 +10,14 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/helpers/file_io.h" #include "opencl/source/program/program.h" - -#include "aub_tests/command_queue/command_enqueue_fixture.h" -#include "aub_tests/command_stream/aub_command_stream_fixture.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/run_kernel_fixture.h" -#include "global_environment.h" -#include "helpers/test_files.h" +#include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/run_kernel_fixture.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/test_files.h" namespace NEO { diff --git a/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h index 4f64cd96b5..3103c2fe89 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h @@ -8,13 +8,12 @@ #pragma once #include "core/command_stream/command_stream_receiver.h" - -#include "aub_tests/command_stream/aub_command_stream_fixture.h" -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/simple_arg_fixture.h" -#include "fixtures/simple_arg_kernel_fixture.h" -#include "indirect_heap/indirect_heap_fixture.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/simple_arg_fixture.h" +#include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h" +#include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h" namespace NEO { diff --git a/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h index f49c59d00e..86fcff5a7b 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h @@ -9,8 +9,7 @@ #include "core/memory_manager/memory_constants.h" #include "opencl/source/api/api.h" - -#include "aub_tests/fixtures/aub_fixture.h" +#include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" namespace NEO { class UnifiedMemoryAubFixture : public AUBFixture { diff --git a/opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt index 786c9306a3..8a1c5da6ea 100644 --- a/opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/gen11/CMakeLists.txt @@ -8,7 +8,7 @@ if(TESTS_GEN11) target_sources(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen11.cpp - ${NEO_RUNTIME_TESTS_DIR}/gen11/unit_test_helper_gen11.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp ) add_subdirectories() endif() diff --git a/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp b/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp index 0cda6cfdfb..8745a0d406 100644 --- a/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp +++ b/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp @@ -6,8 +6,7 @@ */ #include "core/helpers/hw_cmds.h" - -#include "aub_tests/aub_tests_configuration.inl" +#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl" using namespace NEO; diff --git a/opencl/test/unit_test/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 index e7173a0eb8..5aac8009c2 100644 --- a/opencl/test/unit_test/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 @@ -7,7 +7,7 @@ #include "aub_batch_buffer_tests_gen11.h" -#include "fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" using Gen11AubBatchBufferTests = Test; diff --git a/opencl/test/unit_test/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 index 4b3e32f6c2..427aa2f57c 100644 --- a/opencl/test/unit_test/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 @@ -7,8 +7,7 @@ #pragma once #include "opencl/source/aub/aub_helper.h" - -#include "aub_tests/command_stream/aub_mem_dump_tests.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h" template void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType engineType, uint64_t gpuBatchBufferAddr) { diff --git a/opencl/test/unit_test/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 index fb99b098c3..bd289fd4b8 100644 --- a/opencl/test/unit_test/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 @@ -8,11 +8,10 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "test.h" -#include "aub_tests/fixtures/aub_parent_kernel_fixture.h" -#include "fixtures/buffer_fixture.h" - using namespace NEO; typedef AUBParentKernelFixture GEN11AUBParentKernelFixture; diff --git a/opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt index 96399ad567..8179d3838c 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/gen12lp/CMakeLists.txt @@ -9,8 +9,8 @@ if(TESTS_GEN12LP) ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/aub_mem_dump_tests_gen12lp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen12lp.cpp - ${NEO_RUNTIME_TESTS_DIR}/gen12lp/special_ult_helper_gen12lp.cpp - ${NEO_RUNTIME_TESTS_DIR}/gen12lp/unit_test_helper_gen12lp.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp ) add_subdirectories() endif() diff --git a/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp index f016c89d02..080f1dcc06 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "aub_tests/command_stream/aub_mem_dump_tests.h" -#include "fixtures/device_fixture.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" namespace NEO { diff --git a/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp index 664e68b1c8..a5d924678b 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp @@ -6,8 +6,7 @@ */ #include "core/helpers/hw_cmds.h" - -#include "aub_tests/aub_tests_configuration.h" +#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index e389411370..f19b54cbb7 100644 --- a/opencl/test/unit_test/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 @@ -14,14 +14,13 @@ #include "opencl/source/event/event.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" +#include "opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" -#include "aub_tests/command_stream/aub_command_stream_fixture.h" -#include "aub_tests/fixtures/hello_world_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" - using Gen12LPAubBatchBufferTests = Test; using Gen12LPTimestampTests = Test>; diff --git a/opencl/test/unit_test/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 index 5942769228..9b13650c29 100644 --- a/opencl/test/unit_test/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 @@ -7,8 +7,7 @@ #pragma once #include "opencl/source/aub/aub_helper.h" - -#include "aub_tests/command_stream/aub_mem_dump_tests.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h" template void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType engineType, uint64_t gpuBatchBufferAddr) { diff --git a/opencl/test/unit_test/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 index 7eed5cea51..7b3c1ed356 100644 --- a/opencl/test/unit_test/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 @@ -8,11 +8,10 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "test.h" -#include "aub_tests/fixtures/aub_parent_kernel_fixture.h" -#include "fixtures/buffer_fixture.h" - using namespace NEO; typedef AUBParentKernelFixture GEN12LPAUBParentKernelFixture; diff --git a/opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt index 709bf537a0..0f16700784 100644 --- a/opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/gen8/CMakeLists.txt @@ -8,7 +8,7 @@ if(TESTS_GEN8) target_sources(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen8.cpp - ${NEO_RUNTIME_TESTS_DIR}/gen8/unit_test_helper_gen8.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp ) add_subdirectories() endif() diff --git a/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp b/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp index af0e9f51aa..8878c476f2 100644 --- a/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp +++ b/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp @@ -6,8 +6,7 @@ */ #include "core/helpers/hw_cmds.h" - -#include "aub_tests/aub_tests_configuration.inl" +#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl" using namespace NEO; diff --git a/opencl/test/unit_test/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 index c2d313d044..82502c07ab 100644 --- a/opencl/test/unit_test/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 @@ -8,11 +8,10 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "test.h" -#include "aub_tests/fixtures/aub_parent_kernel_fixture.h" -#include "fixtures/buffer_fixture.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt b/opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt index 90318f27c3..60b1fef3d1 100644 --- a/opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/gen9/CMakeLists.txt @@ -7,7 +7,7 @@ if(TESTS_GEN9) target_sources(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/aub_tests_configuration_gen9.cpp - ${NEO_RUNTIME_TESTS_DIR}/gen9/unit_test_helper_gen9.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp ) add_subdirectories() endif() diff --git a/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp b/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp index a0e7fccc77..04019a0d1d 100644 --- a/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp +++ b/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp @@ -6,8 +6,7 @@ */ #include "core/helpers/hw_cmds.h" - -#include "aub_tests/aub_tests_configuration.inl" +#include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 7c71e64504..3517baa0e6 100644 --- a/opencl/test/unit_test/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 @@ -7,7 +7,7 @@ #include "aub_batch_buffer_tests.h" -#include "fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" using AubBatchBufferTests = Test; diff --git a/opencl/test/unit_test/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 index ef2682dbee..0f919217ab 100644 --- a/opencl/test/unit_test/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 @@ -7,8 +7,7 @@ #pragma once #include "opencl/source/aub/aub_helper.h" - -#include "aub_tests/command_stream/aub_mem_dump_tests.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h" template void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType engineType, uint64_t gpuBatchBufferAddr) { diff --git a/opencl/test/unit_test/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 index 7339c14b40..28534fdc78 100644 --- a/opencl/test/unit_test/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 @@ -8,11 +8,10 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/aub_tests/fixtures/aub_parent_kernel_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "test.h" -#include "aub_tests/fixtures/aub_parent_kernel_fixture.h" -#include "fixtures/buffer_fixture.h" - using namespace NEO; GEN9TEST_F(AUBParentKernelFixture, EnqueueParentKernel) { diff --git a/opencl/test/unit_test/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 index ff7cdefc28..d885cca7cf 100644 --- a/opencl/test/unit_test/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 @@ -5,8 +5,8 @@ * */ -#include "aub_tests/fixtures/run_kernel_fixture.h" -#include "fixtures/two_walker_fixture.h" +#include "opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h" +#include "opencl/test/unit_test/fixtures/two_walker_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp index 5024a135cb..7a21c3f230 100644 --- a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp @@ -9,12 +9,11 @@ #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" #include "test.h" -#include "aub_tests/command_stream/aub_command_stream_fixture.h" -#include "command_queue/command_enqueue_fixture.h" -#include "mocks/mock_gmm.h" - #include extern GFXCORE_FAMILY renderCoreFamily; diff --git a/opencl/test/unit_test/aub_tests/test_mode.h b/opencl/test/unit_test/aub_tests/test_mode.h index cde1d39af7..ba09671e04 100644 --- a/opencl/test/unit_test/aub_tests/test_mode.h +++ b/opencl/test/unit_test/aub_tests/test_mode.h @@ -7,7 +7,7 @@ #pragma once -#include "tests_configuration.h" +#include "opencl/test/unit_test/tests_configuration.h" namespace NEO { constexpr TestMode defaultTestMode = TestMode::AubTests; diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp index 28effe8392..e3751befb1 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h" #include "test.h" -#include "aub_tests/fixtures/unified_memory_fixture.h" - namespace NEO { class UnifiedMemoryAubTest : public UnifiedMemoryAubFixture, diff --git a/opencl/test/unit_test/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 index a791a57c98..b237ab23e5 100644 --- a/opencl/test/unit_test/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 @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h" #include "test.h" -#include "aub_tests/fixtures/unified_memory_fixture.h" - namespace NEO { class UnifiedMemoryCopyAubTest : public UnifiedMemoryAubFixture, public ::testing::TestWithParam> { diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index 813f121c7e..593ae82319 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -20,22 +20,22 @@ #include "opencl/source/built_ins/vme_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info_builder.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/built_ins/built_ins_file_names.h" +#include "opencl/test/unit_test/fixtures/built_in_fixture.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/fixtures/run_kernel_fixture.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "built_ins/built_ins_file_names.h" #include "compiler_options.h" -#include "fixtures/built_in_fixture.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "fixtures/run_kernel_fixture.h" -#include "global_environment.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_builtins.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_compilers.h" -#include "mocks/mock_kernel.h" #include "os_inc.h" #include diff --git a/opencl/test/unit_test/built_ins/get_built_ins_file_names.cpp b/opencl/test/unit_test/built_ins/get_built_ins_file_names.cpp index c141e5c5b7..3cb3b24d32 100644 --- a/opencl/test/unit_test/built_ins/get_built_ins_file_names.cpp +++ b/opencl/test/unit_test/built_ins/get_built_ins_file_names.cpp @@ -5,7 +5,7 @@ * */ -#include "built_ins/built_ins_file_names.h" +#include "opencl/test/unit_test/built_ins/built_ins_file_names.h" namespace NEO { diff --git a/opencl/test/unit_test/built_ins/sip_tests.cpp b/opencl/test/unit_test/built_ins/sip_tests.cpp index ba729d7313..5cf1f93af4 100644 --- a/opencl/test/unit_test/built_ins/sip_tests.cpp +++ b/opencl/test/unit_test/built_ins/sip_tests.cpp @@ -7,13 +7,13 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/sip.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "global_environment.h" #include "gtest/gtest.h" -#include "helpers/test_files.h" -#include "mocks/mock_device.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp index dcfcff777c..2f770fbd63 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp @@ -8,15 +8,14 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "test.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" -#include "mocks/mock_timestamp_container.h" - using namespace NEO; struct BlitAuxTranslationTests : public ::testing::Test { diff --git a/opencl/test/unit_test/command_queue/buffer_operations_fixture.h b/opencl/test/unit_test/command_queue/buffer_operations_fixture.h index 8905814ba2..23aab14da9 100644 --- a/opencl/test/unit_test/command_queue/buffer_operations_fixture.h +++ b/opencl/test/unit_test/command_queue/buffer_operations_fixture.h @@ -7,11 +7,11 @@ #pragma once #include "core/helpers/ptr_math.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/command_enqueue_fixture.h b/opencl/test/unit_test/command_queue/command_enqueue_fixture.h index 0d0eb21b05..76b180503f 100644 --- a/opencl/test/unit_test/command_queue/command_enqueue_fixture.h +++ b/opencl/test/unit_test/command_queue/command_enqueue_fixture.h @@ -7,15 +7,14 @@ #pragma once #include "opencl/source/command_queue/command_queue_hw.h" - -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "helpers/hw_parse.h" -#include "indirect_heap/indirect_heap_fixture.h" -#include "mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp index f75e59ca35..3716513124 100644 --- a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp @@ -5,14 +5,14 @@ * */ -#include "command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "core/device/device.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "gtest/gtest.h" -#include "mocks/mock_device.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.h b/opencl/test/unit_test/command_queue/command_queue_fixture.h index 651540eb5c..483824eb77 100644 --- a/opencl/test/unit_test/command_queue/command_queue_fixture.h +++ b/opencl/test/unit_test/command_queue/command_queue_fixture.h @@ -7,10 +7,10 @@ #pragma once #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "CL/cl.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { class Device; diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp index 6d31ecec59..8855246eae 100644 --- a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp @@ -9,21 +9,20 @@ #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info_builder.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_builtins.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_event.h" -#include "mocks/mock_kernel.h" - using namespace NEO; struct CommandQueueHwTest diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp index b9b0521d89..657ebc0554 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -14,28 +14,28 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "fixtures/memory_management_fixture.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "helpers/unit_test_helper.h" -#include "helpers/variable_backup.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index 497a12eeeb..402d6ba35f 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -15,19 +15,18 @@ #include "opencl/source/event/perf_counter.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/helpers/task_information.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/device_fixture.h" -#include "helpers/hw_parse.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_program.h" - using namespace NEO; struct DispatchWalkerTest : public CommandQueueFixture, public DeviceFixture, public ::testing::Test { diff --git a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp index 43e633a9ea..2b7bf7bc9e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp @@ -10,12 +10,11 @@ #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "gen_common/gen_cmd_parse.h" -#include "mocks/mock_command_queue.h" - using namespace NEO; using BarrierTest = Test; diff --git a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp index fd90d6a374..43be64d3eb 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp @@ -11,16 +11,15 @@ #include "opencl/source/event/event_builder.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/enqueue_properties.h" +#include "opencl/test/unit_test/fixtures/dispatch_flags_fixture.h" +#include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "test.h" -#include "fixtures/dispatch_flags_fixture.h" -#include "fixtures/enqueue_handler_fixture.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_timestamp_container.h" - namespace NEO { template diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_event_tests.cpp index 591f7b5892..5bfaf9ec8d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_event_tests.cpp @@ -7,10 +7,10 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/built_in_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/built_in_fixture.h" -#include "fixtures/hello_world_fixture.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h index 9cd3a0bc83..3537920b7e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h @@ -7,12 +7,12 @@ #pragma once #include "core/helpers/ptr_math.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "command_queue/command_enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h index 0b964fb3c6..364e1e6587 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h @@ -7,12 +7,12 @@ #pragma once #include "core/helpers/ptr_math.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "command_queue/command_enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp index 6942f6fb59..8e1ebe2176 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp @@ -9,11 +9,11 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info.h" +#include "opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "test.h" -#include "command_queue/enqueue_copy_buffer_rect_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "mocks/mock_buffer.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp index 5e28e401fe..63d4ba29d3 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp @@ -11,13 +11,13 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "test.h" -#include "command_queue/enqueue_copy_buffer_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" #include "reg_configs_common.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h index 8370f6402f..733ac2f4ec 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h @@ -7,11 +7,11 @@ #pragma once #include "core/helpers/ptr_math.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index 3944ed5a77..3cc1056a5b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -6,14 +6,14 @@ */ #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "test.h" -#include "command_queue/enqueue_copy_buffer_to_image_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_builtin_dispatch_info_builder.h" -#include "mocks/mock_builtins.h" #include "reg_configs_common.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h index 883d5ff766..1823e4e973 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h @@ -7,11 +7,11 @@ #pragma once #include "core/helpers/ptr_math.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/built_in_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/built_in_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp index d037c0a934..28ea1d4c30 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp @@ -6,13 +6,13 @@ */ #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "test.h" -#include "command_queue/enqueue_copy_image_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_builtin_dispatch_info_builder.h" -#include "mocks/mock_builtins.h" #include "reg_configs_common.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h index d36ecd71d6..981aa0b857 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h @@ -7,11 +7,11 @@ #pragma once #include "core/helpers/ptr_math.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp index abfdc1f3c7..d4ce2beddc 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -6,14 +6,14 @@ */ #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "test.h" -#include "command_queue/enqueue_copy_image_to_buffer_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_builtin_dispatch_info_builder.h" -#include "mocks/mock_builtins.h" #include "reg_configs_common.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp index 56897a8cc1..bfcc87afbd 100644 --- a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp @@ -9,17 +9,17 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/program/program.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/kernel_filename_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/program/program_from_binary.h" #include "test.h" #include "compiler_options.h" -#include "fixtures/enqueue_handler_fixture.h" #include "gmock/gmock.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/kernel_filename_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_kernel.h" -#include "program/program_from_binary.h" using namespace NEO; using namespace ::testing; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp index d7021abc7b..04b1cdf4e9 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp @@ -7,10 +7,9 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h" #include "test.h" -#include "command_queue/enqueue_fill_buffer_fixture.h" - using namespace NEO; namespace ULT { diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h index 080f2c97b3..bb022af6cc 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h @@ -6,10 +6,10 @@ */ #pragma once -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "gen_common/gen_cmd_parse.h" -#include "mocks/mock_context.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp index 21770174b8..cae9caad12 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp @@ -7,8 +7,8 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h" -#include "command_queue/enqueue_fill_buffer_fixture.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp index 2f3cebb9a2..27c3b3da82 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp @@ -15,13 +15,13 @@ #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/dispatch_info.h" +#include "opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "test.h" -#include "command_queue/enqueue_fill_buffer_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h index 14c12b0e1f..74b1e553f5 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h @@ -6,9 +6,10 @@ */ #pragma once -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/image_fixture.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" + #include "gtest/gtest.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp index 4283de9442..5d0531d738 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp @@ -6,11 +6,11 @@ */ #include "opencl/source/helpers/convert_color.h" +#include "opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "test.h" -#include "command_queue/enqueue_fill_image_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" #include "reg_configs_common.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_fixture.cpp b/opencl/test/unit_test/command_queue/enqueue_fixture.cpp index 70a0ef0e00..af3234446f 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fixture.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "core/helpers/ptr_math.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fixture.h index 9b109c8688..9c4a1e78ff 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fixture.h @@ -10,10 +10,10 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" #include "CL/cl.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/image_fixture.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp index 0e8b39b26b..c867f20a49 100644 --- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp @@ -9,20 +9,19 @@ #include "opencl/source/command_stream/aub_subcapture.h" #include "opencl/source/event/user_event.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h" +#include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_aub_csr.h" +#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_internal_allocation_storage.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" #include "test.h" -#include "command_stream/thread_arbitration_policy_helper.h" -#include "fixtures/enqueue_handler_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_aub_csr.h" -#include "mocks/mock_aub_subcapture_manager.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_internal_allocation_storage.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" - using namespace NEO; HWTEST_F(EnqueueHandlerTest, WhenEnqueingHandlerWithKernelThenProcessEvictionOnCsrIsCalled) { diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp index 2ed14c3ece..16469e129a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp @@ -8,13 +8,12 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" - -#include "command_queue/enqueue_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "helpers/hw_parse.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_submissions_aggregator.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp index c21ae92e89..cc00226a14 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp @@ -10,16 +10,16 @@ #include "core/memory_manager/allocations_list.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/base_object_utils.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "gen_common/gen_cmd_parse.h" -#include "gen_common/gen_commands_common_validation.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_device_queue.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp index 4658635b0e..993a8a81da 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_event_tests.cpp @@ -7,8 +7,8 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" -#include "fixtures/hello_world_fixture.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_global_offset_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_global_offset_tests.cpp index d25d8b3f19..835186261c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_global_offset_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_global_offset_tests.cpp @@ -6,8 +6,8 @@ */ #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" -#include "fixtures/hello_world_fixture.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_local_work_size_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_local_work_size_tests.cpp index 0eed63466b..aad448bd92 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_local_work_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_local_work_size_tests.cpp @@ -6,8 +6,8 @@ */ #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" -#include "fixtures/hello_world_fixture.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp index 33d7e33039..b8aa1dbd84 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "command_queue/enqueue_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_submissions_aggregator.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" typedef HelloWorldFixture EnqueueKernelFixture; typedef Test EnqueueKernelTest; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp index 7ac56ee778..eea84d0dcf 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ioq_tests.cpp @@ -7,11 +7,10 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" #include "test.h" -#include "fixtures/hello_world_fixture.h" -#include "helpers/hw_parse.h" - using namespace NEO; struct TwoIOQsTwoDependentWalkers : public HelloWorldTest, diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp index f4494a4ed8..c1c857d053 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_ooq_tests.cpp @@ -7,11 +7,10 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" #include "test.h" -#include "fixtures/hello_world_fixture.h" -#include "helpers/hw_parse.h" - using namespace NEO; struct OOQFixtureFactory : public HelloWorldFixtureFactory { diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp index 6fc1f6cfed..5a451fd36a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp @@ -6,10 +6,9 @@ */ #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/fixtures/two_walker_fixture.h" #include "test.h" -#include "fixtures/two_walker_fixture.h" - using namespace NEO; typedef TwoWalkerTest IOQWithTwoWalkers; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp index 0f6efa4614..5371e5ae39 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp @@ -5,11 +5,10 @@ * */ +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/two_walker_fixture.h" #include "test.h" -#include "fixtures/hello_world_fixture.h" -#include "fixtures/two_walker_fixture.h" - using namespace NEO; struct OOQFixtureFactory : public HelloWorldFixtureFactory { diff --git a/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h index eaec238ad6..13d06a9108 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h @@ -6,11 +6,12 @@ */ #pragma once -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" + #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp index 76eac19a8e..364c2042da 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp @@ -8,17 +8,17 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "command_queue/enqueue_map_buffer_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp index 110c55d0ac..05371ea914 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp @@ -10,16 +10,15 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" - using namespace NEO; struct EnqueueMapImageTest : public DeviceFixture, diff --git a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp index 7a9d1995ad..723e98b798 100644 --- a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp @@ -7,12 +7,11 @@ #include "core/command_stream/command_stream_receiver.h" #include "opencl/source/event/user_event.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "gen_common/gen_cmd_parse.h" -#include "mocks/mock_kernel.h" - using namespace NEO; using MarkerTest = Test; diff --git a/opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp b/opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp index ee2565f4b0..3d0c8b0923 100644 --- a/opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_media_kernel.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" #include "test.h" -#include "fixtures/media_kernel_fixture.h" - using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp index 8c03098c7f..79a5f120eb 100644 --- a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp @@ -7,13 +7,12 @@ #include "core/command_stream/command_stream_receiver.h" #include "opencl/source/event/user_event.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_buffer.h" - using namespace NEO; class MigrateMemObjectsFixture diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp index 2899d0c39b..220b189ff0 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp @@ -8,9 +8,9 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/hello_world_fixture.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h index a44cf5b5ea..e5358e7069 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h @@ -6,11 +6,12 @@ */ #pragma once -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" + #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h index 63daf7c1c4..efce187072 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h @@ -8,12 +8,12 @@ #pragma once #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "command_queue/command_enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp index 116c552ecb..ee4940214d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -10,12 +10,12 @@ #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/dispatch_info.h" +#include "opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "test.h" -#include "command_queue/enqueue_read_buffer_rect_fixture.h" -#include "fixtures/buffer_enqueue_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "mocks/mock_buffer.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp index 7d2f4c300e..6d759b8a77 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp @@ -12,15 +12,15 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h" -#include "command_queue/enqueue_fixture.h" -#include "command_queue/enqueue_read_buffer_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_execution_environment.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h index d46b4c315c..05647752fe 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h @@ -7,12 +7,12 @@ #pragma once #include "core/helpers/ptr_math.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index 884b712bf5..81b2867af6 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -8,14 +8,14 @@ #include "core/memory_manager/allocations_list.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" -#include "command_queue/enqueue_read_image_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_builtin_dispatch_info_builder.h" -#include "mocks/mock_builtins.h" -#include "mocks/mock_command_queue.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp index 5311591784..09fe2f6ed0 100644 --- a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" - using namespace NEO; using ResourceBarrierTest = Test; diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp index 001225b4d3..3629f64aa7 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -8,14 +8,13 @@ #include "core/memory_manager/allocations_list.h" #include "core/memory_manager/unified_memory_manager.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_builtin_dispatch_info_builder.h" -#include "mocks/mock_builtins.h" - using namespace NEO; struct EnqueueSvmMemCopyTest : public DeviceFixture, diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp index 1cebfae273..984fb44ca5 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -7,14 +7,13 @@ #include "core/memory_manager/unified_memory_manager.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_builtin_dispatch_info_builder.h" -#include "mocks/mock_builtins.h" - using namespace NEO; struct EnqueueSvmMemFillTest : public DeviceFixture, diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp index dbb442308b..cb6bb1f1b0 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp @@ -15,19 +15,18 @@ #include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_svm_manager.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "command_queue/enqueue_map_buffer_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/device_fixture.h" -#include "helpers/hw_parse.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_svm_manager.h" - using namespace NEO; struct EnqueueSvmTest : public DeviceFixture, diff --git a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp index 8339c25a96..4d815be625 100644 --- a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp @@ -13,12 +13,11 @@ #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_context.h" - using namespace NEO; namespace ULT { diff --git a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp index 238eb63d56..3f275cae33 100644 --- a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp @@ -8,14 +8,13 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_command_queue.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp index 9f31e6c9e7..5b64c9f959 100644 --- a/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "fixtures/hello_world_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_buffer.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" class clEventWrapper { public: diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp index 62d1c2df4d..afc6571c13 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp @@ -8,9 +8,9 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/command_queue/buffer_operations_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" -#include "command_queue/buffer_operations_fixture.h" -#include "fixtures/buffer_fixture.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h index de8f03c9ab..6c2fa62d48 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h @@ -9,12 +9,12 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "command_queue/command_enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp index 54a166eb7f..fa47aaf3be 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -9,13 +9,13 @@ #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/dispatch_info.h" +#include "opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" #include "test.h" -#include "command_queue/enqueue_write_buffer_rect_fixture.h" -#include "fixtures/buffer_enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "mocks/mock_buffer.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp index 65fd8f0c00..ef1f567064 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp @@ -10,15 +10,15 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info.h" +#include "opencl/test/unit_test/command_queue/buffer_operations_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h" -#include "command_queue/buffer_operations_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_execution_environment.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h index 7352a7b1dc..1155d4a91c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h @@ -7,12 +7,12 @@ #pragma once #include "core/helpers/ptr_math.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index c870d33207..69500b30ec 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -8,13 +8,13 @@ #include "core/memory_manager/allocations_list.h" #include "core/memory_manager/memory_manager.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" +#include "opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_builtin_dispatch_info_builder.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "test.h" -#include "command_queue/enqueue_write_image_fixture.h" -#include "gen_common/gen_commands_common_validation.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_builtin_dispatch_info_builder.h" -#include "mocks/mock_builtins.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/finish_tests.cpp b/opencl/test/unit_test/command_queue/finish_tests.cpp index e377706116..b592613f2a 100644 --- a/opencl/test/unit_test/command_queue/finish_tests.cpp +++ b/opencl/test/unit_test/command_queue/finish_tests.cpp @@ -6,15 +6,15 @@ */ #include "core/command_stream/command_stream_receiver.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/device_fixture.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_command_queue.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/flattened_id_tests.cpp b/opencl/test/unit_test/command_queue/flattened_id_tests.cpp index 0279c58fa3..d76f3d8062 100644 --- a/opencl/test/unit_test/command_queue/flattened_id_tests.cpp +++ b/opencl/test/unit_test/command_queue/flattened_id_tests.cpp @@ -7,10 +7,9 @@ #include "core/helpers/basic_math.h" #include "core/helpers/string.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "test.h" -#include "helpers/unit_test_helper.h" - #include #include using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/flush_tests.cpp b/opencl/test/unit_test/command_queue/flush_tests.cpp index cc75fbb3cd..9c0b7da2ab 100644 --- a/opencl/test/unit_test/command_queue/flush_tests.cpp +++ b/opencl/test/unit_test/command_queue/flush_tests.cpp @@ -6,10 +6,10 @@ */ #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp index f533e740fe..ea0ae67510 100644 --- a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp @@ -5,9 +5,10 @@ * */ -#include "command_queue/command_queue_fixture.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" + #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp index bd6fd945bf..1271748636 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp @@ -14,15 +14,14 @@ #include "opencl/source/event/event.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/hello_world_kernel_fixture.h" -#include "fixtures/image_fixture.h" -#include "fixtures/simple_arg_kernel_fixture.h" - using namespace NEO; struct GetSizeRequiredBufferTest : public CommandEnqueueFixture, diff --git a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp index eebb0e7544..01d15f2992 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp @@ -17,15 +17,14 @@ #include "opencl/source/event/perf_counter.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h" +#include "opencl/test/unit_test/fixtures/built_in_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "command_queue/enqueue_write_image_fixture.h" -#include "fixtures/built_in_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_kernel.h" - using namespace NEO; struct GetSizeRequiredImageTest : public CommandEnqueueFixture, diff --git a/opencl/test/unit_test/command_queue/get_size_required_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_tests.cpp index 5e639b12e0..3dd25e4c95 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_tests.cpp @@ -10,11 +10,10 @@ #include "opencl/source/command_queue/enqueue_barrier.h" #include "opencl/source/command_queue/enqueue_marker.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct GetSizeRequiredTest : public CommandEnqueueFixture, diff --git a/opencl/test/unit_test/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 index baedce174d..57aa51ae06 100644 --- a/opencl/test/unit_test/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 @@ -10,15 +10,14 @@ #include "core/memory_manager/memory_constants.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/sharings/gl/gl_buffer.h" - -#include "command_queue/enqueue_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "helpers/hw_parse.h" -#include "mocks/gl/windows/mock_gl_sharing_windows.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_submissions_aggregator.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/ioq_task_tests.cpp b/opencl/test/unit_test/command_queue/ioq_task_tests.cpp index ee2ac93825..9a44f4893b 100644 --- a/opencl/test/unit_test/command_queue/ioq_task_tests.cpp +++ b/opencl/test/unit_test/command_queue/ioq_task_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "command_queue/enqueue_fixture.h" -#include "fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp b/opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp index 8b5b289569..1c58d72fac 100644 --- a/opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp +++ b/opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp @@ -5,10 +5,10 @@ * */ -#include "command_queue/enqueue_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_buffer.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/local_id_tests.cpp b/opencl/test/unit_test/command_queue/local_id_tests.cpp index 7f52bacf7b..c230fbaeee 100644 --- a/opencl/test/unit_test/command_queue/local_id_tests.cpp +++ b/opencl/test/unit_test/command_queue/local_id_tests.cpp @@ -9,10 +9,9 @@ #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "opencl/source/command_queue/local_id_gen.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "test.h" -#include "helpers/unit_test_helper.h" - #include #include diff --git a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp index e2dfcab5ef..290c1081ee 100644 --- a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp @@ -7,10 +7,10 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/gpgpu_walker.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" -#include "mocks/mock_device.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp b/opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp index 653e1f2684..4ae3dd6b8b 100644 --- a/opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp +++ b/opencl/test/unit_test/command_queue/multi_dispatch_info_tests.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/mocks/mock_mdi.h" #include "test.h" -#include "mocks/mock_mdi.h" - using namespace NEO; struct MultiDispatchInfoTest : public ::testing::Test { diff --git a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp index 5219c73998..7499e656b1 100644 --- a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp @@ -8,11 +8,10 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct MultipleMapBufferTest : public DeviceFixture, public ::testing::Test { diff --git a/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp index 26007b5250..914f46855d 100644 --- a/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp @@ -7,14 +7,13 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "helpers/unit_test_helper.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_context.h" - namespace NEO { extern ImageFuncs imageFactory[IGFX_MAX_CORE]; diff --git a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp index c285e81308..4249a2021c 100644 --- a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp @@ -8,16 +8,15 @@ #include "core/memory_manager/memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/hello_world_kernel_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/simple_arg_kernel_fixture.h" - using namespace NEO; struct OOMSetting { diff --git a/opencl/test/unit_test/command_queue/oom_image_tests.cpp b/opencl/test/unit_test/command_queue/oom_image_tests.cpp index 3b3683249a..1cc58e9f93 100644 --- a/opencl/test/unit_test/command_queue/oom_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_image_tests.cpp @@ -8,12 +8,11 @@ #include "core/memory_manager/memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "command_queue/enqueue_fixture.h" -#include "fixtures/device_fixture.h" - using namespace NEO; struct OOMSetting { diff --git a/opencl/test/unit_test/command_queue/oom_tests.cpp b/opencl/test/unit_test/command_queue/oom_tests.cpp index 6086c80641..b8f1f66322 100644 --- a/opencl/test/unit_test/command_queue/oom_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_tests.cpp @@ -8,12 +8,11 @@ #include "core/indirect_heap/indirect_heap.h" #include "core/memory_manager/memory_manager.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct OOMSetting { diff --git a/opencl/test/unit_test/command_queue/ooq_task_tests.cpp b/opencl/test/unit_test/command_queue/ooq_task_tests.cpp index 83da271963..4d75a16571 100644 --- a/opencl/test/unit_test/command_queue/ooq_task_tests.cpp +++ b/opencl/test/unit_test/command_queue/ooq_task_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "command_queue/enqueue_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "mocks/mock_csr.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp b/opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp index a5e78ce058..3f2c6a5845 100644 --- a/opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp +++ b/opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp @@ -5,8 +5,8 @@ * */ -#include "command_queue/enqueue_fixture.h" -#include "fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp b/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp index bbc0f2c538..0fc04282fe 100644 --- a/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp +++ b/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp @@ -7,11 +7,10 @@ #include "core/gmm_helper/gmm.h" #include "core/helpers/basic_math.h" +#include "opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" -#include "command_queue/enqueue_read_buffer_fixture.h" -#include "mocks/mock_command_queue.h" - using namespace NEO; typedef EnqueueReadBufferTypeTest ReadWriteBufferCpuCopyTest; diff --git a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp index 8ab0421473..7f072ed431 100644 --- a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp @@ -7,13 +7,12 @@ #include "core/program/sync_buffer_handler.h" #include "opencl/source/api/api.h" +#include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" #include "test.h" -#include "fixtures/enqueue_handler_fixture.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" - using namespace NEO; class MockSyncBufferHandler : public SyncBufferHandler { diff --git a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp index 8d7af7c55b..5166120ae9 100644 --- a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp @@ -7,9 +7,9 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/gpgpu_walker.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "patch_shared.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp index a5790f1c7e..49cdb945a0 100644 --- a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp @@ -7,15 +7,14 @@ #include "core/memory_manager/unified_memory_manager.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" - using namespace NEO; class ZeroSizeEnqueueHandlerTest : public Test { diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index d2140a36a9..e5878f5454 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -11,23 +11,22 @@ #include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/helpers/hardware_context_controller.h" +#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_aub_center.h" +#include "opencl/test/unit_test/mocks/mock_aub_csr.h" +#include "opencl/test/unit_test/mocks/mock_aub_manager.h" +#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" -#include "fixtures/aub_command_stream_receiver_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/mock_aub_center_fixture.h" -#include "libult/ult_aub_command_stream_receiver.h" -#include "mocks/mock_aub_center.h" -#include "mocks/mock_aub_csr.h" -#include "mocks/mock_aub_manager.h" -#include "mocks/mock_aub_subcapture_manager.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_os_context.h" - using namespace NEO; using AubCommandStreamReceiverTests = Test; diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index 936859f982..34a39eb8f5 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -12,23 +12,23 @@ #include "opencl/source/helpers/hardware_context_controller.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/mocks/mock_aub_center.h" +#include "opencl/test/unit_test/mocks/mock_aub_csr.h" +#include "opencl/test/unit_test/mocks/mock_aub_file_stream.h" +#include "opencl/test/unit_test/mocks/mock_aub_manager.h" +#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" -#include "fixtures/aub_command_stream_receiver_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/mock_aub_center_fixture.h" -#include "mocks/mock_aub_center.h" -#include "mocks/mock_aub_csr.h" -#include "mocks/mock_aub_file_stream.h" -#include "mocks/mock_aub_manager.h" -#include "mocks/mock_aub_subcapture_manager.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_os_context.h" #include "third_party/aub_stream/headers/aubstream.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp index a4af6e9221..b7ddd90efb 100644 --- a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp @@ -11,20 +11,20 @@ #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/helpers/hardware_context_controller.h" #include "opencl/source/helpers/neo_driver_version.h" +#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_aub_center.h" +#include "opencl/test/unit_test/mocks/mock_aub_csr.h" +#include "opencl/test/unit_test/mocks/mock_aub_file_stream.h" +#include "opencl/test/unit_test/mocks/mock_aub_manager.h" +#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" #include "driver_version.h" -#include "fixtures/aub_command_stream_receiver_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_aub_center.h" -#include "mocks/mock_aub_csr.h" -#include "mocks/mock_aub_file_stream.h" -#include "mocks/mock_aub_manager.h" -#include "mocks/mock_aub_subcapture_manager.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_os_context.h" #include #include diff --git a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp index 070d061a45..3d0f916293 100644 --- a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp @@ -8,13 +8,12 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/command_stream/aub_subcapture.h" #include "opencl/source/helpers/dispatch_info.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_aub_subcapture_manager.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" - using namespace NEO; struct AubSubCaptureTest : public DeviceFixture, diff --git a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp index 51fbc45bab..3c728dfeae 100644 --- a/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp +++ b/opencl/test/unit_test/command_stream/cmd_parse_tests.cpp @@ -5,11 +5,10 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "gen_common/gen_cmd_parse.h" - using namespace NEO; struct CommandParse diff --git a/opencl/test/unit_test/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 index f6accaccbb..9fb42e8e9c 100644 --- a/opencl/test/unit_test/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 @@ -10,17 +10,16 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/ult_hw_helper.h" #include "opencl/source/command_queue/gpgpu_walker.h" +#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" #include "test.h" -#include "fixtures/ult_command_stream_receiver_fixture.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_event.h" -#include "mocks/mock_submissions_aggregator.h" - using namespace NEO; typedef UltCommandStreamReceiverTest CommandStreamReceiverFlushTaskTests; diff --git a/opencl/test/unit_test/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 index e878f24c88..f1517b9853 100644 --- a/opencl/test/unit_test/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 @@ -14,20 +14,20 @@ #include "core/os_interface/os_context.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/raii_hw_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_hw_helper.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" #include "test.h" -#include "fixtures/ult_command_stream_receiver_fixture.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/raii_hw_helper.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_event.h" -#include "mocks/mock_hw_helper.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_submissions_aggregator.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index b23121b1d9..d70799979f 100644 --- a/opencl/test/unit_test/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 @@ -11,21 +11,20 @@ #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" #include "test.h" -#include "fixtures/ult_command_stream_receiver_fixture.h" -#include "helpers/dispatch_flags_helper.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_event.h" -#include "mocks/mock_gmm_page_table_mngr.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_os_context.h" -#include "mocks/mock_program.h" -#include "mocks/mock_submissions_aggregator.h" - using namespace NEO; typedef UltCommandStreamReceiverTest CommandStreamReceiverFlushTaskTests; diff --git a/opencl/test/unit_test/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 index c410e188be..06a476eb64 100644 --- a/opencl/test/unit_test/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 @@ -24,23 +24,23 @@ #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/event/user_event.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/built_in_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" #include "test.h" -#include "fixtures/built_in_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/ult_command_stream_receiver_fixture.h" #include "gtest/gtest.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/hw_parse.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_event.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_os_context.h" -#include "mocks/mock_submissions_aggregator.h" #include "reg_configs_common.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp index 1312dc472e..7f95d16136 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp @@ -29,27 +29,27 @@ #include "opencl/source/helpers/cl_blit_properties.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/mem_obj_helper.h" +#include "opencl/test/unit_test/fixtures/built_in_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/raii_hw_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_hw_helper.h" +#include "opencl/test/unit_test/mocks/mock_internal_allocation_storage.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" +#include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "test.h" -#include "fixtures/built_in_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/ult_command_stream_receiver_fixture.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/hw_parse.h" -#include "helpers/raii_hw_helper.h" -#include "helpers/unit_test_helper.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_event.h" -#include "mocks/mock_hw_helper.h" -#include "mocks/mock_internal_allocation_storage.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_submissions_aggregator.h" -#include "mocks/mock_timestamp_container.h" #include "reg_configs_common.h" #include diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp index 8625c630cd..4ee39ebac9 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -21,24 +21,24 @@ #include "core/utilities/tag_allocator.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/gen_common/matchers.h" +#include "opencl/test/unit_test/helpers/raii_hw_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_hw_helper.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" #include "command_stream_receiver_simulated_hw.h" -#include "fixtures/device_fixture.h" -#include "fixtures/multi_root_device_fixture.h" -#include "gen_common/matchers.h" #include "gmock/gmock.h" -#include "helpers/raii_hw_helper.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_builtins.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_hw_helper.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 56de3a4fbe..cf78895f08 100644 --- a/opencl/test/unit_test/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 @@ -18,17 +18,16 @@ #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_aub_center.h" +#include "opencl/test/unit_test/mocks/mock_aub_csr.h" +#include "opencl/test/unit_test/mocks/mock_aub_manager.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" -#include "fixtures/mock_aub_center_fixture.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_aub_center.h" -#include "mocks/mock_aub_csr.h" -#include "mocks/mock_aub_manager.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_os_context.h" - using namespace NEO; struct MyMockCsr : UltCommandStreamReceiver { diff --git a/opencl/test/unit_test/command_stream/compute_mode_tests.h b/opencl/test/unit_test/command_stream/compute_mode_tests.h index d08828339d..8b53fe64f3 100644 --- a/opencl/test/unit_test/command_stream/compute_mode_tests.h +++ b/opencl/test/unit_test/command_stream/compute_mode_tests.h @@ -8,11 +8,10 @@ #pragma once #include "core/command_stream/command_stream_receiver_hw.h" #include "core/helpers/hw_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device.h" - using namespace NEO; struct ComputeModeRequirements : public ::testing::Test { diff --git a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp index 6c00567ef3..28bfc26693 100644 --- a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp @@ -11,13 +11,12 @@ #include "core/unit_tests/helpers/ult_hw_config.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/libult/create_command_stream.h" #include "test.h" -#include "fixtures/mock_aub_center_fixture.h" -#include "helpers/execution_environment_helper.h" -#include "helpers/variable_backup.h" -#include "libult/create_command_stream.h" - using namespace NEO; struct CreateCommandStreamReceiverTest : public ::testing::TestWithParam {}; diff --git a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp index f05eb268ff..7de0d3aedc 100644 --- a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp +++ b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp @@ -10,13 +10,13 @@ #include "core/memory_manager/memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "fixtures/multi_root_device_fixture.h" -#include "fixtures/ult_command_stream_receiver_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_experimental_command_buffer.h" -#include "mocks/mock_memory_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/get_devices_tests.cpp b/opencl/test/unit_test/command_stream/get_devices_tests.cpp index e5d819091b..de254f852a 100644 --- a/opencl/test/unit_test/command_stream/get_devices_tests.cpp +++ b/opencl/test/unit_test/command_stream/get_devices_tests.cpp @@ -13,11 +13,10 @@ #include "core/unit_tests/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/libult/create_command_stream.h" #include "test.h" -#include "helpers/variable_backup.h" -#include "libult/create_command_stream.h" - namespace NEO { bool operator==(const HardwareInfo &hwInfoIn, const HardwareInfo &hwInfoOut) { bool result = (0 == memcmp(&hwInfoIn.platform, &hwInfoOut.platform, sizeof(PLATFORM))); diff --git a/opencl/test/unit_test/command_stream/linear_stream_fixture.h b/opencl/test/unit_test/command_stream/linear_stream_fixture.h index 701d9e4691..8c1ec4c97b 100644 --- a/opencl/test/unit_test/command_stream/linear_stream_fixture.h +++ b/opencl/test/unit_test/command_stream/linear_stream_fixture.h @@ -7,10 +7,9 @@ #pragma once #include "core/command_stream/linear_stream.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" -#include "mocks/mock_graphics_allocation.h" - #include namespace NEO { diff --git a/opencl/test/unit_test/command_stream/linear_stream_tests.cpp b/opencl/test/unit_test/command_stream/linear_stream_tests.cpp index 8efdfd4fb0..a2ee6fd278 100644 --- a/opencl/test/unit_test/command_stream/linear_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/linear_stream_tests.cpp @@ -7,9 +7,8 @@ #include "core/command_stream/linear_stream.h" #include "core/memory_manager/graphics_allocation.h" - -#include "command_stream/linear_stream_fixture.h" -#include "mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/command_stream/linear_stream_fixture.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp index 52273619b8..f5bda328a2 100644 --- a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp +++ b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp @@ -8,15 +8,14 @@ #include "core/command_stream/submissions_aggregator.h" #include "core/helpers/flush_stamp.h" #include "opencl/source/event/event.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" - using namespace NEO; struct MockSubmissionAggregator : public SubmissionAggregator { diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp index 4604995a50..304a949b79 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp @@ -5,15 +5,15 @@ * */ -#include "command_stream/tbx_command_stream_fixture.h" +#include "opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h" #include "core/command_stream/command_stream_receiver.h" #include "core/device/device.h" #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/mocks/mock_device.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -#include "mocks/mock_device.h" namespace NEO { diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h index 37009a0617..54ce8774b2 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h @@ -7,8 +7,7 @@ #pragma once #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" - -#include "command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" #include diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp index 0bd9ab8438..c6190d8f10 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -18,23 +18,23 @@ #include "opencl/source/mem_obj/mem_obj.h" #include "opencl/source/memory_manager/memory_banks.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_aub_center.h" +#include "opencl/test/unit_test/mocks/mock_aub_manager.h" +#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" +#include "opencl/test/unit_test/mocks/mock_tbx_csr.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/mock_aub_center_fixture.h" -#include "gen_common/gen_cmd_parse.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_aub_center.h" -#include "mocks/mock_aub_manager.h" -#include "mocks/mock_aub_subcapture_manager.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_os_context.h" -#include "mocks/mock_tbx_csr.h" #include "tbx_command_stream_fixture.h" #include diff --git a/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp index 6acbc62db6..cf2f8b8024 100644 --- a/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/tbx_stream_tests.cpp @@ -6,10 +6,10 @@ */ #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "opencl/test/unit_test/mocks/mock_tbx_sockets.h" +#include "opencl/test/unit_test/mocks/mock_tbx_stream.h" #include "gtest/gtest.h" -#include "mocks/mock_tbx_sockets.h" -#include "mocks/mock_tbx_stream.h" using namespace NEO; diff --git a/opencl/test/unit_test/context/context_get_info_tests.cpp b/opencl/test/unit_test/context/context_get_info_tests.cpp index b7c9d5f95f..e00d8a4595 100644 --- a/opencl/test/unit_test/context/context_get_info_tests.cpp +++ b/opencl/test/unit_test/context/context_get_info_tests.cpp @@ -5,10 +5,11 @@ * */ -#include "fixtures/context_fixture.h" -#include "fixtures/platform_fixture.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" + #include "gtest/gtest.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/context/context_multi_device_tests.cpp b/opencl/test/unit_test/context/context_multi_device_tests.cpp index 315796c0d1..13056e375d 100644 --- a/opencl/test/unit_test/context/context_multi_device_tests.cpp +++ b/opencl/test/unit_test/context/context_multi_device_tests.cpp @@ -7,9 +7,9 @@ #include "core/helpers/array_count.h" #include "opencl/source/context/context.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/context/context_negative_tests.cpp b/opencl/test/unit_test/context/context_negative_tests.cpp index d779c80c8d..82f98b12d2 100644 --- a/opencl/test/unit_test/context/context_negative_tests.cpp +++ b/opencl/test/unit_test/context/context_negative_tests.cpp @@ -7,11 +7,11 @@ #include "opencl/source/context/context.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "test.h" #include "CL/cl_gl.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 9689e86ddb..6706a2dcce 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -11,15 +11,15 @@ #include "opencl/source/context/context.inl" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/sharings/sharing.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_context.h" -#include "mocks/mock_deferred_deleter.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp index 1f5871f6d1..f9ac8c435e 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp @@ -8,9 +8,8 @@ #include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/event/user_event.h" - -#include "context/driver_diagnostics_tests.h" -#include "fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/context/driver_diagnostics_tests.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/context/driver_diagnostics_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_tests.cpp index ad9cc2addc..629922b2a2 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.cpp @@ -10,8 +10,7 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" - -#include "mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" #include diff --git a/opencl/test/unit_test/context/driver_diagnostics_tests.h b/opencl/test/unit_test/context/driver_diagnostics_tests.h index 5ce2358e43..31afe36883 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.h +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.h @@ -11,15 +11,15 @@ #include "opencl/source/context/context.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/fixtures/program_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/image_fixture.h" -#include "fixtures/platform_fixture.h" -#include "fixtures/program_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_device.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp index e5fd2fd73f..bb08de1845 100644 --- a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp +++ b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp @@ -7,12 +7,12 @@ #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" -#include "fixtures/context_fixture.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" #include diff --git a/opencl/test/unit_test/context/gl/context_gl_tests.cpp b/opencl/test/unit_test/context/gl/context_gl_tests.cpp index 99270eeb20..ff27a83fca 100644 --- a/opencl/test/unit_test/context/gl/context_gl_tests.cpp +++ b/opencl/test/unit_test/context/gl/context_gl_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "context/gl/context_gl_tests.h" +#include "opencl/test/unit_test/context/gl/context_gl_tests.h" #include "opencl/source/sharings/gl/gl_sharing.h" diff --git a/opencl/test/unit_test/context/gl/context_gl_tests.h b/opencl/test/unit_test/context/gl/context_gl_tests.h index 96a2663dc1..c883b6fef5 100644 --- a/opencl/test/unit_test/context/gl/context_gl_tests.h +++ b/opencl/test/unit_test/context/gl/context_gl_tests.h @@ -7,9 +7,10 @@ #pragma once -#include "fixtures/platform_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" + #include "gtest/gtest.h" -#include "mocks/mock_context.h" #include namespace NEO { diff --git a/opencl/test/unit_test/context/gl/windows/context_gl_tests_windows.cpp b/opencl/test/unit_test/context/gl/windows/context_gl_tests_windows.cpp index c24a2a9af9..2a3a9a5be2 100644 --- a/opencl/test/unit_test/context/gl/windows/context_gl_tests_windows.cpp +++ b/opencl/test/unit_test/context/gl/windows/context_gl_tests_windows.cpp @@ -5,7 +5,7 @@ * */ -#include "context/gl/context_gl_tests.h" +#include "opencl/test/unit_test/context/gl/context_gl_tests.h" namespace NEO { diff --git a/opencl/test/unit_test/core_unit_tests_files.cmake b/opencl/test/unit_test/core_unit_tests_files.cmake index 82f0f5ccce..ecc3d3d79e 100644 --- a/opencl/test/unit_test/core_unit_tests_files.cmake +++ b/opencl/test/unit_test/core_unit_tests_files.cmake @@ -4,7 +4,7 @@ # SPDX-License-Identifier: MIT # -target_sources(igdrcl_tests PRIVATE ${NEO_RUNTIME_TESTS_DIR}/core_unit_tests_files.cmake) +target_sources(igdrcl_tests PRIVATE ${NEO_SOURCE_DIR}/opencl/test/unit_test/core_unit_tests_files.cmake) append_sources_from_properties(NEO_CORE_UNIT_TESTS_SOURCES NEO_CORE_COMMAND_CONTAINER_TESTS diff --git a/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp b/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp index 9f8b97a339..1fca51fc7d 100644 --- a/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp @@ -11,13 +11,13 @@ #include "opencl/source/sharings/d3d/d3d_sharing.h" #include "opencl/source/sharings/d3d/d3d_surface.h" #include "opencl/source/sharings/d3d/d3d_texture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_d3d_objects.h" #include "test.h" -#include "fixtures/platform_fixture.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_d3d_objects.h" static const DXGI_FORMAT DXGIformats[] = { DXGI_FORMAT_R32G32B32A32_TYPELESS, diff --git a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp index fb0d1ec42a..e49fce3532 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp @@ -12,15 +12,14 @@ #include "opencl/source/os_interface/windows/d3d_sharing_functions.h" #include "opencl/source/sharings/d3d/cl_d3d_api.h" #include "opencl/source/sharings/d3d/d3d_surface.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_d3d_objects.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" #include "test.h" -#include "fixtures/multi_root_device_fixture.h" -#include "fixtures/platform_fixture.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_d3d_objects.h" -#include "mocks/mock_gmm.h" - namespace NEO { template <> uint32_t MockD3DSharingFunctions::getDxgiDescCalled = 0; diff --git a/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp index 2bed8cddd7..87de3354b5 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp @@ -15,8 +15,8 @@ #include "opencl/source/sharings/d3d/d3d_sharing.h" #include "opencl/source/sharings/d3d/d3d_surface.h" #include "opencl/source/sharings/d3d/d3d_texture.h" +#include "opencl/test/unit_test/fixtures/d3d_test_fixture.h" -#include "fixtures/d3d_test_fixture.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp index 7bd77dcff4..cf6294037b 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp @@ -17,12 +17,12 @@ #include "opencl/source/sharings/d3d/d3d_surface.h" #include "opencl/source/sharings/d3d/d3d_texture.h" #include "opencl/source/sharings/d3d/enable_d3d.h" +#include "opencl/test/unit_test/fixtures/d3d_test_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_sharing_factory.h" -#include "fixtures/d3d_test_fixture.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_sharing_factory.h" namespace NEO { TYPED_TEST_CASE_P(D3DTests); diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp index 61a74af49e..abcce090ab 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp @@ -16,8 +16,8 @@ #include "opencl/source/sharings/d3d/d3d_sharing.h" #include "opencl/source/sharings/d3d/d3d_surface.h" #include "opencl/source/sharings/d3d/d3d_texture.h" +#include "opencl/test/unit_test/fixtures/d3d_test_fixture.h" -#include "fixtures/d3d_test_fixture.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index eab06bc5ca..ef7dbe23fe 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -9,14 +9,14 @@ #include "core/os_interface/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/device/driver_info.h" +#include "opencl/test/unit_test/helpers/hw_helper_tests.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "driver_version.h" #include "gtest/gtest.h" -#include "helpers/hw_helper_tests.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_builtins.h" -#include "mocks/mock_device.h" -#include "mocks/mock_execution_environment.h" #include diff --git a/opencl/test/unit_test/device/device_get_engine_tests.cpp b/opencl/test/unit_test/device/device_get_engine_tests.cpp index d0d6448565..5796c83833 100644 --- a/opencl/test/unit_test/device/device_get_engine_tests.cpp +++ b/opencl/test/unit_test/device/device_get_engine_tests.cpp @@ -8,10 +8,10 @@ #include "core/helpers/options.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/ult_hw_config.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index 7afde11256..0bbea88228 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -12,16 +12,15 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/ult_hw_config.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "helpers/unit_test_helper.h" -#include "helpers/variable_backup.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_execution_environment.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/device/device_timers_tests.cpp b/opencl/test/unit_test/device/device_timers_tests.cpp index ad06a9a8b3..5e94ecc0b2 100644 --- a/opencl/test/unit_test/device/device_timers_tests.cpp +++ b/opencl/test/unit_test/device/device_timers_tests.cpp @@ -5,9 +5,10 @@ * */ -#include "fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_ostime.h" + #include "gtest/gtest.h" -#include "mocks/mock_ostime.h" using namespace NEO; diff --git a/opencl/test/unit_test/device/device_win_timers_tests.cpp b/opencl/test/unit_test/device/device_win_timers_tests.cpp index 57006f4e22..0010d45821 100644 --- a/opencl/test/unit_test/device/device_win_timers_tests.cpp +++ b/opencl/test/unit_test/device/device_win_timers_tests.cpp @@ -6,14 +6,14 @@ */ #include "core/execution_environment/root_device_environment.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_ostime.h" +#include "opencl/test/unit_test/mocks/mock_ostime_win.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_ostime.h" -#include "mocks/mock_ostime_win.h" -#include "mocks/mock_wddm.h" using namespace NEO; diff --git a/opencl/test/unit_test/device/get_device_info_size_tests.cpp b/opencl/test/unit_test/device/get_device_info_size_tests.cpp index 64dbc3f6c3..402277e004 100644 --- a/opencl/test/unit_test/device/get_device_info_size_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_size_tests.cpp @@ -6,8 +6,8 @@ */ #include "opencl/source/device/device_info_map.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp index 1b6327da20..4601cf2e15 100644 --- a/opencl/test/unit_test/device/get_device_info_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_tests.cpp @@ -6,10 +6,10 @@ */ #include "opencl/source/device/device_info_map.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/device_info_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/device_info_fixture.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp b/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp index 8d3802f162..a5467ed253 100644 --- a/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp +++ b/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp @@ -10,9 +10,9 @@ #include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gmock/gmock.h" #include diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp index 593ef590e5..e86e5dbc78 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -8,11 +8,10 @@ #include "core/device/sub_device.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/ult_hw_config.h" - -#include "helpers/variable_backup.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_platform.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp b/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp index a962fb11a2..2eee741bed 100644 --- a/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp +++ b/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp @@ -10,14 +10,13 @@ #include "core/utilities/tag_allocator.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/helpers/hardware_commands_helper.h" - -#include "fixtures/device_host_queue_fixture.h" -#include "fixtures/execution_model_fixture.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_device_queue.h" -#include "mocks/mock_kernel.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/execution_model_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include diff --git a/opencl/test/unit_test/device_queue/device_queue_tests.cpp b/opencl/test/unit_test/device_queue/device_queue_tests.cpp index 369f3acffa..f6dae07c12 100644 --- a/opencl/test/unit_test/device_queue/device_queue_tests.cpp +++ b/opencl/test/unit_test/device_queue/device_queue_tests.cpp @@ -7,12 +7,11 @@ #include "opencl/source/device/device_info.h" #include "opencl/source/helpers/dispatch_info.h" - -#include "fixtures/device_host_queue_fixture.h" -#include "gen_common/matchers.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/gen_common/matchers.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" using namespace NEO; using namespace DeviceHostQueue; diff --git a/opencl/test/unit_test/device_queue/get_device_queue_info_tests.cpp b/opencl/test/unit_test/device_queue/get_device_queue_info_tests.cpp index 4f7fe33186..49dd021142 100644 --- a/opencl/test/unit_test/device_queue/get_device_queue_info_tests.cpp +++ b/opencl/test/unit_test/device_queue/get_device_queue_info_tests.cpp @@ -6,8 +6,7 @@ */ #include "opencl/source/context/context.h" - -#include "fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" using namespace NEO; using namespace DeviceHostQueue; diff --git a/opencl/test/unit_test/event/async_events_handler_tests.cpp b/opencl/test/unit_test/event/async_events_handler_tests.cpp index 176d2c52f8..7d85728228 100644 --- a/opencl/test/unit_test/event/async_events_handler_tests.cpp +++ b/opencl/test/unit_test/event/async_events_handler_tests.cpp @@ -11,10 +11,10 @@ #include "opencl/source/event/event.h" #include "opencl/source/event/user_event.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/mocks/mock_async_event_handler.h" #include "test.h" #include "gmock/gmock.h" -#include "mocks/mock_async_event_handler.h" using namespace NEO; using namespace ::testing; diff --git a/opencl/test/unit_test/event/event_builder_tests.cpp b/opencl/test/unit_test/event/event_builder_tests.cpp index 4d965e4ae4..283f21e2c0 100644 --- a/opencl/test/unit_test/event/event_builder_tests.cpp +++ b/opencl/test/unit_test/event/event_builder_tests.cpp @@ -10,14 +10,14 @@ #include "opencl/source/event/event_builder.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/task_information.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_event.h" -#include "mocks/mock_kernel.h" namespace NEO { diff --git a/opencl/test/unit_test/event/event_callbacks_tests.cpp b/opencl/test/unit_test/event/event_callbacks_tests.cpp index 553218bc0e..59229afef5 100644 --- a/opencl/test/unit_test/event/event_callbacks_tests.cpp +++ b/opencl/test/unit_test/event/event_callbacks_tests.cpp @@ -8,13 +8,12 @@ #include "opencl/source/event/async_events_handler.h" #include "opencl/source/event/user_event.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_event.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_event.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/event/event_fixture.h b/opencl/test/unit_test/event/event_fixture.h index b361b4319e..46003f60f8 100644 --- a/opencl/test/unit_test/event/event_fixture.h +++ b/opencl/test/unit_test/event/event_fixture.h @@ -12,14 +12,14 @@ #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/hello_world_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp index 34bd270951..735da0901c 100644 --- a/opencl/test/unit_test/event/event_tests.cpp +++ b/opencl/test/unit_test/event/event_tests.cpp @@ -15,20 +15,20 @@ #include "opencl/source/event/perf_counter.h" #include "opencl/source/helpers/task_information.h" #include "opencl/source/memory_manager/mem_obj_surface.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/os_interface/mock_performance_counters.h" #include "test.h" #include "event_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_event.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_program.h" -#include "os_interface/mock_performance_counters.h" #include #include diff --git a/opencl/test/unit_test/event/event_tests_mt.cpp b/opencl/test/unit_test/event/event_tests_mt.cpp index df15c03952..c16932f93f 100644 --- a/opencl/test/unit_test/event/event_tests_mt.cpp +++ b/opencl/test/unit_test/event/event_tests_mt.cpp @@ -6,9 +6,9 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/mocks/mock_event.h" #include "event_fixture.h" -#include "mocks/mock_event.h" #include diff --git a/opencl/test/unit_test/event/user_events_tests.cpp b/opencl/test/unit_test/event/user_events_tests.cpp index 329b69701d..ad8fb6abc1 100644 --- a/opencl/test/unit_test/event/user_events_tests.cpp +++ b/opencl/test/unit_test/event/user_events_tests.cpp @@ -9,10 +9,10 @@ #include "core/memory_manager/memory_manager.h" #include "core/os_interface/os_context.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_event.h" -#include "command_queue/enqueue_fixture.h" #include "event_fixture.h" -#include "mocks/mock_event.h" TEST(UserEvent, testInitialStatusOfUserEventCmdQueue) { UserEvent uEvent; diff --git a/opencl/test/unit_test/event/user_events_tests_mt.cpp b/opencl/test/unit_test/event/user_events_tests_mt.cpp index 6594f1b299..884b9a240c 100644 --- a/opencl/test/unit_test/event/user_events_tests_mt.cpp +++ b/opencl/test/unit_test/event/user_events_tests_mt.cpp @@ -6,10 +6,10 @@ */ #include "core/memory_manager/memory_manager.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "event_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "mocks/mock_command_queue.h" #include diff --git a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp index 3d7c4cd308..41614a4e3d 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -19,13 +19,12 @@ #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_memory_operations_handler.h" #include "test.h" -#include "mocks/mock_device.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_memory_operations_handler.h" - using namespace NEO; TEST(ExecutionEnvironment, givenDefaultConstructorWhenItIsCalledThenExecutionEnvironmentHasInitialRefCountZero) { diff --git a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp index ee2bc7b3d5..b9b9d184c5 100644 --- a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp +++ b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp @@ -16,16 +16,15 @@ #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/per_thread_data.h" #include "opencl/source/kernel/kernel.h" - -#include "fixtures/device_host_queue_fixture.h" -#include "fixtures/execution_model_fixture.h" -#include "helpers/gtest_helpers.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device_queue.h" -#include "mocks/mock_event.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_submissions_aggregator.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/execution_model_fixture.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" using namespace NEO; diff --git a/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp b/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp index b776fabdaa..fdfe43b2d3 100644 --- a/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp +++ b/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp @@ -11,14 +11,13 @@ #include "opencl/source/event/perf_counter.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/sampler/sampler.h" - -#include "fixtures/execution_model_fixture.h" -#include "helpers/hw_parse.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/fixtures/execution_model_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp b/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp index 805e642748..9b91e555b0 100644 --- a/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp +++ b/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp @@ -10,14 +10,13 @@ #include "opencl/source/command_queue/enqueue_kernel.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/scheduler/scheduler_kernel.h" - -#include "fixtures/execution_model_fixture.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device_queue.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/fixtures/execution_model_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp b/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp index 6f90d08719..8ab240290c 100644 --- a/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp +++ b/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp @@ -11,10 +11,9 @@ #include "opencl/source/event/hw_timestamps.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/helpers/task_information.h" - -#include "fixtures/execution_model_fixture.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_device_queue.h" +#include "opencl/test/unit_test/fixtures/execution_model_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" #include diff --git a/opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h b/opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h index b589ec1c42..a8a812c4c5 100644 --- a/opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h +++ b/opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h @@ -7,8 +7,8 @@ #pragma once -#include "fixtures/device_fixture.h" -#include "fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" namespace NEO { struct AubCommandStreamReceiverFixture : public DeviceFixture, MockAubCenterFixture { diff --git a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h index fc349beda5..b72cc28c02 100644 --- a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h +++ b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h @@ -8,16 +8,15 @@ #pragma once #include "core/helpers/hw_info.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "fixtures/buffer_fixture.h" -#include "helpers/execution_environment_helper.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" - using namespace NEO; struct BufferEnqueueFixture : public HardwareParse, diff --git a/opencl/test/unit_test/fixtures/buffer_fixture.cpp b/opencl/test/unit_test/fixtures/buffer_fixture.cpp index eb5caf91ec..0e65858c44 100644 --- a/opencl/test/unit_test/fixtures/buffer_fixture.cpp +++ b/opencl/test/unit_test/fixtures/buffer_fixture.cpp @@ -5,9 +5,9 @@ * */ -#include "fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" -#include "mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_context.h" using NEO::Context; diff --git a/opencl/test/unit_test/fixtures/buffer_fixture.h b/opencl/test/unit_test/fixtures/buffer_fixture.h index 2a31641623..99e97e13b5 100644 --- a/opencl/test/unit_test/fixtures/buffer_fixture.h +++ b/opencl/test/unit_test/fixtures/buffer_fixture.h @@ -7,9 +7,9 @@ #pragma once #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "CL/cl.h" -#include "mocks/mock_context.h" #include #include diff --git a/opencl/test/unit_test/fixtures/built_in_fixture.cpp b/opencl/test/unit_test/fixtures/built_in_fixture.cpp index 69a9b20ffb..83b6f2294c 100644 --- a/opencl/test/unit_test/fixtures/built_in_fixture.cpp +++ b/opencl/test/unit_test/fixtures/built_in_fixture.cpp @@ -5,14 +5,13 @@ * */ -#include "fixtures/built_in_fixture.h" +#include "opencl/test/unit_test/fixtures/built_in_fixture.h" #include "core/device/device.h" #include "opencl/source/built_ins/built_ins.h" - -#include "global_environment.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/context_fixture.cpp b/opencl/test/unit_test/fixtures/context_fixture.cpp index a7589fc0a1..0b3a16c822 100644 --- a/opencl/test/unit_test/fixtures/context_fixture.cpp +++ b/opencl/test/unit_test/fixtures/context_fixture.cpp @@ -7,8 +7,9 @@ #include "context_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" + #include "gtest/gtest.h" -#include "mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/d3d_test_fixture.h b/opencl/test/unit_test/fixtures/d3d_test_fixture.h index d712e252a8..04fdc03dd1 100644 --- a/opencl/test/unit_test/fixtures/d3d_test_fixture.h +++ b/opencl/test/unit_test/fixtures/d3d_test_fixture.h @@ -6,14 +6,13 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_d3d_objects.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" #include "test.h" -#include "fixtures/platform_fixture.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_d3d_objects.h" -#include "mocks/mock_gmm.h" - namespace NEO { template <> uint32_t MockD3DSharingFunctions::getDxgiDescCalled = 0; diff --git a/opencl/test/unit_test/fixtures/device_fixture.cpp b/opencl/test/unit_test/fixtures/device_fixture.cpp index dcbcb2bdbb..ad394fb04b 100644 --- a/opencl/test/unit_test/fixtures/device_fixture.cpp +++ b/opencl/test/unit_test/fixtures/device_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/fixtures/device_fixture.h b/opencl/test/unit_test/fixtures/device_fixture.h index 5847e1430c..1ee00507ae 100644 --- a/opencl/test/unit_test/fixtures/device_fixture.h +++ b/opencl/test/unit_test/fixtures/device_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_device.h" namespace NEO { struct HardwareInfo; diff --git a/opencl/test/unit_test/fixtures/device_host_queue_fixture.cpp b/opencl/test/unit_test/fixtures/device_host_queue_fixture.cpp index 74c8d59434..263305ee64 100644 --- a/opencl/test/unit_test/fixtures/device_host_queue_fixture.cpp +++ b/opencl/test/unit_test/fixtures/device_host_queue_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/device_host_queue_fixture.h b/opencl/test/unit_test/fixtures/device_host_queue_fixture.h index a43a88df69..403ee76880 100644 --- a/opencl/test/unit_test/fixtures/device_host_queue_fixture.h +++ b/opencl/test/unit_test/fixtures/device_host_queue_fixture.h @@ -10,10 +10,9 @@ #include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/device_queue/device_queue_hw.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" #include "test.h" -#include "api/cl_api_tests.h" - using namespace NEO; namespace DeviceHostQueue { diff --git a/opencl/test/unit_test/fixtures/device_info_fixture.h b/opencl/test/unit_test/fixtures/device_info_fixture.h index 1d1e0c22fa..c0f43f32ab 100644 --- a/opencl/test/unit_test/fixtures/device_info_fixture.h +++ b/opencl/test/unit_test/fixtures/device_info_fixture.h @@ -6,8 +6,9 @@ */ #pragma once +#include "opencl/test/unit_test/mocks/mock_device.h" + #include "gtest/gtest.h" -#include "mocks/mock_device.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp index bab0be4355..d2b872c81e 100644 --- a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp +++ b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp @@ -5,10 +5,10 @@ * */ -#include "fixtures/device_instrumentation_fixture.h" +#include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" -#include "helpers/execution_environment_helper.h" -#include "mocks/mock_device.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/mocks/mock_device.h" namespace NEO { void DeviceInstrumentationFixture::SetUp(bool instrumentation) { diff --git a/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h b/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h index 70b3e7f677..649166c05b 100644 --- a/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h +++ b/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h @@ -8,11 +8,10 @@ #pragma once #include "core/os_interface/os_context.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" - -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" namespace NEO { struct DispatchFlagsTests : public ::testing::Test { diff --git a/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h b/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h index 40d030d533..d862986c72 100644 --- a/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h +++ b/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h @@ -6,9 +6,10 @@ */ #pragma once -#include "fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" + #include "gtest/gtest.h" -#include "mocks/mock_context.h" class EnqueueHandlerTest : public NEO::DeviceFixture, public testing::Test { diff --git a/opencl/test/unit_test/fixtures/execution_model_fixture.h b/opencl/test/unit_test/fixtures/execution_model_fixture.h index a2883a1dd4..556eb5f21c 100644 --- a/opencl/test/unit_test/fixtures/execution_model_fixture.h +++ b/opencl/test/unit_test/fixtures/execution_model_fixture.h @@ -9,10 +9,9 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/device_queue/device_queue.h" - -#include "command_queue/command_queue_fixture.h" -#include "fixtures/execution_model_kernel_fixture.h" -#include "mocks/mock_kernel.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" class DeviceQueueFixture { public: diff --git a/opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h b/opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h index 1f71b295f0..17543bc67e 100644 --- a/opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h @@ -8,12 +8,11 @@ #pragma once #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/program/program_from_binary.h" #include "test.h" -#include "fixtures/platform_fixture.h" -#include "mocks/mock_kernel.h" -#include "program/program_from_binary.h" - using namespace NEO; class ExecutionModelKernelFixture : public ProgramFromBinaryTest, diff --git a/opencl/test/unit_test/fixtures/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h index 7c6019d1fb..34c7334a38 100644 --- a/opencl/test/unit_test/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_fixture.h @@ -9,15 +9,14 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/helpers/aligned_memory.h" #include "core/memory_manager/memory_manager.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/hello_world_kernel_fixture.h" -#include "gen_common/gen_cmd_parse.h" -#include "indirect_heap/indirect_heap_fixture.h" - namespace NEO { // Factory used to pick various ingredients for use in aggregate tests diff --git a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h index 47ff8f9cfe..eac26d4851 100644 --- a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h @@ -11,15 +11,15 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/program.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/program_fixture.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "CL/cl.h" -#include "fixtures/device_fixture.h" -#include "fixtures/program_fixture.h" #include "gtest/gtest.h" -#include "helpers/test_files.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/image_fixture.cpp b/opencl/test/unit_test/fixtures/image_fixture.cpp index 918fa7b5d5..4d37d8c329 100644 --- a/opencl/test/unit_test/fixtures/image_fixture.cpp +++ b/opencl/test/unit_test/fixtures/image_fixture.cpp @@ -5,9 +5,9 @@ * */ -#include "fixtures/image_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" -#include "mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_context.h" using NEO::MockContext; diff --git a/opencl/test/unit_test/fixtures/image_fixture.h b/opencl/test/unit_test/fixtures/image_fixture.h index 98d53588de..606aa6b2d4 100644 --- a/opencl/test/unit_test/fixtures/image_fixture.h +++ b/opencl/test/unit_test/fixtures/image_fixture.h @@ -12,11 +12,11 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" #include "CL/cl.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" #include #include diff --git a/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp b/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp index b424354b61..cf8973b665 100644 --- a/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp +++ b/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp @@ -5,15 +5,14 @@ * */ -#include "fixtures/kernel_arg_fixture.h" +#include "opencl/test/unit_test/fixtures/kernel_arg_fixture.h" #include "opencl/source/program/kernel_info.h" - -#include "fixtures/image_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_image.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_image.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" KernelImageArgTest::~KernelImageArgTest() = default; diff --git a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h index bc62b7c46b..352e7a176e 100644 --- a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h @@ -7,10 +7,9 @@ #pragma once +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - #include namespace NEO { diff --git a/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp b/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp index 3268f08bc4..0eeae51434 100644 --- a/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp +++ b/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "fixtures/kernel_data_fixture.h" +#include "opencl/test/unit_test/fixtures/kernel_data_fixture.h" #include "core/device_binary_format/patchtokens_decoder.h" #include "core/helpers/aligned_memory.h" diff --git a/opencl/test/unit_test/fixtures/kernel_data_fixture.h b/opencl/test/unit_test/fixtures/kernel_data_fixture.h index 36f1e619b6..7e9a943335 100644 --- a/opencl/test/unit_test/fixtures/kernel_data_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_data_fixture.h @@ -10,10 +10,10 @@ #include "core/memory_manager/memory_manager.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/program/kernel_info.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_program.h" using namespace NEO; using namespace iOpenCL; diff --git a/opencl/test/unit_test/fixtures/media_kernel_fixture.h b/opencl/test/unit_test/fixtures/media_kernel_fixture.h index 4d5dfd23d7..6f97df5ed5 100644 --- a/opencl/test/unit_test/fixtures/media_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/media_kernel_fixture.h @@ -6,9 +6,9 @@ */ #pragma once -#include "command_queue/enqueue_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "helpers/hw_parse.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/memory_allocator_fixture.h b/opencl/test/unit_test/fixtures/memory_allocator_fixture.h index a9c5ee94e9..4ce660ce0c 100644 --- a/opencl/test/unit_test/fixtures/memory_allocator_fixture.h +++ b/opencl/test/unit_test/fixtures/memory_allocator_fixture.h @@ -11,10 +11,9 @@ #include "core/execution_environment/execution_environment.h" #include "core/helpers/hw_helper.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" - -#include "fixtures/memory_management_fixture.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h b/opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h index 06cb915cc9..5d5c251493 100644 --- a/opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h +++ b/opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h @@ -11,11 +11,10 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" - -#include "fixtures/memory_management_fixture.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_platform.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/memory_management_fixture.cpp b/opencl/test/unit_test/fixtures/memory_management_fixture.cpp index 6975af2904..eb8925d680 100644 --- a/opencl/test/unit_test/fixtures/memory_management_fixture.cpp +++ b/opencl/test/unit_test/fixtures/memory_management_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "core/unit_tests/helpers/memory_leak_listener.h" #include "core/unit_tests/helpers/memory_management.h" diff --git a/opencl/test/unit_test/fixtures/memory_manager_fixture.cpp b/opencl/test/unit_test/fixtures/memory_manager_fixture.cpp index 64cbb207c9..d4ebaa7b53 100644 --- a/opencl/test/unit_test/fixtures/memory_manager_fixture.cpp +++ b/opencl/test/unit_test/fixtures/memory_manager_fixture.cpp @@ -5,14 +5,13 @@ * */ -#include "fixtures/memory_manager_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_manager_fixture.h" #include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/os_interface/os_context.h" - -#include "mocks/mock_csr.h" -#include "mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h b/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h index b601a15b7b..be1610e55c 100644 --- a/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h +++ b/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h @@ -10,10 +10,9 @@ #include "core/execution_environment/root_device_environment.h" #include "core/unit_tests/helpers/default_hw_info.h" #include "opencl/source/platform/platform.h" - -#include "mocks/mock_aub_center.h" -#include "mocks/mock_aub_manager.h" -#include "tests_configuration.h" +#include "opencl/test/unit_test/mocks/mock_aub_center.h" +#include "opencl/test/unit_test/mocks/mock_aub_manager.h" +#include "opencl/test/unit_test/tests_configuration.h" namespace NEO { struct MockAubCenterFixture { diff --git a/opencl/test/unit_test/fixtures/multi_root_device_fixture.h b/opencl/test/unit_test/fixtures/multi_root_device_fixture.h index 72e40275ef..c47097dff8 100644 --- a/opencl/test/unit_test/fixtures/multi_root_device_fixture.h +++ b/opencl/test/unit_test/fixtures/multi_root_device_fixture.h @@ -7,10 +7,9 @@ #pragma once #include "core/unit_tests/helpers/debug_manager_state_restore.h" - -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" namespace NEO { class MultiRootDeviceFixture : public ::testing::Test { diff --git a/opencl/test/unit_test/fixtures/platform_fixture.cpp b/opencl/test/unit_test/fixtures/platform_fixture.cpp index 341f3409f7..9265069b58 100644 --- a/opencl/test/unit_test/fixtures/platform_fixture.cpp +++ b/opencl/test/unit_test/fixtures/platform_fixture.cpp @@ -5,12 +5,12 @@ * */ -#include "fixtures/platform_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/source/device/cl_device.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" #include "gtest/gtest.h" -#include "mocks/mock_platform.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/program_fixture.cpp b/opencl/test/unit_test/fixtures/program_fixture.cpp index fd3853a952..c86a30780d 100644 --- a/opencl/test/unit_test/fixtures/program_fixture.cpp +++ b/opencl/test/unit_test/fixtures/program_fixture.cpp @@ -5,11 +5,10 @@ * */ -#include "fixtures/program_fixture.h" +#include "opencl/test/unit_test/fixtures/program_fixture.h" #include "opencl/source/program/create.inl" - -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_program.h" namespace NEO { void ProgramFixture::CreateProgramWithSource(cl_context context, diff --git a/opencl/test/unit_test/fixtures/program_fixture.h b/opencl/test/unit_test/fixtures/program_fixture.h index c70eb2007f..eaed26b038 100644 --- a/opencl/test/unit_test/fixtures/program_fixture.h +++ b/opencl/test/unit_test/fixtures/program_fixture.h @@ -8,10 +8,10 @@ #pragma once #include "core/helpers/file_io.h" #include "opencl/source/program/program.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "gtest/gtest.h" -#include "helpers/test_files.h" -#include "mocks/mock_program.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/run_kernel_fixture.h b/opencl/test/unit_test/fixtures/run_kernel_fixture.h index 995246cfa0..8648abce3b 100644 --- a/opencl/test/unit_test/fixtures/run_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/run_kernel_fixture.h @@ -7,8 +7,8 @@ #pragma once -#include "global_environment.h" -#include "helpers/test_files.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/test_files.h" namespace NEO { struct CommandQueueHwFixture; diff --git a/opencl/test/unit_test/fixtures/scenario_test_fixture.h b/opencl/test/unit_test/fixtures/scenario_test_fixture.h index 98aad1676f..084b7f1d50 100644 --- a/opencl/test/unit_test/fixtures/scenario_test_fixture.h +++ b/opencl/test/unit_test/fixtures/scenario_test_fixture.h @@ -8,12 +8,12 @@ #pragma once #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/simple_arg_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_fixture.h index e74c86bcee..e0a58af8a1 100644 --- a/opencl/test/unit_test/fixtures/simple_arg_fixture.h +++ b/opencl/test/unit_test/fixtures/simple_arg_fixture.h @@ -8,11 +8,10 @@ #pragma once #include "core/command_stream/command_stream_receiver.h" - -#include "command_queue/command_queue_fixture.h" -#include "command_stream/command_stream_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/simple_arg_kernel_fixture.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/command_stream/command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h index dcfe551987..2965e84a06 100644 --- a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h @@ -12,15 +12,15 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/program.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/program_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "CL/cl.h" #include "compiler_options.h" -#include "fixtures/device_fixture.h" -#include "fixtures/program_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/fixtures/two_walker_fixture.h b/opencl/test/unit_test/fixtures/two_walker_fixture.h index 82261807a9..c1178ecf02 100644 --- a/opencl/test/unit_test/fixtures/two_walker_fixture.h +++ b/opencl/test/unit_test/fixtures/two_walker_fixture.h @@ -6,9 +6,10 @@ */ #pragma once -#include "command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/command_queue/enqueue_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" + #include "hello_world_fixture.h" -#include "helpers/hw_parse.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h index 1a0b7ae426..bacf7c68a2 100644 --- a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h +++ b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h @@ -12,12 +12,11 @@ #include "core/gmm_helper/gmm_helper.h" #include "core/helpers/cache_policy.h" #include "core/memory_manager/graphics_allocation.h" - -#include "fixtures/device_fixture.h" -#include "helpers/hw_parse.h" -#include "helpers/unit_test_helper.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" namespace NEO { diff --git a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp index 1a87ab7f0b..d5735582ff 100644 --- a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp @@ -8,12 +8,11 @@ #include "core/command_stream/command_stream_receiver_hw.h" #include "core/helpers/hw_helper.h" #include "opencl/source/gen11/reg_configs.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device.h" - using namespace NEO; struct Gen11CoherencyRequirements : public ::testing::Test { diff --git a/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp index 3fe5cd377d..439ee74582 100644 --- a/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp @@ -8,21 +8,21 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/command_stream/linear_stream.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_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_csr.h" -#include "mocks/mock_event.h" -#include "mocks/mock_kernel.h" #include "reg_configs_common.h" using namespace NEO; -#include "command_stream/command_stream_receiver_hw_tests.inl" +#include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl" using CommandStreamReceiverHwTestGen11 = CommandStreamReceiverHwTest; diff --git a/opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp b/opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp index 74426e2c9e..dea2206abf 100644 --- a/opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/gtest_helpers.h" -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp index d4493ea532..e92ab19e33 100644 --- a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; using EhlTest = Test; diff --git a/opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp b/opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp index 666c7fe93a..94a5226d02 100644 --- a/opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp index 613c085196..fe4610a912 100644 --- a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp @@ -6,12 +6,12 @@ */ #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/static_size3.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "helpers/hw_parse.h" -#include "helpers/static_size3.h" -#include "mocks/mock_kernel.h" #include "reg_configs_common.h" namespace NEO { diff --git a/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp index be712f7b57..4ff7450cef 100644 --- a/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp @@ -7,10 +7,9 @@ #include "core/helpers/pipeline_select_helper.h" #include "core/helpers/preamble.h" +#include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" #include "test.h" -#include "fixtures/media_kernel_fixture.h" - using namespace NEO; typedef MediaKernelFixture MediaKernelTest; auto expectedMask = pipelineSelectEnablePipelineSelectMaskBits | diff --git a/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp b/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp index 5627c777c0..b8685fd266 100644 --- a/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/hw_helper_tests_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/get_gpgpu_engines_tests.inl" -#include "helpers/hw_helper_tests.h" +#include "opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl" +#include "opencl/test/unit_test/helpers/hw_helper_tests.h" using HwHelperTestGen11 = HwHelperTest; diff --git a/opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp b/opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp index 3565d9f633..74822878ff 100644 --- a/opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/gtest_helpers.h" -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp index 834cfbf512..9c6f784e9f 100644 --- a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; using IcllpTest = Test; diff --git a/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp index 79c5dd8f87..53770c1d28 100644 --- a/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp @@ -7,10 +7,9 @@ #include "core/helpers/pipeline_select_helper.h" #include "core/helpers/preamble.h" +#include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" #include "test.h" -#include "fixtures/media_kernel_fixture.h" - using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp index 464c6aced7..a46fe5b550 100644 --- a/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp @@ -9,12 +9,11 @@ #include "core/helpers/hw_helper.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/gen11/reg_configs.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device.h" - using namespace NEO; struct Gen11MediaSamplerProgramingTest : public ::testing::Test { diff --git a/opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp b/opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp index c4a306e7f9..b073aa6da5 100644 --- a/opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen11/image_tests_gen11.cpp b/opencl/test/unit_test/gen11/image_tests_gen11.cpp index 9c89c4ad6c..4a5d96fdd5 100644 --- a/opencl/test/unit_test/gen11/image_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/image_tests_gen11.cpp @@ -7,11 +7,10 @@ #include "core/image/image_surface_state.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; typedef ICLFamily::RENDER_SURFACE_STATE RENDER_SURFACE_STATE; diff --git a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp index 2d915183ab..be0cb174c6 100644 --- a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp @@ -6,11 +6,10 @@ */ #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_kernel.h" - using namespace NEO; using Gen11KernelTest = Test; diff --git a/opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp b/opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp index aa77151e1f..667eae4533 100644 --- a/opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/gtest_helpers.h" -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp index a601916c0f..7d553a18e7 100644 --- a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; using LkfTest = Test; diff --git a/opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp b/opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp index e6bf761e16..6b6660d8ee 100644 --- a/opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp index 282d5602d7..a5f53de7b9 100644 --- a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp @@ -6,11 +6,10 @@ */ #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp b/opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp index c5f456bf50..349e71d461 100644 --- a/opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp @@ -11,10 +11,9 @@ // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one #include "opencl/source/gen11/device_enqueue.h" #include "opencl/source/gen11/scheduler_definitions.h" - -#include "scheduler/scheduler_source_tests.h" +#include "opencl/test/unit_test/scheduler/scheduler_source_tests.h" // Keep this include below scheduler_definitions.h and device_enqueue.h headers as it depends on defines defined in them -#include "scheduler/scheduler_source_tests.inl" +#include "opencl/test/unit_test/scheduler/scheduler_source_tests.inl" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp index cdb40d8bed..100f975f12 100644 --- a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp @@ -6,10 +6,9 @@ */ #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; using Gen11TbxCommandStreamReceiverTests = Test; diff --git a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp index 7da8924a1b..cb566501c4 100644 --- a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp @@ -6,10 +6,9 @@ */ #include "core/helpers/hw_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test Gen11DeviceCaps; diff --git a/opencl/test/unit_test/gen11/test_device_queue_hw_gen11.cpp b/opencl/test/unit_test/gen11/test_device_queue_hw_gen11.cpp index 5fcd4e97b2..32e70638e7 100644 --- a/opencl/test/unit_test/gen11/test_device_queue_hw_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_device_queue_hw_gen11.cpp @@ -6,10 +6,9 @@ */ #include "opencl/source/context/context.h" - -#include "fixtures/device_host_queue_fixture.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device_queue.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" #include diff --git a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp index 23a700185e..e1450791f7 100644 --- a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "test.h" -#include "fixtures/platform_fixture.h" - using namespace NEO; struct Gen11PlatformCaps : public PlatformFixture, public ::testing::Test { diff --git a/opencl/test/unit_test/gen11/test_sample_gen11.cpp b/opencl/test/unit_test/gen11/test_sample_gen11.cpp index 87ac4da1fd..f6caf7eee5 100644 --- a/opencl/test/unit_test/gen11/test_sample_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_sample_gen11.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test Gen11OnlyTeset; diff --git a/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp b/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp index 4648ca78bb..01cd489a7c 100644 --- a/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp +++ b/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp @@ -6,9 +6,8 @@ */ #include "core/gen11/hw_info.h" - -#include "helpers/unit_test_helper.h" -#include "helpers/unit_test_helper.inl" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.inl" namespace NEO { diff --git a/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl index 2ee76d2aa2..74de57f132 100644 --- a/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl @@ -9,14 +9,13 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/hw_helper_tests.h" +#include "opencl/test/unit_test/mocks/mock_aub_csr.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "helpers/hw_helper_tests.h" -#include "mocks/mock_aub_csr.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_os_context.h" - using namespace NEO; using Gen12LPAubCommandStreamReceiverTests = Test; diff --git a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl index 2f49f3a72f..2284712147 100644 --- a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl @@ -9,11 +9,10 @@ #include "core/helpers/hw_helper.h" #include "core/helpers/ptr_math.h" #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device.h" - using namespace NEO; struct Gen12LpCoherencyRequirements : public ::testing::Test { diff --git a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl index faec4d5efb..27a14dd445 100644 --- a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl @@ -8,23 +8,23 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/command_stream/linear_stream.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/ult_command_stream_receiver_fixture.h" -#include "gen12lp/special_ult_helper_gen12lp.h" #include "gtest/gtest.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_event.h" -#include "mocks/mock_kernel.h" #include "reg_configs_common.h" using namespace NEO; -#include "command_stream/command_stream_receiver_hw_tests.inl" +#include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl" using CommandStreamReceiverHwTestGen12lp = CommandStreamReceiverHwTest; diff --git a/opencl/test/unit_test/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 index 485eb5ebc4..490693da6a 100644 --- a/opencl/test/unit_test/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 @@ -6,11 +6,11 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_aub_stream.h" #include "test.h" #include "command_stream_receiver_simulated_hw.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_aub_stream.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl index 76fef67723..3500de938b 100644 --- a/opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl @@ -5,7 +5,7 @@ * */ -#include "command_stream/compute_mode_tests.h" +#include "opencl/test/unit_test/command_stream/compute_mode_tests.h" TGLLPTEST_F(ComputeModeRequirements, givenCsrRequestFlagsWithSharedHandlesWhenCommandSizeIsCalculatedThenCorrectCommandSizeIsReturned) { SetUpImpl(); diff --git a/opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp index 2b5c51114a..00448673f0 100644 --- a/opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp @@ -5,11 +5,11 @@ * */ -#include "fixtures/device_host_queue_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_device_queue.h" -#include "mocks/mock_kernel.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" using namespace NEO; using namespace DeviceHostQueue; diff --git a/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl b/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl index 1ec5a99309..d9b0b235c5 100644 --- a/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" #include "test.h" -#include "fixtures/media_kernel_fixture.h" - using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp b/opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp index baaf1a2b08..52b87f8314 100644 --- a/opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp +++ b/opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp @@ -6,21 +6,20 @@ */ #include "core/unit_tests/gen12lp/test_preemption_gen12lp.inl" - -#include "gen12lp/aub_command_stream_receiver_tests_gen12lp.inl" -#include "gen12lp/coherency_tests_gen12lp.inl" -#include "gen12lp/command_stream_receiver_hw_tests_gen12lp.inl" -#include "gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl" -#include "gen12lp/compute_mode_tests_gen12lp.inl" -#include "gen12lp/enqueue_media_kernel_gen12lp.inl" -#include "gen12lp/hw_helper_tests_gen12lp.inl" -#include "gen12lp/image_tests_gen12lp.inl" -#include "gen12lp/kernel_tests_gen12lp.inl" -#include "gen12lp/profiling_tests_gen12lp.inl" -#include "gen12lp/sampler_tests_gen12lp.inl" -#include "gen12lp/scheduler_source_tests_gen12lp.inl" -#include "gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl" -#include "gen12lp/test_device_caps_gen12lp.inl" -#include "gen12lp/test_device_queue_hw_gen12lp.inl" -#include "gen12lp/test_platform_caps_gen12lp.inl" -#include "gen12lp/test_sample_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/compute_mode_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/enqueue_media_kernel_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl" +#include "opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl" diff --git a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl index 9dd275e9b1..a03ef3e917 100644 --- a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl @@ -6,13 +6,13 @@ */ #include "core/command_container/command_encoder.h" +#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" +#include "opencl/test/unit_test/helpers/hw_helper_tests.h" +#include "opencl/test/unit_test/helpers/raii_hw_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_hw_helper.h" #include "engine_node.h" -#include "gen12lp/special_ult_helper_gen12lp.h" -#include "helpers/hw_helper_tests.h" -#include "helpers/raii_hw_helper.h" -#include "mocks/mock_context.h" -#include "mocks/mock_hw_helper.h" using HwHelperTestGen12Lp = HwHelperTest; diff --git a/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl index d6698782b6..1053465dc2 100644 --- a/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl @@ -9,15 +9,15 @@ #include "core/image/image_surface_state.h" #include "core/memory_manager/memory_manager.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" #include "test.h" -#include "fixtures/image_fixture.h" -#include "gen12lp/special_ult_helper_gen12lp.h" -#include "helpers/variable_backup.h" #include "mock_gmm_client_context.h" -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_context.h" -#include "mocks/mock_gmm.h" #include diff --git a/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl index cbce19563f..4c5402f374 100644 --- a/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl @@ -6,11 +6,10 @@ */ #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_kernel.h" - using namespace NEO; using Gen12LpKernelTest = Test; diff --git a/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl index a25658c9b2..cb91c4c116 100644 --- a/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl @@ -7,11 +7,10 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_common.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "mocks/mock_kernel.h" - using namespace NEO; struct ProfilingTestsGen12LP : public CommandEnqueueFixture, diff --git a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl index 3764baf366..e5e70ca6e7 100644 --- a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl @@ -9,11 +9,10 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl index 6ddc4ca945..445b4bb6ce 100644 --- a/opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl @@ -11,10 +11,9 @@ // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one #include "opencl/source/gen12lp/device_enqueue.h" #include "opencl/source/gen12lp/scheduler_definitions.h" - -#include "scheduler/scheduler_source_tests.h" +#include "opencl/test/unit_test/scheduler/scheduler_source_tests.h" // Keep this include below scheduler_definitions.h and device_enqueue.h headers as it depends on defines defined in them -#include "scheduler/scheduler_source_tests.inl" +#include "opencl/test/unit_test/scheduler/scheduler_source_tests.inl" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp index 5eb2b43b2e..38b8401cae 100644 --- a/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "gen12lp/special_ult_helper_gen12lp.h" +#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" #include "core/helpers/hw_info.h" diff --git a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl index 58487a90a0..26f43d3097 100644 --- a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl @@ -7,11 +7,10 @@ #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_graphics_allocation.h" - using namespace NEO; using Gen12LPTbxCommandStreamReceiverTests = Test; diff --git a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl index 3c174986bb..4198a0902e 100644 --- a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl @@ -6,10 +6,9 @@ */ #include "core/helpers/hw_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test Gen12LpDeviceCaps; diff --git a/opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl index c818e70d22..9b45e5df4c 100644 --- a/opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl @@ -8,11 +8,10 @@ #include "core/utilities/tag_allocator.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/context/context.h" - -#include "fixtures/device_host_queue_fixture.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device_queue.h" -#include "mocks/mock_kernel.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" using namespace NEO; using namespace DeviceHostQueue; diff --git a/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl index a15bc16b7c..5b33ee0b4f 100644 --- a/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "test.h" -#include "fixtures/platform_fixture.h" - using namespace NEO; struct Gen12LpPlatformCaps : public PlatformFixture, public ::testing::Test { diff --git a/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl index 70ffff111b..378a3ceb54 100644 --- a/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test TigerlakeLpOnlyTest; diff --git a/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp index 2b2a66e9f5..d7783576f7 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp @@ -6,11 +6,10 @@ */ #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "mocks/mock_device.h" -#include "mocks/mock_kernel.h" - using namespace NEO; using KernelTgllpTests = ::testing::Test; diff --git a/opencl/test/unit_test/gen12lp/tgllp/linux/test_hw_info_config_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/linux/test_hw_info_config_tgllp.cpp index e3cf09e17a..4c7076c83f 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/linux/test_hw_info_config_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/linux/test_hw_info_config_tgllp.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using HwInfoConfigTestLinuxTGLLP = HwInfoConfigTestLinux; diff --git a/opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp index 79d3b9369c..f51a5d2490 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/test_hw_helper_tgllp.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/hw_helper_tests.h" +#include "opencl/test/unit_test/helpers/hw_helper_tests.h" using HwHelperTestGen12Lp = HwHelperTest; diff --git a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp index 78797ce4b8..81724791f5 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp @@ -7,10 +7,9 @@ #include "core/os_interface/device_factory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h" -#include "mocks/mock_execution_environment.h" - using namespace NEO; TEST(TgllpHwInfoConfig, givenHwInfoErrorneousConfigString) { diff --git a/opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp index 45b1f89a1f..29a01eb2c2 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp b/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp index a317472e65..feda09426d 100644 --- a/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp @@ -6,10 +6,9 @@ */ #include "core/gen12lp/hw_info.h" - -#include "gen12lp/special_ult_helper_gen12lp.h" -#include "helpers/unit_test_helper.h" -#include "helpers/unit_test_helper.inl" +#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.inl" namespace NEO { diff --git a/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp index b20063fe26..db1f53b314 100644 --- a/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp @@ -15,12 +15,11 @@ #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include "test.h" -#include "helpers/execution_environment_helper.h" -#include "helpers/hw_parse.h" -#include "libult/ult_command_stream_receiver.h" - using namespace NEO; using Gen12LpGmmCallbacksTests = ::testing::Test; diff --git a/opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp index f1937c74f9..63a94b55a6 100644 --- a/opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp @@ -7,9 +7,8 @@ #include "core/os_interface/windows/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" - -#include "gen12lp/special_ult_helper_gen12lp.h" -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp index db4694bb7b..7b64d87563 100644 --- a/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp @@ -8,12 +8,12 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" #include "core/os_interface/windows/gdi_interface.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" +#include "opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h" #include "test.h" #include "mock_gmm_memory.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_wddm.h" -#include "os_interface/windows/gdi_dll_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp index f1f7368725..83260be914 100644 --- a/opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp @@ -5,12 +5,11 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_device.h" -#include "mocks/mock_source_level_debugger.h" - using namespace NEO; struct BdwDeviceTest : public DeviceFixture, public ::testing::Test { diff --git a/opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp index 619a8c8240..4c07cd85a3 100644 --- a/opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/gtest_helpers.h" -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp b/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp index 18b53f5934..a0ee4deac1 100644 --- a/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp @@ -6,10 +6,9 @@ */ #include "core/helpers/hw_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test BdwDeviceCaps; diff --git a/opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp index 20859c3df8..c84193727c 100644 --- a/opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp b/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp index 03021a71a5..f2be168205 100644 --- a/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp +++ b/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp @@ -6,10 +6,9 @@ */ #include "core/helpers/hw_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test BdwDeviceCaps; diff --git a/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp b/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp index f0698cad73..edfdf75b66 100644 --- a/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp @@ -8,10 +8,9 @@ #include "core/command_stream/command_stream_receiver_hw.h" #include "core/execution_environment/execution_environment.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "test.h" -#include "helpers/dispatch_flags_helper.h" - using namespace NEO; typedef ::testing::Test Gen8CoherencyRequirements; diff --git a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp index 9c7ae56de3..e7ead83661 100644 --- a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp @@ -8,22 +8,22 @@ #include "core/command_stream/command_stream_receiver.h" #include "core/command_stream/linear_stream.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_event.h" -#include "mocks/mock_kernel.h" #include "reg_configs_common.h" using namespace NEO; -#include "command_stream/command_stream_receiver_hw_tests.inl" +#include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl" using CommandStreamReceiverHwTestGen8 = CommandStreamReceiverHwTest; diff --git a/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp b/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp index 1721519c3a..07fb4b91f4 100644 --- a/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp +++ b/opencl/test/unit_test/gen8/enqueue_media_kernel_gen8.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" #include "test.h" -#include "fixtures/media_kernel_fixture.h" - using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp b/opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp index a24db7ca45..66af040124 100644 --- a/opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp @@ -6,9 +6,8 @@ */ #include "core/memory_manager/memory_constants.h" - -#include "helpers/get_gpgpu_engines_tests.inl" -#include "helpers/hw_helper_tests.h" +#include "opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl" +#include "opencl/test/unit_test/helpers/hw_helper_tests.h" using HwHelperTestGen8 = HwHelperTest; diff --git a/opencl/test/unit_test/gen8/image_tests_gen8.cpp b/opencl/test/unit_test/gen8/image_tests_gen8.cpp index fc5a2a4d98..aa5f2e6148 100644 --- a/opencl/test/unit_test/gen8/image_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/image_tests_gen8.cpp @@ -5,11 +5,10 @@ * */ +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; typedef ::testing::Test gen8ImageTests; diff --git a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp index 82963edb8c..44e3e66298 100644 --- a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp @@ -6,11 +6,10 @@ */ #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_kernel.h" - using namespace NEO; using Gen8KernelTest = Test; diff --git a/opencl/test/unit_test/gen8/sampler_tests_gen8.cpp b/opencl/test/unit_test/gen8/sampler_tests_gen8.cpp index 8c0eeddb39..d80d50f456 100644 --- a/opencl/test/unit_test/gen8/sampler_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/sampler_tests_gen8.cpp @@ -6,11 +6,10 @@ */ #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/gen8/scheduler_dispatch_tests_gen8.cpp b/opencl/test/unit_test/gen8/scheduler_dispatch_tests_gen8.cpp index c55f6e3ef8..84e7f19675 100644 --- a/opencl/test/unit_test/gen8/scheduler_dispatch_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/scheduler_dispatch_tests_gen8.cpp @@ -12,11 +12,11 @@ #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/scheduler/scheduler_kernel.h" +#include "opencl/test/unit_test/fixtures/execution_model_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" #include "test.h" -#include "fixtures/execution_model_fixture.h" #include "gtest/gtest.h" -#include "helpers/hw_parse.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp b/opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp index 072c86d2ba..f8ab17b4bd 100644 --- a/opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp @@ -11,10 +11,9 @@ // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one #include "opencl/source/gen8/device_enqueue.h" #include "opencl/source/gen8/scheduler_definitions.h" - -#include "scheduler/scheduler_source_tests.h" +#include "opencl/test/unit_test/scheduler/scheduler_source_tests.h" // Keep this include below scheduler_definitions.h and device_enqueue.h headers as it depends on defines defined in them -#include "scheduler/scheduler_source_tests.inl" +#include "opencl/test/unit_test/scheduler/scheduler_source_tests.inl" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp index bcf8ad67ba..b7179d5c7f 100644 --- a/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp @@ -6,10 +6,9 @@ */ #include "core/helpers/hw_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test Gen8DeviceCaps; diff --git a/opencl/test/unit_test/gen8/test_device_queue_hw_gen8.cpp b/opencl/test/unit_test/gen8/test_device_queue_hw_gen8.cpp index 66cc9de3c9..87682b656c 100644 --- a/opencl/test/unit_test/gen8/test_device_queue_hw_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_device_queue_hw_gen8.cpp @@ -6,10 +6,9 @@ */ #include "opencl/source/context/context.h" - -#include "fixtures/device_host_queue_fixture.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device_queue.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" using namespace NEO; using namespace DeviceHostQueue; diff --git a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp index 8a5779f861..9ba1f1eb6b 100644 --- a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "test.h" -#include "fixtures/platform_fixture.h" - using namespace NEO; struct Gen8PlatformCaps : public PlatformFixture, public ::testing::Test { diff --git a/opencl/test/unit_test/gen8/test_sample_gen8.cpp b/opencl/test/unit_test/gen8/test_sample_gen8.cpp index 9c3fc1cb3c..f289e3168a 100644 --- a/opencl/test/unit_test/gen8/test_sample_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_sample_gen8.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test BroadwellOnlyTest; diff --git a/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp b/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp index 7adac1afaf..9139f8f90f 100644 --- a/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp +++ b/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp @@ -6,9 +6,8 @@ */ #include "core/gen8/hw_info.h" - -#include "helpers/unit_test_helper.h" -#include "helpers/unit_test_helper.inl" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.inl" namespace NEO { diff --git a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp index d8042241ac..f0b86a3aed 100644 --- a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test DeviceTest; diff --git a/opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp b/opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp index a4acd59bd3..7bc1bfe76d 100644 --- a/opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp +++ b/opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/gtest_helpers.h" -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp index f6f81bd37e..58f7fcd8de 100644 --- a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test BxtDeviceCaps; diff --git a/opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp b/opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp index d0765b16f6..298baacdd8 100644 --- a/opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp index e876e38432..3d7124b41d 100644 --- a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp +++ b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test BxtDeviceCapsWindows; diff --git a/opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp index f77344e350..b937f99aa8 100644 --- a/opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/gtest_helpers.h" -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp index 64e460a9c7..63c1ea0d12 100644 --- a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test CflDeviceCaps; diff --git a/opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp index e4f42ebb8d..35415fa0e3 100644 --- a/opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp index c0264d281d..6074aadeb5 100644 --- a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp +++ b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test CflDeviceCapsWindows; diff --git a/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp index 7debb7465c..4d022f775d 100644 --- a/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp @@ -8,10 +8,9 @@ #include "core/command_stream/command_stream_receiver_hw.h" #include "core/execution_environment/execution_environment.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "test.h" -#include "helpers/dispatch_flags_helper.h" - using namespace NEO; typedef ::testing::Test Gen9CoherencyRequirements; diff --git a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp index a7a4d6b725..d08cbe5577 100644 --- a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp @@ -10,23 +10,23 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/ult_command_stream_receiver_fixture.h" #include "gtest/gtest.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_event.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" #include "reg_configs_common.h" using namespace NEO; -#include "command_stream/command_stream_receiver_hw_tests.inl" +#include "opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl" using CommandStreamReceiverHwTestGen9 = CommandStreamReceiverHwTest; diff --git a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp index ae1d0d8945..996ad8aafe 100644 --- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp @@ -7,14 +7,13 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/gen9/reg_configs.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/static_size3.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "helpers/hw_parse.h" -#include "helpers/static_size3.h" -#include "mocks/mock_kernel.h" - namespace NEO { using Gen9EnqueueTest = Test; diff --git a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp index bca7bfdca7..27368b49a8 100644 --- a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp @@ -6,10 +6,9 @@ */ #include "core/helpers/preamble.h" +#include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" #include "test.h" -#include "fixtures/media_kernel_fixture.h" - using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp b/opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp index b8b4e08e6d..6be6d392c7 100644 --- a/opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/gtest_helpers.h" -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp index 8f5d180d16..5a8b42025f 100644 --- a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test Gen9DeviceCaps; diff --git a/opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp b/opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp index e7c850e9bc..4676fff910 100644 --- a/opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp index 6d2cc519d8..aa569a8429 100644 --- a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp +++ b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test GlkDeviceCapsWindows; diff --git a/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp b/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp index 7921303a68..b86a5af320 100644 --- a/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/hw_helper_tests_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/get_gpgpu_engines_tests.inl" -#include "helpers/hw_helper_tests.h" +#include "opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl" +#include "opencl/test/unit_test/helpers/hw_helper_tests.h" using HwHelperTestGen9 = HwHelperTest; diff --git a/opencl/test/unit_test/gen9/image_tests_gen9.cpp b/opencl/test/unit_test/gen9/image_tests_gen9.cpp index b87c9a38bd..f1729f33cb 100644 --- a/opencl/test/unit_test/gen9/image_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/image_tests_gen9.cpp @@ -5,11 +5,10 @@ * */ +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; typedef ::testing::Test gen9ImageTests; diff --git a/opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp b/opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp index 856124cb07..cacdd7b226 100644 --- a/opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/gtest_helpers.h" -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp index b1c19d02b6..9e314d3b05 100644 --- a/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test KblDeviceCaps; diff --git a/opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp b/opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp index 2d780746d4..2cde12b8bd 100644 --- a/opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp index 5c5ebf7d5e..7a5c7125d4 100644 --- a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp +++ b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test KblDeviceCapsWindows; diff --git a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp index 0c681a6eca..914ee646c7 100644 --- a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp @@ -7,11 +7,10 @@ #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_kernel.h" - using namespace NEO; using Gen9KernelTest = Test; diff --git a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp index 27bbe98976..2d29a3576f 100644 --- a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp @@ -6,11 +6,10 @@ */ #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp b/opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp index 37f1092d7e..608de63061 100644 --- a/opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp @@ -11,10 +11,9 @@ // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one #include "opencl/source/gen9/device_enqueue.h" #include "opencl/source/gen9/scheduler_definitions.h" - -#include "scheduler/scheduler_source_tests.h" +#include "opencl/test/unit_test/scheduler/scheduler_source_tests.h" // Keep this include below scheduler_definitions.h and device_enqueue.h headers as it depends on defines defined in them -#include "scheduler/scheduler_source_tests.inl" +#include "opencl/test/unit_test/scheduler/scheduler_source_tests.inl" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp index 448d5a545b..9dbcf01b0b 100644 --- a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp @@ -7,12 +7,12 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/sip.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" -#include "global_environment.h" #include "gtest/gtest.h" -#include "helpers/test_files.h" -#include "mocks/mock_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp index 286686e19d..bfe5931730 100644 --- a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test DeviceTest; diff --git a/opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp index 3641e9ca5b..264cb9170a 100644 --- a/opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/gtest_helpers.h" -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp index 965545285a..dcf06fb28d 100644 --- a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test SklDeviceCaps; diff --git a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp index 9e6b753165..7969321617 100644 --- a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test SkylakeOnlyTest; diff --git a/opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp index 89df8ab82c..f381b34e45 100644 --- a/opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp @@ -6,8 +6,7 @@ */ #include "core/os_interface/windows/os_interface.h" - -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp index 0ba6886e76..9611964aa8 100644 --- a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp +++ b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test SklDeviceCapsWindows; diff --git a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp index f7e795f41c..4168a1ef01 100644 --- a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp @@ -6,10 +6,9 @@ */ #include "core/helpers/hw_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test Gen9DeviceCaps; diff --git a/opencl/test/unit_test/gen9/test_device_queue_hw_gen9.cpp b/opencl/test/unit_test/gen9/test_device_queue_hw_gen9.cpp index 2ddd9d80d4..522a22ff3b 100644 --- a/opencl/test/unit_test/gen9/test_device_queue_hw_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_device_queue_hw_gen9.cpp @@ -7,10 +7,9 @@ #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/context/context.h" - -#include "fixtures/device_host_queue_fixture.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device_queue.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" using namespace NEO; using namespace DeviceHostQueue; diff --git a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp index 3e7696bd87..6988274a59 100644 --- a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp @@ -6,10 +6,9 @@ */ #include "core/device/device.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "test.h" -#include "fixtures/platform_fixture.h" - using namespace NEO; struct Gen9PlatformCaps : public PlatformFixture, public ::testing::Test { diff --git a/opencl/test/unit_test/gen9/test_sample_gen9.cpp b/opencl/test/unit_test/gen9/test_sample_gen9.cpp index 9c4bae0e43..9e286bc3b8 100644 --- a/opencl/test/unit_test/gen9/test_sample_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_sample_gen9.cpp @@ -5,10 +5,9 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; typedef Test Gen9OnlyTest; diff --git a/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp b/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp index f6ed4b5d17..f999f6e460 100644 --- a/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp +++ b/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp @@ -6,9 +6,8 @@ */ #include "core/gen9/hw_info.h" - -#include "helpers/unit_test_helper.h" -#include "helpers/unit_test_helper.inl" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.inl" namespace NEO { using Family = SKLFamily; diff --git a/opencl/test/unit_test/gen_common/cmd_parse_base.inl b/opencl/test/unit_test/gen_common/cmd_parse_base.inl index 8e8dba4c53..257c957850 100644 --- a/opencl/test/unit_test/gen_common/cmd_parse_base.inl +++ b/opencl/test/unit_test/gen_common/cmd_parse_base.inl @@ -5,7 +5,7 @@ * */ -#include "gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" // clang-format off using namespace NEO; diff --git a/opencl/test/unit_test/gen_common/gen_commands_common_validation.h b/opencl/test/unit_test/gen_common/gen_commands_common_validation.h index bc0f2eebc4..9ad9ffb8dc 100644 --- a/opencl/test/unit_test/gen_common/gen_commands_common_validation.h +++ b/opencl/test/unit_test/gen_common/gen_commands_common_validation.h @@ -9,10 +9,10 @@ #include "core/indirect_heap/indirect_heap.h" #include "core/memory_manager/memory_constants.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -#include "helpers/unit_test_helper.h" #include diff --git a/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp b/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp index 9dddfb8854..3a059bf458 100644 --- a/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp +++ b/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp @@ -7,10 +7,9 @@ #include "core/helpers/hw_cmds.h" #include "opencl/source/helpers/hardware_commands_helper.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" -#include "mocks/mock_device.h" - using InterfaceDescriptorDataTests = ::testing::Test; HWCMDTEST_F(IGFX_GEN8_CORE, InterfaceDescriptorDataTests, givenVariousValuesWhenCallingSetBarrierEnableThenCorrectValueIsSet) { diff --git a/opencl/test/unit_test/global_environment.cpp b/opencl/test/unit_test/global_environment.cpp index 060cbce6e3..849a97042b 100644 --- a/opencl/test/unit_test/global_environment.cpp +++ b/opencl/test/unit_test/global_environment.cpp @@ -5,7 +5,7 @@ * */ -#include "global_environment.h" +#include "opencl/test/unit_test/global_environment.h" #include "core/helpers/hw_info.h" #include "opencl/source/os_interface/os_inc_base.h" diff --git a/opencl/test/unit_test/global_environment.h b/opencl/test/unit_test/global_environment.h index 59e74cb8bf..f377685e71 100644 --- a/opencl/test/unit_test/global_environment.h +++ b/opencl/test/unit_test/global_environment.h @@ -8,9 +8,9 @@ #pragma once #include "core/helpers/hw_info.h" #include "core/os_interface/os_library.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" #include "gtest/gtest.h" -#include "mocks/mock_compilers.h" using namespace NEO; diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp index addfaee90f..786427708d 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -14,18 +14,18 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "GL/gl.h" #include "GL/glext.h" #include "gmm_client_context.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" #include "igfxfmid.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_memory_manager.h" using namespace ::testing; diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index 34b6266b7e..8cdad8506b 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -23,22 +23,22 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/program/create.inl" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" +#include "opencl/test/unit_test/program/program_tests.h" #include "test.h" -#include "fixtures/context_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_platform.h" -#include "program/program_tests.h" #include #include diff --git a/opencl/test/unit_test/helpers/base_object_tests.cpp b/opencl/test/unit_test/helpers/base_object_tests.cpp index 46a98f1c50..b1cdd5b8da 100644 --- a/opencl/test/unit_test/helpers/base_object_tests.cpp +++ b/opencl/test/unit_test/helpers/base_object_tests.cpp @@ -17,13 +17,13 @@ #include "opencl/source/platform/platform.h" #include "opencl/source/program/program.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" #include "gmock/gmock.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_platform.h" namespace NEO { typedef struct _cl_object_for_test2 *cl_object_for_test2; diff --git a/opencl/test/unit_test/helpers/built_ins_helper.cpp b/opencl/test/unit_test/helpers/built_ins_helper.cpp index b5b86f7ddc..46a13a1689 100644 --- a/opencl/test/unit_test/helpers/built_ins_helper.cpp +++ b/opencl/test/unit_test/helpers/built_ins_helper.cpp @@ -9,11 +9,10 @@ #include "core/device/device.h" #include "opencl/source/compiler_interface/default_cl_cache_config.h" - -#include "mocks/mock_builtins.h" -#include "mocks/mock_compilers.h" -#include "mocks/mock_program.h" -#include "mocks/mock_sip.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_sip.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/cmd_buffer_validator.h b/opencl/test/unit_test/helpers/cmd_buffer_validator.h index 1a6524fa4d..7cd8df038d 100644 --- a/opencl/test/unit_test/helpers/cmd_buffer_validator.h +++ b/opencl/test/unit_test/helpers/cmd_buffer_validator.h @@ -8,8 +8,7 @@ #pragma once #include "core/utilities/stackvec.h" - -#include "helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" #include #include diff --git a/opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp b/opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp index 55df1b0493..5abc625db3 100644 --- a/opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp +++ b/opencl/test/unit_test/helpers/cmd_buffer_validator_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "opencl/test/unit_test/helpers/cmd_buffer_validator.h" #include "test.h" -#include "helpers/cmd_buffer_validator.h" #include "hw_parse.h" using HwParseTest = ::testing::Test; diff --git a/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp b/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp index ab48fb1b6e..9095731078 100644 --- a/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp +++ b/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp @@ -9,9 +9,9 @@ #include "core/helpers/ptr_math.h" #include "core/indirect_heap/indirect_heap.h" #include "core/memory_manager/graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" -#include "mocks/mock_graphics_allocation.h" #include diff --git a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp index a740896698..393d9123db 100644 --- a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp +++ b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp @@ -6,13 +6,12 @@ */ #include "opencl/source/helpers/dispatch_info_builder.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_kernel.h" - namespace NEO { using namespace SplitDispatch; diff --git a/opencl/test/unit_test/helpers/dispatch_info_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_tests.cpp index e8035f2ab8..44a16b389b 100644 --- a/opencl/test/unit_test/helpers/dispatch_info_tests.cpp +++ b/opencl/test/unit_test/helpers/dispatch_info_tests.cpp @@ -6,13 +6,13 @@ */ #include "opencl/source/helpers/dispatch_info.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_kernel.h" #include diff --git a/opencl/test/unit_test/helpers/execution_environment_helper.cpp b/opencl/test/unit_test/helpers/execution_environment_helper.cpp index ea435c24d1..a3c5271ed7 100644 --- a/opencl/test/unit_test/helpers/execution_environment_helper.cpp +++ b/opencl/test/unit_test/helpers/execution_environment_helper.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "core/os_interface/device_factory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp index e8a666cee0..4cff55358b 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/hardware_commands_helper_tests.h" +#include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h" #include "core/helpers/basic_math.h" #include "core/helpers/engine_node_helper.h" @@ -16,12 +16,11 @@ #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" - -#include "fixtures/execution_model_kernel_fixture.h" -#include "fixtures/hello_world_fixture.h" -#include "fixtures/image_fixture.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" +#include "opencl/test/unit_test/fixtures/hello_world_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h index 56ad1c039e..f7d146798e 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h @@ -8,16 +8,15 @@ #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/built_in_fixture.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/built_in_fixture.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp index 9d242ee139..018b318a2a 100644 --- a/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp @@ -6,8 +6,7 @@ */ #include "core/helpers/hw_info.h" - -#include "helpers/hw_helper_tests.h" +#include "opencl/test/unit_test/helpers/hw_helper_tests.h" void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper, const HardwareInfo &hwInfo) { HardwareCapabilities hwCaps = {0}; diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp index fe2b0f2448..cf6b79ffb5 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/hw_helper_tests.h" +#include "opencl/test/unit_test/helpers/hw_helper_tests.h" #include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" @@ -19,11 +19,10 @@ #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/image.h" - -#include "helpers/unit_test_helper.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include #include diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.h b/opencl/test/unit_test/helpers/hw_helper_tests.h index b7ad33cc5a..1b23aee8dd 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.h +++ b/opencl/test/unit_test/helpers/hw_helper_tests.h @@ -9,10 +9,9 @@ #include "core/device/device.h" #include "core/helpers/hw_helper.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" - using namespace NEO; using HwHelperTest = Test; diff --git a/opencl/test/unit_test/helpers/hw_parse.h b/opencl/test/unit_test/helpers/hw_parse.h index 840b4860f5..76eb86dc10 100644 --- a/opencl/test/unit_test/helpers/hw_parse.h +++ b/opencl/test/unit_test/helpers/hw_parse.h @@ -12,8 +12,8 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" -#include "gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/hw_parse.inl b/opencl/test/unit_test/helpers/hw_parse.inl index f8104008dd..c8e8bb7317 100644 --- a/opencl/test/unit_test/helpers/hw_parse.inl +++ b/opencl/test/unit_test/helpers/hw_parse.inl @@ -5,7 +5,7 @@ * */ -#include "helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/kernel_binary_helper.cpp b/opencl/test/unit_test/helpers/kernel_binary_helper.cpp index 68d5f3027e..3dbff21687 100644 --- a/opencl/test/unit_test/helpers/kernel_binary_helper.cpp +++ b/opencl/test/unit_test/helpers/kernel_binary_helper.cpp @@ -5,10 +5,10 @@ * */ -#include "helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" -#include "global_environment.h" -#include "helpers/test_files.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include diff --git a/opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp b/opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp index 91d66545a2..55cec409e3 100644 --- a/opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp +++ b/opencl/test/unit_test/helpers/kernel_binary_helper_hash_value.cpp @@ -5,6 +5,6 @@ * */ -#include "helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" const std::string KernelBinaryHelper::BUILT_INS("7030307152995455603"); \ No newline at end of file diff --git a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp index 2dd5d4e58c..3f047fcea4 100644 --- a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp +++ b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp @@ -8,12 +8,12 @@ #include "core/os_interface/os_context.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" #include "gmock/gmock.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" #if defined(__clang__) #pragma clang diagnostic push diff --git a/opencl/test/unit_test/helpers/memory_management_tests.cpp b/opencl/test/unit_test/helpers/memory_management_tests.cpp index b01e235565..329c0c779c 100644 --- a/opencl/test/unit_test/helpers/memory_management_tests.cpp +++ b/opencl/test/unit_test/helpers/memory_management_tests.cpp @@ -6,8 +6,8 @@ */ #include "core/unit_tests/helpers/memory_management.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" using MemoryManagement::AllocationEvent; diff --git a/opencl/test/unit_test/helpers/mipmap_tests.cpp b/opencl/test/unit_test/helpers/mipmap_tests.cpp index a733affb77..7d618282c5 100644 --- a/opencl/test/unit_test/helpers/mipmap_tests.cpp +++ b/opencl/test/unit_test/helpers/mipmap_tests.cpp @@ -7,11 +7,11 @@ #include "opencl/source/helpers/mipmap.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_image.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_image.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp index cba06eb42a..4611f075ac 100644 --- a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp +++ b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp @@ -10,10 +10,10 @@ #include "opencl/source/command_queue/local_id_gen.h" #include "opencl/source/helpers/per_thread_data.h" #include "opencl/source/program/kernel_info.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_graphics_allocation.h" #include "patch_shared.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/queue_helpers_tests.cpp b/opencl/test/unit_test/helpers/queue_helpers_tests.cpp index 8d1ea984b9..9b69f4f6fe 100644 --- a/opencl/test/unit_test/helpers/queue_helpers_tests.cpp +++ b/opencl/test/unit_test/helpers/queue_helpers_tests.cpp @@ -6,11 +6,11 @@ */ #include "opencl/source/helpers/queue_helpers.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_event.h" #include "gtest/gtest.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_event.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/task_information_tests.cpp b/opencl/test/unit_test/helpers/task_information_tests.cpp index 2d58e6b17f..f3e0d514db 100644 --- a/opencl/test/unit_test/helpers/task_information_tests.cpp +++ b/opencl/test/unit_test/helpers/task_information_tests.cpp @@ -8,15 +8,14 @@ #include "core/memory_manager/internal_allocation_storage.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/task_information.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/dispatch_flags_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/dispatch_flags_fixture.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_kernel.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp index aa879bf07c..f345b1a50e 100644 --- a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp +++ b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp @@ -13,21 +13,21 @@ #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/source/event/user_event.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "test.h" #include "gmock/gmock.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/hw_parse.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_timestamp_container.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/transfer_properties_tests.cpp b/opencl/test/unit_test/helpers/transfer_properties_tests.cpp index c12c0203a4..b89fd90339 100644 --- a/opencl/test/unit_test/helpers/transfer_properties_tests.cpp +++ b/opencl/test/unit_test/helpers/transfer_properties_tests.cpp @@ -7,11 +7,11 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/properties_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_memory_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/validator_tests.cpp b/opencl/test/unit_test/helpers/validator_tests.cpp index 0efd937225..0b3d9dabb8 100644 --- a/opencl/test/unit_test/helpers/validator_tests.cpp +++ b/opencl/test/unit_test/helpers/validator_tests.cpp @@ -10,11 +10,11 @@ #include "opencl/source/helpers/base_object.h" #include "opencl/source/helpers/error_mappers.h" #include "opencl/source/helpers/validators.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" -#include "mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp b/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp index e346f18b0e..d8f4a7fd5b 100644 --- a/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp @@ -8,10 +8,10 @@ #include "core/os_interface/os_library.h" #include "core/os_interface/windows/windows_wrapper.h" #include "opencl/source/helpers/windows/gl_helper.h" +#include "opencl/test/unit_test/helpers/windows/mock_function.h" #include "test.h" #include "gtest/gtest.h" -#include "helpers/windows/mock_function.h" #include diff --git a/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp b/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp index 02a4b563e0..b5537c04a6 100644 --- a/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp +++ b/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp @@ -8,10 +8,9 @@ #include "core/helpers/kmd_notify_properties.h" #include "core/os_interface/windows/sys_calls.h" #include "core/unit_tests/helpers/default_hw_info.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" #include "test.h" -#include "helpers/variable_backup.h" - namespace NEO { namespace SysCalls { diff --git a/opencl/test/unit_test/igdrcl_tests_pch.cpp b/opencl/test/unit_test/igdrcl_tests_pch.cpp index 02b2374735..903202c8cb 100644 --- a/opencl/test/unit_test/igdrcl_tests_pch.cpp +++ b/opencl/test/unit_test/igdrcl_tests_pch.cpp @@ -5,4 +5,4 @@ * */ -#include "igdrcl_tests_pch.h" +#include "opencl/test/unit_test/igdrcl_tests_pch.h" diff --git a/opencl/test/unit_test/igdrcl_tests_pch.h b/opencl/test/unit_test/igdrcl_tests_pch.h index 65958420a6..60e34758f9 100644 --- a/opencl/test/unit_test/igdrcl_tests_pch.h +++ b/opencl/test/unit_test/igdrcl_tests_pch.h @@ -15,9 +15,9 @@ #include "core/helpers/ptr_math.h" #include "core/memory_manager/memory_constants.h" #include "core/sku_info/sku_info_base.h" +#include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" -#include "gen_common/gen_cmd_parse.h" #include "third_party/opencl_headers/CL/cl.h" #include diff --git a/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp index f3b05b8d9b..23020dc7e6 100644 --- a/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp +++ b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "indirect_heap/indirect_heap_fixture.h" +#include "opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h" #include "opencl/source/command_queue/command_queue.h" diff --git a/opencl/test/unit_test/kernel/clone_kernel_tests.cpp b/opencl/test/unit_test/kernel/clone_kernel_tests.cpp index 0928ab12fa..a832632663 100644 --- a/opencl/test/unit_test/kernel/clone_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/clone_kernel_tests.cpp @@ -11,19 +11,19 @@ #include "opencl/source/helpers/sampler_helpers.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/pipe.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_pipe.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_sampler.h" #include "test.h" #include "CL/cl.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_device_queue.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_pipe.h" -#include "mocks/mock_program.h" -#include "mocks/mock_sampler.h" #include diff --git a/opencl/test/unit_test/kernel/debug_kernel_tests.cpp b/opencl/test/unit_test/kernel/debug_kernel_tests.cpp index bb6a308832..875448ed4e 100644 --- a/opencl/test/unit_test/kernel/debug_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/debug_kernel_tests.cpp @@ -5,13 +5,12 @@ * */ +#include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/execution_model_kernel_fixture.h" -#include "mocks/mock_device.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp index 7ac7973cf9..e0e34be619 100644 --- a/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp @@ -8,20 +8,20 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/sharings/gl/gl_buffer.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h" +#include "opencl/test/unit_test/mocks/gl/mock_gl_sharing.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" #include "CL/cl.h" #include "config.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" -#include "kernel/kernel_arg_buffer_fixture.h" -#include "mocks/gl/mock_gl_sharing.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/kernel/image_transformer_tests.cpp b/opencl/test/unit_test/kernel/image_transformer_tests.cpp index 335c73b39a..ed66e4f838 100644 --- a/opencl/test/unit_test/kernel/image_transformer_tests.cpp +++ b/opencl/test/unit_test/kernel/image_transformer_tests.cpp @@ -7,10 +7,9 @@ #include "opencl/source/kernel/image_transformer.h" #include "opencl/source/program/kernel_info.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" #include "test.h" -#include "fixtures/image_fixture.h" - using namespace NEO; class ImageTransformerTest : public ::testing::Test { diff --git a/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp index 53793c1e81..c4a9598f50 100644 --- a/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp @@ -9,16 +9,16 @@ #include "opencl/source/accelerators/intel_motion_estimation.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" #include "CL/cl.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp index c8241eecd5..49f3c257f8 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp @@ -9,16 +9,16 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" #include "CL/cl.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h index acba4e2fa0..877a215c74 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h @@ -8,16 +8,16 @@ #pragma once #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" #include "CL/cl.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp index b7e1575228..e71710b3aa 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp @@ -7,18 +7,18 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" #include "CL/cl.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" -#include "kernel/kernel_arg_buffer_fixture.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_arg_dev_queue_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_dev_queue_tests.cpp index 75c4931654..c47b69d641 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_dev_queue_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_dev_queue_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "fixtures/device_fixture.h" -#include "fixtures/device_host_queue_fixture.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" using namespace NEO; using namespace DeviceHostQueue; diff --git a/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp index f9611fd7e5..6d67b1b678 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_info_tests.cpp @@ -6,16 +6,15 @@ */ #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/program/program_tests.h" +#include "opencl/test/unit_test/program/program_with_source.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "helpers/kernel_binary_helper.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" -#include "program/program_tests.h" -#include "program/program_with_source.h" - using namespace NEO; class KernelArgInfoTest : public ProgramFromSourceTest { diff --git a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp index 86141014f1..cb717a5499 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp @@ -7,17 +7,17 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/pipe.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_pipe.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" #include "CL/cl.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_pipe.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp index 9336acc941..485dd4a405 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp @@ -7,16 +7,16 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" #include "CL/cl.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp index fddf9eb738..94783960cd 100644 --- a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp @@ -6,14 +6,13 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" - -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp index d339c9cd2d..7ec957db8b 100644 --- a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp @@ -8,16 +8,16 @@ #include "core/helpers/ptr_math.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/kernel_arg_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_image.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/kernel_arg_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_image.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp index 5fe41de760..b057dca1b7 100644 --- a/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp @@ -6,14 +6,14 @@ */ #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" #include "CL/cl.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp b/opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp index 1555a7a623..7fd08bd69b 100644 --- a/opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp @@ -5,10 +5,11 @@ * */ +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" + #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp b/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp index 6412c9dd1a..c5c2f7f361 100644 --- a/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp @@ -10,19 +10,19 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/printf_handler.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/execution_model_fixture.h" +#include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/gen_common/matchers.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_sampler.h" -#include "fixtures/execution_model_fixture.h" -#include "fixtures/execution_model_kernel_fixture.h" -#include "fixtures/image_fixture.h" -#include "fixtures/multi_root_device_fixture.h" -#include "gen_common/matchers.h" -#include "helpers/gtest_helpers.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device_queue.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_program.h" -#include "mocks/mock_sampler.h" #include "patch_list.h" #include diff --git a/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp index 696e478745..879ae8dc18 100644 --- a/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp @@ -8,13 +8,13 @@ #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp index aae74b6554..aed8507fdc 100644 --- a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp @@ -9,12 +9,11 @@ #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/kernel_info.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" - using namespace NEO; struct KernelSLMAndBarrierTest : public DeviceFixture, diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index d110ea212e..3e6c872c5c 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -22,24 +22,23 @@ #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/execution_model_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/program/program_from_binary.h" +#include "opencl/test/unit_test/program/program_tests.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/device_host_queue_fixture.h" -#include "fixtures/execution_model_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/multi_root_device_fixture.h" -#include "helpers/gtest_helpers.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_program.h" -#include "program/program_from_binary.h" -#include "program/program_tests.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/kernel/kernel_transformable_tests.cpp b/opencl/test/unit_test/kernel/kernel_transformable_tests.cpp index 50af6f488f..b824fb3f8a 100644 --- a/opencl/test/unit_test/kernel/kernel_transformable_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_transformable_tests.cpp @@ -7,14 +7,13 @@ #include "opencl/source/program/kernel_info.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_sampler.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_sampler.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/kernel/parent_kernel_tests.cpp b/opencl/test/unit_test/kernel/parent_kernel_tests.cpp index 8a52f2846a..dfe4427aa7 100644 --- a/opencl/test/unit_test/kernel/parent_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/parent_kernel_tests.cpp @@ -5,13 +5,12 @@ * */ +#include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/execution_model_kernel_fixture.h" -#include "mocks/mock_device.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp index 537c0085d6..96280c0986 100644 --- a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp +++ b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp @@ -7,11 +7,10 @@ #include "core/memory_manager/internal_allocation_storage.h" #include "core/os_interface/os_context.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_kernel.h" - using namespace NEO; typedef Test KernelSubstituteTest; diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index 13ba2f4099..b7f5052171 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -27,21 +27,21 @@ set(IGDRCL_SRCS_LIB_ULT ${NEO_SOURCE_DIR}/core/unit_tests/utilities/cpuintrinsics.cpp ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp ${NEO_SOURCE_DIR}/opencl/source/dll/debugger.cpp - ${NEO_RUNTIME_TESTS_DIR}/abort.cpp - ${NEO_RUNTIME_TESTS_DIR}/helpers/built_ins_helper.cpp - ${NEO_RUNTIME_TESTS_DIR}/helpers/debug_helpers.cpp - ${NEO_RUNTIME_TESTS_DIR}/helpers/execution_environment_helper.cpp - ${NEO_RUNTIME_TESTS_DIR}/helpers/execution_environment_helper.h - ${NEO_RUNTIME_TESTS_DIR}/helpers/test_files.cpp - ${NEO_RUNTIME_TESTS_DIR}/helpers/test_files.h - ${NEO_RUNTIME_TESTS_DIR}/libult/create_tbx_sockets.cpp - ${NEO_RUNTIME_TESTS_DIR}/libult/debug_manager.cpp - ${NEO_RUNTIME_TESTS_DIR}/libult/source_level_debugger.cpp - ${NEO_RUNTIME_TESTS_DIR}/libult/source_level_debugger_library.cpp - ${NEO_RUNTIME_TESTS_DIR}/libult/source_level_debugger_library.h - ${NEO_RUNTIME_TESTS_DIR}/libult/ult_aub_command_stream_receiver.h - ${NEO_RUNTIME_TESTS_DIR}/libult/ult_command_stream_receiver.h - ${NEO_RUNTIME_TESTS_DIR}/utilities/debug_settings_reader_creator.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/built_ins_helper.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/debug_helpers.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/execution_environment_helper.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/test_files.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/test_files.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_tbx_sockets.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/debug_manager.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_library.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_library.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_command_stream_receiver.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_leak_listener.cpp ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_leak_listener.h ${NEO_CORE_DIRECTORY}/unit_tests/helpers/memory_management.cpp @@ -49,7 +49,7 @@ set(IGDRCL_SRCS_LIB_ULT ) set(IGDRCL_SRCS_LIB_ULT_WINDOWS - ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/mock_environment_variables.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp ) add_library (igdrcl_libult OBJECT EXCLUDE_FROM_ALL @@ -61,8 +61,8 @@ if(UNIX) endif() set(IGDRCL_SRCS_LIB_ULT_CS - ${NEO_RUNTIME_TESTS_DIR}/libult/create_command_stream.cpp - ${NEO_RUNTIME_TESTS_DIR}/libult/create_command_stream.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_command_stream.h ) add_library (igdrcl_libult_cs OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SRCS_LIB_ULT_CS} @@ -72,49 +72,49 @@ target_include_directories(igdrcl_libult PRIVATE ) set(IGDRCL_SRCS_LIB_ULT_ENV - ${NEO_RUNTIME_TESTS_DIR}/custom_event_listener.h - ${NEO_RUNTIME_TESTS_DIR}/global_environment.cpp - ${NEO_RUNTIME_TESTS_DIR}/global_environment.h - ${NEO_RUNTIME_TESTS_DIR}/main.cpp - ${NEO_RUNTIME_TESTS_DIR}/options_unit_tests.cpp - ${NEO_RUNTIME_TESTS_DIR}/command_queue/command_queue_fixture.cpp - ${NEO_RUNTIME_TESTS_DIR}/command_queue/command_queue_fixture.h - ${NEO_RUNTIME_TESTS_DIR}/fixtures/memory_management_fixture.cpp - ${NEO_RUNTIME_TESTS_DIR}/fixtures/memory_management_fixture.h - ${NEO_RUNTIME_TESTS_DIR}/fixtures/built_in_fixture.cpp - ${NEO_RUNTIME_TESTS_DIR}/fixtures/built_in_fixture.h - ${NEO_RUNTIME_TESTS_DIR}/fixtures/buffer_fixture.cpp - ${NEO_RUNTIME_TESTS_DIR}/fixtures/buffer_fixture.h - ${NEO_RUNTIME_TESTS_DIR}/fixtures/device_fixture.cpp - ${NEO_RUNTIME_TESTS_DIR}/fixtures/device_fixture.h - ${NEO_RUNTIME_TESTS_DIR}/fixtures/program_fixture.cpp - ${NEO_RUNTIME_TESTS_DIR}/fixtures/program_fixture.h - ${NEO_RUNTIME_TESTS_DIR}/helpers/kernel_binary_helper.cpp - ${NEO_RUNTIME_TESTS_DIR}/helpers/kernel_binary_helper.h - ${NEO_RUNTIME_TESTS_DIR}/helpers${BRANCH_DIR_SUFFIX}/kernel_binary_helper_hash_value.cpp - ${NEO_RUNTIME_TESTS_DIR}/indirect_heap/indirect_heap_fixture.cpp - ${NEO_RUNTIME_TESTS_DIR}/indirect_heap/indirect_heap_fixture.h - ${NEO_RUNTIME_TESTS_DIR}/ult_config_listener.cpp - ${NEO_RUNTIME_TESTS_DIR}/ult_config_listener.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/custom_event_listener.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/global_environment.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/main.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/options_unit_tests.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/command_queue_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/command_queue_fixture.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/memory_management_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/memory_management_fixture.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/built_in_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/built_in_fixture.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/buffer_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/buffer_fixture.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/device_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/device_fixture.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/program_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/program_fixture.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/kernel_binary_helper.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/kernel_binary_helper.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}/kernel_binary_helper_hash_value.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_config_listener.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_config_listener.h ) add_library (igdrcl_libult_env OBJECT EXCLUDE_FROM_ALL ${IGDRCL_SRCS_LIB_ULT_ENV} ) set(IGDRCL_SRCS_LIB_ULT_ENV_WINDOWS - ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/create_wddm_memory_manager.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/options.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/sys_calls.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/ult_dxgi_factory.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/ult_dxgi_factory.h - ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/wddm_calls.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp ) set(IGDRCL_SRCS_LIB_ULT_ENV_LINUX - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/allocator_helper.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/create_drm_memory_manager.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/options.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/sys_calls_linux_ult.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/allocator_helper.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp ) if(WIN32) @@ -126,7 +126,7 @@ endif() target_include_directories(igdrcl_libult_env PRIVATE $ - ${NEO_RUNTIME_TESTS_DIR}/mocks${BRANCH_DIR_SUFFIX} + ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX} ) set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW ${IGDRCL_SRCS_ENABLE_TESTED_HW}) diff --git a/opencl/test/unit_test/libult/create_command_stream.cpp b/opencl/test/unit_test/libult/create_command_stream.cpp index 1970a5c57d..1a94042c85 100644 --- a/opencl/test/unit_test/libult/create_command_stream.cpp +++ b/opencl/test/unit_test/libult/create_command_stream.cpp @@ -5,7 +5,7 @@ * */ -#include "libult/create_command_stream.h" +#include "opencl/test/unit_test/libult/create_command_stream.h" #include "core/command_stream/command_stream_receiver.h" #include "core/execution_environment/root_device_environment.h" @@ -14,8 +14,7 @@ #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/create_command_stream_impl.h" #include "opencl/source/command_stream/tbx_command_stream_receiver.h" - -#include "libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include diff --git a/opencl/test/unit_test/libult/create_tbx_sockets.cpp b/opencl/test/unit_test/libult/create_tbx_sockets.cpp index 9ac1830922..80204e0cce 100644 --- a/opencl/test/unit_test/libult/create_tbx_sockets.cpp +++ b/opencl/test/unit_test/libult/create_tbx_sockets.cpp @@ -6,9 +6,8 @@ */ #include "opencl/source/tbx/tbx_sockets_imp.h" - -#include "mocks/mock_tbx_sockets.h" -#include "tests_configuration.h" +#include "opencl/test/unit_test/mocks/mock_tbx_sockets.h" +#include "opencl/test/unit_test/tests_configuration.h" namespace NEO { TbxSockets *TbxSockets::create() { diff --git a/opencl/test/unit_test/libult/source_level_debugger.cpp b/opencl/test/unit_test/libult/source_level_debugger.cpp index 1378c55713..e24669aa11 100644 --- a/opencl/test/unit_test/libult/source_level_debugger.cpp +++ b/opencl/test/unit_test/libult/source_level_debugger.cpp @@ -7,7 +7,7 @@ #include "opencl/source/source_level_debugger/source_level_debugger.h" -#include "libult/source_level_debugger_library.h" +#include "opencl/test/unit_test/libult/source_level_debugger_library.h" namespace NEO { OsLibrary *SourceLevelDebugger::loadDebugger() { diff --git a/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h index bed8168fd0..ccc51a6a57 100644 --- a/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h +++ b/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h @@ -9,8 +9,7 @@ #include "core/execution_environment/execution_environment.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" - -#include "mocks/mock_experimental_command_buffer.h" +#include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.h" namespace NEO { diff --git a/opencl/test/unit_test/libult/ult_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_command_stream_receiver.h index c3ede8f061..4430d6ae1d 100644 --- a/opencl/test/unit_test/libult/ult_command_stream_receiver.h +++ b/opencl/test/unit_test/libult/ult_command_stream_receiver.h @@ -13,9 +13,8 @@ #include "core/os_interface/os_context.h" #include "core/unit_tests/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" - -#include "helpers/dispatch_flags_helper.h" -#include "mocks/mock_experimental_command_buffer.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.h" #include #include diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt index 22b7cebe82..d690d3b3a8 100644 --- a/opencl/test/unit_test/linux/CMakeLists.txt +++ b/opencl/test/unit_test/linux/CMakeLists.txt @@ -24,9 +24,9 @@ add_executable(igdrcl_${target_name} ${NEO_SOURCE_DIR}/opencl/source/dll/linux/drm_neo_create.cpp ${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp ${NEO_SOURCE_DIR}/opencl/source/dll/linux/os_interface.cpp - ${NEO_RUNTIME_TESTS_DIR}/aub_stream_mocks/aub_stream_interface_mock.cpp - ${NEO_RUNTIME_TESTS_DIR}/linux${BRANCH_DIR_SUFFIX}/drm_other_requests.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/create_drm_memory_manager.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/linux${BRANCH_DIR_SUFFIX}/drm_other_requests.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp ) if(NEO__LIBVA_FOUND) target_sources(igdrcl_${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/va_tests.cpp) @@ -38,7 +38,7 @@ set_property(TARGET igdrcl_${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS $ target_include_directories(igdrcl_${target_name} PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX} - ${NEO_RUNTIME_TESTS_DIR}/gen_common${BRANCH_DIR_SUFFIX} + ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX} ${CMAKE_CURRENT_SOURCE_DIR} ) add_dependencies(unit_tests igdrcl_${target_name}) diff --git a/opencl/test/unit_test/linux/drm_null_device_tests.cpp b/opencl/test/unit_test/linux/drm_null_device_tests.cpp index c4ec0fda36..365b9274a9 100644 --- a/opencl/test/unit_test/linux/drm_null_device_tests.cpp +++ b/opencl/test/unit_test/linux/drm_null_device_tests.cpp @@ -8,11 +8,10 @@ #include "core/execution_environment/execution_environment.h" #include "core/os_interface/linux/drm_null_device.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/linux/drm_wrap.h" +#include "opencl/test/unit_test/linux/mock_os_layer.h" #include "test.h" -#include "linux/drm_wrap.h" -#include "linux/mock_os_layer.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp index 8b857aa7e3..7cca768270 100644 --- a/opencl/test/unit_test/linux/main_linux_dll.cpp +++ b/opencl/test/unit_test/linux/main_linux_dll.cpp @@ -14,16 +14,16 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/helpers/default_hw_info.inl" #include "core/unit_tests/helpers/ult_hw_config.inl" +#include "opencl/test/unit_test/custom_event_listener.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/linux/drm_wrap.h" +#include "opencl/test/unit_test/linux/mock_os_layer.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include "test.h" -#include "custom_event_listener.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "linux/drm_wrap.h" -#include "linux/mock_os_layer.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/linux/device_command_stream_fixture.h" #include diff --git a/opencl/test/unit_test/linux/test_mode.h b/opencl/test/unit_test/linux/test_mode.h index 8bcee9f00a..b12da06357 100644 --- a/opencl/test/unit_test/linux/test_mode.h +++ b/opencl/test/unit_test/linux/test_mode.h @@ -7,7 +7,7 @@ #pragma once -#include "tests_configuration.h" +#include "opencl/test/unit_test/tests_configuration.h" namespace NEO { constexpr TestMode defaultTestMode = TestMode::NotSpecified; diff --git a/opencl/test/unit_test/linux/va_tests.cpp b/opencl/test/unit_test/linux/va_tests.cpp index f6fa04301f..4a19272880 100644 --- a/opencl/test/unit_test/linux/va_tests.cpp +++ b/opencl/test/unit_test/linux/va_tests.cpp @@ -6,10 +6,9 @@ */ #include "opencl/source/sharings/va/va_sharing_functions.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" #include "test.h" -#include "helpers/variable_backup.h" - using namespace NEO; TEST(VaTests, whenLibvaSo2IsNotInstalledThenFail) { diff --git a/opencl/test/unit_test/main.cpp b/opencl/test/unit_test/main.cpp index 73082b20d1..9187d315ad 100644 --- a/opencl/test/unit_test/main.cpp +++ b/opencl/test/unit_test/main.cpp @@ -15,18 +15,18 @@ #include "core/unit_tests/helpers/ult_hw_config.inl" #include "core/utilities/debug_settings_reader.h" #include "opencl/source/os_interface/ocl_reg_path.h" +#include "opencl/test/unit_test/custom_event_listener.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_sip.h" +#include "opencl/test/unit_test/tests_configuration.h" +#include "opencl/test/unit_test/ult_config_listener.h" -#include "custom_event_listener.h" -#include "global_environment.h" #include "gmock/gmock.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/test_files.h" #include "mock_gmm_client_context.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_program.h" -#include "mocks/mock_sip.h" -#include "tests_configuration.h" -#include "ult_config_listener.h" #include #include diff --git a/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp index 0920219b0d..1a76f3701b 100644 --- a/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp @@ -7,15 +7,15 @@ #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_memory_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp index 362ed419a4..92ccf6335a 100644 --- a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp @@ -12,14 +12,14 @@ #include "core/memory_manager/unified_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index ad50d30d9d..7dfa8f89dc 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -24,25 +24,25 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/gen_common/matchers.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" +#include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/multi_root_device_fixture.h" -#include "gen_common/matchers.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "helpers/hw_parse.h" -#include "helpers/unit_test_helper.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_gmm_resource_info.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_platform.h" -#include "mocks/mock_timestamp_container.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/create_image_format_tests.cpp b/opencl/test/unit_test/mem_obj/create_image_format_tests.cpp index 8376533282..2e68e8f4b7 100644 --- a/opencl/test/unit_test/mem_obj/create_image_format_tests.cpp +++ b/opencl/test/unit_test/mem_obj/create_image_format_tests.cpp @@ -8,11 +8,11 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp b/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp index ec74bc1c24..2fa4636d50 100644 --- a/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp +++ b/opencl/test/unit_test/mem_obj/destructor_callback_tests.cpp @@ -6,10 +6,10 @@ */ #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "test.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/get_mem_object_info_subbuffer_tests.cpp b/opencl/test/unit_test/mem_obj/get_mem_object_info_subbuffer_tests.cpp index 06a5b798ef..8d4563ff28 100644 --- a/opencl/test/unit_test/mem_obj/get_mem_object_info_subbuffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/get_mem_object_info_subbuffer_tests.cpp @@ -8,9 +8,9 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp b/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp index 757aab7b1b..dd604a2349 100644 --- a/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp +++ b/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp @@ -9,12 +9,12 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "fixtures/buffer_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" #include diff --git a/opencl/test/unit_test/mem_obj/image1d_tests.cpp b/opencl/test/unit_test/mem_obj/image1d_tests.cpp index 07122ca8fd..16114e91d6 100644 --- a/opencl/test/unit_test/mem_obj/image1d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image1d_tests.cpp @@ -8,11 +8,10 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; static const unsigned int testImageDimensions = 32; diff --git a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp index 0579831edc..f533d87e9c 100644 --- a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp @@ -11,13 +11,12 @@ #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/platform/extensions.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/raii_hw_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "helpers/raii_hw_helper.h" -#include "mocks/mock_context.h" -#include "mocks/mock_gmm.h" - using namespace NEO; namespace NEO { diff --git a/opencl/test/unit_test/mem_obj/image2d_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_tests.cpp index b3fc27bf72..b7766abc8a 100644 --- a/opencl/test/unit_test/mem_obj/image2d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_tests.cpp @@ -7,12 +7,11 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_context.h" - using namespace NEO; static const unsigned int testImageDimensions = 32; diff --git a/opencl/test/unit_test/mem_obj/image3d_tests.cpp b/opencl/test/unit_test/mem_obj/image3d_tests.cpp index d2a0c7be7d..0b3d524434 100644 --- a/opencl/test/unit_test/mem_obj/image3d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image3d_tests.cpp @@ -8,13 +8,12 @@ #include "core/helpers/aligned_memory.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_context.h" -#include "mocks/mock_gmm.h" - using namespace NEO; static const unsigned int testImageDimensions = 31; diff --git a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp index 69fa2b83b3..e88c77c57f 100644 --- a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp @@ -8,12 +8,11 @@ #include "core/helpers/aligned_memory.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_context.h" - using namespace NEO; static const unsigned int testImageDimensions = 17; diff --git a/opencl/test/unit_test/mem_obj/image_compression_fixture.h b/opencl/test/unit_test/mem_obj/image_compression_fixture.h index 98d1b0b4e7..762f45f542 100644 --- a/opencl/test/unit_test/mem_obj/image_compression_fixture.h +++ b/opencl/test/unit_test/mem_obj/image_compression_fixture.h @@ -7,12 +7,11 @@ #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/helpers/surface_formats.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" - using namespace NEO; class ImageCompressionTests : public ::testing::Test { diff --git a/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp b/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp index 9279f7aa63..2cc7d22fd8 100644 --- a/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp @@ -9,11 +9,10 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_context.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp index f2d6a141f9..351d1ef96a 100644 --- a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp @@ -10,11 +10,11 @@ #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" #include "igfxfmid.h" -#include "mocks/mock_context.h" extern GFXCORE_FAMILY renderCoreFamily; diff --git a/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp b/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp index 2b749e50aa..641e99e2b4 100644 --- a/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_release_mapped_ptr_tests.cpp @@ -8,14 +8,13 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_event.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_context.h" -#include "mocks/mock_event.h" - using namespace NEO; template diff --git a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp index e1cd48e876..d769629c32 100644 --- a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp @@ -15,16 +15,16 @@ #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" #include "gmock/gmock.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_gmm_resource_info.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" using namespace NEO; using namespace ::testing; diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp index 12671d81fc..57f1146a39 100644 --- a/opencl/test/unit_test/mem_obj/image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests.cpp @@ -14,20 +14,19 @@ #include "opencl/source/helpers/mipmap.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/mem_obj_helper.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mem_obj/image_compression_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/multi_root_device_fixture.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/unit_test_helper.h" -#include "mem_obj/image_compression_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_memory_manager.h" - using namespace NEO; static const unsigned int testImageDimensions = 45; diff --git a/opencl/test/unit_test/mem_obj/image_tests_tgllp_plus.cpp b/opencl/test/unit_test/mem_obj/image_tests_tgllp_plus.cpp index abed1879db..c5784aa7ca 100644 --- a/opencl/test/unit_test/mem_obj/image_tests_tgllp_plus.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests_tgllp_plus.cpp @@ -6,12 +6,11 @@ */ #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; struct ImageTestsTgllPlus : DeviceFixture, testing::Test { diff --git a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp index 7286b41429..adeb95b0da 100644 --- a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp @@ -7,15 +7,15 @@ #include "core/helpers/hw_helper.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" -#include "command_queue/command_queue_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_context.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp b/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp index a739098779..bf5a979d97 100644 --- a/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp @@ -6,11 +6,11 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp index 1be475cb59..60b449acd1 100644 --- a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp @@ -10,11 +10,11 @@ #include "opencl/source/helpers/convert_color.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp index 106e95a775..ff546741b8 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp @@ -12,13 +12,12 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" - using namespace NEO; template diff --git a/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp index 832729ad67..447c7b5bc8 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp @@ -8,8 +8,8 @@ #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp index 4ffb13d7a0..95e6ceebb1 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp @@ -14,14 +14,14 @@ #include "opencl/source/helpers/properties_helper.h" #include "opencl/source/mem_obj/mem_obj.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" -#include "fixtures/multi_root_device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_deferred_deleter.h" -#include "mocks/mock_device.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_memory_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp index 9aa452b914..0b8b87c757 100644 --- a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp @@ -11,16 +11,16 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" -#include "helpers/kernel_binary_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_gmm_resource_info.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp b/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp index 9922fb725b..0cb43244e8 100644 --- a/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp @@ -10,13 +10,13 @@ #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/mem_obj/image.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/pipe_tests.cpp b/opencl/test/unit_test/mem_obj/pipe_tests.cpp index 428db117ef..568b3628d2 100644 --- a/opencl/test/unit_test/mem_obj/pipe_tests.cpp +++ b/opencl/test/unit_test/mem_obj/pipe_tests.cpp @@ -7,13 +7,12 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/mem_obj/pipe.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/multi_root_device_fixture.h" -#include "mocks/mock_context.h" - using namespace NEO; //Tests for pipes diff --git a/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp index 18c7b38fc0..19ef5df3c9 100644 --- a/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp @@ -8,11 +8,11 @@ #include "core/helpers/ptr_math.h" #include "core/memory_manager/memory_constants.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp index 92bfca1375..c8815701d1 100644 --- a/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp +++ b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp @@ -8,11 +8,11 @@ #include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/mem_obj/buffer.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp b/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp index fd521779d2..4ff3096982 100644 --- a/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp +++ b/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp @@ -11,13 +11,12 @@ #include "core/memory_manager/deferred_deleter.h" #include "core/os_interface/os_context.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" - using namespace NEO; struct DeferredDeleterPublic : DeferredDeleter { diff --git a/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp b/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp index 4ee34fb6cb..2626eb0633 100644 --- a/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp +++ b/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp @@ -6,10 +6,10 @@ */ #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_deferrable_deletion.h" +#include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" #include "gtest/gtest.h" -#include "mocks/mock_deferrable_deletion.h" -#include "mocks/mock_deferred_deleter.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/gfx_partition_tests.cpp b/opencl/test/unit_test/memory_manager/gfx_partition_tests.cpp index 9f4fe44226..dc015d1b30 100644 --- a/opencl/test/unit_test/memory_manager/gfx_partition_tests.cpp +++ b/opencl/test/unit_test/memory_manager/gfx_partition_tests.cpp @@ -5,4 +5,4 @@ * */ -#include "memory_manager/gfx_partition_tests.inl" +#include "opencl/test/unit_test/memory_manager/gfx_partition_tests.inl" diff --git a/opencl/test/unit_test/memory_manager/gfx_partition_tests.inl b/opencl/test/unit_test/memory_manager/gfx_partition_tests.inl index 28354c18ce..5601acad1b 100644 --- a/opencl/test/unit_test/memory_manager/gfx_partition_tests.inl +++ b/opencl/test/unit_test/memory_manager/gfx_partition_tests.inl @@ -9,9 +9,9 @@ #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "core/os_interface/os_memory.h" +#include "opencl/test/unit_test/mocks/mock_gfx_partition.h" #include "gtest/gtest.h" -#include "mocks/mock_gfx_partition.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp b/opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp index 0ede716c0d..9e76964652 100644 --- a/opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp +++ b/opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" + #include "gtest/gtest.h" -#include "mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp b/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp index b7fffc3f16..ab7fc639ca 100644 --- a/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp @@ -9,15 +9,14 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/memory_constants.h" +#include "opencl/test/unit_test/fixtures/memory_manager_fixture.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h" +#include "opencl/test/unit_test/mocks/mock_internal_allocation_storage.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "fixtures/memory_manager_fixture.h" -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_host_ptr_manager.h" -#include "mocks/mock_internal_allocation_storage.h" -#include "mocks/mock_memory_manager.h" - using namespace NEO; TEST(HostPtrManager, AlignedPointerAndAlignedSizeAskedForAllocationCountReturnsOne) { diff --git a/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp b/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp index fb409d97ac..4b1101b46c 100644 --- a/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp +++ b/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp @@ -9,12 +9,11 @@ #include "core/os_interface/os_context.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/containers_tests_helpers.h" +#include "opencl/test/unit_test/fixtures/memory_allocator_fixture.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" -#include "fixtures/memory_allocator_fixture.h" -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_graphics_allocation.h" - struct InternalAllocationStorageTest : public MemoryAllocatorFixture, public ::testing::Test { using MemoryAllocatorFixture::TearDown; diff --git a/opencl/test/unit_test/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 index e1f511b673..be4a11f1d7 100644 --- a/opencl/test/unit_test/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 @@ -5,7 +5,7 @@ * */ -#include "memory_manager/memory_manager_allocate_in_device_pool_tests.inl" +#include "opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl" #include "core/helpers/array_count.h" diff --git a/opencl/test/unit_test/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 index aaa9cac387..dc3cfe79a6 100644 --- a/opencl/test/unit_test/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 @@ -9,11 +9,11 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" #include "gtest/gtest.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_memory_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 1933299d9b..02898fb1ca 100644 --- a/opencl/test/unit_test/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 @@ -5,4 +5,4 @@ * */ -#include "memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl" +#include "opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl" diff --git a/opencl/test/unit_test/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 index 3e7fa7fb59..6712629da0 100644 --- a/opencl/test/unit_test/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 @@ -9,12 +9,12 @@ #include "core/execution_environment/execution_environment.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" #include "gtest/gtest.h" -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_memory_manager.h" using namespace NEO; class MemoryManagerGetAlloctionDataTest : public testing::TestWithParam { diff --git a/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp index 68e9940ce9..9dcdc93376 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp @@ -12,16 +12,15 @@ #include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_manager_fixture.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" -#include "fixtures/memory_allocator_multi_device_fixture.h" -#include "fixtures/memory_manager_fixture.h" -#include "helpers/execution_environment_helper.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_os_context.h" - using namespace NEO; using MemoryManagerMultiDeviceTest = MemoryAllocatorMultiDeviceFixture<10>; diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp index c61b8ac6c0..5006a22ea0 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -25,27 +25,26 @@ #include "opencl/source/platform/platform.h" #include "opencl/source/program/printf_handler.h" #include "opencl/source/program/program.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_allocator_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_manager_fixture.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_deferrable_deletion.h" +#include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_allocator_fixture.h" -#include "fixtures/memory_manager_fixture.h" -#include "fixtures/multi_root_device_fixture.h" -#include "helpers/execution_environment_helper.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_deferrable_deletion.h" -#include "mocks/mock_deferred_deleter.h" -#include "mocks/mock_device.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_os_context.h" - #include #include diff --git a/opencl/test/unit_test/memory_manager/page_table_tests.cpp b/opencl/test/unit_test/memory_manager/page_table_tests.cpp index 53866abeba..231cbb9468 100644 --- a/opencl/test/unit_test/memory_manager/page_table_tests.cpp +++ b/opencl/test/unit_test/memory_manager/page_table_tests.cpp @@ -10,10 +10,10 @@ #include "opencl/source/memory_manager/memory_banks.h" #include "opencl/source/memory_manager/page_table.h" #include "opencl/source/memory_manager/page_table.inl" +#include "opencl/test/unit_test/mocks/mock_physical_address_allocator.h" #include "test.h" #include "gtest/gtest.h" -#include "mocks/mock_physical_address_allocator.h" #include diff --git a/opencl/test/unit_test/memory_manager/physical_address_allocator_tests.cpp b/opencl/test/unit_test/memory_manager/physical_address_allocator_tests.cpp index 96833acaa3..a5e16a7a4e 100644 --- a/opencl/test/unit_test/memory_manager/physical_address_allocator_tests.cpp +++ b/opencl/test/unit_test/memory_manager/physical_address_allocator_tests.cpp @@ -7,9 +7,9 @@ #include "opencl/source/memory_manager/memory_banks.h" #include "opencl/source/memory_manager/page_table.h" +#include "opencl/test/unit_test/mocks/mock_physical_address_allocator.h" #include "gtest/gtest.h" -#include "mocks/mock_physical_address_allocator.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/surface_tests.cpp b/opencl/test/unit_test/memory_manager/surface_tests.cpp index 9f575d9d29..171a341973 100644 --- a/opencl/test/unit_test/memory_manager/surface_tests.cpp +++ b/opencl/test/unit_test/memory_manager/surface_tests.cpp @@ -10,11 +10,11 @@ #include "core/memory_manager/graphics_allocation.h" #include "opencl/source/memory_manager/mem_obj_surface.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" #include "test.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_csr.h" #include diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index c822a81fdf..ce6f672e94 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -11,14 +11,14 @@ #include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/mem_obj_helper.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_svm_manager.h" #include "test.h" #include "gtest/gtest.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_svm_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/mock_gl/windows/CMakeLists.txt b/opencl/test/unit_test/mock_gl/windows/CMakeLists.txt index b2be0cf537..acb921ea8b 100644 --- a/opencl/test/unit_test/mock_gl/windows/CMakeLists.txt +++ b/opencl/test/unit_test/mock_gl/windows/CMakeLists.txt @@ -8,7 +8,7 @@ if(WIN32) set(IGDRCL_SRCS_mock_opengl32 ${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_opengl32.def - ${NEO_RUNTIME_TESTS_DIR}/helpers/windows/mock_function.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/windows/mock_function.cpp ) add_library(mock_opengl32 SHARED ${IGDRCL_SRCS_mock_opengl32}) diff --git a/opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp b/opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp index a2c7a8cbda..b369eb0914 100644 --- a/opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp +++ b/opencl/test/unit_test/mock_gl/windows/mock_opengl32.cpp @@ -7,9 +7,10 @@ #define _GDI32_ //It causes that definitions of functions are not loaded from dll in file wingdi.h because they are in this file. +#include "opencl/test/unit_test/helpers/windows/mock_function.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" + #include "GL/gl.h" -#include "helpers/windows/mock_function.h" -#include "mocks/gl/windows/mock_gl_sharing_windows.h" #include diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt index 7fe83b912c..84c07ced13 100644 --- a/opencl/test/unit_test/mocks/CMakeLists.txt +++ b/opencl/test/unit_test/mocks/CMakeLists.txt @@ -108,8 +108,8 @@ else() ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_memory_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_command_stream_receiver.h ${NEO_SOURCE_DIR}/core/os_interface/linux/page_table_manager_functions.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/drm_mock.cpp - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/drm_mock.h + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.h ) endif() @@ -118,7 +118,7 @@ add_subdirectories() if(WIN32) target_include_directories(igdrcl_mocks PUBLIC - ${NEO_RUNTIME_TESTS_DIR}/mocks/gmm_memory${BRANCH_DIR_SUFFIX} + ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/gmm_memory${BRANCH_DIR_SUFFIX} ) endif() diff --git a/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.cpp b/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.cpp index 6b7e4c9a84..1961b4783c 100644 --- a/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.cpp +++ b/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/gl/windows/mock_gl_sharing_windows.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" #include "config.h" diff --git a/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h b/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h index acef25cfff..9bc3fd75ca 100644 --- a/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h +++ b/opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h @@ -8,9 +8,9 @@ #pragma once #include "opencl/source/extensions/public/cl_gl_private_intel.h" #include "opencl/source/sharings/gl/windows/gl_sharing_windows.h" +#include "opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h" #include "config.h" -#include "os_interface/windows/gl/gl_dll_helper.h" #include diff --git a/opencl/test/unit_test/mocks/gmm_memory/mock_gmm_memory.h b/opencl/test/unit_test/mocks/gmm_memory/mock_gmm_memory.h index 0a2c221699..38a8869da3 100644 --- a/opencl/test/unit_test/mocks/gmm_memory/mock_gmm_memory.h +++ b/opencl/test/unit_test/mocks/gmm_memory/mock_gmm_memory.h @@ -6,7 +6,7 @@ */ #pragma once -#include "mocks/mock_gmm_memory_base.h" +#include "opencl/test/unit_test/mocks/mock_gmm_memory_base.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp index 396b175a6f..186b3dd6a3 100644 --- a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp +++ b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp @@ -5,14 +5,13 @@ * */ -#include "mocks/linux/mock_drm_memory_manager.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" #include "core/os_interface/linux/allocator_helper.h" #include "core/os_interface/linux/drm_memory_manager.h" - -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_host_ptr_manager.h" -#include "mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include diff --git a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h index b727dc70ae..80cbd5b758 100644 --- a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h +++ b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h @@ -7,8 +7,7 @@ #pragma once #include "core/os_interface/linux/drm_memory_manager.h" - -#include "mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include diff --git a/opencl/test/unit_test/mocks/mock_async_event_handler.cpp b/opencl/test/unit_test/mocks/mock_async_event_handler.cpp index 723a02aeda..d62900a454 100644 --- a/opencl/test/unit_test/mocks/mock_async_event_handler.cpp +++ b/opencl/test/unit_test/mocks/mock_async_event_handler.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_async_event_handler.h" +#include "opencl/test/unit_test/mocks/mock_async_event_handler.h" namespace MockAsyncEventHandlerGlobals { bool destructorCalled = false; } \ No newline at end of file diff --git a/opencl/test/unit_test/mocks/mock_aub_center.h b/opencl/test/unit_test/mocks/mock_aub_center.h index 2db52eb873..652d6d523c 100644 --- a/opencl/test/unit_test/mocks/mock_aub_center.h +++ b/opencl/test/unit_test/mocks/mock_aub_center.h @@ -9,8 +9,7 @@ #include "opencl/source/aub/aub_center.h" #include "opencl/source/command_stream/aub_stream_provider.h" - -#include "mocks/mock_aub_file_stream.h" +#include "opencl/test/unit_test/mocks/mock_aub_file_stream.h" namespace NEO { class MockAubStreamProvider : public AubStreamProvider { diff --git a/opencl/test/unit_test/mocks/mock_aub_csr.h b/opencl/test/unit_test/mocks/mock_aub_csr.h index 0cc45780f8..49d31709ac 100644 --- a/opencl/test/unit_test/mocks/mock_aub_csr.h +++ b/opencl/test/unit_test/mocks/mock_aub_csr.h @@ -14,9 +14,9 @@ #include "core/unit_tests/helpers/default_hw_info.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "gmock/gmock.h" -#include "mocks/mock_allocation_properties.h" #include diff --git a/opencl/test/unit_test/mocks/mock_buffer.h b/opencl/test/unit_test/mocks/mock_buffer.h index 97517dd91b..53ca7cd134 100644 --- a/opencl/test/unit_test/mocks/mock_buffer.h +++ b/opencl/test/unit_test/mocks/mock_buffer.h @@ -9,10 +9,9 @@ #include "core/helpers/aligned_memory.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" - -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_builtins.cpp b/opencl/test/unit_test/mocks/mock_builtins.cpp index 1d069289d2..df4b4c3abc 100644 --- a/opencl/test/unit_test/mocks/mock_builtins.cpp +++ b/opencl/test/unit_test/mocks/mock_builtins.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" diff --git a/opencl/test/unit_test/mocks/mock_cif.cpp b/opencl/test/unit_test/mocks/mock_cif.cpp index ce953fefeb..b09c7d89b8 100644 --- a/opencl/test/unit_test/mocks/mock_cif.cpp +++ b/opencl/test/unit_test/mocks/mock_cif.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_cif.h" +#include "opencl/test/unit_test/mocks/mock_cif.h" #include "cif/builtins/memory/buffer/buffer.h" #include "cif/export/library_api.h" diff --git a/opencl/test/unit_test/mocks/mock_command_queue.h b/opencl/test/unit_test/mocks/mock_command_queue.h index cbb450348d..68d4a98665 100644 --- a/opencl/test/unit_test/mocks/mock_command_queue.h +++ b/opencl/test/unit_test/mocks/mock_command_queue.h @@ -8,8 +8,7 @@ #pragma once #include "core/memory_manager/graphics_allocation.h" #include "opencl/source/command_queue/command_queue_hw.h" - -#include "libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" //////////////////////////////////////////////////////////////////////////////// // MockCommandQueue - Core implementation diff --git a/opencl/test/unit_test/mocks/mock_compilers.cpp b/opencl/test/unit_test/mocks/mock_compilers.cpp index b57ce81ed2..4026f1fd3e 100644 --- a/opencl/test/unit_test/mocks/mock_compilers.cpp +++ b/opencl/test/unit_test/mocks/mock_compilers.cpp @@ -10,12 +10,12 @@ #include "core/helpers/file_io.h" #include "core/helpers/hw_info.h" #include "opencl/source/os_interface/os_inc_base.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" +#include "opencl/test/unit_test/mocks/mock_sip.h" #include "cif/macros/enable.h" #include "compiler_options.h" -#include "helpers/test_files.h" -#include "mocks/mock_compilers.h" -#include "mocks/mock_sip.h" #include "ocl_igc_interface/fcl_ocl_device_ctx.h" #include "ocl_igc_interface/igc_ocl_device_ctx.h" diff --git a/opencl/test/unit_test/mocks/mock_compilers.h b/opencl/test/unit_test/mocks/mock_compilers.h index 4616e1a265..b7529700ee 100644 --- a/opencl/test/unit_test/mocks/mock_compilers.h +++ b/opencl/test/unit_test/mocks/mock_compilers.h @@ -8,8 +8,8 @@ #pragma once #include "core/compiler_interface/compiler_interface.h" +#include "opencl/test/unit_test/mocks/mock_cif.h" -#include "mocks/mock_cif.h" #include "ocl_igc_interface/fcl_ocl_device_ctx.h" #include "ocl_igc_interface/igc_ocl_device_ctx.h" diff --git a/opencl/test/unit_test/mocks/mock_context.cpp b/opencl/test/unit_test/mocks/mock_context.cpp index 1c4f223f51..70ffdbd4be 100644 --- a/opencl/test/unit_test/mocks/mock_context.cpp +++ b/opencl/test/unit_test/mocks/mock_context.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "core/compiler_interface/compiler_interface.h" #include "core/memory_manager/deferred_deleter.h" @@ -14,9 +14,9 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/sharings/sharing.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" #include "d3d_sharing_functions.h" -#include "fixtures/device_fixture.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_csr.cpp b/opencl/test/unit_test/mocks/mock_csr.cpp index 66f92eb639..0059ba496f 100644 --- a/opencl/test/unit_test/mocks/mock_csr.cpp +++ b/opencl/test/unit_test/mocks/mock_csr.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" bool MockCommandStreamReceiver::flush(BatchBuffer &batchBuffer, ResidencyContainer &allocationsForResidency) { return true; diff --git a/opencl/test/unit_test/mocks/mock_csr.h b/opencl/test/unit_test/mocks/mock_csr.h index 52d90515a6..26d701d32c 100644 --- a/opencl/test/unit_test/mocks/mock_csr.h +++ b/opencl/test/unit_test/mocks/mock_csr.h @@ -15,9 +15,9 @@ #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" #include "core/os_interface/os_context.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include "gmock/gmock.h" -#include "libult/ult_command_stream_receiver.h" #include diff --git a/opencl/test/unit_test/mocks/mock_deferrable_deletion.cpp b/opencl/test/unit_test/mocks/mock_deferrable_deletion.cpp index 58e694c9da..93370d5f0a 100644 --- a/opencl/test/unit_test/mocks/mock_deferrable_deletion.cpp +++ b/opencl/test/unit_test/mocks/mock_deferrable_deletion.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_deferrable_deletion.h" +#include "opencl/test/unit_test/mocks/mock_deferrable_deletion.h" namespace NEO { bool MockDeferrableDeletion::apply() { diff --git a/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp b/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp index 4862fbe0cf..c403f9226a 100644 --- a/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp +++ b/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_deferred_deleter.h" +#include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" #include "core/memory_manager/deferrable_deletion.h" #include "core/os_interface/os_thread.h" diff --git a/opencl/test/unit_test/mocks/mock_device.cpp b/opencl/test/unit_test/mocks/mock_device.cpp index c668ad4ca3..b23a3ad7ac 100644 --- a/opencl/test/unit_test/mocks/mock_device.cpp +++ b/opencl/test/unit_test/mocks/mock_device.cpp @@ -5,16 +5,15 @@ * */ -#include "mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "core/command_stream/preemption.h" #include "core/os_interface/os_context.h" #include "opencl/source/device/driver_info.h" - -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_ostime.h" -#include "tests_configuration.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_ostime.h" +#include "opencl/test/unit_test/tests_configuration.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_device.h b/opencl/test/unit_test/mocks/mock_device.h index bd2a5ae334..8ada2569d3 100644 --- a/opencl/test/unit_test/mocks/mock_device.h +++ b/opencl/test/unit_test/mocks/mock_device.h @@ -11,11 +11,10 @@ #include "core/helpers/hw_helper.h" #include "core/unit_tests/helpers/default_hw_info.h" #include "opencl/source/device/cl_device.h" - -#include "fixtures/mock_aub_center_fixture.h" -#include "helpers/variable_backup.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" namespace NEO { class OSTime; diff --git a/opencl/test/unit_test/mocks/mock_execution_environment.h b/opencl/test/unit_test/mocks/mock_execution_environment.h index 1e1695fd4f..1413fc60e7 100644 --- a/opencl/test/unit_test/mocks/mock_execution_environment.h +++ b/opencl/test/unit_test/mocks/mock_execution_environment.h @@ -9,8 +9,7 @@ #include "core/execution_environment/execution_environment.h" #include "core/helpers/hw_helper.h" - -#include "fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_gfx_partition.cpp b/opencl/test/unit_test/mocks/mock_gfx_partition.cpp index f558b5f884..d95b0693c0 100644 --- a/opencl/test/unit_test/mocks/mock_gfx_partition.cpp +++ b/opencl/test/unit_test/mocks/mock_gfx_partition.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_gfx_partition.h" +#include "opencl/test/unit_test/mocks/mock_gfx_partition.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_gmm.h b/opencl/test/unit_test/mocks/mock_gmm.h index 637f4eeacf..87df882e54 100644 --- a/opencl/test/unit_test/mocks/mock_gmm.h +++ b/opencl/test/unit_test/mocks/mock_gmm.h @@ -9,9 +9,8 @@ #include "core/gmm_helper/gmm.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" - -#include "mocks/mock_device.h" -#include "mocks/mock_gmm_resource_info.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" namespace NEO { namespace MockGmmParams { diff --git a/opencl/test/unit_test/mocks/mock_gmm_client_context.h b/opencl/test/unit_test/mocks/mock_gmm_client_context.h index a7c062df8f..90565a5075 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_client_context.h +++ b/opencl/test/unit_test/mocks/mock_gmm_client_context.h @@ -6,7 +6,7 @@ */ #pragma once -#include "mocks/mock_gmm_client_context_base.h" +#include "opencl/test/unit_test/mocks/mock_gmm_client_context_base.h" namespace NEO { class MockGmmClientContext : public MockGmmClientContextBase { diff --git a/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp b/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp index 10da7ac7da..2e32205d63 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp +++ b/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_gmm_client_context.h" +#include "opencl/test/unit_test/mocks/mock_gmm_client_context.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp b/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp index 3f622a8d55..138a3c8aea 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp +++ b/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_gmm_page_table_mngr.h" +#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h" namespace NEO { using namespace ::testing; diff --git a/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp b/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp index ee275a5873..c68a1aac81 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp +++ b/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_gmm_resource_info.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" #include "core/helpers/aligned_memory.h" #include "opencl/source/helpers/surface_formats.h" diff --git a/opencl/test/unit_test/mocks/mock_image.h b/opencl/test/unit_test/mocks/mock_image.h index dcb7925b3b..107ca56b0e 100644 --- a/opencl/test/unit_test/mocks/mock_image.h +++ b/opencl/test/unit_test/mocks/mock_image.h @@ -8,8 +8,7 @@ #pragma once #include "opencl/source/mem_obj/image.h" - -#include "mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" struct MockImageBase : public NEO::Image { using Image::graphicsAllocation; diff --git a/opencl/test/unit_test/mocks/mock_kernel.cpp b/opencl/test/unit_test/mocks/mock_kernel.cpp index a58f257619..91b3e2b4db 100644 --- a/opencl/test/unit_test/mocks/mock_kernel.cpp +++ b/opencl/test/unit_test/mocks/mock_kernel.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/source/kernel/kernel.inl" #include "opencl/source/program/printf_handler.h" diff --git a/opencl/test/unit_test/mocks/mock_kernel.h b/opencl/test/unit_test/mocks/mock_kernel.h index 6dc2fc5037..94827a80e5 100644 --- a/opencl/test/unit_test/mocks/mock_kernel.h +++ b/opencl/test/unit_test/mocks/mock_kernel.h @@ -15,9 +15,8 @@ #include "opencl/source/platform/platform.h" #include "opencl/source/program/block_kernel_manager.h" #include "opencl/source/scheduler/scheduler_kernel.h" - -#include "mocks/mock_context.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/mocks/mock_memory_manager.cpp b/opencl/test/unit_test/mocks/mock_memory_manager.cpp index 6fdb373015..c01e569c81 100644 --- a/opencl/test/unit_test/mocks/mock_memory_manager.cpp +++ b/opencl/test/unit_test/mocks/mock_memory_manager.cpp @@ -5,14 +5,13 @@ * */ -#include "mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "core/command_stream/command_stream_receiver.h" #include "core/gmm_helper/gmm.h" #include "core/memory_manager/deferred_deleter.h" #include "opencl/source/helpers/surface_formats.h" - -#include "mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include diff --git a/opencl/test/unit_test/mocks/mock_memory_manager.h b/opencl/test/unit_test/mocks/mock_memory_manager.h index 564fe08890..615c005f3e 100644 --- a/opencl/test/unit_test/mocks/mock_memory_manager.h +++ b/opencl/test/unit_test/mocks/mock_memory_manager.h @@ -9,10 +9,10 @@ #include "core/execution_environment/execution_environment.h" #include "core/unit_tests/helpers/default_hw_info.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h" #include "gmock/gmock.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_host_ptr_manager.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_pipe.h b/opencl/test/unit_test/mocks/mock_pipe.h index ceb297a09d..68e288c1bf 100644 --- a/opencl/test/unit_test/mocks/mock_pipe.h +++ b/opencl/test/unit_test/mocks/mock_pipe.h @@ -8,8 +8,7 @@ #pragma once #include "core/helpers/aligned_memory.h" #include "opencl/source/mem_obj/pipe.h" - -#include "mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_platform.cpp b/opencl/test/unit_test/mocks/mock_platform.cpp index c08b8ece9d..8c2b8c1496 100644 --- a/opencl/test/unit_test/mocks/mock_platform.cpp +++ b/opencl/test/unit_test/mocks/mock_platform.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_platform.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" #include "core/device/device.h" diff --git a/opencl/test/unit_test/mocks/mock_program.cpp b/opencl/test/unit_test/mocks/mock_program.cpp index 5d50827f40..8df0732f87 100644 --- a/opencl/test/unit_test/mocks/mock_program.cpp +++ b/opencl/test/unit_test/mocks/mock_program.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "core/compiler_interface/compiler_cache.h" #include "core/device_binary_format/patchtokens_decoder.h" @@ -15,10 +15,9 @@ #include "opencl/source/context/context.h" #include "opencl/source/program/create.inl" #include "opencl/source/program/kernel_info.h" - -#include "helpers/ult_limits.h" -#include "mocks/mock_compilers.h" -#include "mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/helpers/ult_limits.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" namespace NEO { GlobalMockSipProgram *GlobalMockSipProgram::sipProgram; diff --git a/opencl/test/unit_test/mocks/mock_sip.cpp b/opencl/test/unit_test/mocks/mock_sip.cpp index 054e972f3f..9a8855dc09 100644 --- a/opencl/test/unit_test/mocks/mock_sip.cpp +++ b/opencl/test/unit_test/mocks/mock_sip.cpp @@ -5,17 +5,17 @@ * */ -#include "mocks/mock_sip.h" +#include "opencl/test/unit_test/mocks/mock_sip.h" #include "core/helpers/file_io.h" #include "core/helpers/hw_info.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/os_interface/os_inc_base.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "cif/macros/enable.h" -#include "helpers/test_files.h" -#include "mocks/mock_compilers.h" -#include "mocks/mock_program.h" #include "ocl_igc_interface/igc_ocl_device_ctx.h" #include diff --git a/opencl/test/unit_test/mocks/mock_sip.h b/opencl/test/unit_test/mocks/mock_sip.h index a46ec9b9ba..2d241ef804 100644 --- a/opencl/test/unit_test/mocks/mock_sip.h +++ b/opencl/test/unit_test/mocks/mock_sip.h @@ -8,8 +8,7 @@ #pragma once #include "opencl/source/built_ins/sip.h" - -#include "mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include #include diff --git a/opencl/test/unit_test/mocks/mock_wddm.cpp b/opencl/test/unit_test/mocks/mock_wddm.cpp index aee49cc9a4..5e2d763674 100644 --- a/opencl/test/unit_test/mocks/mock_wddm.cpp +++ b/opencl/test/unit_test/mocks/mock_wddm.cpp @@ -5,16 +5,16 @@ * */ -#include "mocks/mock_wddm.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" #include "core/execution_environment/root_device_environment.h" #include "core/helpers/aligned_memory.h" #include "core/os_interface/windows/gdi_interface.h" #include "core/os_interface/windows/wddm_allocation.h" +#include "opencl/test/unit_test/mock_gdi/mock_gdi.h" +#include "opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h" #include "gtest/gtest.h" -#include "mock_gdi/mock_gdi.h" -#include "mocks/mock_wddm_residency_allocations_container.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_wddm.h b/opencl/test/unit_test/mocks/mock_wddm.h index 952208c8a7..a0f8918da5 100644 --- a/opencl/test/unit_test/mocks/mock_wddm.h +++ b/opencl/test/unit_test/mocks/mock_wddm.h @@ -12,9 +12,9 @@ #include "core/os_interface/windows/wddm/wddm.h" #include "core/os_interface/windows/wddm_residency_allocations_container.h" #include "core/os_interface/windows/windows_defs.h" +#include "opencl/test/unit_test/mocks/wddm_mock_helpers.h" #include "gmock/gmock.h" -#include "mocks/wddm_mock_helpers.h" #include #include diff --git a/opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h b/opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h index 615606090d..d8d617aa49 100644 --- a/opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h +++ b/opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h @@ -8,8 +8,7 @@ #pragma once #include "core/memory_manager/memory_operations_status.h" #include "core/os_interface/windows/wddm_residency_allocations_container.h" - -#include "mocks/wddm_mock_helpers.h" +#include "opencl/test/unit_test/mocks/wddm_mock_helpers.h" namespace NEO { class Wddm; diff --git a/opencl/test/unit_test/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt index bad989e448..a743a80689 100644 --- a/opencl/test/unit_test/mt_tests/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt @@ -8,8 +8,8 @@ project(igdrcl_mt_tests) add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${NEO_RUNTIME_TESTS_DIR}/libult/os_interface.cpp - ${NEO_RUNTIME_TESTS_DIR}/ult_configuration.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h $ @@ -30,11 +30,11 @@ target_link_libraries(igdrcl_mt_tests igdrcl_mocks ${IGDRCL_EXTRA_LIBS}) if(WIN32) target_sources(igdrcl_mt_tests PRIVATE - ${NEO_RUNTIME_TESTS_DIR}/os_interface/windows/wddm_create.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp ) else() target_sources(igdrcl_mt_tests PRIVATE - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/drm_neo_create.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp ) endif() diff --git a/opencl/test/unit_test/mt_tests/api/CMakeLists.txt b/opencl/test/unit_test/mt_tests/api/CMakeLists.txt index ee35bf27f7..63417c87ec 100644 --- a/opencl/test/unit_test/mt_tests/api/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/api/CMakeLists.txt @@ -9,10 +9,10 @@ set(IGDRCL_SRCS_mt_tests_api ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt # necessary dependencies from igdrcl_tests - ${NEO_RUNTIME_TESTS_DIR}/api/cl_api_tests.cpp - ${NEO_RUNTIME_TESTS_DIR}/api/cl_create_user_event_tests_mt.cpp - ${NEO_RUNTIME_TESTS_DIR}/api/cl_get_platform_ids_tests_mt.cpp - ${NEO_RUNTIME_TESTS_DIR}/api/cl_intel_tracing_tests_mt.cpp - ${NEO_RUNTIME_TESTS_DIR}/api/cl_set_mem_object_destructor_callback_tests_mt.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_api_tests.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_create_user_event_tests_mt.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_get_platform_ids_tests_mt.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_intel_tracing_tests_mt.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests_mt.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_api}) diff --git a/opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt b/opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt index 0f2b1f7384..04904aa355 100644 --- a/opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/command_queue/CMakeLists.txt @@ -9,9 +9,9 @@ set(IGDRCL_SRCS_mt_tests_command_queue ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt # necessary dependencies from igdrcl_tests - ${NEO_RUNTIME_TESTS_DIR}/command_queue/enqueue_kernel_mt_tests.cpp - ${NEO_RUNTIME_TESTS_DIR}/command_queue/enqueue_fixture.cpp - ${NEO_RUNTIME_TESTS_DIR}/command_queue/ooq_task_tests_mt.cpp - ${NEO_RUNTIME_TESTS_DIR}/command_queue/ioq_task_tests_mt.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/enqueue_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/ooq_task_tests_mt.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/command_queue/ioq_task_tests_mt.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_command_queue}) diff --git a/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp b/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp index 0053ff4958..80115dfa99 100644 --- a/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp +++ b/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp @@ -5,12 +5,11 @@ * */ +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" #include "test.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_device_queue.h" - using namespace NEO; typedef ::testing::Test DeviceQueueHwMtTest; diff --git a/opencl/test/unit_test/mt_tests/event/CMakeLists.txt b/opencl/test/unit_test/mt_tests/event/CMakeLists.txt index 8fef364b75..13167cf2d2 100644 --- a/opencl/test/unit_test/mt_tests/event/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/event/CMakeLists.txt @@ -9,6 +9,6 @@ set(IGDRCL_SRCS_mt_tests_event ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt # necessary dependencies from igdrcl_tests - ${NEO_RUNTIME_TESTS_DIR}/event/user_events_tests_mt.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/event/user_events_tests_mt.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_event}) diff --git a/opencl/test/unit_test/mt_tests/fixtures/CMakeLists.txt b/opencl/test/unit_test/mt_tests/fixtures/CMakeLists.txt index a460200f38..e6845cc018 100644 --- a/opencl/test/unit_test/mt_tests/fixtures/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/fixtures/CMakeLists.txt @@ -9,7 +9,7 @@ set(IGDRCL_SRCS_mt_tests_fixtures ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt # necessary dependencies from igdrcl_tests - ${NEO_RUNTIME_TESTS_DIR}/fixtures/image_fixture.cpp - ${NEO_RUNTIME_TESTS_DIR}/fixtures/platform_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/image_fixture.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/platform_fixture.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_fixtures}) diff --git a/opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt b/opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt index a5c6039d28..89d1ab3b1d 100644 --- a/opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/helpers/CMakeLists.txt @@ -10,6 +10,6 @@ set(IGDRCL_SRCS_mt_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max_mt_tests.cpp # necessary dependencies from igdrcl_tests - ${NEO_RUNTIME_TESTS_DIR}/helpers/base_object_tests_mt.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/base_object_tests_mt.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_helpers}) diff --git a/opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt b/opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt index 57102ab76e..ee97979067 100644 --- a/opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/memory_manager/CMakeLists.txt @@ -10,6 +10,6 @@ set(IGDRCL_SRCS_mt_tests_memory_manager ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_clear_queue_mt_tests.cpp # necessary dependencies from igdrcl_tests - ${NEO_RUNTIME_TESTS_DIR}/memory_manager/deferred_deleter_mt_tests.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp ) target_sources(igdrcl_mt_tests PRIVATE ${IGDRCL_SRCS_mt_tests_memory_manager}) diff --git a/opencl/test/unit_test/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 index 7e38eaac72..212e908814 100644 --- a/opencl/test/unit_test/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 @@ -5,9 +5,10 @@ * */ +#include "opencl/test/unit_test/mocks/mock_deferrable_deletion.h" +#include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" + #include "gtest/gtest.h" -#include "mocks/mock_deferrable_deletion.h" -#include "mocks/mock_deferred_deleter.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 26d9daa9b8..ba175c38fb 100644 --- a/opencl/test/unit_test/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 @@ -8,11 +8,11 @@ #include "core/execution_environment/execution_environment.h" #include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/os_interface.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include "gtest/gtest.h" -#include "mocks/linux/mock_drm_memory_manager.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/linux/device_command_stream_fixture.h" #include #include diff --git a/opencl/test/unit_test/mt_tests/test_mode.h b/opencl/test/unit_test/mt_tests/test_mode.h index a5f24d4671..84fcb57109 100644 --- a/opencl/test/unit_test/mt_tests/test_mode.h +++ b/opencl/test/unit_test/mt_tests/test_mode.h @@ -7,7 +7,7 @@ #pragma once -#include "tests_configuration.h" +#include "opencl/test/unit_test/tests_configuration.h" namespace NEO { constexpr TestMode defaultTestMode = TestMode::UnitTests; diff --git a/opencl/test/unit_test/offline_compiler/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/CMakeLists.txt index 01049a767d..693a7f911c 100644 --- a/opencl/test/unit_test/offline_compiler/CMakeLists.txt +++ b/opencl/test/unit_test/offline_compiler/CMakeLists.txt @@ -58,7 +58,7 @@ set(IGDRCL_SRCS_offline_compiler_tests ${NEO_SOURCE_DIR}/core/helpers/file_io.cpp ${NEO_SOURCE_DIR}/core/memory_manager/deferred_deleter.cpp ${NEO_SOURCE_DIR}/core/memory_manager/deferred_deleter.h - ${NEO_RUNTIME_TESTS_DIR}/helpers/test_files.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/test_files.cpp ${IGDRCL_SRCS_cloc} ${IGDRCL_SRCS_offline_compiler_mock} ${IGDRCL_SRCS_tests_compiler_mocks} diff --git a/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp index 878edc9d13..a327000d4b 100644 --- a/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp @@ -6,10 +6,10 @@ */ #include "core/helpers/array_count.h" +#include "opencl/test/unit_test/test_files/patch_list.h" #include "gmock/gmock.h" #include "mock/mock_decoder.h" -#include "test_files/patch_list.h" #include diff --git a/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp index a8b1616daf..89dca13bd0 100644 --- a/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp @@ -7,9 +7,9 @@ #include "core/helpers/array_count.h" #include "offline_compiler/decoder/binary_decoder.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "gmock/gmock.h" -#include "helpers/test_files.h" #include "mock/mock_encoder.h" #include diff --git a/opencl/test/unit_test/offline_compiler/environment.h b/opencl/test/unit_test/offline_compiler/environment.h index a3ff38237d..c70a753e49 100644 --- a/opencl/test/unit_test/offline_compiler/environment.h +++ b/opencl/test/unit_test/offline_compiler/environment.h @@ -9,10 +9,10 @@ #include "offline_compiler/offline_compiler.h" #include "opencl/source/os_interface/os_inc_base.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" #include "gtest/gtest.h" -#include "helpers/test_files.h" -#include "mocks/mock_compilers.h" class Environment : public ::testing::Environment { public: diff --git a/opencl/test/unit_test/offline_compiler/main.cpp b/opencl/test/unit_test/offline_compiler/main.cpp index efc2861a48..a58465466a 100644 --- a/opencl/test/unit_test/offline_compiler/main.cpp +++ b/opencl/test/unit_test/offline_compiler/main.cpp @@ -6,10 +6,10 @@ */ #include "core/os_interface/os_library.h" +#include "opencl/test/unit_test/custom_event_listener.h" +#include "opencl/test/unit_test/helpers/test_files.h" -#include "custom_event_listener.h" #include "environment.h" -#include "helpers/test_files.h" #include "limits.h" #ifdef WIN32 diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_sip_ocloc_tests.cpp b/opencl/test/unit_test/offline_compiler/mock/mock_sip_ocloc_tests.cpp index 92b4d878e2..6bc3623130 100644 --- a/opencl/test/unit_test/offline_compiler/mock/mock_sip_ocloc_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/mock/mock_sip_ocloc_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_sip.h" +#include "opencl/test/unit_test/mocks/mock_sip.h" #include diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp index 483b9e3d3e..2c95adc51e 100644 --- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp @@ -12,12 +12,12 @@ #include "core/helpers/hw_cmds.h" #include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" #include "compiler_options.h" #include "environment.h" #include "gmock/gmock.h" #include "mock/mock_offline_compiler.h" -#include "mocks/mock_compilers.h" #include #include diff --git a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt index e8e4516db1..d8d9f3546f 100644 --- a/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt +++ b/opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt @@ -10,7 +10,7 @@ set(CLOC_SEGFAULT_TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${NEO_SOURCE_DIR}/core/helpers/abort.cpp ${NEO_SOURCE_DIR}/core/os_interface/os_library.h - ${NEO_RUNTIME_TESTS_DIR}/helpers/debug_helpers.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/debug_helpers.cpp ) if(WIN32) diff --git a/opencl/test/unit_test/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 index a1a163fec6..94f44ff2e4 100644 --- a/opencl/test/unit_test/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 @@ -5,8 +5,8 @@ * */ -#include "offline_compiler/segfault_test/segfault_helper.h" #include "offline_compiler/utilities/windows/safety_guard_windows.h" +#include "opencl/test/unit_test/offline_compiler/segfault_test/segfault_helper.h" void generateSegfaultWithSafetyGuard(SegfaultHelper *segfaultHelper) { SafetyGuardWindows safetyGuard; diff --git a/opencl/test/unit_test/os_interface/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/device_factory_tests.cpp index cf645957f1..79ce219783 100644 --- a/opencl/test/unit_test/os_interface/device_factory_tests.cpp +++ b/opencl/test/unit_test/os_interface/device_factory_tests.cpp @@ -13,10 +13,10 @@ #include "core/os_interface/os_library.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "gtest/gtest.h" #include "hw_device_id.h" -#include "mocks/mock_execution_environment.h" #include diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp index 34cc0fdbc2..41da366692 100644 --- a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp +++ b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/hw_info_config_tests.h" +#include "opencl/test/unit_test/os_interface/hw_info_config_tests.h" #include "core/helpers/hw_helper.h" diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.h b/opencl/test/unit_test/os_interface/hw_info_config_tests.h index 31a82b4f95..a93539e580 100644 --- a/opencl/test/unit_test/os_interface/hw_info_config_tests.h +++ b/opencl/test/unit_test/os_interface/hw_info_config_tests.h @@ -8,9 +8,9 @@ #pragma once #include "core/device/device.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "test.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h b/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h index 5eba136fef..dbe908bea6 100644 --- a/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h +++ b/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h @@ -12,12 +12,12 @@ #include "core/os_interface/linux/drm_neo.h" #include "core/unit_tests/helpers/default_hw_info.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" #include "drm/i915_drm.h" #include "engine_node.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "helpers/gtest_helpers.h" #include #include diff --git a/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp index 2c9428c38b..1f6b787ffc 100644 --- a/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp @@ -12,13 +12,13 @@ #include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/os_interface/linux/device_command_stream.inl" #include "opencl/source/os_interface/linux/drm_command_stream.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/mock_aub_center_fixture.h" #include "gtest/gtest.h" -#include "helpers/execution_environment_helper.h" -#include "os_interface/linux/device_command_stream_fixture.h" #include diff --git a/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp index c6747537f5..4f58954f66 100644 --- a/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/linux/device_factory_tests.h" +#include "opencl/test/unit_test/os_interface/linux/device_factory_tests.h" #include "core/execution_environment/root_device_environment.h" #include "core/os_interface/linux/os_interface.h" diff --git a/opencl/test/unit_test/os_interface/linux/device_factory_tests.h b/opencl/test/unit_test/os_interface/linux/device_factory_tests.h index 23e9670ee3..19079e1def 100644 --- a/opencl/test/unit_test/os_interface/linux/device_factory_tests.h +++ b/opencl/test/unit_test/os_interface/linux/device_factory_tests.h @@ -10,12 +10,12 @@ #include "core/device/device.h" #include "core/execution_environment/execution_environment.h" #include "core/os_interface/device_factory.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/linux/drm_mock.h" namespace NEO { extern Drm **pDrmToReturnFromCreateFunc; diff --git a/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp index 2125651564..75ca37194a 100644 --- a/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp @@ -10,13 +10,13 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" using namespace ::testing; diff --git a/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp index 6391b6057b..3842e5bfdb 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp @@ -6,10 +6,10 @@ */ #include "core/os_interface/linux/drm_buffer_object.h" +#include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include "test.h" #include "drm/i915_drm.h" -#include "os_interface/linux/device_command_stream_fixture.h" #include diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h b/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h index 2def76b43f..59b4298946 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h +++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h @@ -11,12 +11,12 @@ #include "core/os_interface/linux/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h" +#include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gmock/gmock.h" -#include "mocks/linux/mock_drm_command_stream_receiver.h" -#include "os_interface/linux/device_command_stream_fixture.h" #include diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp index b36f7f95b8..fd8427690f 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp @@ -12,12 +12,11 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include "test.h" -#include "mocks/linux/mock_drm_memory_manager.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/linux/device_command_stream_fixture.h" - using namespace NEO; class DrmCommandStreamMMTest : public ::testing::Test { diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp index dc212c8c7f..33cb30538c 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp @@ -21,21 +21,21 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h" +#include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" +#include "opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h" #include "test.h" #include "drm/i915_drm.h" -#include "fixtures/device_fixture.h" #include "gmock/gmock.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/execution_environment_helper.h" -#include "helpers/hw_parse.h" -#include "mocks/linux/mock_drm_command_stream_receiver.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_gmm_page_table_mngr.h" -#include "mocks/mock_host_ptr_manager.h" -#include "mocks/mock_program.h" -#include "mocks/mock_submissions_aggregator.h" -#include "os_interface/linux/drm_command_stream_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp index 8996b558f1..d116b7ab41 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_engine_info_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" + #include "gtest/gtest.h" -#include "os_interface/linux/drm_mock.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp index 55ebab36e4..a1c75dbadd 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp @@ -15,13 +15,13 @@ #include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include "test.h" #include "drm/i915_drm.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/linux/device_command_stream_fixture.h" #include #include diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp index 4cccb66504..d8268e104d 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp @@ -6,9 +6,9 @@ */ #include "core/os_interface/linux/memory_info.h" +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "gtest/gtest.h" -#include "os_interface/linux/drm_mock.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index 776d6d6584..4e0506a5fc 100644 --- a/opencl/test/unit_test/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 @@ -8,12 +8,12 @@ #include "core/execution_environment/execution_environment.h" #include "core/os_interface/linux/drm_memory_manager.h" #include "core/os_interface/linux/os_interface.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h" #include "test.h" #include "gtest/gtest.h" -#include "mocks/linux/mock_drm_memory_manager.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/linux/drm_memory_manager_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index e52664b4a6..7820acbe6e 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -31,17 +31,17 @@ #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_gfx_partition.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" #include "test.h" #include "drm/i915_drm.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "helpers/unit_test_helper.h" -#include "mocks/linux/mock_drm_command_stream_receiver.h" -#include "mocks/mock_context.h" -#include "mocks/mock_gfx_partition.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_platform.h" #include #include diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h index 05403a87a2..34902d5216 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h @@ -8,12 +8,11 @@ #pragma once #include "core/os_interface/linux/drm_memory_operations_handler.h" #include "core/os_interface/linux/os_interface.h" - -#include "fixtures/memory_management_fixture.h" -#include "mocks/linux/mock_drm_memory_manager.h" -#include "mocks/mock_device.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/linux/device_command_stream_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include diff --git a/opencl/test/unit_test/os_interface/linux/drm_mock.cpp b/opencl/test/unit_test/os_interface/linux/drm_mock.cpp index 7f45dfccc1..97fdf68fbd 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_mock.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_mock.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/linux/drm_mock.h" +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" const int DrmMock::mockFd; diff --git a/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp b/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp index 230f35ac1d..a7e455fbd3 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp @@ -5,8 +5,9 @@ * */ +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" + #include "drm/i915_drm.h" -#include "os_interface/linux/drm_mock.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp index e2ba79d6c9..c5ed15d98b 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp @@ -6,10 +6,9 @@ */ #include "core/os_interface/linux/drm_memory_operations_handler.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" -#include "mocks/mock_graphics_allocation.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/linux/drm_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_tests.cpp index d09145a25a..2143334831 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_tests.cpp @@ -9,10 +9,10 @@ #include "core/os_interface/device_factory.h" #include "core/os_interface/linux/os_context_linux.h" #include "core/os_interface/linux/os_interface.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" -#include "os_interface/linux/drm_mock.h" #include #include diff --git a/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp index b29a54ad3b..cdaa256768 100644 --- a/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp @@ -6,11 +6,10 @@ */ #include "core/debug_settings/debug_settings_manager.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_allocation.h" +#include "opencl/test/unit_test/utilities/file_logger_tests.h" #include "test.h" -#include "mocks/linux/mock_drm_allocation.h" -#include "utilities/file_logger_tests.h" - using namespace NEO; TEST(FileLogger, GivenLogAllocationMemoryPoolFlagThenLogsCorrectInfo) { diff --git a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp index c3cb7c0ec2..ec3f058183 100644 --- a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/linux/hw_info_config_linux_tests.h" +#include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" #include "core/helpers/hw_helper.h" #include "core/os_interface/linux/os_interface.h" diff --git a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h index 1d0e91e35c..280197c9c2 100644 --- a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h +++ b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h @@ -10,9 +10,8 @@ #include "core/os_interface/hw_info_config.h" #include "core/os_interface/os_interface.h" #include "core/utilities/cpu_info.h" - -#include "os_interface/hw_info_config_tests.h" -#include "os_interface/linux/drm_mock.h" +#include "opencl/test/unit_test/os_interface/hw_info_config_tests.h" +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/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 index d5106a1ca2..6be3d8b011 100644 --- a/opencl/test/unit_test/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 @@ -7,14 +7,13 @@ #include "core/os_interface/linux/os_interface.h" #include "opencl/source/command_queue/command_queue_hw.h" +#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" -#include "fixtures/ult_command_stream_receiver_fixture.h" -#include "mocks/linux/mock_drm_command_stream_receiver.h" -#include "mocks/linux/mock_drm_memory_manager.h" -#include "mocks/mock_context.h" -#include "os_interface/linux/drm_mock.h" - using namespace NEO; struct clCreateCommandQueueWithPropertiesLinux : public UltCommandStreamReceiverTest { diff --git a/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp b/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp index 007fa819bb..92f7501946 100644 --- a/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp +++ b/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp @@ -7,8 +7,8 @@ #include "mock_performance_counters_linux.h" -#include "os_interface/linux/mock_os_time_linux.h" -#include "os_interface/mock_performance_counters.h" +#include "opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h" +#include "opencl/test/unit_test/os_interface/mock_performance_counters.h" namespace NEO { ////////////////////////////////////////////////////// diff --git a/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp index 945807f225..baa9f69306 100644 --- a/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp @@ -9,9 +9,9 @@ #include "core/helpers/hw_helper.h" #include "core/os_interface/linux/os_context_linux.h" #include "core/os_interface/linux/os_interface.h" +#include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "gtest/gtest.h" -#include "os_interface/linux/drm_mock.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/linux/os_time_test.cpp b/opencl/test/unit_test/os_interface/linux/os_time_test.cpp index 106c628c0b..e15655b036 100644 --- a/opencl/test/unit_test/os_interface/linux/os_time_test.cpp +++ b/opencl/test/unit_test/os_interface/linux/os_time_test.cpp @@ -8,11 +8,11 @@ #include "core/os_interface/linux/drm_neo.h" #include "core/os_interface/linux/os_interface.h" #include "core/os_interface/linux/os_time_linux.h" +#include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" +#include "opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h" #include "test.h" #include "gtest/gtest.h" -#include "os_interface/linux/device_command_stream_fixture.h" -#include "os_interface/linux/mock_os_time_linux.h" #include diff --git a/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp index 2821df2532..31be57d085 100644 --- a/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp @@ -5,9 +5,10 @@ * */ +#include "opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.h" +#include "opencl/test/unit_test/os_interface/mock_performance_counters.h" + #include "gtest/gtest.h" -#include "os_interface/linux/mock_performance_counters_linux.h" -#include "os_interface/mock_performance_counters.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/mock_performance_counters.cpp b/opencl/test/unit_test/os_interface/mock_performance_counters.cpp index 9e21b057c0..37f2355719 100644 --- a/opencl/test/unit_test/os_interface/mock_performance_counters.cpp +++ b/opencl/test/unit_test/os_interface/mock_performance_counters.cpp @@ -9,8 +9,7 @@ #include "core/execution_environment/root_device_environment.h" #include "core/os_interface/os_interface.h" - -#include "mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" using namespace MetricsLibraryApi; namespace NEO { diff --git a/opencl/test/unit_test/os_interface/mock_performance_counters.h b/opencl/test/unit_test/os_interface/mock_performance_counters.h index c0752a93fc..0f18dc7432 100644 --- a/opencl/test/unit_test/os_interface/mock_performance_counters.h +++ b/opencl/test/unit_test/os_interface/mock_performance_counters.h @@ -8,11 +8,11 @@ #pragma once #include "core/device/device.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "instrumentation.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/os_library_tests.cpp b/opencl/test/unit_test/os_interface/os_library_tests.cpp index 5dfd35826e..a09d181d13 100644 --- a/opencl/test/unit_test/os_interface/os_library_tests.cpp +++ b/opencl/test/unit_test/os_interface/os_library_tests.cpp @@ -11,9 +11,9 @@ #include "core/os_interface/linux/os_library_linux.h" #endif #include "core/os_interface/os_library.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "test.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp index f1228709b9..61e0fecdd3 100644 --- a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp +++ b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp @@ -10,12 +10,12 @@ #include "core/os_interface/os_time.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/utilities/tag_allocator.h" +#include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/mock_performance_counters.h" -#include "fixtures/device_instrumentation_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_device.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/mock_performance_counters.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/windows/deferrable_deletion_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/deferrable_deletion_win_tests.cpp index 861ad10bd9..9bc6f20cb4 100644 --- a/opencl/test/unit_test/os_interface/windows/deferrable_deletion_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/deferrable_deletion_win_tests.cpp @@ -7,10 +7,10 @@ #include "core/execution_environment/root_device_environment.h" #include "core/os_interface/windows/deferrable_deletion_win.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" #include "gtest/gtest.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_wddm.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index 86ca91977e..e8966564c6 100644 --- a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp @@ -27,24 +27,23 @@ #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h" +#include "opencl/test/unit_test/mocks/mock_wddm_interface23.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/mock_aub_center_fixture.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/execution_environment_helper.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_builtins.h" -#include "mocks/mock_device.h" -#include "mocks/mock_gmm_page_table_mngr.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_program.h" -#include "mocks/mock_submissions_aggregator.h" -#include "mocks/mock_wddm_interface23.h" -#include "os_interface/windows/mock_wddm_memory_manager.h" -#include "os_interface/windows/wddm_fixture.h" - using namespace NEO; using namespace ::testing; diff --git a/opencl/test/unit_test/os_interface/windows/device_os_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_os_tests.cpp index da7d67ac63..6d969ee2c5 100644 --- a/opencl/test/unit_test/os_interface/windows/device_os_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/device_os_tests.cpp @@ -8,10 +8,10 @@ #include "core/device/device.h" #include "core/helpers/get_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/mocks/mock_device.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "mocks/mock_device.h" using namespace ::testing; diff --git a/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp b/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp index 16ca3a52bf..e4a24d810a 100644 --- a/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp @@ -13,14 +13,14 @@ #include "core/unit_tests/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/os_interface/windows/driver_info.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" +#include "opencl/test/unit_test/os_interface/windows/registry_reader_tests.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_wddm.h" -#include "os_interface/windows/registry_reader_tests.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp index c26bbf55f6..fc834756bf 100644 --- a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp @@ -8,11 +8,10 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/gmm_helper/gmm.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" +#include "opencl/test/unit_test/utilities/file_logger_tests.h" #include "test.h" -#include "os_interface/windows/mock_wddm_allocation.h" -#include "utilities/file_logger_tests.h" - using namespace NEO; TEST(FileLogger, GivenLogAllocationMemoryPoolFlagThenLogsCorrectInfo) { diff --git a/opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h b/opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h index 5fe7ce6c5e..33f4feeba7 100644 --- a/opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h +++ b/opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h @@ -9,8 +9,7 @@ #include "core/helpers/hw_info.h" #include "core/os_interface/os_library.h" #include "core/unit_tests/helpers/default_hw_info.h" - -#include "mock_gdi/mock_gdi.h" +#include "opencl/test/unit_test/mock_gdi/mock_gdi.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp b/opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp index 24c891f980..956ac6da84 100644 --- a/opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp @@ -15,11 +15,11 @@ #include "opencl/source/extensions/public/cl_gl_private_intel.h" #include "opencl/source/sharings/gl/gl_arb_sync_event.h" #include "opencl/source/sharings/gl/windows/gl_sharing_windows.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "gtest/gtest.h" -#include "mocks/gl/windows/mock_gl_sharing_windows.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/windows/wddm_fixture.h" #include using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp index c7706326eb..f27559f9bf 100644 --- a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp @@ -5,17 +5,17 @@ * */ -#include "os_interface/windows/hw_info_config_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" #include "core/execution_environment/root_device_environment.h" #include "core/helpers/hw_helper.h" #include "core/os_interface/windows/os_interface.h" #include "core/os_interface/windows/wddm/wddm.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h" #include "instrumentation.h" -#include "mocks/mock_execution_environment.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h index 60842e7b77..b9ca484d6d 100644 --- a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h +++ b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h @@ -8,8 +8,7 @@ #pragma once #include "core/os_interface/hw_info_config.h" - -#include "os_interface/hw_info_config_tests.h" +#include "opencl/test/unit_test/os_interface/hw_info_config_tests.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp b/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp index f7d9d111c5..e370f8560b 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp +++ b/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/windows/mock_environment_variables.h" +#include "opencl/test/unit_test/os_interface/windows/mock_environment_variables.h" #include "opencl/source/os_interface/windows/environment_variables.h" diff --git a/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp index 6ee3ba88a7..ce3f2009b0 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp +++ b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp @@ -10,9 +10,8 @@ #include "core/os_interface/os_interface.h" #include "core/os_interface/windows/os_interface.h" #include "core/os_interface/windows/windows_wrapper.h" - -#include "mocks/mock_wddm.h" -#include "os_interface/windows/mock_os_time_win.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" +#include "opencl/test/unit_test/os_interface/windows/mock_os_time_win.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.h b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.h index c334e6772f..b24349292c 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.h +++ b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.h @@ -7,8 +7,7 @@ #pragma once #include "opencl/source/os_interface/windows/performance_counters_win.h" - -#include "os_interface/mock_performance_counters.h" +#include "opencl/test/unit_test/os_interface/mock_performance_counters.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h b/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h index b9a53af6dc..c2426e738b 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h +++ b/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h @@ -8,9 +8,8 @@ #pragma once #include "core/memory_manager/deferred_deleter.h" #include "core/os_interface/windows/wddm_memory_manager.h" - -#include "mocks/mock_host_ptr_manager.h" -#include "mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" namespace NEO { class MockWddmMemoryManager : public MemoryManagerCreate { diff --git a/opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp index 839c9b4595..2e93253ece 100644 --- a/opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp @@ -6,9 +6,8 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" - -#include "mocks/mock_wddm.h" -#include "os_interface/windows/wddm_fixture.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp index d201fd5f9a..cc3de3d638 100644 --- a/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp @@ -5,13 +5,12 @@ * */ -#include "os_interface/windows/os_interface_win_tests.h" +#include "opencl/test/unit_test/os_interface/windows/os_interface_win_tests.h" #include "core/execution_environment/root_device_environment.h" #include "core/os_interface/windows/os_context_win.h" - -#include "mocks/mock_execution_environment.h" -#include "os_interface/windows/wddm_fixture.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" TEST_F(OsInterfaceTest, GivenWindowsWhenOsSupportFor64KBpagesIsBeingQueriedThenTrueIsReturned) { EXPECT_TRUE(OSInterface::are64kbPagesEnabled()); diff --git a/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp index 10ce6ffcc8..2a11420c5a 100644 --- a/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp @@ -6,10 +6,10 @@ */ #include "core/os_interface/windows/os_library_win.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" #include "test.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp index 5abce49989..12e3a0a2ff 100644 --- a/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp @@ -7,11 +7,11 @@ #include "core/execution_environment/root_device_environment.h" #include "core/os_interface/windows/os_interface.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "gtest/gtest.h" #include "mock_os_time_win.h" -#include "mocks/mock_execution_environment.h" -#include "os_interface/windows/wddm_fixture.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp index 3e0570830a..131ad9efc2 100644 --- a/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.h" + #include "gtest/gtest.h" -#include "os_interface/windows/mock_performance_counters_win.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp index 00cdd65341..a1fb9073d8 100644 --- a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/windows/registry_reader_tests.h" +#include "opencl/test/unit_test/os_interface/windows/registry_reader_tests.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp b/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp index 167c8d3255..befc394634 100644 --- a/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp +++ b/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/windows/ult_dxgi_factory.h" +#include "opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp index bf89665807..e9cb846be1 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp @@ -20,16 +20,16 @@ #include "core/os_interface/windows/wddm_memory_manager.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_gfx_partition.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" +#include "opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_gfx_partition.h" -#include "mocks/mock_gmm_resource_info.h" -#include "mocks/mock_memory_manager.h" -#include "os_interface/windows/mock_wddm_allocation.h" -#include "os_interface/windows/ult_dxgi_factory.h" -#include "os_interface/windows/wddm_fixture.h" #include #include diff --git a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp index 6283c3a07f..43a0169199 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp @@ -14,12 +14,11 @@ #include "core/os_interface/windows/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" +#include "opencl/test/unit_test/mocks/mock_wddm_interface23.h" +#include "opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h" #include "test.h" -#include "mocks/mock_wddm.h" -#include "mocks/mock_wddm_interface23.h" -#include "os_interface/windows/gdi_dll_fixture.h" - using namespace NEO; struct Wddm23TestsWithoutWddmInit : public ::testing::Test, GdiDllFixture { diff --git a/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp index f01a9e65ee..72ece161ac 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp @@ -7,11 +7,10 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" #include "test.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_wddm.h" - using namespace NEO; class WddmMockReserveAddress : public WddmMock { diff --git a/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp b/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp index f80886e224..39bd38ab18 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp @@ -6,9 +6,8 @@ */ #include "core/memory_manager/host_ptr_defines.h" - -#include "mocks/mock_wddm.h" -#include "os_interface/windows/ult_dxgi_factory.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" +#include "opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/wddm_create.cpp b/opencl/test/unit_test/os_interface/windows/wddm_create.cpp index af9d6391cd..069ed4446e 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_create.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_create.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_wddm.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" namespace NEO { Wddm *Wddm::createWddm(std::unique_ptr hwDeviceId, RootDeviceEnvironment &rootDeviceEnvironment) { diff --git a/opencl/test/unit_test/os_interface/windows/wddm_fixture.h b/opencl/test/unit_test/os_interface/windows/wddm_fixture.h index 0af3505fc0..180763c262 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_fixture.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_fixture.h @@ -18,13 +18,13 @@ #include "core/unit_tests/helpers/default_hw_info.h" #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" +#include "opencl/test/unit_test/mocks/mock_wddm_interface20.h" +#include "opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h" +#include "opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h" #include "test.h" #include "mock_gmm_memory.h" -#include "mocks/mock_wddm.h" -#include "mocks/mock_wddm_interface20.h" -#include "mocks/mock_wddm_residency_allocations_container.h" -#include "os_interface/windows/gdi_dll_fixture.h" namespace NEO { struct WddmFixture : ::testing::Test { diff --git a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp index 50df087e7b..04a135e5cd 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -14,12 +14,11 @@ #include "core/os_interface/windows/wddm_allocation.h" #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/mock_gdi/mock_gdi.h" +#include "opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" #include "test.h" -#include "mock_gdi/mock_gdi.h" -#include "os_interface/windows/mock_kmdaf_listener.h" -#include "os_interface/windows/mock_wddm_allocation.h" - using namespace NEO; class WddmWithKmDafMock : public Wddm { diff --git a/opencl/test/unit_test/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 index a7900f1502..6e5f6aecaa 100644 --- a/opencl/test/unit_test/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 @@ -5,7 +5,7 @@ * */ -#include "os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl" +#include "opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl" TEST_F(WddmMemoryManagerSimpleTest, givenWddmMemoryManagerWhenGetLocalMemoryIsCalledThenSizeOfLocalMemoryIsReturned) { EXPECT_EQ(0 * GB, memoryManager->getLocalMemorySize(0u)); diff --git a/opencl/test/unit_test/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 index 304d84c5bb..0149ebc635 100644 --- a/opencl/test/unit_test/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 @@ -6,10 +6,10 @@ */ #include "core/os_interface/windows/wddm_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h" #include "gtest/gtest.h" -#include "mocks/mock_memory_manager.h" -#include "os_interface/windows/wddm_memory_manager_tests.h" using namespace NEO; using namespace ::testing; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp index 29466ddbc7..235fa19258 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/windows/wddm_memory_manager_tests.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h" #include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" @@ -23,14 +23,13 @@ #include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/source/platform/platform.h" - -#include "helpers/execution_environment_helper.h" -#include "helpers/unit_test_helper.h" -#include "mocks/mock_deferred_deleter.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_os_context.h" -#include "os_interface/windows/mock_wddm_allocation.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/unit_test_helper.h" +#include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_os_context.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" using namespace NEO; using namespace ::testing; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h index 6984561b30..3c42b77f04 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h @@ -10,17 +10,17 @@ #include "core/os_interface/windows/os_interface.h" #include "core/os_interface/windows/wddm_memory_operations_handler.h" #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h" +#include "opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "test.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "helpers/execution_environment_helper.h" -#include "mocks/mock_context.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_gmm_page_table_mngr.h" -#include "mocks/mock_wddm_residency_allocations_container.h" -#include "os_interface/windows/mock_wddm_memory_manager.h" -#include "os_interface/windows/wddm_fixture.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp index 7260e0bcff..e7fde930ab 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp @@ -20,15 +20,15 @@ #include "core/os_interface/windows/wddm_residency_controller.h" #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/libult/create_command_stream.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h" #include "test.h" #include "gmock/gmock.h" -#include "libult/create_command_stream.h" -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_wddm.h" -#include "os_interface/windows/mock_wddm_allocation.h" -#include "os_interface/windows/mock_wddm_memory_manager.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp index 67248482e1..c272c92747 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp @@ -10,16 +10,15 @@ #include "core/unit_tests/helpers/ult_hw_config.h" #include "core/utilities/stackvec.h" #include "opencl/source/device/cl_device.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" +#include "opencl/test/unit_test/mocks/mock_wddm.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" +#include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "test.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_allocation_properties.h" -#include "mocks/mock_context.h" -#include "mocks/mock_platform.h" -#include "mocks/mock_wddm.h" -#include "os_interface/windows/mock_wddm_allocation.h" -#include "os_interface/windows/wddm_fixture.h" - using namespace NEO; struct WddmMemoryOperationsHandlerTest : public WddmTest { diff --git a/opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt b/opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt index be69cb304c..846ef999ef 100644 --- a/opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt +++ b/opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt @@ -12,8 +12,8 @@ add_executable(neo_page_fault_manager_tests $ $ ${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp - ${NEO_RUNTIME_TESTS_DIR}/libult/os_interface.cpp - ${NEO_RUNTIME_TESTS_DIR}/ult_configuration.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp ) append_sources_from_properties(CPU_PAGE_FAULT_MANAGER_TESTS NEO_CORE_CPU_PAGE_FAULT_MANAGER_TESTS) @@ -30,7 +30,7 @@ if(WIN32) else() target_sources(neo_page_fault_manager_tests PRIVATE ${CPU_PAGE_FAULT_MANAGER_LINUX_TESTS} - ${NEO_RUNTIME_TESTS_DIR}/os_interface/linux/drm_neo_create.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp ) endif() @@ -38,7 +38,7 @@ target_link_libraries(neo_page_fault_manager_tests ${NEO_MOCKABLE_LIB_NAME} ${NE target_include_directories(neo_page_fault_manager_tests PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX} - ${NEO_RUNTIME_TESTS_DIR}/gen_common${BRANCH_DIR_SUFFIX} + ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX} ) create_project_source_tree(neo_page_fault_manager_tests) diff --git a/opencl/test/unit_test/perf_tests/api/api_tests.h b/opencl/test/unit_test/perf_tests/api/api_tests.h index 2eff0ec535..81d28afbaa 100644 --- a/opencl/test/unit_test/perf_tests/api/api_tests.h +++ b/opencl/test/unit_test/perf_tests/api/api_tests.h @@ -9,12 +9,12 @@ #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/program/program.h" +#include "opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.h" +#include "opencl/test/unit_test/perf_tests/fixtures/device_fixture.h" +#include "opencl/test/unit_test/perf_tests/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/perf_tests/perf_test_utils.h" #include "gtest/gtest.h" -#include "perf_tests/fixtures/command_queue_fixture.h" -#include "perf_tests/fixtures/device_fixture.h" -#include "perf_tests/fixtures/platform_fixture.h" -#include "perf_tests/perf_test_utils.h" namespace NEO { diff --git a/opencl/test/unit_test/perf_tests/api/context_tests.cpp b/opencl/test/unit_test/perf_tests/api/context_tests.cpp index 8baddc71b4..294bd8a9ba 100644 --- a/opencl/test/unit_test/perf_tests/api/context_tests.cpp +++ b/opencl/test/unit_test/perf_tests/api/context_tests.cpp @@ -7,10 +7,10 @@ #include "opencl/source/compiler_interface/compiler_interface.h" #include "opencl/source/helpers/file_io.h" +#include "opencl/test/unit_test/helpers/memory_management.h" +#include "opencl/test/unit_test/helpers/test_files.h" #include "cl_api_tests.h" -#include "helpers/memory_management.h" -#include "helpers/test_files.h" using namespace NEO; diff --git a/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp index 63b61a8868..293a14b0ec 100644 --- a/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp +++ b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "perf_tests/fixtures/command_queue_fixture.h" +#include "opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.h" #include "core/device/device.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp index 36fb465aa9..a22b0f54b9 100644 --- a/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp +++ b/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "fixtures/platform_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "core/device/device.h" diff --git a/opencl/test/unit_test/platform/platform_icd_tests.cpp b/opencl/test/unit_test/platform/platform_icd_tests.cpp index b76e21ed8a..71c15b70f8 100644 --- a/opencl/test/unit_test/platform/platform_icd_tests.cpp +++ b/opencl/test/unit_test/platform/platform_icd_tests.cpp @@ -8,9 +8,9 @@ #include "core/helpers/string.h" #include "opencl/source/api/dispatch.h" #include "opencl/source/sharings/sharing_factory.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" #include "gtest/gtest.h" -#include "mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp index dc0acf7d9b..8a4433220d 100644 --- a/opencl/test/unit_test/platform/platform_tests.cpp +++ b/opencl/test/unit_test/platform/platform_tests.cpp @@ -11,19 +11,19 @@ #include "core/unit_tests/helpers/ult_hw_config.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/sharings/sharing_factory.h" +#include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_async_event_handler.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" +#include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" -#include "fixtures/mock_aub_center_fixture.h" -#include "fixtures/platform_fixture.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_async_event_handler.h" -#include "mocks/mock_builtins.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_platform.h" -#include "mocks/mock_source_level_debugger.h" using namespace NEO; diff --git a/opencl/test/unit_test/profiling/profiling_tests.cpp b/opencl/test/unit_test/profiling/profiling_tests.cpp index 8ace898800..4cf5546039 100644 --- a/opencl/test/unit_test/profiling/profiling_tests.cpp +++ b/opencl/test/unit_test/profiling/profiling_tests.cpp @@ -15,18 +15,17 @@ #include "opencl/source/command_queue/enqueue_marker.h" #include "opencl/source/command_queue/enqueue_migrate_mem_objects.h" #include "opencl/source/helpers/dispatch_info.h" +#include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" +#include "opencl/test/unit_test/event/event_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/os_interface/mock_performance_counters.h" #include "test.h" -#include "command_queue/command_enqueue_fixture.h" -#include "event/event_fixture.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_event.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" -#include "os_interface/mock_performance_counters.h" - namespace NEO { struct ProfilingTests : public CommandEnqueueFixture, diff --git a/opencl/test/unit_test/program/block_kernel_manager_tests.cpp b/opencl/test/unit_test/program/block_kernel_manager_tests.cpp index f76120320c..9b2687f492 100644 --- a/opencl/test/unit_test/program/block_kernel_manager_tests.cpp +++ b/opencl/test/unit_test/program/block_kernel_manager_tests.cpp @@ -7,10 +7,10 @@ #include "core/memory_manager/graphics_allocation.h" #include "opencl/source/program/kernel_info.h" +#include "opencl/test/unit_test/mocks/mock_block_kernel_manager.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" -#include "mocks/mock_block_kernel_manager.h" -#include "mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/program/kernel_data.cpp b/opencl/test/unit_test/program/kernel_data.cpp index 817405407a..6000ca5b38 100644 --- a/opencl/test/unit_test/program/kernel_data.cpp +++ b/opencl/test/unit_test/program/kernel_data.cpp @@ -8,9 +8,8 @@ #include "core/helpers/string.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/program.h" - -#include "fixtures/kernel_data_fixture.h" -#include "helpers/gtest_helpers.h" +#include "opencl/test/unit_test/fixtures/kernel_data_fixture.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" TEST_F(KernelDataTest, KernelInfo_Name) { kernelName = "myTestKernel"; diff --git a/opencl/test/unit_test/program/kernel_data_OCL2_0.cpp b/opencl/test/unit_test/program/kernel_data_OCL2_0.cpp index 00a4635fcd..e0a80fed92 100644 --- a/opencl/test/unit_test/program/kernel_data_OCL2_0.cpp +++ b/opencl/test/unit_test/program/kernel_data_OCL2_0.cpp @@ -5,8 +5,8 @@ * */ -#include "fixtures/kernel_data_fixture.h" -#include "helpers/gtest_helpers.h" +#include "opencl/test/unit_test/fixtures/kernel_data_fixture.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" TEST_F(KernelDataTest, GIVENpatchTokenAllocateStatelessEventPoolSurfaceWHENdecodeTokensTHENtokenLocatedInPatchInfo) { iOpenCL::SPatchAllocateStatelessEventPoolSurface allocateStatelessEventPoolSurface; diff --git a/opencl/test/unit_test/program/kernel_info_tests.cpp b/opencl/test/unit_test/program/kernel_info_tests.cpp index 22f2533645..1df42a491b 100644 --- a/opencl/test/unit_test/program/kernel_info_tests.cpp +++ b/opencl/test/unit_test/program/kernel_info_tests.cpp @@ -9,10 +9,10 @@ #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/program/kernel_arg_info.h" #include "opencl/source/program/kernel_info.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" -#include "fixtures/multi_root_device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_execution_environment.h" #include #include diff --git a/opencl/test/unit_test/program/printf_handler_tests.cpp b/opencl/test/unit_test/program/printf_handler_tests.cpp index 6c60ed71b5..8826a23b87 100644 --- a/opencl/test/unit_test/program/printf_handler_tests.cpp +++ b/opencl/test/unit_test/program/printf_handler_tests.cpp @@ -6,16 +6,16 @@ */ #include "opencl/source/program/printf_handler.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_program.h" -#include "fixtures/device_fixture.h" -#include "fixtures/multi_root_device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/program/printf_helper_tests.cpp b/opencl/test/unit_test/program/printf_helper_tests.cpp index f5386d602f..527c21bc76 100644 --- a/opencl/test/unit_test/program/printf_helper_tests.cpp +++ b/opencl/test/unit_test/program/printf_helper_tests.cpp @@ -8,12 +8,12 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/string.h" #include "core/program/print_formatter.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "gtest/gtest.h" -#include "mocks/mock_device.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/program/process_debug_data_tests.cpp b/opencl/test/unit_test/program/process_debug_data_tests.cpp index acbe060b61..f4eba54599 100644 --- a/opencl/test/unit_test/program/process_debug_data_tests.cpp +++ b/opencl/test/unit_test/program/process_debug_data_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/program/program_tests.h" #include "test.h" -#include "mocks/mock_program.h" -#include "program/program_tests.h" #include "program_debug_data.h" #include diff --git a/opencl/test/unit_test/program/process_elf_binary_tests.cpp b/opencl/test/unit_test/program/process_elf_binary_tests.cpp index df48bac1d6..04b12f6645 100644 --- a/opencl/test/unit_test/program/process_elf_binary_tests.cpp +++ b/opencl/test/unit_test/program/process_elf_binary_tests.cpp @@ -12,12 +12,12 @@ #include "core/helpers/file_io.h" #include "core/helpers/string.h" #include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "compiler_options.h" #include "gtest/gtest.h" -#include "helpers/test_files.h" -#include "mocks/mock_device.h" -#include "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/program/process_spir_binary_tests.cpp b/opencl/test/unit_test/program/process_spir_binary_tests.cpp index 60ee836bfa..caa5791088 100644 --- a/opencl/test/unit_test/program/process_spir_binary_tests.cpp +++ b/opencl/test/unit_test/program/process_spir_binary_tests.cpp @@ -7,9 +7,9 @@ #include "core/device/device.h" #include "core/helpers/string.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "gtest/gtest.h" -#include "mocks/mock_program.h" using namespace NEO; diff --git a/opencl/test/unit_test/program/program_data_tests.cpp b/opencl/test/unit_test/program/program_data_tests.cpp index 2287aa7860..19da724107 100644 --- a/opencl/test/unit_test/program/program_data_tests.cpp +++ b/opencl/test/unit_test/program/program_data_tests.cpp @@ -14,15 +14,14 @@ #include "core/unit_tests/device_binary_format/patchtokens_tests.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/program.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/program/program_with_source.h" #include "test.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_memory_manager.h" -#include "mocks/mock_program.h" -#include "program/program_with_source.h" - using namespace NEO; using namespace iOpenCL; diff --git a/opencl/test/unit_test/program/program_from_binary.h b/opencl/test/unit_test/program/program_from_binary.h index 842beecb19..f556801b01 100644 --- a/opencl/test/unit_test/program/program_from_binary.h +++ b/opencl/test/unit_test/program/program_from_binary.h @@ -7,11 +7,10 @@ #pragma once #include "opencl/source/built_ins/built_ins.h" - -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" -#include "fixtures/program_fixture.h" -#include "mocks/mock_context.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/program_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include diff --git a/opencl/test/unit_test/program/program_nonuniform.cpp b/opencl/test/unit_test/program/program_nonuniform.cpp index 2e87484bed..519bf7a0c5 100644 --- a/opencl/test/unit_test/program/program_nonuniform.cpp +++ b/opencl/test/unit_test/program/program_nonuniform.cpp @@ -12,17 +12,17 @@ #include "core/memory_manager/graphics_allocation.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/program/program_from_binary.h" +#include "opencl/test/unit_test/program/program_with_source.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "helpers/kernel_binary_helper.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" -#include "program/program_from_binary.h" -#include "program/program_with_source.h" #include "program_tests.h" #include @@ -148,12 +148,11 @@ TEST(ProgramNonUniform, UpdateAllowNonUniformOutcomeUniformFlag) { } #include "opencl/source/kernel/kernel.h" - -#include "command_queue/command_queue_fixture.h" -#include "fixtures/context_fixture.h" -#include "fixtures/platform_fixture.h" -#include "fixtures/program_fixture.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/command_queue/command_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/fixtures/program_fixture.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/program/program_spec_constants_tests.cpp b/opencl/test/unit_test/program/program_spec_constants_tests.cpp index 272e773dd8..acfcf2846d 100644 --- a/opencl/test/unit_test/program/program_spec_constants_tests.cpp +++ b/opencl/test/unit_test/program/program_spec_constants_tests.cpp @@ -10,14 +10,14 @@ #include "core/helpers/file_io.h" #include "core/helpers/hw_info.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/test_files.h" +#include "opencl/test/unit_test/mocks/mock_cif.h" +#include "opencl/test/unit_test/mocks/mock_compilers.h" +#include "opencl/test/unit_test/mocks/mock_program.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 "mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index 9b7e744c9d..5a5abff122 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "program/program_tests.h" +#include "opencl/test/unit_test/program/program_tests.h" #include "core/command_stream/command_stream_receiver_hw.h" #include "core/compiler_interface/intermediate_representations.h" @@ -28,22 +28,22 @@ #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/create.inl" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/program/program_from_binary.h" +#include "opencl/test/unit_test/program/program_with_source.h" #include "test.h" #include "compiler_options.h" -#include "fixtures/device_fixture.h" -#include "fixtures/multi_root_device_fixture.h" -#include "global_environment.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "helpers/kernel_binary_helper.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_platform.h" -#include "mocks/mock_program.h" -#include "program/program_from_binary.h" -#include "program/program_with_source.h" #include #include diff --git a/opencl/test/unit_test/program/program_tests.h b/opencl/test/unit_test/program/program_tests.h index 42c09f421b..ceedad5607 100644 --- a/opencl/test/unit_test/program/program_tests.h +++ b/opencl/test/unit_test/program/program_tests.h @@ -6,8 +6,9 @@ */ #pragma once -#include "fixtures/context_fixture.h" -#include "fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" + #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp b/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp index 166553503a..7a9cf065ed 100644 --- a/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp +++ b/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp @@ -9,13 +9,12 @@ #include "core/device/device.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/program/block_kernel_manager.h" - -#include "fixtures/context_fixture.h" -#include "fixtures/platform_fixture.h" -#include "fixtures/program_fixture.h" -#include "fixtures/run_kernel_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/fixtures/program_fixture.h" +#include "opencl/test/unit_test/fixtures/run_kernel_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include diff --git a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp index 3f4af3160b..dd50663739 100644 --- a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp +++ b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp @@ -5,18 +5,18 @@ * */ +#include "opencl/test/unit_test/fixtures/program_fixture.h" +#include "opencl/test/unit_test/global_environment.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/helpers/kernel_filename_helper.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" +#include "opencl/test/unit_test/program/program_from_binary.h" +#include "opencl/test/unit_test/program/program_tests.h" #include "test.h" #include "compiler_options.h" -#include "fixtures/program_fixture.h" -#include "global_environment.h" #include "gmock/gmock.h" -#include "helpers/kernel_binary_helper.h" -#include "helpers/kernel_filename_helper.h" -#include "mocks/mock_program.h" -#include "mocks/mock_source_level_debugger.h" -#include "program/program_from_binary.h" -#include "program/program_tests.h" #include #include diff --git a/opencl/test/unit_test/program/program_with_source.h b/opencl/test/unit_test/program/program_with_source.h index 1ade6441b3..dbe349550d 100644 --- a/opencl/test/unit_test/program/program_with_source.h +++ b/opencl/test/unit_test/program/program_with_source.h @@ -8,13 +8,12 @@ #pragma once #include "core/compiler_interface/compiler_interface.h" - -#include "fixtures/context_fixture.h" -#include "fixtures/memory_management_fixture.h" -#include "fixtures/platform_fixture.h" -#include "fixtures/program_fixture.h" -#include "helpers/kernel_binary_helper.h" -#include "mocks/mock_context.h" +#include "opencl/test/unit_test/fixtures/context_fixture.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/fixtures/program_fixture.h" +#include "opencl/test/unit_test/helpers/kernel_binary_helper.h" +#include "opencl/test/unit_test/mocks/mock_context.h" namespace NEO { diff --git a/opencl/test/unit_test/sampler/get_sampler_info_tests.cpp b/opencl/test/unit_test/sampler/get_sampler_info_tests.cpp index 5a293cccf5..58e6e7b3e2 100644 --- a/opencl/test/unit_test/sampler/get_sampler_info_tests.cpp +++ b/opencl/test/unit_test/sampler/get_sampler_info_tests.cpp @@ -6,10 +6,10 @@ */ #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp index 4b00d95bfd..33f8935f0d 100644 --- a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp +++ b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp @@ -10,14 +10,13 @@ #include "opencl/source/helpers/sampler_helpers.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" - using namespace NEO; namespace NEO { diff --git a/opencl/test/unit_test/sampler/sampler_tests.cpp b/opencl/test/unit_test/sampler/sampler_tests.cpp index 832d398c36..3a1af43671 100644 --- a/opencl/test/unit_test/sampler/sampler_tests.cpp +++ b/opencl/test/unit_test/sampler/sampler_tests.cpp @@ -6,11 +6,11 @@ */ #include "opencl/source/sampler/sampler.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_sampler.h" -#include "fixtures/image_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_sampler.h" #include "patch_list.h" #include diff --git a/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp index 761906095c..5e33e4f4ed 100644 --- a/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp +++ b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp @@ -7,12 +7,12 @@ #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" +#include "opencl/test/unit_test/fixtures/scenario_test_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/scenario_test_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp b/opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp index 2541c25cc1..d6825fbce8 100644 --- a/opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp +++ b/opencl/test/unit_test/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp @@ -8,12 +8,12 @@ #include "opencl/source/event/async_events_handler.h" #include "opencl/source/event/user_event.h" #include "opencl/source/platform/platform.h" +#include "opencl/test/unit_test/fixtures/scenario_test_fixture.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" -#include "fixtures/scenario_test_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/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 index d26e1292e5..a2e99c1ba8 100644 --- a/opencl/test/unit_test/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 @@ -9,15 +9,14 @@ #include "core/os_interface/windows/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h" #include "test.h" -#include "fixtures/buffer_fixture.h" -#include "helpers/execution_environment_helper.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_device.h" -#include "os_interface/windows/mock_wddm_memory_manager.h" - using namespace NEO; struct EnqueueBufferWindowsTest : public HardwareParse, diff --git a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp index 0923052cc0..5d98a079a5 100644 --- a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp +++ b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp @@ -8,15 +8,15 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/scheduler/scheduler_kernel.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_ostime.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_ostime.h" -#include "mocks/mock_program.h" #include #include diff --git a/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp index d64bafcf33..a3df854527 100644 --- a/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp +++ b/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp @@ -5,17 +5,17 @@ * */ -#include "scheduler/scheduler_source_tests.h" +#include "opencl/test/unit_test/scheduler/scheduler_source_tests.h" #include "core/helpers/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/fixtures/execution_model_fixture.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" #include "test.h" -#include "fixtures/device_host_queue_fixture.h" -#include "fixtures/execution_model_fixture.h" #include "gtest/gtest.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_device_queue.h" // Keep this include after execution_model_fixture.h otherwise there is high chance of conflict with macros #include "opencl/source/builtin_kernels_simulation/opencl_c.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h" diff --git a/opencl/test/unit_test/scheduler/scheduler_source_tests.h b/opencl/test/unit_test/scheduler/scheduler_source_tests.h index f6fc2e3219..07af66d538 100644 --- a/opencl/test/unit_test/scheduler/scheduler_source_tests.h +++ b/opencl/test/unit_test/scheduler/scheduler_source_tests.h @@ -5,11 +5,11 @@ * */ +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" -#include "fixtures/device_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" class SchedulerSourceTest : public testing::Test { public: diff --git a/opencl/test/unit_test/scheduler/scheduler_source_tests.inl b/opencl/test/unit_test/scheduler/scheduler_source_tests.inl index fdadfe852e..49ae879232 100644 --- a/opencl/test/unit_test/scheduler/scheduler_source_tests.inl +++ b/opencl/test/unit_test/scheduler/scheduler_source_tests.inl @@ -6,9 +6,8 @@ */ #include "opencl/source/device_queue/device_queue.h" - -#include "fixtures/device_host_queue_fixture.h" -#include "mocks/mock_device_queue.h" +#include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" +#include "opencl/test/unit_test/mocks/mock_device_queue.h" #include diff --git a/opencl/test/unit_test/sharings/d3d/context_d3d_tests.cpp b/opencl/test/unit_test/sharings/d3d/context_d3d_tests.cpp index e6bba91b41..a5ff85151a 100644 --- a/opencl/test/unit_test/sharings/d3d/context_d3d_tests.cpp +++ b/opencl/test/unit_test/sharings/d3d/context_d3d_tests.cpp @@ -7,11 +7,11 @@ #include "opencl/source/os_interface/windows/d3d_sharing_functions.h" #include "opencl/source/sharings/d3d/cl_d3d_api.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" +#include "opencl/test/unit_test/helpers/gtest_helpers.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "api/cl_api_tests.h" #include "gtest/gtest.h" -#include "helpers/gtest_helpers.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp index ebb04fa9c5..154314a342 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp @@ -12,16 +12,15 @@ #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/gl/gl_arb_sync_event.h" #include "opencl/source/sharings/sharing.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_arb_sync_event_windows.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_event.h" #include "test.h" -#include "mocks/gl/windows/mock_gl_arb_sync_event_windows.h" -#include "mocks/gl/windows/mock_gl_sharing_windows.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_event.h" - using namespace NEO; TEST(GlArbSyncEvent, whenCreateArbSyncEventNameIsCalledMultipleTimesThenEachCallReturnsUniqueName) { diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp index c7c0a9d47e..4b0595d312 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp @@ -9,14 +9,14 @@ #include "core/helpers/get_info.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sharings/gl/gl_texture.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" #include "test.h" #include "gtest/gtest.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/gl/windows/mock_gl_sharing_windows.h" -#include "mocks/mock_context.h" -#include "mocks/mock_execution_environment.h" -#include "mocks/mock_gmm.h" namespace NEO { class CreateFromGlTexture : public ::testing::Test { diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp index bae59fef03..9e9c61546c 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp @@ -10,12 +10,11 @@ #include "opencl/source/device/cl_device.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/sharings/gl/gl_buffer.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "mocks/gl/windows/mock_gl_sharing_windows.h" -#include "mocks/mock_context.h" -#include "mocks/mock_memory_manager.h" - using namespace NEO; struct GlReusedBufferTests : public ::testing::Test { diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_enable_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_enable_tests.cpp index c580b81a5a..659ff15aae 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_enable_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_enable_tests.cpp @@ -6,10 +6,10 @@ */ #include "opencl/source/sharings/gl/windows/win_enable_gl.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp index 58a94db918..85d0dacae6 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp @@ -23,19 +23,19 @@ #include "opencl/source/sharings/gl/gl_texture.h" #include "opencl/source/sharings/gl/windows/gl_sharing_windows.h" #include "opencl/source/sharings/sharing.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_arb_sync_event_windows.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" +#include "opencl/test/unit_test/mocks/mock_async_event_handler.h" +#include "opencl/test/unit_test/mocks/mock_command_queue.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_event.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" #include "gl/gl_sharing_os.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/gl/windows/mock_gl_arb_sync_event_windows.h" -#include "mocks/gl/windows/mock_gl_sharing_windows.h" -#include "mocks/mock_async_event_handler.h" -#include "mocks/mock_command_queue.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_event.h" -#include "mocks/mock_gmm_resource_info.h" -#include "mocks/mock_memory_manager.h" using namespace NEO; bool MockGLSharingFunctions::SharingEnabled = false; diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp index 808453a161..64db966be6 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp @@ -9,13 +9,13 @@ #include "opencl/source/mem_obj/image.h" #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/gl/gl_texture.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/gl/windows/mock_gl_sharing_windows.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "gtest/gtest.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/gl/windows/mock_gl_sharing_windows.h" -#include "mocks/mock_context.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_memory_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp index 6211e21bd3..d1f432483c 100644 --- a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp +++ b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp @@ -14,12 +14,12 @@ #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/sharing.h" #include "opencl/source/sharings/sharing_factory.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_sharing_factory.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_sharing_factory.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/sharing_tests.cpp b/opencl/test/unit_test/sharings/sharing_tests.cpp index 7a385535ab..4e0317b745 100644 --- a/opencl/test/unit_test/sharings/sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/sharing_tests.cpp @@ -8,10 +8,10 @@ #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj.h" #include "opencl/source/sharings/sharing.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" -#include "mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp index 357cd3de80..a7903a5696 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_buffer_tests.cpp @@ -6,9 +6,8 @@ */ #include "opencl/source/sharings/unified/unified_buffer.h" - -#include "sharings/unified/unified_sharing_fixtures.h" -#include "sharings/unified/unified_sharing_mocks.h" +#include "opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h" +#include "opencl/test/unit_test/sharings/unified/unified_sharing_mocks.h" using UnifiedSharingBufferTestsWithMemoryManager = UnifiedSharingFixture; using UnifiedSharingBufferTestsWithInvalidMemoryManager = UnifiedSharingFixture; diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h b/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h index 751289bd7c..c0d66ff29c 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h @@ -6,14 +6,13 @@ */ #include "opencl/source/sharings/unified/unified_sharing_types.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_gmm.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_gmm.h" -#include "mocks/mock_memory_manager.h" - namespace NEO { template diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp index b235b79d84..60b93c5028 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp @@ -8,11 +8,10 @@ #include "core/gmm_helper/gmm.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sharings/unified/unified_image.h" - -#include "helpers/raii_hw_helper.h" -#include "mocks/mock_gmm_resource_info.h" -#include "sharings/unified/unified_sharing_fixtures.h" -#include "sharings/unified/unified_sharing_mocks.h" +#include "opencl/test/unit_test/helpers/raii_hw_helper.h" +#include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" +#include "opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h" +#include "opencl/test/unit_test/sharings/unified/unified_sharing_mocks.h" using UnifiedSharingImageTestsWithMemoryManager = UnifiedSharingFixture; using UnifiedSharingImageTestsWithInvalidMemoryManager = UnifiedSharingFixture; diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp index 0c870f104d..6f8862ca1e 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp @@ -8,14 +8,13 @@ #include "opencl/source/sharings/unified/enable_unified.h" #include "opencl/source/sharings/unified/unified_buffer.h" #include "opencl/source/sharings/unified/unified_sharing.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" +#include "opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h" #include "test.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_context.h" -#include "mocks/mock_device.h" -#include "mocks/mock_memory_manager.h" -#include "sharings/unified/unified_sharing_fixtures.h" - using namespace NEO; TEST(UnifiedSharingTests, givenContextCreatedWithExternalDeviceHandlePropertyWhenGettingUnifiedSharingThenReturnIt) { diff --git a/opencl/test/unit_test/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 index f7229bae6a..38a898426a 100644 --- a/opencl/test/unit_test/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 @@ -5,7 +5,8 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" + #include using namespace NEO; diff --git a/opencl/test/unit_test/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 index bbce31ba8c..c69d0951da 100644 --- a/opencl/test/unit_test/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 @@ -5,7 +5,8 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" + #include using namespace NEO; diff --git a/opencl/test/unit_test/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 index eee184d481..8dd2bb877a 100644 --- a/opencl/test/unit_test/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 @@ -5,7 +5,8 @@ * */ -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" + #include using namespace NEO; diff --git a/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp b/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp index dbda0c2d71..8a53b81e86 100644 --- a/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp +++ b/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp @@ -7,8 +7,7 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/sharings/va/cl_va_api.h" - -#include "api/cl_api_tests.h" +#include "opencl/test/unit_test/api/cl_api_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/va/context_va_tests.cpp b/opencl/test/unit_test/sharings/va/context_va_tests.cpp index 878e2c9c72..6dca58b708 100644 --- a/opencl/test/unit_test/sharings/va/context_va_tests.cpp +++ b/opencl/test/unit_test/sharings/va/context_va_tests.cpp @@ -7,10 +7,10 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/sharings/va/va_sharing.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp b/opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp index 3b33b17300..1505609cc1 100644 --- a/opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp +++ b/opencl/test/unit_test/sharings/va/kernel_va_image_arg_tests.cpp @@ -6,13 +6,13 @@ */ #include "opencl/source/sharings/va/va_surface.h" +#include "opencl/test/unit_test/fixtures/kernel_arg_fixture.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_program.h" +#include "opencl/test/unit_test/sharings/va/mock_va_sharing.h" #include "test.h" -#include "fixtures/kernel_arg_fixture.h" #include "gtest/gtest.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_program.h" -#include "sharings/va/mock_va_sharing.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp b/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp index 7675add5af..57b85278ff 100644 --- a/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_base_object_tests.cpp @@ -10,9 +10,9 @@ #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/sharings/sharing_factory.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" #include "gtest/gtest.h" -#include "mocks/mock_platform.h" namespace NEO { diff --git a/opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp index 94974fc892..2fa18119e5 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_enable_tests.cpp @@ -7,11 +7,11 @@ #include "opencl/source/sharings/va/enable_va.h" #include "opencl/source/sharings/va/va_sharing_functions.h" +#include "opencl/test/unit_test/fixtures/memory_management_fixture.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/mocks/mock_context.h" -#include "fixtures/memory_management_fixture.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "mocks/mock_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp index 0760307d4d..ea49ee7d86 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp @@ -7,10 +7,10 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/sharings/va/va_sharing_functions.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/sharings/va/mock_va_sharing.h" #include "gtest/gtest.h" -#include "helpers/variable_backup.h" -#include "sharings/va/mock_va_sharing.h" #include #include diff --git a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp index f65816a560..aeed8f377f 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp @@ -15,13 +15,13 @@ #include "opencl/source/sharings/va/cl_va_api.h" #include "opencl/source/sharings/va/va_sharing.h" #include "opencl/source/sharings/va/va_surface.h" +#include "opencl/test/unit_test/fixtures/platform_fixture.h" +#include "opencl/test/unit_test/libult/create_command_stream.h" +#include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/sharings/va/mock_va_sharing.h" -#include "fixtures/platform_fixture.h" #include "gtest/gtest.h" -#include "libult/create_command_stream.h" -#include "libult/ult_command_stream_receiver.h" -#include "mocks/mock_context.h" -#include "sharings/va/mock_va_sharing.h" using namespace NEO; diff --git a/opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp b/opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp index adaf802ebd..91c2cbcf9d 100644 --- a/opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp +++ b/opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp @@ -6,9 +6,9 @@ */ #include "core/sku_info/operations/windows/sku_info_receiver.h" +#include "opencl/test/unit_test/sku_info/sku_info_base_reference.h" #include "gtest/gtest.h" -#include "sku_info/sku_info_base_reference.h" using namespace NEO; diff --git a/opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp b/opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp index 37e6bac79a..6bdf47dffb 100644 --- a/opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp +++ b/opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp @@ -6,9 +6,9 @@ */ #include "core/sku_info/operations/sku_info_transfer.h" +#include "opencl/test/unit_test/sku_info/sku_info_base_reference.h" #include "gtest/gtest.h" -#include "sku_info/sku_info_base_reference.h" using namespace NEO; diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp index b01c8b8d92..bdd0dc25e4 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp @@ -7,18 +7,17 @@ #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/hw_parse.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_csr.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "helpers/dispatch_flags_helper.h" -#include "helpers/execution_environment_helper.h" -#include "helpers/hw_parse.h" -#include "mocks/mock_builtins.h" -#include "mocks/mock_csr.h" -#include "mocks/mock_device.h" -#include "mocks/mock_graphics_allocation.h" -#include "mocks/mock_memory_manager.h" - #include class CommandStreamReceiverWithActiveDebuggerTest : public ::testing::Test { diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp index 6cce873011..b25f90cf95 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp @@ -8,13 +8,12 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/platform/platform.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/mocks/mock_builtins.h" +#include "opencl/test/unit_test/mocks/mock_device.h" +#include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" #include "test.h" -#include "fixtures/device_fixture.h" -#include "mocks/mock_builtins.h" -#include "mocks/mock_device.h" -#include "mocks/mock_source_level_debugger.h" - using PreambleTest = ::testing::Test; using namespace NEO; diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp index 0eb34129bc..d3c107bffe 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp @@ -11,13 +11,13 @@ #include "opencl/source/platform/platform.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" +#include "opencl/test/unit_test/fixtures/device_fixture.h" +#include "opencl/test/unit_test/helpers/execution_environment_helper.h" +#include "opencl/test/unit_test/helpers/variable_backup.h" +#include "opencl/test/unit_test/libult/source_level_debugger_library.h" +#include "opencl/test/unit_test/mocks/mock_platform.h" +#include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" -#include "fixtures/device_fixture.h" -#include "helpers/execution_environment_helper.h" -#include "helpers/variable_backup.h" -#include "libult/source_level_debugger_library.h" -#include "mocks/mock_platform.h" -#include "mocks/mock_source_level_debugger.h" #include #include diff --git a/opencl/test/unit_test/test_mode.h b/opencl/test/unit_test/test_mode.h index a5f24d4671..84fcb57109 100644 --- a/opencl/test/unit_test/test_mode.h +++ b/opencl/test/unit_test/test_mode.h @@ -7,7 +7,7 @@ #pragma once -#include "tests_configuration.h" +#include "opencl/test/unit_test/tests_configuration.h" namespace NEO { constexpr TestMode defaultTestMode = TestMode::UnitTests; diff --git a/opencl/test/unit_test/ult_config_listener.cpp b/opencl/test/unit_test/ult_config_listener.cpp index f2089fb8e0..73a879dba4 100644 --- a/opencl/test/unit_test/ult_config_listener.cpp +++ b/opencl/test/unit_test/ult_config_listener.cpp @@ -5,7 +5,7 @@ * */ -#include "ult_config_listener.h" +#include "opencl/test/unit_test/ult_config_listener.h" #include "core/execution_environment/execution_environment.h" #include "core/memory_manager/memory_manager.h" diff --git a/opencl/test/unit_test/utilities/debug_file_reader_tests.cpp b/opencl/test/unit_test/utilities/debug_file_reader_tests.cpp index 3af965160b..9e8b1bacee 100644 --- a/opencl/test/unit_test/utilities/debug_file_reader_tests.cpp +++ b/opencl/test/unit_test/utilities/debug_file_reader_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "utilities/debug_file_reader_tests.inl" +#include "opencl/test/unit_test/utilities/debug_file_reader_tests.inl" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl b/opencl/test/unit_test/utilities/debug_file_reader_tests.inl index 66aef91808..5a6dc392b1 100644 --- a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl +++ b/opencl/test/unit_test/utilities/debug_file_reader_tests.inl @@ -73,7 +73,7 @@ TEST(SettingsFileReader, GetStringSettingFromFile) { EXPECT_TRUE(true); \ } \ } -#include "helpers/test_debug_variables.inl" +#include "opencl/test/unit_test/helpers/test_debug_variables.inl" #undef DECLARE_DEBUG_VARIABLE } diff --git a/opencl/test/unit_test/utilities/file_logger_tests.cpp b/opencl/test/unit_test/utilities/file_logger_tests.cpp index c8ed8f4bcc..24d296a120 100644 --- a/opencl/test/unit_test/utilities/file_logger_tests.cpp +++ b/opencl/test/unit_test/utilities/file_logger_tests.cpp @@ -5,19 +5,18 @@ * */ -#include "utilities/file_logger_tests.h" +#include "opencl/test/unit_test/utilities/file_logger_tests.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "opencl/source/utilities/logger.h" - -#include "fixtures/buffer_fixture.h" -#include "fixtures/image_fixture.h" -#include "mocks/mock_buffer.h" -#include "mocks/mock_context.h" -#include "mocks/mock_kernel.h" -#include "mocks/mock_mdi.h" -#include "mocks/mock_program.h" +#include "opencl/test/unit_test/fixtures/buffer_fixture.h" +#include "opencl/test/unit_test/fixtures/image_fixture.h" +#include "opencl/test/unit_test/mocks/mock_buffer.h" +#include "opencl/test/unit_test/mocks/mock_context.h" +#include "opencl/test/unit_test/mocks/mock_kernel.h" +#include "opencl/test/unit_test/mocks/mock_mdi.h" +#include "opencl/test/unit_test/mocks/mock_program.h" #include #include diff --git a/opencl/test/unit_test/utilities/tag_allocator_tests.cpp b/opencl/test/unit_test/utilities/tag_allocator_tests.cpp index 1dc7b1f873..7db6ad79f5 100644 --- a/opencl/test/unit_test/utilities/tag_allocator_tests.cpp +++ b/opencl/test/unit_test/utilities/tag_allocator_tests.cpp @@ -7,9 +7,9 @@ #include "core/helpers/timestamp_packet.h" #include "core/utilities/tag_allocator.h" +#include "opencl/test/unit_test/fixtures/memory_allocator_fixture.h" #include "test.h" -#include "fixtures/memory_allocator_fixture.h" #include "gtest/gtest.h" #include diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt index d33b48cb72..e4e6da0bd0 100644 --- a/opencl/test/unit_test/windows/CMakeLists.txt +++ b/opencl/test/unit_test/windows/CMakeLists.txt @@ -20,7 +20,7 @@ add_executable(igdrcl_windows_dll_tests ${NEO_SOURCE_DIR}/opencl/source/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp ${NEO_SOURCE_DIR}/opencl/source/dll/windows/os_interface.cpp ${NEO_SOURCE_DIR}/core/os_interface/windows/wddm/wddm_create.cpp - ${NEO_RUNTIME_TESTS_DIR}/ult_configuration.cpp + ${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp @@ -31,7 +31,7 @@ target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CO target_include_directories(igdrcl_windows_dll_tests PRIVATE ${NEO_SOURCE_DIR}/core/unit_tests/test_macros${BRANCH_DIR_SUFFIX} - ${NEO_RUNTIME_TESTS_DIR}/gen_common${BRANCH_DIR_SUFFIX} + ${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX} ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/opencl/test/unit_test/windows/test_mode.h b/opencl/test/unit_test/windows/test_mode.h index a5f24d4671..84fcb57109 100644 --- a/opencl/test/unit_test/windows/test_mode.h +++ b/opencl/test/unit_test/windows/test_mode.h @@ -7,7 +7,7 @@ #pragma once -#include "tests_configuration.h" +#include "opencl/test/unit_test/tests_configuration.h" namespace NEO { constexpr TestMode defaultTestMode = TestMode::UnitTests; diff --git a/opencl/test/unit_test/windows/wddm_create_tests.cpp b/opencl/test/unit_test/windows/wddm_create_tests.cpp index ca0e160de4..6d018b5c36 100644 --- a/opencl/test/unit_test/windows/wddm_create_tests.cpp +++ b/opencl/test/unit_test/windows/wddm_create_tests.cpp @@ -10,10 +10,9 @@ #include "core/os_interface/os_interface.h" #include "core/os_interface/windows/wddm/wddm.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h" -#include "mocks/mock_execution_environment.h" - #include using namespace NEO;