refactor: Change wording from NonCopyableOrMovable to NonCopyableAndNonMovable

Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
2025-12-25 13:33:02 +08:00 · 2025-02-17 11:26:17 +00:00
parent 28be16771d
commit 4c7900008f
146 changed files with 294 additions and 294 deletions
--- a/shared/source/assert_handler/assert_handler.h
+++ b/shared/source/assert_handler/assert_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -27,7 +27,7 @@ static_assert(sizeof(AssertBufferHeader) == 3u * sizeof(uint32_t));

 #pragma pack()

-class AssertHandler : NonCopyableOrMovableClass {
+class AssertHandler : NonCopyableAndNonMovableClass {
  public:
    AssertHandler(Device *device);
    MOCKABLE_VIRTUAL ~AssertHandler();
--- a/shared/source/aub/aub_helper.h
+++ b/shared/source/aub/aub_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -17,7 +17,7 @@ namespace NEO {
 class ReleaseHelper;
 struct HardwareInfo;

-class AubHelper : public NonCopyableOrMovableClass {
+class AubHelper : public NonCopyableAndNonMovableClass {
  public:
    static bool isOneTimeAubWritableAllocationType(const AllocationType &type);
    static uint64_t getTotalMemBankSize(const ReleaseHelper *releaseHelper);
--- a/shared/source/command_container/cmdcontainer.h
+++ b/shared/source/command_container/cmdcontainer.h
@@ -58,7 +58,7 @@ struct HeapReserveArguments {
    size_t alignment = 0;
 };

-class CommandContainer : public NonCopyableOrMovableClass {
+class CommandContainer : public NonCopyableAndNonMovableClass {
  public:
    enum class ErrorCode {
        success = 0,
@@ -272,6 +272,6 @@ class CommandContainer : public NonCopyableOrMovableClass {
    bool globalBindlessHeapsEnabled = false;
 };

-static_assert(NEO::NonCopyableOrMovable<CommandContainer>);
+static_assert(NEO::NonCopyableAndNonMovable<CommandContainer>);

 } // namespace NEO
--- a/shared/source/command_stream/scratch_space_controller.h
+++ b/shared/source/command_stream/scratch_space_controller.h
@@ -29,7 +29,7 @@ inline constexpr size_t scratchSpaceOffsetFor64Bit = 4096u;

 using ResidencyContainer = std::vector<GraphicsAllocation *>;

-class ScratchSpaceController : NonCopyableOrMovableClass {
+class ScratchSpaceController : NonCopyableAndNonMovableClass {
  public:
    ScratchSpaceController(uint32_t rootDeviceIndex, ExecutionEnvironment &environment, InternalAllocationStorage &allocationStorage);
    virtual ~ScratchSpaceController();
--- a/shared/source/debugger/debugger_l0.h
+++ b/shared/source/debugger/debugger_l0.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -71,7 +71,7 @@ static_assert(sizeof(DebugAreaHeader) == 32u * sizeof(uint8_t));

 #pragma pack()

-class DebuggerL0 : public NEO::Debugger, NEO::NonCopyableOrMovableClass {
+class DebuggerL0 : public NEO::Debugger, NEO::NonCopyableAndNonMovableClass {
  public:
    static std::unique_ptr<Debugger> create(NEO::Device *device);

--- a/shared/source/device/device.h
+++ b/shared/source/device/device.h
@@ -42,7 +42,7 @@ class UsmMemAllocPoolsManager;
 enum class EngineGroupType : uint32_t;
 struct PhysicalDevicePciBusInfo;

-struct SelectorCopyEngine : NonCopyableOrMovableClass {
+struct SelectorCopyEngine : NonCopyableAndNonMovableClass {
    std::atomic<bool> isMainUsed = false;
    std::atomic<uint32_t> selector = 0;
 };
--- a/shared/source/device_binary_format/zebin/zeinfo.h
+++ b/shared/source/device_binary_format/zebin/zeinfo.h
@@ -399,7 +399,7 @@ struct ExecutionEnvExt;
 ExecutionEnvExt *allocateExecEnvExt();
 void freeExecEnvExt(ExecutionEnvExt *);

-struct ExecutionEnvBaseT final : NEO::NonCopyableOrMovableClass {
+struct ExecutionEnvBaseT final : NEO::NonCopyableAndNonMovableClass {
    ExecutionEnvBaseT() {
        execEnvExt = allocateExecEnvExt();
    }
--- a/shared/source/direct_submission/direct_submission_hw_diagnostic_mode.h
+++ b/shared/source/direct_submission/direct_submission_hw_diagnostic_mode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -28,7 +28,7 @@ struct DirectSubmissionSingleDelta {

 using DirectSubmissionExecution = std::vector<DirectSubmissionSingleDelta>;

-class DirectSubmissionDiagnosticsCollector : NonCopyableOrMovableClass {
+class DirectSubmissionDiagnosticsCollector : NonCopyableAndNonMovableClass {
  public:
    DirectSubmissionDiagnosticsCollector(uint32_t executions,
                                         bool storeExecutions,
--- a/shared/source/gmm_helper/resource_info.h
+++ b/shared/source/gmm_helper/resource_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -14,7 +14,7 @@

 namespace NEO {
 class GmmClientContext;
-class GmmResourceInfo : NonCopyableOrMovableClass {
+class GmmResourceInfo : NonCopyableAndNonMovableClass {
  public:
    static GmmResourceInfo *create(GmmClientContext *clientContext, GMM_RESCREATE_PARAMS *resourceCreateParams);

--- a/shared/source/helpers/non_copyable_or_moveable.h
+++ b/shared/source/helpers/non_copyable_or_moveable.h
@@ -10,14 +10,14 @@
 #include <type_traits>

 namespace NEO {
-class NonCopyableOrMovableClass {
+class NonCopyableAndNonMovableClass {
  public:
-    NonCopyableOrMovableClass() = default;
-    NonCopyableOrMovableClass(const NonCopyableOrMovableClass &) = delete;
-    NonCopyableOrMovableClass &operator=(const NonCopyableOrMovableClass &) = delete;
+    NonCopyableAndNonMovableClass() = default;
+    NonCopyableAndNonMovableClass(const NonCopyableAndNonMovableClass &) = delete;
+    NonCopyableAndNonMovableClass &operator=(const NonCopyableAndNonMovableClass &) = delete;

-    NonCopyableOrMovableClass(NonCopyableOrMovableClass &&) = delete;
-    NonCopyableOrMovableClass &operator=(NonCopyableOrMovableClass &&) = delete;
+    NonCopyableAndNonMovableClass(NonCopyableAndNonMovableClass &&) = delete;
+    NonCopyableAndNonMovableClass &operator=(NonCopyableAndNonMovableClass &&) = delete;
 };

 class NonCopyableClass {
@@ -31,7 +31,7 @@ class NonCopyableClass {
 };

 template <typename T>
-concept NonCopyableOrMovable = !
+concept NonCopyableAndNonMovable = !
 std::is_copy_constructible_v<T> &&
    !std::is_copy_assignable_v<T> &&
    !std::is_move_constructible_v<T> &&
--- a/shared/source/helpers/ray_tracing_helper.h
+++ b/shared/source/helpers/ray_tracing_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -20,7 +20,7 @@
 #include <cstdint>

 namespace NEO {
-class RayTracingHelper : public NonCopyableOrMovableClass {
+class RayTracingHelper : public NonCopyableAndNonMovableClass {
  public:
    static constexpr uint32_t hitInfoSize = 64;
    static constexpr uint32_t bvhStackSize = 96;
--- a/shared/source/kernel/kernel_descriptor.h
+++ b/shared/source/kernel/kernel_descriptor.h
@@ -33,7 +33,7 @@ struct KernelDescriptorExt;
 KernelDescriptorExt *allocateKernelDescriptorExt();
 void freeKernelDescriptorExt(KernelDescriptorExt *);

-struct KernelDescriptor : NEO::NonCopyableOrMovableClass {
+struct KernelDescriptor : NEO::NonCopyableAndNonMovableClass {
    static bool isBindlessAddressingKernel(const KernelDescriptor &desc);

    enum AddressingMode : uint8_t {
--- a/shared/source/memory_manager/local_memory_usage.h
+++ b/shared/source/memory_manager/local_memory_usage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -15,7 +15,7 @@
 #include <memory>

 namespace NEO {
-class LocalMemoryUsageBankSelector : public NonCopyableOrMovableClass {
+class LocalMemoryUsageBankSelector : public NonCopyableAndNonMovableClass {
  public:
    LocalMemoryUsageBankSelector() = delete;
    LocalMemoryUsageBankSelector(uint32_t banksCount);
--- a/shared/source/memory_manager/prefetch_manager.h
+++ b/shared/source/memory_manager/prefetch_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -25,7 +25,7 @@ struct PrefetchContext {
    SpinLock lock;
 };

-class PrefetchManager : public NonCopyableOrMovableClass {
+class PrefetchManager : public NonCopyableAndNonMovableClass {
  public:
    static std::unique_ptr<PrefetchManager> create();

--- a/shared/source/os_interface/linux/file_descriptor.h
+++ b/shared/source/os_interface/linux/file_descriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -12,7 +12,7 @@

 namespace NEO {

-class FileDescriptor : NonCopyableOrMovableClass {
+class FileDescriptor : NonCopyableAndNonMovableClass {
  public:
    FileDescriptor(const char *file, int flags) : handle(SysCalls::open(file, flags)) {}

--- a/shared/source/os_interface/windows/os_library_win.h
+++ b/shared/source/os_interface/windows/os_library_win.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -15,7 +15,7 @@
 namespace NEO {
 namespace Windows {

-class OsLibrary : public NEO::OsLibrary, NEO::NonCopyableOrMovableClass {
+class OsLibrary : public NEO::OsLibrary, NEO::NonCopyableAndNonMovableClass {
  private:
    HMODULE handle;

--- a/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
+++ b/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -23,7 +23,7 @@ constexpr bool wddmResidencyLoggingAvailable = true;
 constexpr bool wddmResidencyLoggingAvailable = false;
 #endif

-class WddmResidencyLogger : NonCopyableOrMovableClass {
+class WddmResidencyLogger : NonCopyableAndNonMovableClass {
  public:
    WddmResidencyLogger(unsigned int device, volatile void *fenceValueCpuVirtualAddress, std::string outDirectory) {
        const char *wddmResidencyLoggerDefaultDirectory = "unk";
--- a/shared/source/program/sync_buffer_handler.h
+++ b/shared/source/program/sync_buffer_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -19,7 +19,7 @@ class Device;
 class GraphicsAllocation;
 class MemoryManager;

-class SyncBufferHandler : NonCopyableOrMovableClass {
+class SyncBufferHandler : NonCopyableAndNonMovableClass {
  public:
    ~SyncBufferHandler();

--- a/shared/source/utilities/tag_allocator.h
+++ b/shared/source/utilities/tag_allocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -31,7 +31,7 @@ class TagNode;

 class TagAllocatorBase;

-class TagNodeBase : public NonCopyableOrMovableClass {
+class TagNodeBase : public NonCopyableAndNonMovableClass {
  public:
    virtual ~TagNodeBase() = default;