Skip to content

Commit 3b820d4

Browse files
fhazubski-IntelCompute-Runtime-Automation
fhazubski-Intel
authored and
Compute-Runtime-Automation
committed
Reorder engines to match API engines order
Related-To: NEO-6219 Signed-off-by: Filip Hazubski <[email protected]>
1 parent 0ce5c6c commit 3b820d4

File tree

5 files changed

+44
-44
lines changed

5 files changed

+44
-44
lines changed

‎opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ GEN12LPTEST_F(HwHelperTestGen12Lp, givenFtrCcsNodeSetWhenGetGpgpuEnginesThenRetu
125125
EXPECT_EQ(4u, device->engines.size());
126126
auto &engines = HwHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
127127
EXPECT_EQ(4u, engines.size());
128-
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first);
128+
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);
129129
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[1].first);
130-
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[2].first);
130+
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[2].first);
131131
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[3].first);
132132
}
133133

@@ -158,9 +158,9 @@ GEN12LPTEST_F(HwHelperTestGen12Lp, givenFtrCcsNodeSetFtrGpGpuMidThreadLevelPreem
158158
EXPECT_EQ(4u, device->engines.size());
159159
auto &engines = HwHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
160160
EXPECT_EQ(4u, engines.size());
161-
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first);
161+
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);
162162
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[1].first);
163-
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[2].first);
163+
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[2].first);
164164
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[3].first);
165165
}
166166

‎opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenAllFlagsSetWhenGetGp
104104
auto &engines = HwHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
105105
EXPECT_EQ(9u, engines.size());
106106

107-
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first);
108-
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[1].first); // low priority
109-
EXPECT_EQ(EngineUsage::LowPriority, engines[1].second);
110-
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[2].first); // internal
111-
EXPECT_EQ(EngineUsage::Internal, engines[2].second);
112-
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[3].first);
113-
EXPECT_EQ(aub_stream::ENGINE_CCS1, engines[4].first);
114-
EXPECT_EQ(aub_stream::ENGINE_CCS2, engines[5].first);
115-
EXPECT_EQ(aub_stream::ENGINE_CCS3, engines[6].first);
107+
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);
108+
EXPECT_EQ(aub_stream::ENGINE_CCS1, engines[1].first);
109+
EXPECT_EQ(aub_stream::ENGINE_CCS2, engines[2].first);
110+
EXPECT_EQ(aub_stream::ENGINE_CCS3, engines[3].first);
111+
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[4].first);
112+
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[5].first); // low priority
113+
EXPECT_EQ(EngineUsage::LowPriority, engines[5].second);
114+
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[6].first); // internal
115+
EXPECT_EQ(EngineUsage::Internal, engines[6].second);
116116
EXPECT_EQ(aub_stream::ENGINE_BCS, engines[7].first);
117117
EXPECT_EQ(aub_stream::ENGINE_BCS, engines[8].first);
118118
}
@@ -130,13 +130,13 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenBcsDisabledWhenGetGp
130130
auto &engines = HwHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
131131
EXPECT_EQ(7u, engines.size());
132132

133-
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first);
134-
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[1].first); // low priority
135-
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[2].first);
136-
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[3].first);
137-
EXPECT_EQ(aub_stream::ENGINE_CCS1, engines[4].first);
138-
EXPECT_EQ(aub_stream::ENGINE_CCS2, engines[5].first);
139-
EXPECT_EQ(aub_stream::ENGINE_CCS3, engines[6].first);
133+
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);
134+
EXPECT_EQ(aub_stream::ENGINE_CCS1, engines[1].first);
135+
EXPECT_EQ(aub_stream::ENGINE_CCS2, engines[2].first);
136+
EXPECT_EQ(aub_stream::ENGINE_CCS3, engines[3].first);
137+
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[4].first);
138+
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[5].first); // low priority
139+
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[6].first);
140140
}
141141

