diff --git a/shared/source/direct_submission/linux/drm_direct_submission.h b/shared/source/direct_submission/linux/drm_direct_submission.h index cb224db37c..672c182ee4 100644 --- a/shared/source/direct_submission/linux/drm_direct_submission.h +++ b/shared/source/direct_submission/linux/drm_direct_submission.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -42,5 +42,6 @@ class DrmDirectSubmission : public DirectSubmissionHw { TagData currentTagData{}; volatile TagAddressType *tagAddress; TaskCountType completionFenceValue{}; + bool tlbFlushRequired = true; }; } // namespace NEO diff --git a/shared/source/direct_submission/linux/drm_direct_submission.inl b/shared/source/direct_submission/linux/drm_direct_submission.inl index 61f4599be9..b6375cf8e5 100644 --- a/shared/source/direct_submission/linux/drm_direct_submission.inl +++ b/shared/source/direct_submission/linux/drm_direct_submission.inl @@ -35,6 +35,8 @@ DrmDirectSubmission::DrmDirectSubmission(const DirectSubm this->completionFenceValue = static_cast(DebugManager.flags.OverrideUserFenceStartValue.get()); } + this->tlbFlushRequired = inputParams.rootDeviceEnvironment.getProductHelper().isTlbFlushRequired(); + auto osContextLinux = static_cast(&this->osContext); auto subDevices = osContextLinux->getDeviceBitfield(); @@ -162,7 +164,7 @@ bool DrmDirectSubmission::handleResidency() { template bool DrmDirectSubmission::isNewResourceHandleNeeded() { auto osContextLinux = static_cast(&this->osContext); - auto newResourcesBound = osContextLinux->isTlbFlushRequired(); + auto newResourcesBound = this->tlbFlushRequired && osContextLinux->isTlbFlushRequired(); if (DebugManager.flags.DirectSubmissionNewResourceTlbFlush.get() != -1) { newResourcesBound = DebugManager.flags.DirectSubmissionNewResourceTlbFlush.get(); diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h index a0bc9d8c8d..52c0578c88 100644 --- a/shared/source/os_interface/hw_info_config.h +++ b/shared/source/os_interface/hw_info_config.h @@ -151,6 +151,7 @@ class ProductHelper { virtual bool isMidThreadPreemptionDisallowedForRayTracingKernels() const = 0; virtual bool isBufferPoolAllocatorSupported() const = 0; virtual uint64_t overridePatIndex(AllocationType allocationType, uint64_t patIndex) const = 0; + virtual bool isTlbFlushRequired() const = 0; virtual bool getFrontEndPropertyScratchSizeSupport() const = 0; virtual bool getFrontEndPropertyPrivateScratchSizeSupport() const = 0; virtual bool getFrontEndPropertyComputeDispatchAllWalkerSupport() const = 0; @@ -295,7 +296,7 @@ class ProductHelperHw : public ProductHelper { bool isMidThreadPreemptionDisallowedForRayTracingKernels() const override; bool isBufferPoolAllocatorSupported() const override; uint64_t overridePatIndex(AllocationType allocationType, uint64_t patIndex) const override; - + bool isTlbFlushRequired() const override; bool getFrontEndPropertyScratchSizeSupport() const override; bool getFrontEndPropertyPrivateScratchSizeSupport() const override; bool getFrontEndPropertyComputeDispatchAllWalkerSupport() const override; diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl index a9a8e3844b..f24581b8ac 100644 --- a/shared/source/os_interface/hw_info_config.inl +++ b/shared/source/os_interface/hw_info_config.inl @@ -50,6 +50,11 @@ void ProductHelperHw::adjustPlatformForProductFamily(HardwareInfo *h template void ProductHelperHw::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) const {} +template +bool ProductHelperHw::isTlbFlushRequired() const { + return true; +} + template void ProductHelperHw::enableBlitterOperationsSupport(HardwareInfo *hwInfo) const { hwInfo->capabilityTable.blitterOperationsSupported = obtainBlitterPreference(*hwInfo); diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp index c7553bb014..dd0b5d6146 100644 --- a/shared/source/os_interface/linux/drm_neo.cpp +++ b/shared/source/os_interface/linux/drm_neo.cpp @@ -655,6 +655,9 @@ uint32_t Drm::getVirtualMemoryAddressSpace(uint32_t vmId) const { } void Drm::setNewResourceBoundToVM(uint32_t vmHandleId) { + if (!this->rootDeviceEnvironment.getProductHelper().isTlbFlushRequired()) { + return; + } const auto &engines = this->rootDeviceEnvironment.executionEnvironment.memoryManager->getRegisteredEngines(); for (const auto &engine : engines) { if (engine.osContext->getDeviceBitfield().test(vmHandleId)) { diff --git a/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl b/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl index 44ef5e1773..8e634985ef 100644 --- a/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl +++ b/shared/source/xe_hpc_core/os_agnostic_hw_info_config_xe_hpc_core.inl @@ -43,6 +43,11 @@ std::pair ProductHelperHw::isPipeControlPriorToNonPipeli return {isBasicWARequired, isExtendedWARequired}; } +template <> +bool ProductHelperHw::isTlbFlushRequired() const { + return false; +} + template <> void ProductHelperHw::adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) const { using SAMPLER_STATE = typename XeHpcCoreFamily::SAMPLER_STATE; diff --git a/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp index 82f4b77e25..a35077c4ca 100644 --- a/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp +++ b/shared/test/unit_test/direct_submission/linux/drm_direct_submission_tests.cpp @@ -607,9 +607,12 @@ HWTEST_F(DrmDirectSubmissionTest, givenNewResourceBoundWhenDispatchCommandBuffer hwParse.parseCommands(directSubmission.ringCommandStream, 0); hwParse.findHardwareCommands(); auto *pipeControl = hwParse.getCommand(); - EXPECT_TRUE(pipeControl->getTlbInvalidate()); - EXPECT_TRUE(pipeControl->getTextureCacheInvalidationEnable()); - EXPECT_FALSE(osContext->isTlbFlushRequired()); + if (executionEnvironment.rootDeviceEnvironments[0]->getProductHelper().isTlbFlushRequired()) { + auto *pipeControl = hwParse.getCommand(); + EXPECT_TRUE(pipeControl->getTlbInvalidate()); + } else { + EXPECT_EQ(pipeControl, nullptr); + } EXPECT_EQ(directSubmission.getSizeNewResourceHandler(), sizeof(PIPE_CONTROL)); } diff --git a/shared/test/unit_test/os_interface/linux/drm_residency_handler_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_residency_handler_prelim_tests.cpp index 95ccb796ec..179385692b 100644 --- a/shared/test/unit_test/os_interface/linux/drm_residency_handler_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_residency_handler_prelim_tests.cpp @@ -123,7 +123,7 @@ TEST_F(DrmMemoryOperationsHandlerBindMultiRootDeviceTest, whenSetNewResourceBoun for (const auto &engine : device->getAllEngines()) { auto osContexLinux = static_cast(engine.osContext); - if (osContexLinux->getDeviceBitfield().test(1u)) { + if (osContexLinux->getDeviceBitfield().test(1u) && executionEnvironment->rootDeviceEnvironments[device->getRootDeviceIndex()]->getProductHelper().isTlbFlushRequired()) { EXPECT_TRUE(osContexLinux->isTlbFlushRequired()); } else { EXPECT_FALSE(osContexLinux->isTlbFlushRequired()); @@ -141,7 +141,7 @@ TEST_F(DrmMemoryOperationsHandlerBindMultiRootDeviceTest, whenSetNewResourceBoun for (const auto &engine : devices[1]->getAllEngines()) { auto osContexLinux = static_cast(engine.osContext); - if (osContexLinux->getDeviceBitfield().test(0u)) { + if (osContexLinux->getDeviceBitfield().test(0u) && executionEnvironment->rootDeviceEnvironments[1]->getProductHelper().isTlbFlushRequired()) { EXPECT_TRUE(osContexLinux->isTlbFlushRequired()); } else { EXPECT_FALSE(osContexLinux->isTlbFlushRequired()); diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp index 5f2d1d91ef..f3b70a1867 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp @@ -27,6 +27,10 @@ PVCTEST_F(PvcProductHelper, whenGettingAubstreamProductFamilyThenProperEnumValue EXPECT_EQ(aub_stream::ProductFamily::Pvc, productHelper->getAubStreamProductFamily()); } +PVCTEST_F(PvcProductHelper, whenCheckIsTlbFlushRequiredThenReturnProperValue) { + EXPECT_FALSE(productHelper->isTlbFlushRequired()); +} + PVCTEST_F(PvcProductHelper, givenPVCRevId3AndAboveWhenGettingThreadEuRatioForScratchThen16IsReturned) { auto hwInfo = *defaultHwInfo; hwInfo.platform.usRevId = 3;