Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

performance: don't wait on fence immediately after bind 

Related-To: NEO-13456

Signed-off-by: Szymon Morek <szymon.morek@intel.com>
This commit is contained in:
Szymon Morek 2024-12-13 16:51:38 +00:00 committed by Compute-Runtime-Automation
parent 322089fa5f
commit ff65d0ab59
3 changed files with 18 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shared/source/os_interface/linux/xe/ioctl_helper_xe.cpp
View File

@ -1379,17 +1379,7 @@ int IoctlHelperXe::xeVmBind(const VmBindParams &vmBindParams, bool isBind) {
return ret;
}
constexpr auto oneSecTimeout = 1000000000ll;
constexpr auto infiniteTimeout = -1;
bool debuggingEnabled = drm.getRootDeviceEnvironment().executionEnvironment.isDebuggingEnabled();
uint64_t timeout = debuggingEnabled ? infiniteTimeout : oneSecTimeout;
if (debugManager.flags.VmBindWaitUserFenceTimeout.get() != -1) {
timeout = debugManager.flags.VmBindWaitUserFenceTimeout.get();
}
return xeWaitUserFence(bind.exec_queue_id, DRM_XE_UFENCE_WAIT_OP_EQ,
sync[0].addr,
sync[0].timeline_value, timeout,
false, NEO::InterruptId::notUsed, nullptr);
return ret;
}
std::string IoctlHelperXe::getDrmParamString(DrmParam drmParam) const {

31
shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_debugger_tests.cpp
View File

@ -349,34 +349,3 @@ TEST(IoctlHelperXeTest, givenResourceRegistrationEnabledWhenAllocationTypeShould
}
EXPECT_EQ(DrmResourceClass::maxSize, drm.registeredClass);
}
TEST(IoctlHelperXeTest, givenDebuggingEnabledWhenCallingVmBindThenWaitUserFenceIsCalledWithCorrectTimeout) {
DebugManagerStateRestore restorer;
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
executionEnvironment->setDebuggingMode(DebuggingMode::online);
auto drm = DrmMockXeDebug::create(*executionEnvironment->rootDeviceEnvironments[0]);
auto xeIoctlHelper = std::make_unique<MockIoctlHelperXeDebug>(*drm);
auto expectedTimeout = -1;
uint64_t fenceAddress = 0x4321;
uint64_t fenceValue = 0x789;
auto handle = 0x1234u;
VmBindExtUserFenceT vmBindExtUserFence{};
xeIoctlHelper->fillVmBindExtUserFence(vmBindExtUserFence, fenceAddress, fenceValue, 0u);
VmBindParams vmBindParams{};
vmBindParams.handle = handle;
xeIoctlHelper->setVmBindUserFence(vmBindParams, vmBindExtUserFence);
EXPECT_EQ(0, xeIoctlHelper->vmBind(vmBindParams));
auto &waitUserFence = drm->waitUserFenceInputs[0];
EXPECT_EQ(expectedTimeout, waitUserFence.timeout);
drm->waitUserFenceInputs.clear();
EXPECT_EQ(0, xeIoctlHelper->vmUnbind(vmBindParams));
waitUserFence = drm->waitUserFenceInputs[0];
EXPECT_EQ(expectedTimeout, waitUserFence.timeout);
}

26
shared/test/unit_test/os_interface/linux/xe/ioctl_helper_xe_tests.cpp
View File

