Cleanup includes 57

Related-To: NEO-5548 Signed-off-by: Warchulski, Jaroslaw <jaroslaw.warchulski@intel.com>
2026-01-07 12:42:54 +08:00 · 2023-02-16 16:51:55 +00:00
parent 498e2183e2
commit b485c025d0
105 changed files with 138 additions and 142 deletions
--- a/level_zero/core/source/builtin/builtin_functions_lib_impl.h
+++ b/level_zero/core/source/builtin/builtin_functions_lib_impl.h
@@ -6,9 +6,6 @@
 */

 #pragma once
-
-#include "shared/source/os_interface/os_thread.h"
-
 #include "level_zero/core/source/builtin/builtin_functions_lib.h"
 #include "level_zero/core/source/module/module.h"

--- a/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
+++ b/level_zero/core/source/cmdqueue/cmdqueue_xe_hp_core_and_later.inl
@@ -6,10 +6,8 @@
 */

 #include "shared/source/command_container/encode_surface_state.h"
-#include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_stream/csr_definitions.h"
 #include "shared/source/command_stream/scratch_space_controller.h"
-#include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/helpers/pipe_control_args.h"
--- a/level_zero/core/source/image/image_hw.inl
+++ b/level_zero/core/source/image/image_hw.inl
@@ -12,7 +12,6 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/gmm_helper/gmm.h"
 #include "shared/source/helpers/basic_math.h"
-#include "shared/source/helpers/string.h"
 #include "shared/source/helpers/surface_format_info.h"
 #include "shared/source/image/image_surface_state.h"
 #include "shared/source/memory_manager/allocation_properties.h"
--- a/level_zero/core/source/module/module.h
+++ b/level_zero/core/source/module/module.h
@@ -10,7 +10,6 @@
 #include <level_zero/ze_api.h>

 #include <memory>
-#include <set>
 #include <vector>

 struct _ze_module_handle_t {};
--- a/level_zero/core/source/module/module_imp.h
+++ b/level_zero/core/source/module/module_imp.h
@@ -17,6 +17,7 @@

 #include <list>
 #include <memory>
