Cleanup headers

Make TUs and headers self-contained, remove unused headers

Signed-off-by: Daniel Chabrowski <daniel.chabrowski@intel.com>

shared/source/helpers/affinity_mask.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,12 +7,10 @@
 
 #pragma once
 
-#include "shared/source/helpers/constants.h"
-#include "shared/source/helpers/debug_helpers.h"
+#include "shared/source/helpers/common_types.h"
 
-#include <array>
 #include <bitset>
-#include <string>
+#include <limits>
 #include <vector>
 
 namespace NEO {

shared/source/helpers/aligned_memory.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,6 +16,7 @@
 #include <functional>
 #include <memory>
 #include <new>
+#include <type_traits>
 
 #ifdef _MSC_VER
 #define ALIGNAS(x) __declspec(align(x))

shared/source/helpers/api_specific_config.h

@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#pragma once
 #include <cstdint>
 #include <string>
 
-#pragma once
 namespace NEO {
 struct ApiSpecificConfig {
     enum ApiType { OCL,

shared/source/helpers/app_resource_defines.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,6 @@
 
 #pragma once
 #include <cstdint>
-#include <type_traits>
 
 namespace NEO {
 namespace AppResourceDefines {

shared/source/helpers/app_resource_helper.h

@@ -5,7 +5,11 @@
  *
  */
 
-#include "shared/source/memory_manager/graphics_allocation.h"
+#pragma once
+
+#include "shared/source/memory_manager/allocation_type.h"
+
+#include <cstddef>
 
 namespace NEO {
 struct AppResourceHelper {
@@ -13,5 +17,4 @@ struct AppResourceHelper {
     static const char *getResourceTagStr(AllocationType type);
     static void copyResourceTagStr(char *dst, AllocationType type, size_t size);
 };
-
 } // namespace NEO

shared/source/helpers/bindless_heaps_helper.h

@@ -8,7 +8,6 @@
 #pragma once
 #include "shared/source/helpers/constants.h"
 #include "shared/source/helpers/heap_helper.h"
-#include "shared/source/helpers/non_copyable_or_moveable.h"
 
 #include <memory>
 #include <mutex>
@@ -37,6 +36,10 @@ class BindlessHeapsHelper {
     };
     BindlessHeapsHelper(MemoryManager *memManager, bool isMultiOsContextCapable, const uint32_t rootDeviceIndex, DeviceBitfield deviceBitfield);
     ~BindlessHeapsHelper();
+
+    BindlessHeapsHelper(const BindlessHeapsHelper &) = delete;
+    BindlessHeapsHelper &operator=(const BindlessHeapsHelper &) = delete;
+
     GraphicsAllocation *getHeapAllocation(size_t heapSize, size_t alignment, bool allocInFrontWindow);
 
     SurfaceStateInHeapInfo allocateSSInHeap(size_t ssSize, GraphicsAllocation *surfaceAllocation, BindlesHeapType heapType);
@@ -60,4 +63,4 @@ class BindlessHeapsHelper {
     std::mutex mtx;
     DeviceBitfield deviceBitfield;
 };
-} // namespace NEO
+} // namespace NEO

shared/source/helpers/common_types.h

@@ -7,8 +7,10 @@
 
 #pragma once
 #include <bitset>
+#include <cstdint>
 #include <memory>
 #include <vector>
+
 namespace NEO {
 struct EngineControl;
 using EngineControlContainer = std::vector<EngineControl>;

shared/source/helpers/completion_stamp.h

@@ -10,7 +10,7 @@
 #include <cstdint>
 
 namespace NEO {
-typedef uint64_t FlushStamp;
+using FlushStamp = uint64_t;
 struct CompletionStamp {
     uint32_t taskCount;
     uint32_t taskLevel;

shared/source/helpers/deferred_deleter_helper.h

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#pragma once
+
 namespace NEO {
 bool isDeferredDeleterEnabled();
 } // namespace NEO

shared/source/helpers/engine_node_helper.cpp

@@ -7,6 +7,7 @@
 
 #include "shared/source/helpers/engine_node_helper.h"
 
+#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/hw_helper.h"
 

shared/source/helpers/hash.h

@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/helpers/aligned_memory.h"
-
+#include <cstddef>
 #include <cstdint>
 
 namespace NEO {

shared/source/helpers/heap_assigner.h

@@ -6,10 +6,14 @@
  */
 
 #pragma once
-#include "shared/source/memory_manager/graphics_allocation.h"
+#include "shared/source/memory_manager/allocation_type.h"
+
+#include <cstdint>
 
 namespace NEO {
+enum class HeapIndex : uint32_t;
 struct HardwareInfo;
+
 struct HeapAssigner {
     HeapAssigner();
     ~HeapAssigner() = default;
@@ -24,4 +28,4 @@ struct HeapAssigner {
     static HeapIndex mapInternalWindowIndex(HeapIndex index);
     bool apiAllowExternalHeapForSshAndDsh = false;
 };
-} // namespace NEO
+} // namespace NEO

shared/source/helpers/kernel_helpers.h

@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#pragma once
+
 #include <cstddef>
 #include <cstdint>
 

shared/source/helpers/memory_properties_helpers_base.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/bit_helpers.h"
 #include "shared/source/helpers/memory_properties_helpers.h"