Skip to content

Commit a2aa645

Browse files
refactor: Update MI_MEM_FENCE
Refactors the MI_MEM_FENCE to align with the latest specification. Related-To: NEO-13147 Signed-off-by: Vysochyn, Illia <[email protected]>
1 parent b192893 commit a2aa645

File tree

13 files changed

+45
-45
lines changed

13 files changed

+45
-45
lines changed

level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_memory_extension.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022-2024 Intel Corporation
2+
* Copyright (C) 2022-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -760,7 +760,7 @@ HWTEST2_F(CommandListAppendWaitOnMem, givenAppendWaitOnMemWithHostMemAndNoScopeT
760760
auto itor = find<MI_MEM_FENCE *>(cmdList.begin(), cmdList.end());
761761
EXPECT_NE(cmdList.end(), itor);
762762
auto cmd = genCmdCast<MI_MEM_FENCE *>(*itor);
763-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE, cmd->getFenceType());
763+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE_FENCE, cmd->getFenceType());
764764

765765
context->freeMem(dstBuffer);
766766
}
@@ -1328,7 +1328,7 @@ HWTEST2_F(ImmediateCommandListAppendWaitOnMem, givenAppendWaitOnMemWithHostMemAn
13281328
auto itor = find<MI_MEM_FENCE *>(cmdList.begin(), cmdList.end());
13291329
EXPECT_NE(cmdList.end(), itor);
13301330
auto cmd = genCmdCast<MI_MEM_FENCE *>(*itor);
1331-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE, cmd->getFenceType());
1331+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE_FENCE, cmd->getFenceType());
13321332

13331333
context->freeMem(dstBuffer);
13341334
}

opencl/test/unit_test/xe2_hpg_core/command_stream_receiver_hw_tests_xe2_hpg_core.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2024 Intel Corporation
2+
* Copyright (C) 2024-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -401,7 +401,7 @@ XE2_HPG_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTestXe2HpgCore,
401401
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
402402
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
403403
ASSERT_NE(nullptr, fenceCmd);
404-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
404+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
405405
}
406406
}
407407

@@ -439,7 +439,7 @@ XE2_HPG_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTestXe2HpgCore,
439439
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
440440
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
441441
ASSERT_NE(nullptr, fenceCmd);
442-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
442+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
443443
}
444444
}
445445

@@ -477,7 +477,7 @@ XE2_HPG_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTestXe2HpgCore,
477477
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
478478
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
479479
ASSERT_NE(nullptr, fenceCmd);
480-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
480+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
481481
}
482482

483483
auto event = castToObject<Event>(kernelEvent);
@@ -519,7 +519,7 @@ XE2_HPG_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTestXe2HpgCore,
519519
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
520520
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
521521
ASSERT_NE(nullptr, fenceCmd);
522-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
522+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
523523
}
524524

525525
auto event = castToObject<Event>(kernelEvent);
@@ -562,7 +562,7 @@ XE2_HPG_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTestXe2HpgCore,
562562
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
563563
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
564564
ASSERT_NE(nullptr, fenceCmd);
565-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
565+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
566566
}
567567

568568
auto event = castToObject<Event>(kernelEvent);

opencl/test/unit_test/xe_hpc_core/command_stream_receiver_hw_tests_xe_hpc_core.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021-2023 Intel Corporation
2+
* Copyright (C) 2021-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -333,7 +333,7 @@ XE_HPC_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTest,
333333
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
334334
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
335335
ASSERT_NE(nullptr, fenceCmd);
336-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
336+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
337337
}
338338

339339
XE_HPC_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTest,
@@ -376,7 +376,7 @@ XE_HPC_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTest,
376376
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
377377
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
378378
ASSERT_NE(nullptr, fenceCmd);
379-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
379+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
380380
}
381381

382382
XE_HPC_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTest,
@@ -419,7 +419,7 @@ XE_HPC_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTest,
419419
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
420420
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
421421
ASSERT_NE(nullptr, fenceCmd);
422-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
422+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
423423

424424
auto event = castToObject<Event>(kernelEvent);
425425
event->release();
@@ -466,7 +466,7 @@ XE_HPC_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTest,
466466
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
467467
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
468468
ASSERT_NE(nullptr, fenceCmd);
469-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
469+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
470470