+#include <set>
 #include <string>

 namespace NEO {
--- a/level_zero/core/test/black_box_tests/common/zello_common.cpp
+++ b/level_zero/core/test/black_box_tests/common/zello_common.cpp
@@ -8,6 +8,7 @@
 #include "zello_common.h"

 #include <bitset>
+#include <cstring>
 #include <iomanip>

 bool verbose;
--- a/level_zero/core/test/black_box_tests/common/zello_common.h
+++ b/level_zero/core/test/black_box_tests/common/zello_common.h
@@ -9,7 +9,6 @@

 #include <level_zero/ze_api.h>

-#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <limits>
--- a/level_zero/core/test/black_box_tests/common/zello_compile.cpp
+++ b/level_zero/core/test/black_box_tests/common/zello_compile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -9,6 +9,8 @@

 #include "ocloc_api.h"

+#include <cstring>
+
 std::vector<uint8_t> compileToSpirV(const std::string &src, const std::string &options, std::string &outCompilerLog) {
    std::vector<uint8_t> ret;

--- a/level_zero/core/test/black_box_tests/common/zello_compile.h
+++ b/level_zero/core/test/black_box_tests/common/zello_compile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,7 +8,6 @@
 #pragma once

 #include <cstdint>
-#include <cstring>
 #include <string>
 #include <vector>

--- a/level_zero/core/test/black_box_tests/zello_commandlist_immediate.cpp
+++ b/level_zero/core/test/black_box_tests/zello_commandlist_immediate.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
 #include <iomanip>
 #include <iostream>
 #include <limits>
--- a/level_zero/core/test/black_box_tests/zello_copy.cpp
+++ b/level_zero/core/test/black_box_tests/zello_copy.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,6 +7,7 @@

 #include "zello_common.h"

+#include <cstring>
 #include <iomanip>

 void testAppendMemoryCopyFromHeapToDeviceToStack(ze_context_handle_t &context, ze_device_handle_t &device, bool &validRet) {
--- a/level_zero/core/test/black_box_tests/zello_copy_fence.cpp
+++ b/level_zero/core/test/black_box_tests/zello_copy_fence.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -9,6 +9,7 @@

 #include "zello_common.h"

+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <limits>
--- a/level_zero/core/test/black_box_tests/zello_copy_image.cpp
+++ b/level_zero/core/test/black_box_tests/zello_copy_image.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -9,6 +9,7 @@

 #include "zello_common.h"

+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>
--- a/level_zero/core/test/black_box_tests/zello_copy_kernel_printf.cpp
+++ b/level_zero/core/test/black_box_tests/zello_copy_kernel_printf.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -10,6 +10,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>
--- a/level_zero/core/test/black_box_tests/zello_copy_only.cpp
+++ b/level_zero/core/test/black_box_tests/zello_copy_only.cpp
@@ -9,6 +9,7 @@

 #include "zello_common.h"

+#include <cstring>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
--- a/level_zero/core/test/black_box_tests/zello_copy_tracing.cpp
+++ b/level_zero/core/test/black_box_tests/zello_copy_tracing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -11,6 +11,7 @@

 #include "zello_common.h"

+#include <cstring>
 #include <ctime>
 #include <fstream>
 #include <iomanip>
--- a/level_zero/core/test/black_box_tests/zello_dyn_local_arg.cpp
+++ b/level_zero/core/test/black_box_tests/zello_dyn_local_arg.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>
--- a/level_zero/core/test/black_box_tests/zello_events.cpp
+++ b/level_zero/core/test/black_box_tests/zello_events.cpp
@@ -9,6 +9,7 @@

 #include "zello_common.h"

+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>
--- a/level_zero/core/test/black_box_tests/zello_fence.cpp
+++ b/level_zero/core/test/black_box_tests/zello_fence.cpp
@@ -10,6 +10,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>
--- a/level_zero/core/test/black_box_tests/zello_function_pointers_cl.cpp
+++ b/level_zero/core/test/black_box_tests/zello_function_pointers_cl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -10,6 +10,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>
--- a/level_zero/core/test/black_box_tests/zello_host_pointer.cpp
+++ b/level_zero/core/test/black_box_tests/zello_host_pointer.cpp
@@ -7,6 +7,8 @@

 #include "zello_common.h"

+#include <cstring>
+
 typedef ze_result_t (*pFnzexDriverImportExternalPointer)(ze_driver_handle_t, void *, size_t);
 typedef ze_result_t (*pFnzexDriverReleaseImportedPointer)(ze_driver_handle_t, void *);
 typedef ze_result_t (*pFnzexDriverGetHostPointerBaseAddress)(ze_driver_handle_t, void *, void **);
--- a/level_zero/core/test/black_box_tests/zello_image_view.cpp
+++ b/level_zero/core/test/black_box_tests/zello_image_view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,8 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
+
 const char *readNV12Module = R"===(
    __kernel void
    ReadNV12Kernel(
--- a/level_zero/core/test/black_box_tests/zello_immediate.cpp
+++ b/level_zero/core/test/black_box_tests/zello_immediate.cpp
@@ -9,6 +9,7 @@

 #include "zello_common.h"

+#include <cstring>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
--- a/level_zero/core/test/black_box_tests/zello_multidev.cpp
+++ b/level_zero/core/test/black_box_tests/zello_multidev.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,7 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>
--- a/level_zero/core/test/black_box_tests/zello_printf.cpp
+++ b/level_zero/core/test/black_box_tests/zello_printf.cpp
@@ -11,6 +11,7 @@
 #include "zello_compile.h"

 #include <array>
+#include <cstring>
 #include <iostream>
 #include <numeric>
 #ifdef WIN32
--- a/level_zero/core/test/black_box_tests/zello_sandbox.cpp
+++ b/level_zero/core/test/black_box_tests/zello_sandbox.cpp
@@ -8,6 +8,7 @@
 #include "zello_common.h"

 #include <bitset>
+#include <cstring>
 #include <sstream>

 void executeMemoryTransferAndValidate(ze_context_handle_t &context, ze_device_handle_t &device,
--- a/level_zero/core/test/black_box_tests/zello_scratch.cpp
+++ b/level_zero/core/test/black_box_tests/zello_scratch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,8 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
+
 const char *moduleSrc = R"===(
 typedef long16 TYPE;
 __attribute__((reqd_work_group_size(32, 1, 1))) // force LWS to 32
--- a/level_zero/core/test/black_box_tests/zello_timestamp.cpp
+++ b/level_zero/core/test/black_box_tests/zello_timestamp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,6 +7,7 @@

 #include "zello_common.h"

+#include <cstring>
 #include <functional>
 #include <map>

--- a/level_zero/core/test/black_box_tests/zello_world_global_work_offset.cpp
+++ b/level_zero/core/test/black_box_tests/zello_world_global_work_offset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -11,6 +11,8 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
+
 const char *moduleSrc = R"===(
 __kernel void kernel_copy(__global char *dst, __global char *src){
    uint gid = get_global_id(0);
--- a/level_zero/core/test/black_box_tests/zello_world_gpu.cpp
+++ b/level_zero/core/test/black_box_tests/zello_world_gpu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,6 +7,8 @@

 #include "zello_common.h"

+#include <cstring>
+
 void executeGpuKernelAndValidate(ze_context_handle_t &context, ze_device_handle_t &device, bool &outputValidationSuccessful) {
    ze_command_queue_handle_t cmdQueue;
    ze_command_queue_desc_t cmdQueueDesc = {ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC};
--- a/level_zero/core/test/black_box_tests/zello_world_jitc_ocloc.cpp
+++ b/level_zero/core/test/black_box_tests/zello_world_jitc_ocloc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,8 @@
 #include "zello_common.h"
 #include "zello_compile.h"

+#include <cstring>
+
 const char *moduleSrc = R"===(
 __kernel void kernel_copy(__global char *dst, __global char *src){
    uint gid = get_global_id(0);
--- a/level_zero/core/test/black_box_tests/zello_world_usm.cpp
+++ b/level_zero/core/test/black_box_tests/zello_world_usm.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -9,6 +9,7 @@

 #include "zello_common.h"

+#include <cstring>
 #include <fstream>
 #include <iostream>
 #include <memory>
--- a/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h
@@ -16,8 +16,6 @@

 #include <gtest/gtest.h>

-#include <iostream>
-
 namespace L0 {

 extern struct APITracerContextImp *pGlobalAPITracerContextImp;
--- a/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *