Skip to content

Commit 0f122fb

Browse files
MichalMrozekCompute-Runtime-Automation
MichalMrozek
authored and
Compute-Runtime-Automation
committed
Remove simplified mocs logic.
Change-Id: I9fabfea94129fbc419ab0c9bca957cf7b9952c38 Signed-off-by: Michal Mrozek <[email protected]>
1 parent 8410bd6 commit 0f122fb

File tree

10 files changed

+0
-167
lines changed

10 files changed

+0
-167
lines changed

‎runtime/dll/linux/drm_neo_create.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,6 @@ Drm *Drm::create(int32_t deviceOrdinal) {
178178
// Activate the Turbo Boost Frequency feature
179179
ret = drmObject->enableTurboBoost();
180180
if (ret != 0) {
181-
// turbo patch not present, we are not on custom Kernel, switch to simplified Mocs selection
182-
// do this only for GEN9+
183-
if (device->pHwInfo->platform.eRenderCoreFamily >= IGFX_GEN9_CORE) {
184-
drmObject->setSimplifiedMocsTableUsage(true);
185-
}
186181
printDebugString(DebugManager.flags.PrintDebugMessages.get(), stderr, "%s", "WARNING: Failed to request OCL Turbo Boost\n");
187182
}
188183

‎runtime/gmm_helper/gmm_helper.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ GmmHelper *GmmHelper::getInstance() {
3737
return platform()->peekExecutionEnvironment()->getGmmHelper();
3838
}
3939

40-
void GmmHelper::setSimplifiedMocsTableUsage(bool value) {
41-
useSimplifiedMocsTable = value;
42-
}
43-
4440
void GmmHelper::initContext(const PLATFORM *platform,
4541
const FeatureTable *featureTable,
4642
const WorkaroundTable *workaroundTable,
@@ -57,13 +53,6 @@ void GmmHelper::initContext(const PLATFORM *platform,
5753
}
5854

5955
uint32_t GmmHelper::getMOCS(uint32_t type) {
60-
if (useSimplifiedMocsTable) {
61-
if (type == GMM_RESOURCE_USAGE_OCL_BUFFER_CACHELINE_MISALIGNED) {
62-
return cacheDisabledIndex;
63-
} else {
64-
return cacheEnabledIndex;
65-
}
66-
}
6756
MEMORY_OBJECT_CONTROL_STATE mocs = gmmClientContext->cachePolicyGetMemoryObject(nullptr, static_cast<GMM_RESOURCE_USAGE_TYPE>(type));
6857

6958
return static_cast<uint32_t>(mocs.DwordValue);

‎runtime/gmm_helper/gmm_helper.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ class GmmHelper {
3333

3434
const HardwareInfo *getHardwareInfo();
3535
uint32_t getMOCS(uint32_t type);
36-
void setSimplifiedMocsTableUsage(bool value);
3736

38-
static constexpr uint32_t cacheDisabledIndex = 0;
39-
static constexpr uint32_t cacheEnabledIndex = 4;
4037
static constexpr uint64_t maxPossiblePitch = 2147483648;
4138

4239
template <uint8_t addressWidth = 48>
@@ -63,7 +60,6 @@ class GmmHelper {
6360
void loadLib();
6461
void initContext(const PLATFORM *platform, const FeatureTable *featureTable, const WorkaroundTable *workaroundTable, const GT_SYSTEM_INFO *pGtSysInfo);
6562

66-
bool useSimplifiedMocsTable = false;
6763
const HardwareInfo *hwInfo = nullptr;
6864
std::unique_ptr<OsLibrary> gmmLib;
6965
std::unique_ptr<GmmClientContext> gmmClientContext;

‎runtime/os_interface/linux/drm_neo.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,4 @@ int Drm::getErrno() {
205205
return errno;
206206
}
207207

208-
bool Drm::getSimplifiedMocsTableUsage() const {
209-
return useSimplifiedMocsTable;
210-
}
211-
212-
void Drm::setSimplifiedMocsTableUsage(bool value) {
213-
useSimplifiedMocsTable = value;
214-
}
215-
216208
} // namespace NEO

‎runtime/os_interface/linux/drm_neo.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ class Drm {
7272
void setGtType(GTTYPE eGtType) { this->eGtType = eGtType; }
7373
GTTYPE getGtType() const { return this->eGtType; }
7474
MOCKABLE_VIRTUAL int getErrno();
75-
void setSimplifiedMocsTableUsage(bool value);
76-
bool getSimplifiedMocsTableUsage() const;
7775
bool setQueueSliceCount(uint64_t sliceCount);
7876
void checkQueueSliceSupport();
7977
uint64_t getSliceMask(uint64_t sliceCount);
@@ -89,7 +87,6 @@ class Drm {
8987
int getQueueSliceCount(drm_i915_gem_context_param_sseu *sseu);
9088
bool sliceCountChangeSupported = false;
9189
drm_i915_gem_context_param_sseu sseu{};
92-
bool useSimplifiedMocsTable = false;
9390
bool preemptionSupported = false;
9491
int fd;
9592
int deviceId = 0;

‎unit_tests/gen9/kernel_tests_gen9.cpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,3 @@ using Gen9HardwareCommandsTest = testing::Test;
2424
GEN9TEST_F(Gen9HardwareCommandsTest, givenGen9PlatformWhenDoBindingTablePrefetchIsCalledThenReturnsTrue) {
2525
EXPECT_TRUE(HardwareCommandsHelper<FamilyType>::doBindingTablePrefetch());
2626
}
27-
28-
GEN9TEST_F(Gen9HardwareCommandsTest, givenBufferThatIsNotZeroCopyWhenSurfaceStateisSetThenL3IsTurnedOn) {
29-
MockContext context;
30-
31-
auto retVal = CL_SUCCESS;
32-
char ptr[16u] = {};
33-
34-
std::unique_ptr<Buffer> buffer(Buffer::create(
35-
&context,
36-
CL_MEM_USE_HOST_PTR,
37-
16u,
38-
ptr,
39-
retVal));
40-
41-
EXPECT_FALSE(buffer->isMemObjZeroCopy());
42-
43-
using RENDER_SURFACE_STATE = typename SKLFamily::RENDER_SURFACE_STATE;
44-
RENDER_SURFACE_STATE surfaceState = {};
45-
46-
auto gmmHelper = context.getDevice(0)->getExecutionEnvironment()->getGmmHelper();
47-
gmmHelper->setSimplifiedMocsTableUsage(true);
48-
49-
buffer->setArgStateful(&surfaceState, false, false, false, false);
50-
//make sure proper mocs is selected
51-
constexpr uint32_t expectedMocs = GmmHelper::cacheEnabledIndex;
52-
EXPECT_EQ(expectedMocs, surfaceState.getMemoryObjectControlStateIndexToMocsTables());
53-
}

‎unit_tests/gmm_helper/gmm_helper_tests.cpp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -674,22 +674,6 @@ TEST(GmmTest, givenGmmWithSetMCSInResourceInfoGpuFlagsWhenCallhasMultisampleCont
674674
EXPECT_TRUE(gmm->hasMultisampleControlSurface());
675675
}
676676

677-
TEST(GmmSimplifiedCacheSelectionPolicy, givenGmmInSimplifiedCacheSelectionPolicyWhenItIsAskedForUncachedIndexThen0IsReturned) {
678-
GmmHelper gmmHelper(*platformDevices);
679-
gmmHelper.setSimplifiedMocsTableUsage(true);
680-
auto index = gmmHelper.getMOCS(GMM_RESOURCE_USAGE_OCL_BUFFER_CACHELINE_MISALIGNED);
681-
auto expectedIndex = GmmHelper::cacheDisabledIndex;
682-
EXPECT_EQ(expectedIndex, index);
683-
}
684-
685-
TEST(GmmSimplifiedCacheSelectionPolicy, givenGmmInSimplifiedCacheSelectionPolicyWhenItIsAskedForCachedIndexThen4IsReturned) {
686-
GmmHelper gmmHelper(*platformDevices);
687-
gmmHelper.setSimplifiedMocsTableUsage(true);
688-
auto index = gmmHelper.getMOCS(GMM_RESOURCE_USAGE_OCL_BUFFER);
689-
auto expectedIndex = GmmHelper::cacheEnabledIndex;
690-
EXPECT_EQ(expectedIndex, index);
691-
}
692-
693677
TEST(GmmHelperTest, whenGmmHelperIsInitializedThenClientContextIsSet) {
694678
ASSERT_NE(nullptr, GmmHelper::getClientContext());
695679
EXPECT_NE(nullptr, GmmHelper::getClientContext()->getHandle());

‎unit_tests/linux/main_linux_dll.cpp

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -219,86 +219,6 @@ TEST_F(DrmTests, failOnParamBoost) {
219219
EXPECT_NE(drm, nullptr);
220220
}
221221

222-
#ifdef TESTS_BDW
223-
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenBdwDeviceIsCreatedThenSimplifiedMocsSelectionIsFalse) {
224-
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
225-
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
226-
227-
deviceId = IBDW_GT3_WRK_DEVICE_F0_ID;
228-
failOnParamBoost = -1;
229-
auto drm = DrmWrap::createDrm(0);
230-
EXPECT_NE(drm, nullptr);
231-
EXPECT_FALSE(drm->getSimplifiedMocsTableUsage());
232-
}
233-
#endif
234-
235-
#ifdef TESTS_SKL
236-
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenSklDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
237-
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
238-
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
239-
240-
deviceId = ISKL_GT2_DT_DEVICE_F0_ID;
241-
failOnParamBoost = -1;
242-
auto drm = DrmWrap::createDrm(0);
243-
EXPECT_NE(drm, nullptr);
244-
EXPECT_TRUE(drm->getSimplifiedMocsTableUsage());
245-
}
246-
#endif
247-
#ifdef TESTS_KBL
248-
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenKblDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
249-
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
250-
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
251-
252-
deviceId = IKBL_GT1_ULT_DEVICE_F0_ID;
253-
failOnParamBoost = -1;
254-
auto drm = DrmWrap::createDrm(0);
255-
EXPECT_NE(drm, nullptr);
256-
EXPECT_TRUE(drm->getSimplifiedMocsTableUsage());
257-
}
258-
#endif
259-
#ifdef TESTS_BXT
260-
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenBxtDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
261-
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
262-
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
263-
264-
deviceId = IBXT_X_DEVICE_F0_ID;
265-
failOnParamBoost = -1;
266-
auto drm = DrmWrap::createDrm(0);
267-
EXPECT_NE(drm, nullptr);
268-
EXPECT_TRUE(drm->getSimplifiedMocsTableUsage());
269-
}
270-
#endif
271-
#ifdef TESTS_GLK
272-
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenGlkDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
273-
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
274-
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
275-
276-
deviceId = IGLK_GT2_ULT_18EU_DEVICE_F0_ID;
277-
failOnParamBoost = -1;
278-
auto drm = DrmWrap::createDrm(0);
279-
EXPECT_NE(drm, nullptr);
280-
EXPECT_TRUE(drm->getSimplifiedMocsTableUsage());
281-
}
282-
#endif
283-
#ifdef TESTS_CFL
284-
TEST_F(DrmTests, givenKernelNotSupportingTurboPatchWhenCflDeviceIsCreatedThenSimplifiedMocsSelectionIsTrue) {
285-
VariableBackup<decltype(deviceId)> backupDeviceId(&deviceId);
286-
VariableBackup<decltype(failOnParamBoost)> backupFailOnParamBoost(&failOnParamBoost);
287-
288-
deviceId = ICFL_GT1_S61_DT_DEVICE_F0_ID;
289-
failOnParamBoost = -1;
290-
auto drm = DrmWrap::createDrm(0);
291-
EXPECT_NE(drm, nullptr);
292-
EXPECT_TRUE(drm->getSimplifiedMocsTableUsage());
293-
}
294-
#endif
295-
296-
TEST_F(DrmTests, givenKernelSupportingTurboPatchWhenDeviceIsCreatedThenSimplifiedMocsSelectionIsFalse) {
297-
auto drm = DrmWrap::createDrm(0);
298-
EXPECT_NE(drm, nullptr);
299-
EXPECT_FALSE(drm->getSimplifiedMocsTableUsage());
300-
}
301-
302222
TEST_F(DrmTests, failOnContextCreate) {
303223
VariableBackup<decltype(failOnContextCreate)> backupFailOnContextCreate(&failOnContextCreate);
304224

‎unit_tests/mem_obj/buffer_tests.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,8 +1982,6 @@ HWTEST_F(BufferSetSurfaceTests, givenMisalignedPointerWhenSurfaceStateIsProgramm
19821982
HWTEST_F(BufferSetSurfaceTests, givenBufferThatIsMisalignedWhenSurfaceStateIsBeingProgrammedThenL3CacheIsOff) {
19831983
using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
19841984

1985-
this->device->getExecutionEnvironment()->getGmmHelper()->setSimplifiedMocsTableUsage(true);
1986-
19871985
RENDER_SURFACE_STATE surfaceState = {};
19881986
MockContext context;
19891987
void *svmPtr = reinterpret_cast<void *>(0x1005);
@@ -2001,7 +1999,6 @@ HWTEST_F(BufferSetSurfaceTests, givenBufferThatIsMisalignedWhenSurfaceStateIsBei
20011999
class BufferL3CacheTests : public ::testing::TestWithParam<uint64_t> {
20022000
public:
20032001
void SetUp() override {
2004-
ctx.getDevice(0)->getExecutionEnvironment()->getGmmHelper()->setSimplifiedMocsTableUsage(true);
20052002
hostPtr = reinterpret_cast<void *>(GetParam());
20062003
}
20072004
MockContext ctx;

‎unit_tests/os_interface/linux/drm_command_stream_tests.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,16 +1370,6 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenDrmCommandStreamReceiverWh
13701370
EXPECT_TRUE(mm->isValidateHostMemoryEnabled());
13711371
}
13721372

1373-
HWTEST_TEMPLATED_F(DrmCommandStreamTest, givenDrmCommandStreamWhenGettingMocsThenProperValueIsReturned) {
1374-
auto mocs = platform()->peekExecutionEnvironment()->getGmmHelper()->getMOCS(GMM_RESOURCE_USAGE_OCL_BUFFER_CACHELINE_MISALIGNED);
1375-
auto expectedMocs = GmmHelper::cacheDisabledIndex;
1376-
EXPECT_EQ(mocs, expectedMocs);
1377-
1378-
mocs = platform()->peekExecutionEnvironment()->getGmmHelper()->getMOCS(0);
1379-
expectedMocs = GmmHelper::cacheEnabledIndex;
1380-
EXPECT_EQ(mocs, expectedMocs);
1381-
}
1382-
13831373
HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenAllocationWithSingleBufferObjectWhenMakeResidentBufferObjectsIsCalledThenTheBufferObjectIsMadeResident) {
13841374
auto size = 1024u;
13851375
auto bo = this->createBO(size);

0 commit comments

Comments
 (0)