142142
HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenCcsDisabledWhenGetGpgpuEnginesThenReturnRcsAndOneBcsEngine) {

‎opencl/test/unit_test/xe_hp_core/xehp/hw_helper_tests_xehp.inl‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ XEHPTEST_F(HwHelperTestsXeHP, givenRcsDisabledWhenGetGpgpuEnginesCalledThenDontS
6262
auto &engines = HwHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
6363
EXPECT_EQ(8u, engines.size());
6464

65-
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[0].first); // low priority
66-
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[1].first); // internal
67-
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[2].first);
68-
EXPECT_EQ(aub_stream::ENGINE_CCS1, engines[3].first);
69-
EXPECT_EQ(aub_stream::ENGINE_CCS2, engines[4].first);
70-
EXPECT_EQ(aub_stream::ENGINE_CCS3, engines[5].first);
65+
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);
66+
EXPECT_EQ(aub_stream::ENGINE_CCS1, engines[1].first);
67+
EXPECT_EQ(aub_stream::ENGINE_CCS2, engines[2].first);
68+
EXPECT_EQ(aub_stream::ENGINE_CCS3, engines[3].first);
69+
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[4].first); // low priority
70+
EXPECT_EQ(hwInfo.capabilityTable.defaultEngineType, engines[5].first); // internal
7171
EXPECT_EQ(aub_stream::ENGINE_BCS, engines[6].first);
7272
EXPECT_EQ(aub_stream::ENGINE_BCS, engines[7].first);
7373
}
@@ -90,13 +90,13 @@ XEHPTEST_F(HwHelperTestsXeHP, givenRcsDisabledButDebugVariableSetWhenGetGpgpuEng
9090
auto &engines = HwHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
9191
EXPECT_EQ(9u, engines.size());
9292

93-
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first);
94-
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[1].first); // low priority
95-
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[2].first); // internal
96-
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[3].first);
97-
EXPECT_EQ(aub_stream::ENGINE_CCS1, engines[4].first);
98-
EXPECT_EQ(aub_stream::ENGINE_CCS2, engines[5].first);
99-
EXPECT_EQ(aub_stream::ENGINE_CCS3, engines[6].first);
93+
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);
94+
EXPECT_EQ(aub_stream::ENGINE_CCS1, engines[1].first);
95+
EXPECT_EQ(aub_stream::ENGINE_CCS2, engines[2].first);
96+
EXPECT_EQ(aub_stream::ENGINE_CCS3, engines[3].first);
97+
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[4].first);
98+
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[5].first); // low priority
99+
EXPECT_EQ(aub_stream::ENGINE_RCS, engines[6].first); // internal
100100
EXPECT_EQ(aub_stream::ENGINE_BCS, engines[7].first);
101101
EXPECT_EQ(aub_stream::ENGINE_BCS, engines[8].first);
102102
}

‎shared/source/gen12lp/hw_helper_gen12lp.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ template <>
8686
const EngineInstancesContainer HwHelperHw<Family>::getGpgpuEngineInstances(const HardwareInfo &hwInfo) const {
8787
auto defaultEngine = getChosenEngineType(hwInfo);
8888

89-
EngineInstancesContainer engines = {
90-
{aub_stream::ENGINE_RCS, EngineUsage::Regular},
91-
{aub_stream::ENGINE_RCS, EngineUsage::LowPriority}, // low priority
92-
{defaultEngine, EngineUsage::Internal}, // internal usage
93-
};
89+
EngineInstancesContainer engines;
9490

9591
if (defaultEngine == aub_stream::EngineType::ENGINE_CCS && hwInfo.featureTable.flags.ftrCCSNode && !hwInfo.featureTable.flags.ftrGpGpuMidThreadLevelPreempt) {
9692
engines.push_back({aub_stream::ENGINE_CCS, EngineUsage::Regular});
9793
}
9894

95+
engines.push_back({aub_stream::ENGINE_RCS, EngineUsage::Regular});
96+
engines.push_back({aub_stream::ENGINE_RCS, EngineUsage::LowPriority}); // low priority
97+
engines.push_back({defaultEngine, EngineUsage::Internal}); // internal usage
98+
9999
if (hwInfo.capabilityTable.blitterOperationsSupported) {
100100
if (hwInfo.featureTable.ftrBcsInfo.test(0)) {
101101
engines.push_back({aub_stream::ENGINE_BCS, EngineUsage::Regular});

‎shared/source/helpers/hw_helper_xehp_and_later.inl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ const EngineInstancesContainer HwHelperHw<GfxFamily>::getGpgpuEngineInstances(co
6060

6161
EngineInstancesContainer engines;
6262

63+
if (hwInfo.featureTable.flags.ftrCCSNode) {
64+
for (uint32_t i = 0; i < hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled; i++) {
65+
engines.push_back({static_cast<aub_stream::EngineType>(i + aub_stream::ENGINE_CCS), EngineUsage::Regular});
66+
}
67+
}
68+
6369
if ((DebugManager.flags.NodeOrdinal.get() == static_cast<int32_t>(aub_stream::EngineType::ENGINE_RCS)) ||
6470
hwInfo.featureTable.flags.ftrRcsNode) {
6571
engines.push_back({aub_stream::ENGINE_RCS, EngineUsage::Regular});
@@ -68,12 +74,6 @@ const EngineInstancesContainer HwHelperHw<GfxFamily>::getGpgpuEngineInstances(co
6874
engines.push_back({defaultEngine, EngineUsage::LowPriority});
6975
engines.push_back({defaultEngine, EngineUsage::Internal});
7076

71-
if (hwInfo.featureTable.flags.ftrCCSNode) {
72-
for (uint32_t i = 0; i < hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled; i++) {
73-
engines.push_back({static_cast<aub_stream::EngineType>(i + aub_stream::ENGINE_CCS), EngineUsage::Regular});
74-
}
75-
}
76-
7777
if (hwInfo.capabilityTable.blitterOperationsSupported && hwInfo.featureTable.ftrBcsInfo.test(0)) {
7878
engines.push_back({aub_stream::ENGINE_BCS, EngineUsage::Regular});
7979
engines.push_back({aub_stream::ENGINE_BCS, EngineUsage::Internal}); // internal usage

0 commit comments

Comments
 (0)