refactor: adjust code to compile with c++20

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
2025-12-19 06:24:51 +08:00 · 2024-11-28 15:49:15 +00:00
parent a9c0199dfe
commit 5e1fa75676
29 changed files with 55 additions and 43 deletions
--- a/level_zero/core/source/image/image_format_desc_helper.h
+++ b/level_zero/core/source/image/image_format_desc_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2024 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -19,7 +19,7 @@ struct Swizzles {
    ze_image_format_swizzle_t z;
    ze_image_format_swizzle_t w;

-    bool operator==(const Swizzles &rhs) {
+    bool operator==(const Swizzles &rhs) const {
        if (x != rhs.x)
            return false;
        if (y != rhs.y)
--- a/opencl/source/os_interface/windows/d3d_sharing_functions.h
+++ b/opencl/source/os_interface/windows/d3d_sharing_functions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2024 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -8,6 +8,7 @@
 #pragma once
 #include "shared/source/helpers/debug_helpers.h"

+#include "opencl/source/context/context.h"
 #include "opencl/source/sharings/sharing.h"

 #if __clang__
--- a/opencl/source/sharings/d3d/d3d_buffer.h
+++ b/opencl/source/sharings/d3d/d3d_buffer.h
@@ -6,6 +6,7 @@
 */

 #pragma once
+#include "shared/source/helpers/get_info.h"
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/source/memory_manager/memory_manager.h"

--- a/shared/source/command_container/command_encoder.h
+++ b/shared/source/command_container/command_encoder.h
@@ -106,6 +106,15 @@ enum class CompareOperation : uint32_t {
 struct EncodeWalkerArgs {
    EncodeWalkerArgs() = delete;

+    EncodeWalkerArgs(const KernelDescriptor &kernelDescriptor, KernelExecutionType kernelExecutionType, NEO::RequiredDispatchWalkOrder requiredDispatchWalkOrder,
+                     uint32_t localRegionSize, uint32_t maxFrontEndThreads, bool requiredSystemFence)
+        : kernelDescriptor(kernelDescriptor),
+          kernelExecutionType(kernelExecutionType),
+          requiredDispatchWalkOrder(requiredDispatchWalkOrder),
+          localRegionSize(localRegionSize),
+          maxFrontEndThreads(maxFrontEndThreads),
+          requiredSystemFence(requiredSystemFence) {}
+
    const KernelDescriptor &kernelDescriptor;
    KernelExecutionType kernelExecutionType = KernelExecutionType::defaultType;
    NEO::RequiredDispatchWalkOrder requiredDispatchWalkOrder = NEO::RequiredDispatchWalkOrder::none;
--- a/shared/source/command_container/command_encoder_xehp_and_later.inl
+++ b/shared/source/command_container/command_encoder_xehp_and_later.inl
@@ -361,11 +361,11 @@ void EncodeDispatchKernel<Family>::encode(CommandContainer &container, EncodeDis
                                                   rootDeviceEnvironment);

    if (args.inOrderExecInfo) {
-        EncodeDispatchKernel<Family>::setupPostSyncForInOrderExec<WalkerType>(walkerCmd, args);
+        EncodeDispatchKernel<Family>::setupPostSyncForInOrderExec(walkerCmd, args);
    } else if (args.eventAddress) {
-        EncodeDispatchKernel<Family>::setupPostSyncForRegularEvent<WalkerType>(walkerCmd, args);
+        EncodeDispatchKernel<Family>::setupPostSyncForRegularEvent(walkerCmd, args);
    } else {
-        EncodeDispatchKernel<Family>::forceComputeWalkerPostSyncFlushWithWrite<WalkerType>(walkerCmd);
+        EncodeDispatchKernel<Family>::forceComputeWalkerPostSyncFlushWithWrite(walkerCmd);
    }

    if (debugManager.flags.ForceComputeWalkerPostSyncFlush.get() == 1) {
--- a/shared/source/command_stream/preemption.inl
+++ b/shared/source/command_stream/preemption.inl
@@ -122,18 +122,18 @@ template <typename GfxFamily, typename InterfaceDescriptorType>
 void PreemptionHelper::programInterfaceDescriptorDataPreemption(InterfaceDescriptorType *idd, PreemptionMode preemptionMode) {}

 template <typename GfxFamily>
-constexpr uint32_t PreemptionConfig<GfxFamily>::mmioAddress = 0x2580;
+const uint32_t PreemptionConfig<GfxFamily>::mmioAddress = 0x2580;

 template <typename GfxFamily>
-constexpr uint32_t PreemptionConfig<GfxFamily>::mask = ((1 << 1) | (1 << 2)) << 16;
+const uint32_t PreemptionConfig<GfxFamily>::mask = ((1 << 1) | (1 << 2)) << 16;

 template <typename GfxFamily>
-constexpr uint32_t PreemptionConfig<GfxFamily>::threadGroupVal = (1 << 1);
+const uint32_t PreemptionConfig<GfxFamily>::threadGroupVal = (1 << 1);

 template <typename GfxFamily>
-constexpr uint32_t PreemptionConfig<GfxFamily>::cmdLevelVal = (1 << 2);
+const uint32_t PreemptionConfig<GfxFamily>::cmdLevelVal = (1 << 2);

 template <typename GfxFamily>
-constexpr uint32_t PreemptionConfig<GfxFamily>::midThreadVal = 0;
+const uint32_t PreemptionConfig<GfxFamily>::midThreadVal = 0;

 } // namespace NEO
--- a/shared/source/gen12lp/hw_cmds_base.h
+++ b/shared/source/gen12lp/hw_cmds_base.h
@@ -7,6 +7,7 @@

 #pragma once
 #include "shared/source/commands/bxml_generator_glue.h"
+#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"

 #include <cstring>
--- a/shared/source/generated/gen12lp/hw_cmds_generated_gen12lp.inl
+++ b/shared/source/generated/gen12lp/hw_cmds_generated_gen12lp.inl
@@ -5572,7 +5572,7 @@ struct L3_CONTROL {
 };

 STATIC_ASSERT(28 == sizeof(L3_CONTROL));
-STATIC_ASSERT(std::is_pod<L3_CONTROL>::value);
+STATIC_ASSERT(NEO::TypeTraits::isPodV<L3_CONTROL>);

 typedef struct tagXY_BLOCK_COPY_BLT {
    union tagTheStructure {
--- a/shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl
+++ b/shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl
@@ -5102,7 +5102,7 @@ typedef struct tag_3DSTATE_BTD {
    }
 } _3DSTATE_BTD;
 STATIC_ASSERT(24 == sizeof(_3DSTATE_BTD));
-STATIC_ASSERT(std::is_pod<_3DSTATE_BTD>::value); // patched
+STATIC_ASSERT(NEO::TypeTraits::isPodV<_3DSTATE_BTD>); // patched

 typedef struct tagGRF {
    union tagTheStructure {
--- a/shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl
+++ b/shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl
@@ -5096,7 +5096,7 @@ typedef struct tag_3DSTATE_BTD {
    }
 } _3DSTATE_BTD;
 STATIC_ASSERT(24 == sizeof(_3DSTATE_BTD));
-STATIC_ASSERT(std::is_pod<_3DSTATE_BTD>::value); // patched
+STATIC_ASSERT(NEO::TypeTraits::isPodV<_3DSTATE_BTD>); // patched

 typedef struct tagGRF {
    union tagTheStructure {
--- a/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl
+++ b/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl
@@ -5074,7 +5074,7 @@ typedef struct tag_3DSTATE_BTD {
    }
 } _3DSTATE_BTD;
 STATIC_ASSERT(24 == sizeof(_3DSTATE_BTD));
-STATIC_ASSERT(std::is_pod<_3DSTATE_BTD>::value);
+STATIC_ASSERT(NEO::TypeTraits::isPodV<_3DSTATE_BTD>);

 typedef struct tagGRF {
    union tagTheStructure {
--- a/shared/source/generated/xe_hpg_core/hw_cmds_generated_xe_hpg_core.inl
+++ b/shared/source/generated/xe_hpg_core/hw_cmds_generated_xe_hpg_core.inl
@@ -4827,7 +4827,7 @@ typedef struct tag_3DSTATE_BTD {
    }
 } _3DSTATE_BTD;
 STATIC_ASSERT(24 == sizeof(_3DSTATE_BTD));
-STATIC_ASSERT(std::is_pod<_3DSTATE_BTD>::value);
+STATIC_ASSERT(NEO::TypeTraits::isPodV<_3DSTATE_BTD>);

 typedef struct tagGRF {
    union tagTheStructure {
@@ -7149,7 +7149,7 @@ struct L3_CONTROL {
    }
 };
 STATIC_ASSERT(20 == sizeof(L3_CONTROL));
-STATIC_ASSERT(std::is_pod<L3_CONTROL>::value);
+STATIC_ASSERT(NEO::TypeTraits::isPodV<L3_CONTROL>);

 typedef struct tagSTATE_SIP {
    union tagTheStructure {
--- a/shared/source/helpers/common_types.h
+++ b/shared/source/helpers/common_types.h
@@ -10,6 +10,7 @@

 #include <cstdint>
 #include <memory>
+#include <type_traits>
 #include <vector>

 namespace NEO {
@@ -98,4 +99,8 @@ namespace InterruptId {
 static constexpr uint32_t notUsed = std::numeric_limits<uint32_t>::max();
 }

+namespace TypeTraits {
+template <typename T>
+constexpr bool isPodV = std::is_standard_layout_v<T> && std::is_trivial_v<T> && std::is_trivially_copyable_v<T>;
+}
 } // namespace NEO
--- a/shared/source/helpers/product_config_helper.h
+++ b/shared/source/helpers/product_config_helper.h
@@ -36,7 +36,7 @@ struct DeviceAotInfo {
    std::vector<NEO::ConstStringRef> deviceAcronyms{};
    std::vector<NEO::ConstStringRef> rtlIdAcronyms{};

-    bool operator==(const DeviceAotInfo &rhs) {
+    bool operator==(const DeviceAotInfo &rhs) const {
        return aotConfig.value == rhs.aotConfig.value && family == rhs.family && release == rhs.release && hwInfo == rhs.hwInfo;
    }
 };
--- a/shared/source/helpers/vec.h
+++ b/shared/source/helpers/vec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2024 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
@@ -7,6 +7,7 @@

 #pragma once

+#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"

 #include <cstddef>
@@ -15,7 +16,7 @@

 template <typename T>
 struct Vec3 {
-    static_assert(std::is_pod<T>::value);
+    static_assert(NEO::TypeTraits::isPodV<T>);

    Vec3(T x, T y, T z) : x(x), y(y), z(z) {}
    Vec3(const Vec3 &v) : x(v.x), y(v.y), z(v.z) {}
--- a/shared/source/xe2_hpg_core/hw_cmds_base.h
+++ b/shared/source/xe2_hpg_core/hw_cmds_base.h
@@ -7,6 +7,7 @@

 #pragma once
 #include "shared/source/commands/bxml_generator_glue.h"
+#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"

 #include <cstring>
--- a/shared/source/xe3_core/hw_cmds_base.h
+++ b/shared/source/xe3_core/hw_cmds_base.h
@@ -7,6 +7,7 @@

 #pragma once
 #include "shared/source/commands/bxml_generator_glue.h"
+#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"

 #include <cstdint>
--- a/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h
+++ b/shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h
@@ -8,6 +8,7 @@
 #pragma once

 #include "shared/source/commands/bxml_generator_glue.h"
+#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/xe_hpc_core/hw_info.h"

--- a/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h
+++ b/shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h
@@ -7,6 +7,7 @@

 #pragma once
 #include "shared/source/commands/bxml_generator_glue.h"
+#include "shared/source/helpers/common_types.h"
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/xe_hpg_core/hw_info.h"

--- a/shared/test/common/cmd_parse/CMakeLists.txt
+++ b/shared/test/common/cmd_parse/CMakeLists.txt
@@ -8,7 +8,6 @@ target_sources(neo_libult_common PRIVATE
               ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_3d_state_btd.inl
               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base.inl
-               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_base_mi_arb.inl
               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_mi_arb.inl
               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_mode.inl
               ${CMAKE_CURRENT_SOURCE_DIR}/cmd_parse_compute_walker.inl
--- a/shared/test/common/cmd_parse/cmd_parse_base_mi_arb.inl
+++ b/shared/test/common/cmd_parse/cmd_parse_base_mi_arb.inl
@@ -1,16 +0,0 @@
-/*
- * Copyright (C) 2018-2021 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-template <>
-MI_ARB_CHECK *genCmdCast<MI_ARB_CHECK *>(void *buffer) {
-    auto pCmd = reinterpret_cast<MI_ARB_CHECK *>(buffer);
-
-    return MI_ARB_CHECK::MI_INSTRUCTION_TYPE_MI_INSTRUCTION == pCmd->TheStructure.Common.MiInstructionType &&
-                   MI_ARB_CHECK::MI_INSTRUCTION_OPCODE_MI_ARB_CHECK == pCmd->TheStructure.Common.MiInstructionOpcode
-               ? pCmd
-               : nullptr;
-}
--- a/shared/test/common/cmd_parse/cmd_parse_compute_mi_arb.inl
+++ b/shared/test/common/cmd_parse/cmd_parse_compute_mi_arb.inl
@@ -1,10 +1,13 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2024 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

+using namespace NEO;
+using MI_ARB_CHECK = GenStruct::MI_ARB_CHECK;
+
 template <>
 MI_ARB_CHECK *genCmdCast<MI_ARB_CHECK *>(void *buffer) {
    auto pCmd = reinterpret_cast<MI_ARB_CHECK *>(buffer);
--- a/shared/test/common/cmd_parse/cmd_parse_mi_arb.inl
+++ b/shared/test/common/cmd_parse/cmd_parse_mi_arb.inl
@@ -1,10 +1,12 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2024 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
 */

+using namespace NEO;
+using MI_ARB_CHECK = GenStruct::MI_ARB_CHECK;
 template <>
 MI_ARB_CHECK *genCmdCast<MI_ARB_CHECK *>(void *buffer) {
    auto pCmd = reinterpret_cast<MI_ARB_CHECK *>(buffer);
--- a/shared/test/common/cmd_parse/cmd_parse_xe_hpg_and_later.inl
+++ b/shared/test/common/cmd_parse/cmd_parse_xe_hpg_and_later.inl
@@ -7,7 +7,6 @@

 #include "shared/test/common/cmd_parse/cmd_parse_3d_state_btd.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_base.inl"
-#include "shared/test/common/cmd_parse/cmd_parse_compute_mi_arb.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_compute_mode.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_compute_walker.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_sip.inl"
--- a/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp
+++ b/shared/test/common/gen12lp/cmd_parse_gen12lp.cpp
@@ -6,6 +6,7 @@
 */

 #include "shared/source/gen12lp/hw_cmds_base.h"
+
 using GenStruct = NEO::Gen12Lp;
 using GenGfxFamily = NEO::Gen12LpFamily;

@@ -127,6 +128,7 @@ const char *CmdParse<GenGfxFamily>::getCommandNameHwSpecific(void *cmd) {
 template struct CmdParse<GenGfxFamily>;

 namespace NEO {
+
 template void HardwareParse::findHardwareCommands<Gen12LpFamily>();
 template void HardwareParse::findHardwareCommands<Gen12LpFamily>(IndirectHeap *);
 template const void *HardwareParse::getStatelessArgumentPointer<Gen12LpFamily>(const KernelInfo &kernelInfo, uint32_t indexArg, IndirectHeap &ioh, uint32_t rootDeviceIndex);
--- a/shared/test/common/xe2_hpg_core/cmd_parse_xe2_hpg_core.cpp
+++ b/shared/test/common/xe2_hpg_core/cmd_parse_xe2_hpg_core.cpp
@@ -74,7 +74,7 @@ const char *CmdParse<GenGfxFamily>::getAdditionalCommandName(void *cmd) {

    return "UNKNOWN";
 }
-
+#include "shared/test/common/cmd_parse/cmd_parse_compute_mi_arb.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_xe_hpg_and_later.inl"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse_base.inl"
--- a/shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp
+++ b/shared/test/common/xe_hpc_core/cmd_parse_xe_hpc_core.cpp
@@ -65,7 +65,7 @@ const char *CmdParse<GenGfxFamily>::getAdditionalCommandName(void *cmd) {

    return "UNKNOWN";
 }
-
+#include "shared/test/common/cmd_parse/cmd_parse_compute_mi_arb.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_xe_hpg_and_later.inl"
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/cmd_parse/hw_parse_base.inl"
--- a/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp
+++ b/shared/test/common/xe_hpg_core/cmd_parse_xe_hpg_core.cpp
@@ -52,7 +52,7 @@ const char *CmdParse<GenGfxFamily>::getAdditionalCommandName(void *cmd) {

    return "UNKNOWN";
 }
-
+#include "shared/test/common/cmd_parse/cmd_parse_compute_mi_arb.inl"
 #include "shared/test/common/cmd_parse/cmd_parse_xe_hpg_and_later.inl"
 #include "shared/test/common/cmd_parse/hw_parse_base.inl"
 #include "shared/test/common/cmd_parse/hw_parse_xe_hpg_and_later.inl"
--- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp
+++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp
@@ -6,6 +6,7 @@
 */

 #include "shared/source/aub_mem_dump/page_table_entry_bits.h"
+#include "shared/source/command_stream/aub_command_stream_receiver_hw.h"
 #include "shared/source/gmm_helper/client_context/gmm_client_context.h"
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/gmm_helper/resource_info.h"