471471
auto event = castToObject<Event>(kernelEvent);
472472
event->release();
@@ -514,7 +514,7 @@ XE_HPC_CORETEST_F(SystemMemoryFenceInDefaultConfigurationTest,
514514
ASSERT_NE(hwParser.cmdList.end(), itorMiMemFence);
515515
auto fenceCmd = genCmdCast<MI_MEM_FENCE *>(*itorMiMemFence);
516516
ASSERT_NE(nullptr, fenceCmd);
517-
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE, fenceCmd->getFenceType());
517+
EXPECT_EQ(MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE, fenceCmd->getFenceType());
518518

519519
auto event = castToObject<Event>(kernelEvent);
520520
event->release();

shared/source/generated/xe2_hpg_core/hw_cmds_generated_xe2_hpg_core.inl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2024 Intel Corporation
2+
* Copyright (C) 2024-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -7188,9 +7188,9 @@ typedef struct tagMI_MEM_FENCE {
71887188
uint32_t RawData[1];
71897189
} TheStructure;
71907190
typedef enum tagFENCE_TYPE {
7191-
FENCE_TYPE_RELEASE = 0x0,
7192-
FENCE_TYPE_ACQUIRE = 0x1,
7193-
FENCE_TYPE_MI_WRITE = 0x3,
7191+
FENCE_TYPE_RELEASE_FENCE = 0x0,
7192+
FENCE_TYPE_ACQUIRE_FENCE = 0x1,
7193+
FENCE_TYPE_MI_WRITE_FENCE = 0x3,
71947194
} FENCE_TYPE;
71957195
typedef enum tagMI_COMMAND_SUB_OPCODE {
71967196
MI_COMMAND_SUB_OPCODE_MI_MEM_FENCE = 0x0,
@@ -7203,7 +7203,7 @@ typedef struct tagMI_MEM_FENCE {
72037203
} COMMAND_TYPE;
72047204
inline void init() {
72057205
memset(&TheStructure, 0, sizeof(TheStructure));
7206-
TheStructure.Common.FenceType = FENCE_TYPE_RELEASE;
7206+
TheStructure.Common.FenceType = FENCE_TYPE_RELEASE_FENCE;
72077207
TheStructure.Common.MiCommandSubOpcode = MI_COMMAND_SUB_OPCODE_MI_MEM_FENCE;
72087208
TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_EXTENDED;
72097209
TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND;

shared/source/generated/xe3_core/hw_cmds_generated_xe3_core.inl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2024 Intel Corporation
2+
* Copyright (C) 2024-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -7225,9 +7225,9 @@ typedef struct tagMI_MEM_FENCE {
72257225
uint32_t RawData[1];
72267226
} TheStructure;
72277227
typedef enum tagFENCE_TYPE {
7228-
FENCE_TYPE_RELEASE = 0x0,
7229-
FENCE_TYPE_ACQUIRE = 0x1,
7230-
FENCE_TYPE_MI_WRITE = 0x3,
7228+
FENCE_TYPE_RELEASE_FENCE = 0x0,
7229+
FENCE_TYPE_ACQUIRE_FENCE = 0x1,
7230+
FENCE_TYPE_MI_WRITE_FENCE = 0x3,
72317231
} FENCE_TYPE;
72327232
typedef enum tagMI_COMMAND_SUB_OPCODE {
72337233
MI_COMMAND_SUB_OPCODE_MI_MEM_FENCE = 0x0,
@@ -7240,7 +7240,7 @@ typedef struct tagMI_MEM_FENCE {
72407240
} COMMAND_TYPE;
72417241
inline void init() {
72427242
memset(&TheStructure, 0, sizeof(TheStructure));
7243-
TheStructure.Common.FenceType = FENCE_TYPE_RELEASE;
7243+
TheStructure.Common.FenceType = FENCE_TYPE_RELEASE_FENCE;
72447244
TheStructure.Common.MiCommandSubOpcode = MI_COMMAND_SUB_OPCODE_MI_MEM_FENCE;
72457245
TheStructure.Common.MiCommandOpcode = MI_COMMAND_OPCODE_MI_EXTENDED;
72467246
TheStructure.Common.CommandType = COMMAND_TYPE_MI_COMMAND;

shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021-2024 Intel Corporation
2+
* Copyright (C) 2021-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -7057,14 +7057,14 @@ struct MI_MEM_FENCE {
70577057
} TheStructure;
70587058

70597059
typedef enum tagFENCE_TYPE {
7060-
FENCE_TYPE_RELEASE = 0x0,
7061-
FENCE_TYPE_ACQUIRE = 0x1,
7060+
FENCE_TYPE_RELEASE_FENCE = 0x0,
7061+
FENCE_TYPE_ACQUIRE_FENCE = 0x1,
70627062
} FENCE_TYPE;
70637063

70647064
inline void init() {
70657065
memset(&TheStructure, 0, sizeof(TheStructure));
70667066
TheStructure.Common.MiCommandOpcode = 0x9;
7067-
TheStructure.Common.FenceType = FENCE_TYPE::FENCE_TYPE_RELEASE;
7067+
TheStructure.Common.FenceType = FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE;
70687068
}
70697069

70707070
static MI_MEM_FENCE sInit() {

shared/source/xe2_hpg_core/gfx_core_helper_xe2_hpg_core.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ void MemorySynchronizationCommands<Family>::setAdditionalSynchronization(void *&
141141
if (programGlobalFenceAsMiMemFenceCommandInCommandStream == AdditionalSynchronizationType::fence) {
142142
MI_MEM_FENCE miMemFence = Family::cmdInitMemFence;
143143
if (acquire) {
144-
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE);
144+
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE_FENCE);
145145
} else {
146-
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE);
146+
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE);
147147
}
148148
*reinterpret_cast<MI_MEM_FENCE *>(commandsBuffer) = miMemFence;
149149
commandsBuffer = ptrOffset(commandsBuffer, sizeof(MI_MEM_FENCE));

shared/source/xe3_core/gfx_core_helper_xe3_core.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ void MemorySynchronizationCommands<Family>::setAdditionalSynchronization(void *&
141141
if (programGlobalFenceAsMiMemFenceCommandInCommandStream == AdditionalSynchronizationType::fence) {
142142
MI_MEM_FENCE miMemFence = Family::cmdInitMemFence;
143143
if (acquire) {
144-
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE);
144+
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE_FENCE);
145145
} else {
146-
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE);
146+
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE);
147147
}
148148
*reinterpret_cast<MI_MEM_FENCE *>(commandsBuffer) = miMemFence;
149149
commandsBuffer = ptrOffset(commandsBuffer, sizeof(MI_MEM_FENCE));

shared/source/xe_hpc_core/gfx_core_helper_xe_hpc_core.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021-2024 Intel Corporation
2+
* Copyright (C) 2021-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -167,9 +167,9 @@ void MemorySynchronizationCommands<Family>::setAdditionalSynchronization(void *&
167167
if (programGlobalFenceAsMiMemFenceCommandInCommandStream) {
168168
MI_MEM_FENCE miMemFence = Family::cmdInitMemFence;
169169
if (acquire) {
170-
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE);
170+
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE_FENCE);
171171
} else {
172-
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE);
172+
miMemFence.setFenceType(Family::MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_RELEASE_FENCE);
173173
}
174174
*reinterpret_cast<MI_MEM_FENCE *>(commandsBuffer) = miMemFence;
175175
commandsBuffer = ptrOffset(commandsBuffer, sizeof(MI_MEM_FENCE));

shared/test/unit_test/direct_submission/direct_submission_tests_2.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2020-2024 Intel Corporation
2+
* Copyright (C) 2020-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -77,7 +77,7 @@ struct DirectSubmissionDispatchMiMemFenceTest : public DirectSubmissionDispatchB
7777

7878
EXPECT_NE(0u, sysFenceAddress->getSystemMemoryFenceAddress());
7979
} else if (auto miMemFence = genCmdCast<MI_MEM_FENCE *>(it)) {
80-
if (miMemFence->getFenceType() == MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE) {
80+
if (miMemFence->getFenceType() == MI_MEM_FENCE::FENCE_TYPE::FENCE_TYPE_ACQUIRE_FENCE) {
8181
EXPECT_TRUE(id > systemMemoryFenceId);
8282

8383
fenceCount++;

0 commit comments

Comments
 (0)