refactor: remove not needed includes from ocloc sources

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

shared/offline_compiler/source/decoder/binary_decoder.cpp

@@ -13,8 +13,8 @@
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/file_io.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/helpers/ptr_math.h"
-#include "shared/source/os_interface/os_library.h"
 #include "shared/source/utilities/directory.h"
 
 #include <cstring>

shared/offline_compiler/source/decoder/binary_encoder.cpp

@@ -13,7 +13,7 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hash.h"
-#include "shared/source/os_interface/os_library.h"
+#include "shared/source/helpers/product_config_helper.h"
 
 #include "CL/cl.h"
 #include "helper.h"

shared/offline_compiler/source/decoder/helper.cpp

@@ -10,8 +10,8 @@
 #include "shared/offline_compiler/source/decoder/iga_wrapper.h"
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/os_interface/os_inc_base.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "igfxfmid.h"
 

shared/offline_compiler/source/decoder/iga_wrapper.cpp

@@ -9,7 +9,6 @@
 
 #include "shared/offline_compiler/source/ocloc_dll_options.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "helper.h"
 #include "igfxfmid.h"

shared/offline_compiler/source/decoder/zebin_manipulator.cpp

@@ -15,6 +15,7 @@
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/zebin/zebin_decoder.h"
 #include "shared/source/helpers/hw_info.h"
+#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/utilities/directory.h"
 
 #include <algorithm>

shared/offline_compiler/source/multi_command.cpp

@@ -7,8 +7,12 @@
 
 #include "shared/offline_compiler/source/multi_command.h"
 
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
 #include "shared/offline_compiler/source/ocloc_fatbinary.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
+#include "shared/offline_compiler/source/utilities/get_current_dir.h"
+#include "shared/offline_compiler/source/utilities/safety_caller.h"
 #include "shared/source/utilities/const_stringref.h"
 
 #include <memory>

shared/offline_compiler/source/multi_command.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,17 +7,11 @@
 
 #pragma once
 
-#include "shared/offline_compiler/source/decoder/binary_decoder.h"
-#include "shared/offline_compiler/source/decoder/binary_encoder.h"
-#include "shared/offline_compiler/source/offline_compiler.h"
-#include "shared/offline_compiler/source/utilities/get_current_dir.h"
-#include "shared/offline_compiler/source/utilities/safety_caller.h"
-#include "shared/source/os_interface/os_library.h"
-
-#include <CL/cl.h>
-
-#include <iostream>
 #include <sstream>
