intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-06 02:18:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: ulls controller sleep, windows

Browse Source 
Request higher resolution for windows periodic timers for ulls
controller sleep.

Allows for controller thread to sleep with granularity of 1ms.

Related-To: NEO-10800

Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
This commit is contained in:
Dominik Dabek
2024-08-22 15:42:01 +00:00
committed by Compute-Runtime-Automation
parent dbc8baddc1
commit 6455d4648c
16 changed files with 150 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
shared/test/unit_test/direct_submission/direct_submission_controller_mock.h
View File

@@ -30,10 +30,14 @@ struct DirectSubmissionControllerMock : public DirectSubmissionController {
using DirectSubmissionController::timeSinceLastCheck;
bool sleep(std::unique_lock<std::mutex> &lock) override {
auto ret = sleepReturnValue.load();
this->sleepCalled = true;
sleepReturnValue.store(false);
return ret;
if (callBaseSleepMethod) {
return DirectSubmissionController::sleep(lock);
} else {
auto ret = sleepReturnValue.load();
sleepReturnValue.store(false);
return ret;
}
}
SteadyClock::time_point getCpuTimestamp() override {
@@ -53,5 +57,6 @@ struct DirectSubmissionControllerMock : public DirectSubmissionController {
std::atomic<bool> sleepReturnValue{false};
std::atomic<bool> timeoutElapsedReturnValue{false};
std::atomic<bool> timeoutElapsedCallBase{false};
bool callBaseSleepMethod = false;
};
} // namespace NEO

34
shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
View File

@@ -10,21 +10,29 @@
#include "shared/source/gmm_helper/gmm_helper.h"
#include "shared/source/helpers/flush_stamp.h"
#include "shared/source/memory_manager/allocation_properties.h"
#include "shared/source/os_interface/windows/sys_calls.h"
#include "shared/source/os_interface/windows/wddm/wddm_residency_logger.h"
#include "shared/source/os_interface/windows/wddm_memory_manager.h"
#include "shared/source/os_interface/windows/wddm_residency_controller.h"
#include "shared/test/common/cmd_parse/hw_parse.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/helpers/unit_test_helper.h"
#include "shared/test/common/helpers/variable_backup.h"
#include "shared/test/common/mocks/mock_io_functions.h"
#include "shared/test/common/mocks/mock_os_context_win.h"
#include "shared/test/common/os_interface/windows/wddm_fixture.h"
#include "shared/test/common/test_macros/hw_test.h"
#include "shared/test/unit_test/direct_submission/direct_submission_controller_mock.h"
#include "shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h"
using namespace NEO;
extern uint64_t cpuFence;
namespace NEO {
namespace SysCalls {
extern size_t timeBeginPeriodCalled;
extern MMRESULT timeBeginPeriodLastValue;
extern size_t timeEndPeriodCalled;
extern MMRESULT timeEndPeriodLastValue;
} // namespace SysCalls
template <PreemptionMode preemptionMode>
struct WddmDirectSubmissionFixture : public WddmFixture {
@@ -1130,4 +1138,22 @@ HWTEST_F(WddmDirectSubmissionTest, givenDirectSubmissionWhenUnblockPagingFenceSe
wddmDirectSubmission.unblockPagingFenceSemaphore(pagingFenceValueToWait);
EXPECT_GT(wddmDirectSubmission.semaphoreData->pagingFenceCounter, mockedPagingFence);
}
}
TEST(DirectSubmissionControllerWindowsTest, givenDirectSubmissionControllerWhenCallingSleepThenRequestHighResolutionTimers) {
VariableBackup<size_t> timeBeginPeriodCalledBackup(&SysCalls::timeBeginPeriodCalled, 0u);
VariableBackup<MMRESULT> timeBeginPeriodLastValueBackup(&SysCalls::timeBeginPeriodLastValue, 0u);
VariableBackup<size_t> timeEndPeriodCalledBackup(&SysCalls::timeEndPeriodCalled, 0u);
VariableBackup<MMRESULT> timeEndPeriodLastValueBackup(&SysCalls::timeEndPeriodLastValue, 0u);
DirectSubmissionControllerMock controller;
controller.callBaseSleepMethod = true;
std::unique_lock<std::mutex> lock(controller.condVarMutex);
controller.sleep(lock);
EXPECT_TRUE(controller.sleepCalled);
EXPECT_EQ(1u, SysCalls::timeBeginPeriodCalled);
EXPECT_EQ(1u, SysCalls::timeEndPeriodCalled);
EXPECT_EQ(1u, SysCalls::timeBeginPeriodLastValue);
EXPECT_EQ(1u, SysCalls::timeEndPeriodLastValue);
}
} // namespace NEO