Disable gem close worker on direct submission

Signed-off-by: Lukasz Jobczyk <[email protected]>

Author: LukaszJobczyk

opencl/source/os_interface/linux/device_command_stream.inl

@@ -24,7 +24,16 @@ CommandStreamReceiver *DeviceCommandStreamReceiver<GfxFamily>::create(bool withA
                                                                                          rootDeviceIndex,
                                                                                          deviceBitfield);
     } else {
-        auto gemMode = DebugManager.flags.EnableGemCloseWorker.get() ? gemCloseWorkerMode::gemCloseWorkerActive : gemCloseWorkerMode::gemCloseWorkerInactive;
+        auto gemMode = gemCloseWorkerMode::gemCloseWorkerActive;
+
+        if (DebugManager.flags.EnableDirectSubmission.get() == 1) {
+            gemMode = gemCloseWorkerMode::gemCloseWorkerInactive;
+        }
+
+        if (DebugManager.flags.EnableGemCloseWorker.get() != -1) {
+            gemMode = DebugManager.flags.EnableGemCloseWorker.get() ? gemCloseWorkerMode::gemCloseWorkerActive : gemCloseWorkerMode::gemCloseWorkerInactive;
+        }
+
         return new DrmCommandStreamReceiver<GfxFamily>(executionEnvironment,
                                                        rootDeviceIndex,
                                                        deviceBitfield,

opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -99,3 +99,13 @@ HWTEST_F(DeviceCommandStreamSetInternalUsageTests, givenValidDrmCsrThenGemCloseW
     drmCsr->initializeDefaultsForInternalEngine();
     EXPECT_EQ(drmCsr->peekGemCloseWorkerOperationMode(), gemCloseWorkerMode::gemCloseWorkerInactive);
 }
+
+HWTEST_F(DeviceCommandStreamSetInternalUsageTests, givenEnableDirectSubmissionWhenCreateDrmCommandStreamReceiverThenGemCloseWorkerInactive) {
+    DebugManagerStateRestore restorer;
+    DebugManager.flags.EnableDirectSubmission.set(1);
+
+    std::unique_ptr<CommandStreamReceiver> ptr(DeviceCommandStreamReceiver<FamilyType>::create(false, *executionEnvironment, 0, 1));
+
+    auto drmCsr = (DrmCommandStreamReceiver<FamilyType> *)ptr.get();
+    EXPECT_EQ(drmCsr->peekGemCloseWorkerOperationMode(), gemCloseWorkerMode::gemCloseWorkerInactive);
+}

opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp

@@ -63,6 +63,15 @@ typedef Test<DrmMemoryManagerFixture> DrmMemoryManagerTest;
 typedef Test<DrmMemoryManagerWithLocalMemoryFixture> DrmMemoryManagerWithLocalMemoryTest;
 typedef Test<DrmMemoryManagerFixtureWithoutQuietIoctlExpectation> DrmMemoryManagerWithExplicitExpectationsTest;
 
+TEST_F(DrmMemoryManagerTest, givenEnableDirectSubmissionWhenCreateDrmMemoryManagerThenGemCloseWorkerInactive) {
+    DebugManagerStateRestore dbgState;
+    DebugManager.flags.EnableDirectSubmission.set(1);
+
+    TestedDrmMemoryManager memoryManager(false, false, false, *executionEnvironment);
+
+    EXPECT_EQ(memoryManager.peekGemCloseWorker(), nullptr);
+}
+
 TEST_F(DrmMemoryManagerTest, givenDebugVariableWhenCreatingDrmMemoryManagerThenSetSupportForMultiStorageResources) {
     DebugManagerStateRestore dbgState;
 

shared/source/os_interface/linux/drm_memory_manager.cpp

@@ -52,6 +52,10 @@ void DrmMemoryManager::initialize(gemCloseWorkerMode mode) {
     }
     MemoryManager::virtualPaddingAvailable = true;
 
+    if (DebugManager.flags.EnableDirectSubmission.get() == 1) {
+        mode = gemCloseWorkerMode::gemCloseWorkerInactive;
+    }
+
     if (DebugManager.flags.EnableGemCloseWorker.get() != -1) {
         mode = DebugManager.flags.EnableGemCloseWorker.get() ? gemCloseWorkerMode::gemCloseWorkerActive : gemCloseWorkerMode::gemCloseWorkerInactive;
     }