+#include <string>
+#include <vector>
+
+class OclocArgHelper;
 
 namespace NEO {
 

shared/offline_compiler/source/ocloc_arg_helper.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include "shared/offline_compiler/source/decoder/helper.h"
-#include "shared/source/helpers/product_config_helper.h"
 #include "shared/source/utilities/const_stringref.h"
 
 #include <algorithm>
@@ -20,9 +19,11 @@
 
 constexpr auto *oclocStdoutLogName = "stdout.log";
 
+struct ProductConfigHelper;
 namespace NEO {
 class CompilerProductHelper;
 class ReleaseHelper;
+struct HardwareInfo;
 } // namespace NEO
 
 struct Source {

shared/offline_compiler/source/ocloc_concat.cpp

@@ -13,6 +13,7 @@
 #include "shared/source/device_binary_format/ar/ar_encoder.h"
 #include "shared/source/device_binary_format/elf/elf_decoder.h"
 #include "shared/source/device_binary_format/zebin/zebin_decoder.h"
+#include "shared/source/helpers/product_config_helper.h"
 
 namespace NEO {
 OclocConcat::ErrorCode OclocConcat::initialize(const std::vector<std::string> &args) {

shared/offline_compiler/source/ocloc_fatbinary.cpp

@@ -7,17 +7,19 @@
 
 #include "shared/offline_compiler/source/ocloc_fatbinary.h"
 
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
+#include "shared/offline_compiler/source/offline_compiler.h"
 #include "shared/offline_compiler/source/utilities/safety_caller.h"
 #include "shared/source/compiler_interface/compiler_options.h"
 #include "shared/source/compiler_interface/intermediate_representations.h"
 #include "shared/source/compiler_interface/tokenized_string.h"
+#include "shared/source/device_binary_format/ar/ar_encoder.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/file_io.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/helpers/product_config_helper.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "igfxfmid.h"
 #include "platforms.h"

shared/offline_compiler/source/ocloc_fatbinary.h

@@ -7,15 +7,20 @@
 
 #pragma once
 
-#include "shared/offline_compiler/source/offline_compiler.h"
-#include "shared/source/device_binary_format/ar/ar_encoder.h"
+#include "shared/source/utilities/arrayref.h"
 #include "shared/source/utilities/const_stringref.h"
 
 #include <cstdint>
 #include <string>
 #include <vector>
 
+class OclocArgHelper;
+
 namespace NEO {
+namespace Ar {
+struct ArEncoder;
+}
+class OfflineCompiler;
 
 bool requestedFatBinary(const std::vector<std::string> &args, OclocArgHelper *helper);
 inline bool requestedFatBinary(int argc, const char *argv[], OclocArgHelper *helper) {

shared/offline_compiler/source/ocloc_fcl_facade.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -53,9 +53,9 @@ class OclocFclFacade {
     MOCKABLE_VIRTUAL void populateFclInterface(IGC::PlatformTagOCL &handle, const HardwareInfo &hwInfo);
 
     OclocArgHelper *argHelper{};
-    std::unique_ptr<OsLibrary> fclLib{};
-    CIF::RAII::UPtr_t<CIF::CIFMain> fclMain{};
-    CIF::RAII::UPtr_t<IGC::FclOclDeviceCtxTagOCL> fclDeviceCtx{};
+    std::unique_ptr<OsLibrary> fclLib;
+    CIF::RAII::UPtr_t<CIF::CIFMain> fclMain;
+    CIF::RAII::UPtr_t<IGC::FclOclDeviceCtxTagOCL> fclDeviceCtx;
     bool initialized{false};
 };
 

shared/offline_compiler/source/ocloc_igc_facade.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -53,9 +53,9 @@ class OclocIgcFacade {
     void populateWithFeatures(IGC::IgcFeaturesAndWorkaroundsTagOCL *handle, const HardwareInfo &hwInfo, const CompilerProductHelper *compilerProductHelper) const;
 
     OclocArgHelper *argHelper{};
-    std::unique_ptr<OsLibrary> igcLib{};
-    CIF::RAII::UPtr_t<CIF::CIFMain> igcMain{};
-    CIF::RAII::UPtr_t<IGC::IgcOclDeviceCtxTagOCL> igcDeviceCtx{};
+    std::unique_ptr<OsLibrary> igcLib;
+    CIF::RAII::UPtr_t<CIF::CIFMain> igcMain;
+    CIF::RAII::UPtr_t<IGC::IgcOclDeviceCtxTagOCL> igcDeviceCtx;
     bool initialized{false};
 };
 

shared/offline_compiler/source/offline_compiler.cpp

@@ -7,7 +7,10 @@
 
 #include "offline_compiler.h"
 
+#include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
+#include "shared/offline_compiler/source/ocloc_fcl_facade.h"
+#include "shared/offline_compiler/source/ocloc_igc_facade.h"
 #include "shared/offline_compiler/source/queries.h"
 #include "shared/offline_compiler/source/utilities/get_git_version_info.h"
 #include "shared/source/compiler_interface/compiler_options.h"
@@ -23,7 +26,6 @@
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/helpers/validators.h"
-#include "shared/source/os_interface/os_library.h"
 #include "shared/source/release_helper/release_helper.h"
 
 #include "platforms.h"

shared/offline_compiler/source/offline_compiler.h

@@ -7,11 +7,7 @@
 
 #pragma once
 
-#include "shared/offline_compiler/source/ocloc_arg_helper.h"
-#include "shared/offline_compiler/source/ocloc_fcl_facade.h"
-#include "shared/offline_compiler/source/ocloc_igc_facade.h"
 #include "shared/source/helpers/hw_info.h"
-#include "shared/source/release_helper/release_helper.h"
 #include "shared/source/utilities/arrayref.h"
 #include "shared/source/utilities/const_stringref.h"
 
@@ -22,11 +18,14 @@
 #include <string>
 #include <unordered_map>
 
+class OclocArgHelper;
+
 namespace NEO {
 
-struct HardwareInfo;
-class OsLibrary;
 class CompilerCache;
+class ReleaseHelper;
+class OclocFclFacade;
+class OclocIgcFacade;
 
 std::string convertToPascalCase(const std::string &inString);
 
@@ -135,7 +134,7 @@ All supported acronyms: %s.
     MOCKABLE_VIRTUAL void createDir(const std::string &path);
     void unifyExcludeIrFlags();
     void enforceFormat(std::string &format);
-    HardwareInfo hwInfo;
+    HardwareInfo hwInfo{};
 
     uint32_t deviceConfig = {};
     std::string deviceName;
@@ -185,8 +184,8 @@ All supported acronyms: %s.
     int revisionId = -1;
     uint64_t hwInfoConfig = 0u;
 
-    std::unique_ptr<OclocIgcFacade> igcFacade{nullptr};
-    std::unique_ptr<OclocFclFacade> fclFacade{nullptr};
+    std::unique_ptr<OclocIgcFacade> igcFacade;
+    std::unique_ptr<OclocFclFacade> fclFacade;
     std::unique_ptr<CompilerCache> cache;
     std::unique_ptr<CompilerProductHelper> compilerProductHelper;
     std::unique_ptr<ReleaseHelper> releaseHelper;

shared/offline_compiler/source/offline_linker.cpp

@@ -9,12 +9,12 @@
 
 #include "shared/offline_compiler/source/ocloc_arg_helper.h"
 #include "shared/offline_compiler/source/ocloc_error_code.h"
+#include "shared/offline_compiler/source/ocloc_igc_facade.h"
 #include "shared/source/compiler_interface/intermediate_representations.h"
 #include "shared/source/device_binary_format/elf/elf_encoder.h"
 #include "shared/source/device_binary_format/elf/ocl_elf.h"
 #include "shared/source/helpers/compiler_product_helper.h"
 #include "shared/source/helpers/string.h"
-#include "shared/source/os_interface/os_library.h"
 
 #include "cif/common/cif_main.h"
 #include "cif/import/library_api.h"

shared/offline_compiler/source/offline_linker.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "shared/offline_compiler/source/ocloc_igc_facade.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/utilities/arrayref.h"
 
@@ -24,6 +23,7 @@ class OclocArgHelper;
 namespace NEO {
 
 class OsLibrary;
+class OclocIgcFacade;
 
 class OfflineLinker {
   protected:
@@ -76,7 +76,7 @@ class OfflineLinker {
     std::string options{};
     std::string internalOptions{};
 
-    std::unique_ptr<OclocIgcFacade> igcFacade{};
+    std::unique_ptr<OclocIgcFacade> igcFacade;
     HardwareInfo hwInfo{};
     std::string buildLog{};
 };