@ -1504,7 +1504,7 @@ TEST(IoctlHelperXeTest, givenDisabledFtrMultiTileArchWhenCreatingEngineInfoThenM
using IoctlHelperXeFenceWaitTest = ::testing::Test;
TEST_F(IoctlHelperXeFenceWaitTest, whenCallingVmBindThenWaitUserFenceIsCalled) {
TEST_F(IoctlHelperXeFenceWaitTest, whenCallingVmBindThenSyncObjectAdded) {
DebugManagerStateRestore restorer;
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
auto drm = DrmMockXe::create(*executionEnvironment->rootDeviceEnvironments[0]);
@ -1531,9 +1531,11 @@ TEST_F(IoctlHelperXeFenceWaitTest, whenCallingVmBindThenWaitUserFenceIsCalled) {
EXPECT_EQ(0, xeIoctlHelper->vmBind(vmBindParams));
EXPECT_EQ(1u, drm->vmBindInputs.size());
EXPECT_EQ(1u, drm->syncInputs.size());
EXPECT_EQ(1u, drm->waitUserFenceInputs.size());
EXPECT_EQ(0u, drm->waitUserFenceInputs.size());
auto expectedMask = std::numeric_limits<uint64_t>::max();
auto expectedTimeout = 1000000000ll;
xeIoctlHelper->waitUserFence(0u, fenceAddress, fenceValue, static_cast<uint32_t>(Drm::ValueWidth::u64), expectedTimeout, 0, false, NEO::InterruptId::notUsed, nullptr);
EXPECT_EQ(1u, drm->waitUserFenceInputs.size());
{
auto &sync = drm->syncInputs[0];
@ -1543,7 +1545,7 @@ TEST_F(IoctlHelperXeFenceWaitTest, whenCallingVmBindThenWaitUserFenceIsCalled) {
auto &waitUserFence = drm->waitUserFenceInputs[0];
EXPECT_EQ(fenceAddress, waitUserFence.addr);
EXPECT_EQ(static_cast<uint16_t>(DRM_XE_UFENCE_WAIT_OP_EQ), waitUserFence.op);
EXPECT_EQ(static_cast<uint16_t>(DRM_XE_UFENCE_WAIT_OP_GTE), waitUserFence.op);
EXPECT_EQ(0u, waitUserFence.flags);
EXPECT_EQ(fenceValue, waitUserFence.value);
EXPECT_EQ(expectedMask, waitUserFence.mask);
@ -1558,6 +1560,8 @@ TEST_F(IoctlHelperXeFenceWaitTest, whenCallingVmBindThenWaitUserFenceIsCalled) {
EXPECT_EQ(0, xeIoctlHelper->vmUnbind(vmBindParams));
EXPECT_EQ(1u, drm->vmBindInputs.size());
EXPECT_EQ(1u, drm->syncInputs.size());
EXPECT_EQ(0u, drm->waitUserFenceInputs.size());
xeIoctlHelper->waitUserFence(0u, fenceAddress, fenceValue, static_cast<uint32_t>(Drm::ValueWidth::u64), expectedTimeout, 0, false, NEO::InterruptId::notUsed, nullptr);
EXPECT_EQ(1u, drm->waitUserFenceInputs.size());
{
auto &sync = drm->syncInputs[0];
@ -1568,7 +1572,7 @@ TEST_F(IoctlHelperXeFenceWaitTest, whenCallingVmBindThenWaitUserFenceIsCalled) {
auto &waitUserFence = drm->waitUserFenceInputs[0];
EXPECT_EQ(fenceAddress, waitUserFence.addr);
EXPECT_EQ(static_cast<uint16_t>(DRM_XE_UFENCE_WAIT_OP_EQ), waitUserFence.op);
EXPECT_EQ(static_cast<uint16_t>(DRM_XE_UFENCE_WAIT_OP_GTE), waitUserFence.op);
EXPECT_EQ(0u, waitUserFence.flags);
EXPECT_EQ(fenceValue, waitUserFence.value);
EXPECT_EQ(expectedMask, waitUserFence.mask);
@ -1579,7 +1583,7 @@ TEST_F(IoctlHelperXeFenceWaitTest, whenCallingVmBindThenWaitUserFenceIsCalled) {
}
}
TEST(IoctlHelperXeTest, givenVmBindWaitUserFenceTimeoutWhenCallingVmBindThenWaitUserFenceIsCalledWithSpecificTimeout) {
TEST(IoctlHelperXeTest, givenVmBindWaitUserFenceTimeoutCalledThenWaitUserFenceIsCalledWithSpecificTimeout) {
DebugManagerStateRestore restorer;
debugManager.flags.VmBindWaitUserFenceTimeout.set(5000000000ll);
auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
@ -1608,9 +1612,12 @@ TEST(IoctlHelperXeTest, givenVmBindWaitUserFenceTimeoutWhenCallingVmBindThenWait
EXPECT_EQ(0, xeIoctlHelper->vmBind(vmBindParams));
EXPECT_EQ(1u, drm->vmBindInputs.size());
EXPECT_EQ(1u, drm->syncInputs.size());
EXPECT_EQ(1u, drm->waitUserFenceInputs.size());
EXPECT_EQ(0u, drm->waitUserFenceInputs.size());
auto expectedMask = std::numeric_limits<uint64_t>::max();
auto expectedTimeout = 5000000000ll;
xeIoctlHelper->waitUserFence(0u, fenceAddress, fenceValue, static_cast<uint32_t>(Drm::ValueWidth::u64), expectedTimeout, 0, false, NEO::InterruptId::notUsed, nullptr);
EXPECT_EQ(1u, drm->waitUserFenceInputs.size());
{
auto &sync = drm->syncInputs[0];
@ -1620,7 +1627,7 @@ TEST(IoctlHelperXeTest, givenVmBindWaitUserFenceTimeoutWhenCallingVmBindThenWait
auto &waitUserFence = drm->waitUserFenceInputs[0];
EXPECT_EQ(fenceAddress, waitUserFence.addr);
EXPECT_EQ(static_cast<uint16_t>(DRM_XE_UFENCE_WAIT_OP_EQ), waitUserFence.op);
EXPECT_EQ(static_cast<uint16_t>(DRM_XE_UFENCE_WAIT_OP_GTE), waitUserFence.op);
EXPECT_EQ(0u, waitUserFence.flags);
EXPECT_EQ(fenceValue, waitUserFence.value);
EXPECT_EQ(expectedMask, waitUserFence.mask);
@ -1681,8 +1688,9 @@ TEST(IoctlHelperXeTest, whenUserFenceFailsThenErrorIsPropagated) {
int errorValue = -1;
drm->waitUserFenceReturn = errorValue;
EXPECT_EQ(errorValue, xeIoctlHelper->vmBind(vmBindParams));
EXPECT_EQ(errorValue, xeIoctlHelper->vmUnbind(vmBindParams));
auto expectedTimeout = 1000000000ll;
auto ret = xeIoctlHelper->waitUserFence(0u, fenceAddress, fenceValue, static_cast<uint32_t>(Drm::ValueWidth::u64), expectedTimeout, 0, false, NEO::InterruptId::notUsed, nullptr);
EXPECT_EQ(errorValue, ret);
}
TEST(IoctlHelperXeTest, WhenSetupIpVersionIsCalledThenIpVersionIsCorrect) {