fix: move waitWithKmdNotifyFallback under debug key

Related-To: NEO-2024

Signed-off-by: Mateusz Hoppe <[email protected]>

Author: HoppeMateusz

level_zero/core/source/cmdlist/cmdlist_hw_immediate.inl

@@ -1225,11 +1225,10 @@ ze_result_t CommandListCoreFamilyImmediate<gfxCoreFamily>::hostSynchronize(uint6
     if (inOrderWaitAllowed) {
         status = synchronizeInOrderExecution(timeout, (waitQueue == this->cmdQImmediateCopyOffload));
     } else {
-
         const auto indefinitelyPoll = timeout == std::numeric_limits<uint64_t>::max();
         auto waitStatus = NEO::WaitStatus::notReady;
 
-        if (indefinitelyPoll) {
+        if (indefinitelyPoll && static_cast<CommandQueueImp *>(waitQueue)->getUseKmdWaitFunction()) {
             waitStatus = waitCsr->waitForTaskCountWithKmdNotifyFallback(waitTaskCount,
                                                                         waitCsr->obtainCurrentFlushStamp(),
                                                                         true,

level_zero/core/source/cmdqueue/cmdqueue_imp.h

@@ -102,6 +102,10 @@ struct CommandQueueImp : public CommandQueue {
         return syncMode;
     }
 
+    bool getUseKmdWaitFunction() const {
+        return useKmdWaitFunction;
+    }
+
     virtual bool getPreemptionCmdProgramming() = 0;
     void handleIndirectAllocationResidency(UnifiedMemoryControls unifiedMemoryControls, std::unique_lock<std::mutex> &lockForIndirect, bool performMigration) override;
     void makeResidentAndMigrate(bool performMigration, const NEO::ResidencyContainer &residencyContainer) override;

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

@@ -1623,6 +1623,27 @@ HWTEST_F(ImmediateCommandListHostSynchronize, givenMaxTimeoutIsProvidedWaitParam
 
     EXPECT_EQ(cmdList->hostSynchronize(std::numeric_limits<uint64_t>::max()), ZE_RESULT_SUCCESS);
 
+    auto waitParams = csr->latestWaitForCompletionWithTimeoutWaitParams;
+    EXPECT_FALSE(waitParams.enableTimeout);
+    EXPECT_TRUE(waitParams.indefinitelyPoll);
+
+    EXPECT_EQ(0u, csr->waitForTaskCountWithKmdNotifyInputParams.size());
+}
+
+HWTEST_F(ImmediateCommandListHostSynchronize, givenOverrideUseKmdWaitFunctionAndMaxTimeoutIsProvidedThenWaitWithKmdNotifyIsCalled) {
+    auto csr = static_cast<NEO::UltCommandStreamReceiver<FamilyType> *>(device->getNEODevice()->getInternalEngine().commandStreamReceiver);
+    DebugManagerStateRestore restore;
+    NEO::debugManager.flags.OverrideUseKmdWaitFunction.set(1);
+
+    auto cmdList = createCmdList<FamilyType::gfxCoreFamily>(csr);
+
+    csr->captureWaitForTaskCountWithKmdNotifyInputParams = true;
+
+    csr->callBaseWaitForCompletionWithTimeout = false;
+    csr->returnWaitForCompletionWithTimeout = WaitStatus::ready;
+
+    EXPECT_EQ(cmdList->hostSynchronize(std::numeric_limits<uint64_t>::max()), ZE_RESULT_SUCCESS);
+
     auto waitParams = csr->latestWaitForCompletionWithTimeoutWaitParams;
     EXPECT_FALSE(waitParams.enableTimeout);
     EXPECT_FALSE(waitParams.indefinitelyPoll);