diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp index f569f96b71..69ada78385 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp @@ -1599,6 +1599,8 @@ using RayTracingMatcher = IsAtLeastXeHpCore; using CommandListAppendLaunchRayTracingKernelTest = Test; HWTEST2_F(CommandListAppendLaunchRayTracingKernelTest, givenKernelUsingRayTracingWhenAppendLaunchKernelIsCalledThenSuccessIsReturned, RayTracingMatcher) { + VariableBackup rtMemoryBackedBuffer{&neoDevice->rtMemoryBackedBuffer}; + Mock<::L0::KernelImp> kernel; auto pMockModule = std::unique_ptr(new Mock(device, nullptr)); kernel.module = pMockModule.get(); @@ -1611,7 +1613,7 @@ HWTEST2_F(CommandListAppendLaunchRayTracingKernelTest, givenKernelUsingRayTracin kernel.immutableData.kernelDescriptor->kernelAttributes.flags.hasRTCalls = true; - neoDevice->rtMemoryBackedBuffer = nullptr; + rtMemoryBackedBuffer = nullptr; CmdListKernelLaunchParams launchParams = {}; result = pCommandList->appendLaunchKernel(kernel.toHandle(), groupCount, nullptr, 0, nullptr, launchParams, false); EXPECT_NE(ZE_RESULT_SUCCESS, result); @@ -1620,10 +1622,12 @@ HWTEST2_F(CommandListAppendLaunchRayTracingKernelTest, givenKernelUsingRayTracin result = pCommandList->appendLaunchKernel(kernel.toHandle(), groupCount, nullptr, 0, nullptr, launchParams, false); EXPECT_EQ(ZE_RESULT_SUCCESS, result); - neoDevice->rtMemoryBackedBuffer = nullptr; + rtMemoryBackedBuffer = buffer1; } HWTEST2_F(CommandListAppendLaunchRayTracingKernelTest, givenDcFlushMitigationWhenAppendLaunchKernelWithRayTracingIsCalledThenRequireDcFlush, RayTracingMatcher) { + VariableBackup rtMemoryBackedBuffer{&neoDevice->rtMemoryBackedBuffer, buffer1}; + DebugManagerStateRestore restorer; debugManager.flags.AllowDcFlush.set(0); @@ -1638,14 +1642,11 @@ HWTEST2_F(CommandListAppendLaunchRayTracingKernelTest, givenDcFlushMitigationWhe ASSERT_EQ(ZE_RESULT_SUCCESS, result); kernel.immutableData.kernelDescriptor->kernelAttributes.flags.hasRTCalls = true; - neoDevice->rtMemoryBackedBuffer = buffer1; CmdListKernelLaunchParams launchParams = {}; result = pCommandList->appendLaunchKernel(kernel.toHandle(), groupCount, nullptr, 0, nullptr, launchParams, false); EXPECT_EQ(ZE_RESULT_SUCCESS, result); EXPECT_EQ(pCommandList->requiresDcFlushForDcMitigation, device->getProductHelper().isDcFlushMitigated()); - - neoDevice->rtMemoryBackedBuffer = nullptr; } using RayTracingCmdListTest = Test;