intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-04 23:56:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix data race for TLB flush check

Browse Source 
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>
This commit is contained in:
Dunajski, Bartosz
2022-08-30 12:02:01 +00:00
committed by Compute-Runtime-Automation
parent fe73c06b59
commit 2102117e12
6 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp
View File

@@ -542,7 +542,7 @@ HWTEST_F(DrmDirectSubmissionTest, givenDirectSubmissionNewResourceTlbFlushWhenDi
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), sizeof(PIPE_CONTROL));
}
HWTEST_F(DrmDirectSubmissionTest, givenNewResourceBoundhWhenDispatchCommandBufferThenTlbIsFlushed) {
HWTEST_F(DrmDirectSubmissionTest, givenNewResourceBoundWhenDispatchCommandBufferThenTlbIsFlushed) {
using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
using Dispatcher = RenderDispatcher<FamilyType>;
@@ -554,9 +554,10 @@ HWTEST_F(DrmDirectSubmissionTest, givenNewResourceBoundhWhenDispatchCommandBuffe
bool ret = directSubmission.allocateResources();
EXPECT_TRUE(ret);
osContext->setNewResourceBound(true);
osContext->setNewResourceBound();
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), sizeof(PIPE_CONTROL));
EXPECT_TRUE(osContext->isTlbFlushRequired());
directSubmission.handleNewResourcesSubmission();
@@ -567,12 +568,12 @@ HWTEST_F(DrmDirectSubmissionTest, givenNewResourceBoundhWhenDispatchCommandBuffe
auto *pipeControl = hwParse.getCommand<PIPE_CONTROL>();
EXPECT_TRUE(pipeControl->getTlbInvalidate());
EXPECT_TRUE(pipeControl->getTextureCacheInvalidationEnable());
EXPECT_FALSE(osContext->getNewResourceBound());
EXPECT_FALSE(osContext->isTlbFlushRequired());
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), 0u);
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), sizeof(PIPE_CONTROL));
}
HWTEST_F(DrmDirectSubmissionTest, givenNoNewResourceBoundhWhenDispatchCommandBufferThenTlbIsNotFlushed) {
HWTEST_F(DrmDirectSubmissionTest, givenNoNewResourceBoundWhenDispatchCommandBufferThenTlbIsNotFlushed) {
using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
using Dispatcher = RenderDispatcher<FamilyType>;
@@ -584,9 +585,7 @@ HWTEST_F(DrmDirectSubmissionTest, givenNoNewResourceBoundhWhenDispatchCommandBuf
bool ret = directSubmission.allocateResources();
EXPECT_TRUE(ret);
osContext->setNewResourceBound(false);
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), 0u);
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), sizeof(PIPE_CONTROL));
directSubmission.handleNewResourcesSubmission();
@@ -596,12 +595,12 @@ HWTEST_F(DrmDirectSubmissionTest, givenNoNewResourceBoundhWhenDispatchCommandBuf
hwParse.findHardwareCommands<FamilyType>();
auto *pipeControl = hwParse.getCommand<PIPE_CONTROL>();
EXPECT_EQ(pipeControl, nullptr);
EXPECT_FALSE(osContext->getNewResourceBound());
EXPECT_FALSE(osContext->isTlbFlushRequired());
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), 0u);
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), sizeof(PIPE_CONTROL));
}
HWTEST_F(DrmDirectSubmissionTest, givenDirectSubmissionNewResourceTlbFlusZeroAndNewResourceBoundhWhenDispatchCommandBufferThenTlbIsNotFlushed) {
HWTEST_F(DrmDirectSubmissionTest, givenDirectSubmissionNewResourceTlbFlushZeroAndNewResourceBoundWhenDispatchCommandBufferThenTlbIsNotFlushed) {
using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
using Dispatcher = RenderDispatcher<FamilyType>;
@@ -613,9 +612,7 @@ HWTEST_F(DrmDirectSubmissionTest, givenDirectSubmissionNewResourceTlbFlusZeroAnd
bool ret = directSubmission.allocateResources();
EXPECT_TRUE(ret);
osContext->setNewResourceBound(true);
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), 0u);
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), sizeof(PIPE_CONTROL));
directSubmission.handleNewResourcesSubmission();
@@ -625,9 +622,9 @@ HWTEST_F(DrmDirectSubmissionTest, givenDirectSubmissionNewResourceTlbFlusZeroAnd
hwParse.findHardwareCommands<FamilyType>();
auto *pipeControl = hwParse.getCommand<PIPE_CONTROL>();
EXPECT_EQ(pipeControl, nullptr);
EXPECT_FALSE(osContext->getNewResourceBound());
EXPECT_FALSE(osContext->isTlbFlushRequired());
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), 0u);
EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), sizeof(PIPE_CONTROL));
}
HWCMDTEST_F(IGFX_XE_HP_CORE, DrmDirectSubmissionTest, givenMultipleActiveTilesWhenWaitingForTagUpdateThenQueryAllActiveTiles) {

20
shared/test/unit_test/os_interface/linux/drm_residency_handler_prelim_tests.cpp
View File

@@ -105,21 +105,25 @@ struct DrmMemoryOperationsHandlerBindFixture : public ::testing::Test {
using DrmMemoryOperationsHandlerBindMultiRootDeviceTest = DrmMemoryOperationsHandlerBindFixture<2u>;
TEST_F(DrmMemoryOperationsHandlerBindMultiRootDeviceTest, whenSetNewResourceBoundToVMThenAllContextsUsingThatVMHasSetNewResourceBound) {
struct MockOsContextLinux : OsContextLinux {
using OsContextLinux::lastFlushedTlbFlushCounter;
};
mock->setNewResourceBoundToVM(1u);
for (const auto &engine : device->getAllEngines()) {
auto osContexLinux = static_cast<OsContextLinux *>(engine.osContext);
auto osContexLinux = static_cast<MockOsContextLinux *>(engine.osContext);
if (osContexLinux->getDeviceBitfield().test(1u)) {
EXPECT_TRUE(osContexLinux->getNewResourceBound());
EXPECT_TRUE(osContexLinux->isTlbFlushRequired());
} else {
EXPECT_FALSE(osContexLinux->getNewResourceBound());
EXPECT_FALSE(osContexLinux->isTlbFlushRequired());
}
osContexLinux->setNewResourceBound(false);
osContexLinux->lastFlushedTlbFlushCounter.store(osContexLinux->peekTlbFlushCounter());
}
for (const auto &engine : devices[1]->getAllEngines()) {
auto osContexLinux = static_cast<OsContextLinux *>(engine.osContext);
EXPECT_FALSE(osContexLinux->getNewResourceBound());
EXPECT_FALSE(osContexLinux->isTlbFlushRequired());
}
auto mock2 = executionEnvironment->rootDeviceEnvironments[1u]->osInterface->getDriverModel()->as<DrmQueryMock>();
@@ -128,14 +132,14 @@ TEST_F(DrmMemoryOperationsHandlerBindMultiRootDeviceTest, whenSetNewResourceBoun
for (const auto &engine : devices[1]->getAllEngines()) {
auto osContexLinux = static_cast<OsContextLinux *>(engine.osContext);
if (osContexLinux->getDeviceBitfield().test(0u)) {
EXPECT_TRUE(osContexLinux->getNewResourceBound());
EXPECT_TRUE(osContexLinux->isTlbFlushRequired());
} else {
EXPECT_FALSE(osContexLinux->getNewResourceBound());
EXPECT_FALSE(osContexLinux->isTlbFlushRequired());
}
}
for (const auto &engine : device->getAllEngines()) {
auto osContexLinux = static_cast<OsContextLinux *>(engine.osContext);
EXPECT_FALSE(osContexLinux->getNewResourceBound());
EXPECT_FALSE(osContexLinux->isTlbFlushRequired());
}
}