From cb903cbc03e8972cb83325f8fe3ee485ecff851f Mon Sep 17 00:00:00 2001 From: "Baj, Tomasz" Date: Fri, 15 Sep 2023 10:28:08 +0000 Subject: [PATCH] refactor: Move disableRcs to releaseHelper Related-To: NEO-8296 Signed-off-by: Baj, Tomasz --- .../unit_test/windows/get_devices_tests.cpp | 4 +- .../root_device_environment.cpp | 11 +++++ .../root_device_environment.h | 1 + shared/source/os_interface/linux/drm_neo.cpp | 1 + shared/source/os_interface/product_helper.h | 1 - shared/source/os_interface/product_helper.inl | 8 ---- .../source/os_interface/product_helper_hw.h | 1 - .../source/os_interface/windows/wddm/wddm.cpp | 1 + shared/source/release_helper/release_helper.h | 2 + .../release_helper/release_helper_1260.cpp | 4 ++ .../release_helper/release_helper_base.inl | 5 +++ .../release_helper_common_xe_hpg.inl | 4 ++ .../linux/product_helper_xe_hpc_core.inl | 2 - .../windows/product_helper_pvc.cpp | 1 - .../xe_hpg_core/linux/product_helper_dg2.cpp | 1 - .../windows/product_helper_dg2.cpp | 1 - .../test/common/mocks/mock_release_helper.h | 1 + .../execution_environment_tests.cpp | 42 +++++++++++++++++++ .../helpers/gfx_core_helper_tests.cpp | 27 ------------ .../unit_test/release_helper/CMakeLists.txt | 8 +++- .../release_helper_12_55_tests.cpp | 1 + .../release_helper_12_56_tests.cpp | 1 + .../release_helper_12_57_tests.cpp | 1 + .../release_helper_12_60_tests.cpp | 1 + .../release_helper_12_70_tests.cpp | 1 + .../release_helper_12_71_tests.cpp | 1 + .../pvc/test_product_helper_pvc.cpp | 15 ------- .../dg2/gfx_core_helper_tests_dg2.cpp | 4 +- 28 files changed, 87 insertions(+), 64 deletions(-) diff --git a/opencl/test/unit_test/windows/get_devices_tests.cpp b/opencl/test/unit_test/windows/get_devices_tests.cpp index 0e45836f28..1e7393d7a9 100644 --- a/opencl/test/unit_test/windows/get_devices_tests.cpp +++ b/opencl/test/unit_test/windows/get_devices_tests.cpp @@ -41,7 +41,7 @@ HWTEST_F(PrepareDeviceEnvironmentsTests, whenPrepareDeviceEnvironmentsIsCalledTh EXPECT_NE(nullptr, executionEnvironment.rootDeviceEnvironments[0]->getGmmHelper()); } -HWTEST_F(PrepareDeviceEnvironmentsTests, givenRcsAndCcsNotSupportedWhenInitializingThenReturnFalse) { +HWTEST_F(PrepareDeviceEnvironmentsTests, givenCcsNotSupportedWhenInitializingThenReturnFalse) { REQUIRE_64BIT_OR_SKIP(); NEO::ExecutionEnvironment executionEnvironment; @@ -53,7 +53,7 @@ HWTEST_F(PrepareDeviceEnvironmentsTests, givenRcsAndCcsNotSupportedWhenInitializ productHelper.configureHardwareCustom(&hwInfo, nullptr); bool expectedValue = false; - if (hwInfo.featureTable.flags.ftrRcsNode || hwInfo.featureTable.flags.ftrCCSNode) { + if (hwInfo.featureTable.flags.ftrCCSNode) { expectedValue = true; } diff --git a/shared/source/execution_environment/root_device_environment.cpp b/shared/source/execution_environment/root_device_environment.cpp index 78a23bfc9a..083912d6bd 100644 --- a/shared/source/execution_environment/root_device_environment.cpp +++ b/shared/source/execution_environment/root_device_environment.cpp @@ -210,6 +210,17 @@ bool RootDeviceEnvironment::isNumberOfCcsLimited() const { return limitedNumberOfCcs; } +void RootDeviceEnvironment::setRcsExposure() { + if (releaseHelper) { + if (releaseHelper->isRcsExposureDisabled()) { + hwInfo->featureTable.flags.ftrRcsNode = false; + if ((DebugManager.flags.NodeOrdinal.get() == static_cast(aub_stream::EngineType::ENGINE_RCS)) || (DebugManager.flags.NodeOrdinal.get() == static_cast(aub_stream::EngineType::ENGINE_CCCS))) { + hwInfo->featureTable.flags.ftrRcsNode = true; + } + } + } +} + void RootDeviceEnvironment::initDummyAllocation() { std::call_once(isDummyAllocationInitialized, [this]() { auto customDeleter = [this](GraphicsAllocation *dummyAllocation) { diff --git a/shared/source/execution_environment/root_device_environment.h b/shared/source/execution_environment/root_device_environment.h index 957fbeec5b..a54a37013e 100644 --- a/shared/source/execution_environment/root_device_environment.h +++ b/shared/source/execution_environment/root_device_environment.h @@ -78,6 +78,7 @@ struct RootDeviceEnvironment { void createBindlessHeapsHelper(MemoryManager *memoryManager, bool availableDevices, uint32_t rootDeviceIndex, DeviceBitfield deviceBitfield); void limitNumberOfCcs(uint32_t numberOfCcs); bool isNumberOfCcsLimited() const; + void setRcsExposure(); void initProductHelper(); void initHelpers(); void initGfxCoreHelper(); diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp index edd173f6e8..12e4eb60d4 100644 --- a/shared/source/os_interface/linux/drm_neo.cpp +++ b/shared/source/os_interface/linux/drm_neo.cpp @@ -476,6 +476,7 @@ int Drm::setupHardwareInfo(const DeviceDescriptor *device, bool setupFeatureTabl status = querySystemInfo(); auto &compilerProductHelper = rootDeviceEnvironment.getHelper(); device->setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable, compilerProductHelper); + rootDeviceEnvironment.setRcsExposure(); if (status) { systemInfo->checkSysInfoMismatch(hwInfo); diff --git a/shared/source/os_interface/product_helper.h b/shared/source/os_interface/product_helper.h index 7b52972aae..49744e6ccd 100644 --- a/shared/source/os_interface/product_helper.h +++ b/shared/source/os_interface/product_helper.h @@ -69,7 +69,6 @@ class ProductHelper { virtual int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const = 0; virtual void adjustPlatformForProductFamily(HardwareInfo *hwInfo) = 0; virtual void adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) const = 0; - virtual void disableRcsExposure(HardwareInfo *hwInfo) const = 0; virtual uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) const = 0; virtual uint64_t getDeviceMemCapabilities() const = 0; virtual uint64_t getSingleDeviceSharedMemCapabilities() const = 0; diff --git a/shared/source/os_interface/product_helper.inl b/shared/source/os_interface/product_helper.inl index 03f6f3aeec..e02b59845b 100644 --- a/shared/source/os_interface/product_helper.inl +++ b/shared/source/os_interface/product_helper.inl @@ -84,14 +84,6 @@ void ProductHelperHw::enableBlitterOperationsSupport(HardwareInfo *h } } -template -void ProductHelperHw::disableRcsExposure(HardwareInfo *hwInfo) const { - hwInfo->featureTable.flags.ftrRcsNode = false; - if ((DebugManager.flags.NodeOrdinal.get() == static_cast(aub_stream::EngineType::ENGINE_RCS)) || (DebugManager.flags.NodeOrdinal.get() == static_cast(aub_stream::EngineType::ENGINE_CCCS))) { - hwInfo->featureTable.flags.ftrRcsNode = true; - } -} - template uint64_t ProductHelperHw::getDeviceMemCapabilities() const { uint64_t capabilities = UNIFIED_SHARED_MEMORY_ACCESS | UNIFIED_SHARED_MEMORY_ATOMIC_ACCESS; diff --git a/shared/source/os_interface/product_helper_hw.h b/shared/source/os_interface/product_helper_hw.h index a9a6f00b5b..7472c78d37 100644 --- a/shared/source/os_interface/product_helper_hw.h +++ b/shared/source/os_interface/product_helper_hw.h @@ -22,7 +22,6 @@ class ProductHelperHw : public ProductHelper { int configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const override; void adjustPlatformForProductFamily(HardwareInfo *hwInfo) override; void adjustSamplerState(void *sampler, const HardwareInfo &hwInfo) const override; - void disableRcsExposure(HardwareInfo *hwInfo) const override; uint64_t getHostMemCapabilities(const HardwareInfo *hwInfo) const override; uint64_t getDeviceMemCapabilities() const override; uint64_t getSingleDeviceSharedMemCapabilities() const override; diff --git a/shared/source/os_interface/windows/wddm/wddm.cpp b/shared/source/os_interface/windows/wddm/wddm.cpp index 0df42c4e0f..5f174ef426 100644 --- a/shared/source/os_interface/windows/wddm/wddm.cpp +++ b/shared/source/os_interface/windows/wddm/wddm.cpp @@ -115,6 +115,7 @@ bool Wddm::init() { populateIpVersion(*hardwareInfo); rootDeviceEnvironment.initReleaseHelper(); + rootDeviceEnvironment.setRcsExposure(); if (productHelper.configureHwInfoWddm(hardwareInfo, hardwareInfo, rootDeviceEnvironment)) { return false; diff --git a/shared/source/release_helper/release_helper.h b/shared/source/release_helper/release_helper.h index b39826d9c1..606618ad8a 100644 --- a/shared/source/release_helper/release_helper.h +++ b/shared/source/release_helper/release_helper.h @@ -41,6 +41,7 @@ class ReleaseHelper { virtual bool isCachingOnCpuAvailable() const = 0; virtual bool shouldAdjustDepth() const = 0; virtual bool isDirectSubmissionSupported() const = 0; + virtual bool isRcsExposureDisabled() const = 0; virtual std::optional getPreferredAllocationMethod(AllocationType allocationType) const = 0; protected: @@ -69,6 +70,7 @@ class ReleaseHelperHw : public ReleaseHelper { bool isCachingOnCpuAvailable() const override; bool shouldAdjustDepth() const override; bool isDirectSubmissionSupported() const override; + bool isRcsExposureDisabled() const override; std::optional getPreferredAllocationMethod(AllocationType allocationType) const override; protected: diff --git a/shared/source/release_helper/release_helper_1260.cpp b/shared/source/release_helper/release_helper_1260.cpp index 6df412de15..a881879d86 100644 --- a/shared/source/release_helper/release_helper_1260.cpp +++ b/shared/source/release_helper/release_helper_1260.cpp @@ -13,6 +13,10 @@ namespace NEO { constexpr auto release = ReleaseType::release1260; +template <> +bool ReleaseHelperHw::isRcsExposureDisabled() const { + return true; +} } // namespace NEO template class NEO::ReleaseHelperHw; diff --git a/shared/source/release_helper/release_helper_base.inl b/shared/source/release_helper/release_helper_base.inl index b1898b6ffc..0ef3cbba3c 100644 --- a/shared/source/release_helper/release_helper_base.inl +++ b/shared/source/release_helper/release_helper_base.inl @@ -82,4 +82,9 @@ template bool ReleaseHelperHw::isDirectSubmissionSupported() const { return false; } + +template +bool ReleaseHelperHw::isRcsExposureDisabled() const { + return false; +} } // namespace NEO diff --git a/shared/source/release_helper/release_helper_common_xe_hpg.inl b/shared/source/release_helper/release_helper_common_xe_hpg.inl index c6918a875b..3d0c7245b6 100644 --- a/shared/source/release_helper/release_helper_common_xe_hpg.inl +++ b/shared/source/release_helper/release_helper_common_xe_hpg.inl @@ -29,4 +29,8 @@ bool ReleaseHelperHw::isDirectSubmissionSupported() const { return true; } +template <> +bool ReleaseHelperHw::isRcsExposureDisabled() const { + return true; +} } // namespace NEO diff --git a/shared/source/xe_hpc_core/linux/product_helper_xe_hpc_core.inl b/shared/source/xe_hpc_core/linux/product_helper_xe_hpc_core.inl index b02a1ab8d0..33aa776157 100644 --- a/shared/source/xe_hpc_core/linux/product_helper_xe_hpc_core.inl +++ b/shared/source/xe_hpc_core/linux/product_helper_xe_hpc_core.inl @@ -18,8 +18,6 @@ int ProductHelperHw::configureHardwareCustom(HardwareInfo *hwInfo, O enableBlitterOperationsSupport(hwInfo); - disableRcsExposure(hwInfo); - auto &kmdNotifyProperties = hwInfo->capabilityTable.kmdNotifyProperties; kmdNotifyProperties.enableKmdNotify = true; kmdNotifyProperties.delayKmdNotifyMicroseconds = 150; diff --git a/shared/source/xe_hpc_core/windows/product_helper_pvc.cpp b/shared/source/xe_hpc_core/windows/product_helper_pvc.cpp index dba6b4519b..08423a08b1 100644 --- a/shared/source/xe_hpc_core/windows/product_helper_pvc.cpp +++ b/shared/source/xe_hpc_core/windows/product_helper_pvc.cpp @@ -23,7 +23,6 @@ template <> int ProductHelperHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const { enableCompression(hwInfo); enableBlitterOperationsSupport(hwInfo); - disableRcsExposure(hwInfo); return 0; } diff --git a/shared/source/xe_hpg_core/linux/product_helper_dg2.cpp b/shared/source/xe_hpg_core/linux/product_helper_dg2.cpp index 1cb96fa847..ddad468e28 100644 --- a/shared/source/xe_hpg_core/linux/product_helper_dg2.cpp +++ b/shared/source/xe_hpg_core/linux/product_helper_dg2.cpp @@ -35,7 +35,6 @@ int ProductHelperHw::configureHardwareCustom(HardwareInfo *hwInfo, O DG2::adjustHardwareInfo(hwInfo); enableBlitterOperationsSupport(hwInfo); - disableRcsExposure(hwInfo); hwInfo->workaroundTable.flags.wa_15010089951 = true; auto &kmdNotifyProperties = hwInfo->capabilityTable.kmdNotifyProperties; diff --git a/shared/source/xe_hpg_core/windows/product_helper_dg2.cpp b/shared/source/xe_hpg_core/windows/product_helper_dg2.cpp index 21632ca8de..2da31dc9de 100644 --- a/shared/source/xe_hpg_core/windows/product_helper_dg2.cpp +++ b/shared/source/xe_hpg_core/windows/product_helper_dg2.cpp @@ -58,7 +58,6 @@ int ProductHelperHw::configureHardwareCustom(HardwareInfo *hwInfo, O DG2::adjustHardwareInfo(hwInfo); enableBlitterOperationsSupport(hwInfo); - disableRcsExposure(hwInfo); hwInfo->workaroundTable.flags.wa_15010089951 = true; return 0; diff --git a/shared/test/common/mocks/mock_release_helper.h b/shared/test/common/mocks/mock_release_helper.h index a23b8fe547..c1bbba0878 100644 --- a/shared/test/common/mocks/mock_release_helper.h +++ b/shared/test/common/mocks/mock_release_helper.h @@ -27,6 +27,7 @@ class MockReleaseHelper : public ReleaseHelper { ADDMETHOD_CONST_NOBASE(isCachingOnCpuAvailable, bool, false, ()); ADDMETHOD_CONST_NOBASE(shouldAdjustDepth, bool, false, ()); ADDMETHOD_CONST_NOBASE(isDirectSubmissionSupported, bool, false, ()); + ADDMETHOD_CONST_NOBASE(isRcsExposureDisabled, bool, false, ()); ADDMETHOD_CONST_NOBASE(getPreferredAllocationMethod, std::optional, std::nullopt, (AllocationType allocationType)); }; } // namespace NEO diff --git a/shared/test/unit_test/execution_environment/execution_environment_tests.cpp b/shared/test/unit_test/execution_environment/execution_environment_tests.cpp index 996bd44f5b..0c4f06d0b9 100644 --- a/shared/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/shared/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -22,6 +22,7 @@ #include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/os_time.h" +#include "shared/source/release_helper/release_helper.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_driver_model.h" @@ -159,6 +160,47 @@ TEST(RootDeviceEnvironment, givenRootExecutionEnvironmentWhenGetAssertHandlerIsC EXPECT_EQ(assertHandler, rootDeviceEnvironment->getAssertHandler(device.get())); } +TEST(RootDeviceEnvironment, givenDefaultHardwareInfoWhenPrepareDeviceEnvironmentsThenFtrRcsNodeIsCorrectSet) { + MockExecutionEnvironment executionEnvironment; + auto rootDeviceEnvironment = static_cast(executionEnvironment.rootDeviceEnvironments[0].get()); + rootDeviceEnvironment->setHwInfoAndInitHelpers(defaultHwInfo.get()); + rootDeviceEnvironment->setRcsExposure(); + auto hwInfo = rootDeviceEnvironment->getMutableHardwareInfo(); + auto releaseHelper = rootDeviceEnvironment->getReleaseHelper(); + + if (releaseHelper) { + bool shouldRcsBeDisabled = releaseHelper->isRcsExposureDisabled(); + bool isRcsDisabled = hwInfo->featureTable.flags.ftrRcsNode; + EXPECT_NE(shouldRcsBeDisabled, isRcsDisabled); + } +} + +TEST(RootDeviceEnvironment, givenHardwareInfoAndDebugVariableNodeOrdinalEqualsRcsWhenPrepareDeviceEnvironmentsThenFtrRcsNodeIsTrue) { + DebugManagerStateRestore restorer; + DebugManager.flags.NodeOrdinal.set(static_cast(aub_stream::EngineType::ENGINE_RCS)); + + MockExecutionEnvironment executionEnvironment; + executionEnvironment.rootDeviceEnvironments[0]->setHwInfoAndInitHelpers(defaultHwInfo.get()); + auto rootDeviceEnvironment = static_cast(executionEnvironment.rootDeviceEnvironments[0].get()); + rootDeviceEnvironment->setRcsExposure(); + auto hwInfo = rootDeviceEnvironment->getMutableHardwareInfo(); + + EXPECT_TRUE(hwInfo->featureTable.flags.ftrRcsNode); +} + +TEST(RootDeviceEnvironment, givenHardwareInfoAndDebugVariableNodeOrdinalEqualsCccsWhenPrepareDeviceEnvironmentsThenFtrRcsNodeIsTrue) { + DebugManagerStateRestore restorer; + DebugManager.flags.NodeOrdinal.set(static_cast(aub_stream::EngineType::ENGINE_CCCS)); + + MockExecutionEnvironment executionEnvironment; + executionEnvironment.rootDeviceEnvironments[0]->setHwInfoAndInitHelpers(defaultHwInfo.get()); + auto rootDeviceEnvironment = static_cast(executionEnvironment.rootDeviceEnvironments[0].get()); + rootDeviceEnvironment->setRcsExposure(); + auto hwInfo = rootDeviceEnvironment->getMutableHardwareInfo(); + + EXPECT_TRUE(hwInfo->featureTable.flags.ftrRcsNode); +} + TEST(ExecutionEnvironment, givenExecutionEnvironmentWhenInitializeMemoryManagerIsCalledThenLocalMemorySupportedInMemoryManagerHasCorrectValue) { const HardwareInfo *hwInfo = defaultHwInfo.get(); auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(hwInfo)); diff --git a/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp b/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp index 9f9e2d3099..9711e239d3 100644 --- a/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp +++ b/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp @@ -992,33 +992,6 @@ HWTEST2_F(ProductHelperCommonTest, givenBlitterPreferenceWhenEnablingBlitterOper EXPECT_EQ(expectedBlitterSupport, hardwareInfo.capabilityTable.blitterOperationsSupported); } -HWTEST2_F(ProductHelperCommonTest, givenHardwareInfoWhendisableRcsExposureIsCalledThenFtrRcsNodeIsFalse, IsAtLeastGen12lp) { - HardwareInfo hwInfo = *defaultHwInfo; - auto &productHelper = getHelper(); - productHelper.disableRcsExposure(&hwInfo); - EXPECT_FALSE(hwInfo.featureTable.flags.ftrRcsNode); -} - -HWTEST2_F(ProductHelperCommonTest, givenHardwareInfoAndDebugVariableNodeOrdinalEqualsRcsWhenDisableRcsExposureIsCalledThenFtrRcsNodeIsTrue, IsAtLeastGen12lp) { - HardwareInfo hwInfo = *defaultHwInfo; - auto &productHelper = getHelper(); - DebugManagerStateRestore restore; - DebugManager.flags.NodeOrdinal.set(static_cast(aub_stream::EngineType::ENGINE_RCS)); - - productHelper.disableRcsExposure(&hwInfo); - EXPECT_TRUE(hwInfo.featureTable.flags.ftrRcsNode); -} - -HWTEST2_F(ProductHelperCommonTest, givenHardwareInfoAndDebugVariableNodeOrdinalEqualsCccsWhenDisableRcsExposureIsCalledThenFtrRcsNodeIsTrue, IsAtLeastGen12lp) { - HardwareInfo hwInfo = *defaultHwInfo; - auto &productHelper = getHelper(); - DebugManagerStateRestore restore; - DebugManager.flags.NodeOrdinal.set(static_cast(aub_stream::EngineType::ENGINE_CCCS)); - - productHelper.disableRcsExposure(&hwInfo); - EXPECT_TRUE(hwInfo.featureTable.flags.ftrRcsNode); -} - HWTEST_F(GfxCoreHelperTest, givenGfxCoreHelperWhenAskingForIsaSystemMemoryPlacementThenReturnFalseIfLocalMemorySupported) { DebugManagerStateRestore restorer; auto &gfxCoreHelper = getHelper(); diff --git a/shared/test/unit_test/release_helper/CMakeLists.txt b/shared/test/unit_test/release_helper/CMakeLists.txt index 49972d49b7..238e9287ed 100644 --- a/shared/test/unit_test/release_helper/CMakeLists.txt +++ b/shared/test/unit_test/release_helper/CMakeLists.txt @@ -9,14 +9,18 @@ target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_tests_base.cpp ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_tests_base.h ) -if(TESTS_XE_HPG_CORE OR TESTS_XE_HPC_CORE) +if(TESTS_XE_HPG_CORE) target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_12_55_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_12_56_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_12_57_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_12_60_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_12_70_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_12_71_tests.cpp ) endif() +if(TESTS_XE_HPC_CORE) + target_sources(neo_shared_tests PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/release_helper_12_60_tests.cpp + ) +endif() add_subdirectories() \ No newline at end of file diff --git a/shared/test/unit_test/release_helper/release_helper_12_55_tests.cpp b/shared/test/unit_test/release_helper/release_helper_12_55_tests.cpp index 95d570b10c..4f57ab502b 100644 --- a/shared/test/unit_test/release_helper/release_helper_12_55_tests.cpp +++ b/shared/test/unit_test/release_helper/release_helper_12_55_tests.cpp @@ -34,6 +34,7 @@ TEST_F(ReleaseHelper1255Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe EXPECT_TRUE(releaseHelper->isCachingOnCpuAvailable()); EXPECT_TRUE(releaseHelper->isDirectSubmissionSupported()); EXPECT_FALSE(releaseHelper->isAuxSurfaceModeOverrideRequired()); + EXPECT_TRUE(releaseHelper->isRcsExposureDisabled()); } } diff --git a/shared/test/unit_test/release_helper/release_helper_12_56_tests.cpp b/shared/test/unit_test/release_helper/release_helper_12_56_tests.cpp index b0826282c4..541e6ad467 100644 --- a/shared/test/unit_test/release_helper/release_helper_12_56_tests.cpp +++ b/shared/test/unit_test/release_helper/release_helper_12_56_tests.cpp @@ -34,6 +34,7 @@ TEST_F(ReleaseHelper1256Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe EXPECT_TRUE(releaseHelper->isCachingOnCpuAvailable()); EXPECT_TRUE(releaseHelper->isDirectSubmissionSupported()); EXPECT_FALSE(releaseHelper->isAuxSurfaceModeOverrideRequired()); + EXPECT_TRUE(releaseHelper->isRcsExposureDisabled()); } } diff --git a/shared/test/unit_test/release_helper/release_helper_12_57_tests.cpp b/shared/test/unit_test/release_helper/release_helper_12_57_tests.cpp index 5ac91a9414..f4737f2233 100644 --- a/shared/test/unit_test/release_helper/release_helper_12_57_tests.cpp +++ b/shared/test/unit_test/release_helper/release_helper_12_57_tests.cpp @@ -34,6 +34,7 @@ TEST_F(ReleaseHelper1257Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe EXPECT_TRUE(releaseHelper->isCachingOnCpuAvailable()); EXPECT_TRUE(releaseHelper->isDirectSubmissionSupported()); EXPECT_FALSE(releaseHelper->isAuxSurfaceModeOverrideRequired()); + EXPECT_TRUE(releaseHelper->isRcsExposureDisabled()); } } diff --git a/shared/test/unit_test/release_helper/release_helper_12_60_tests.cpp b/shared/test/unit_test/release_helper/release_helper_12_60_tests.cpp index 8b261cab14..d5ba9b3fc4 100644 --- a/shared/test/unit_test/release_helper/release_helper_12_60_tests.cpp +++ b/shared/test/unit_test/release_helper/release_helper_12_60_tests.cpp @@ -32,5 +32,6 @@ TEST_F(ReleaseHelper1260Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe EXPECT_FALSE(releaseHelper->isBFloat16ConversionSupported()); EXPECT_TRUE(releaseHelper->isResolvingSubDeviceIDNeeded()); EXPECT_TRUE(releaseHelper->isCachingOnCpuAvailable()); + EXPECT_TRUE(releaseHelper->isRcsExposureDisabled()); } } diff --git a/shared/test/unit_test/release_helper/release_helper_12_70_tests.cpp b/shared/test/unit_test/release_helper/release_helper_12_70_tests.cpp index b56ed7b64a..2e7d0a1dc8 100644 --- a/shared/test/unit_test/release_helper/release_helper_12_70_tests.cpp +++ b/shared/test/unit_test/release_helper/release_helper_12_70_tests.cpp @@ -35,6 +35,7 @@ TEST_F(ReleaseHelper1270Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe EXPECT_FALSE(releaseHelper->isCachingOnCpuAvailable()); EXPECT_TRUE(releaseHelper->isDirectSubmissionSupported()); EXPECT_TRUE(releaseHelper->isAuxSurfaceModeOverrideRequired()); + EXPECT_FALSE(releaseHelper->isRcsExposureDisabled()); } } diff --git a/shared/test/unit_test/release_helper/release_helper_12_71_tests.cpp b/shared/test/unit_test/release_helper/release_helper_12_71_tests.cpp index 8aae96fc58..af7604e1a5 100644 --- a/shared/test/unit_test/release_helper/release_helper_12_71_tests.cpp +++ b/shared/test/unit_test/release_helper/release_helper_12_71_tests.cpp @@ -35,6 +35,7 @@ TEST_F(ReleaseHelper1271Tests, whenGettingCapabilitiesThenCorrectPropertiesAreRe EXPECT_FALSE(releaseHelper->isCachingOnCpuAvailable()); EXPECT_TRUE(releaseHelper->isDirectSubmissionSupported()); EXPECT_TRUE(releaseHelper->isAuxSurfaceModeOverrideRequired()); + EXPECT_FALSE(releaseHelper->isRcsExposureDisabled()); } } diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_product_helper_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_product_helper_pvc.cpp index 027135ec39..1a2681e4d1 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/test_product_helper_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/test_product_helper_pvc.cpp @@ -205,21 +205,6 @@ PVCTEST_F(PvcProductHelper, givenProductHelperAndProgramExtendedPipeControlPrior EXPECT_FALSE(isBasicWARequired); } -PVCTEST_F(PvcProductHelper, givenPvcWhenConfiguringThenDisableCccs) { - productHelper->configureHardwareCustom(&pInHwInfo, nullptr); - EXPECT_FALSE(pInHwInfo.featureTable.flags.ftrRcsNode); -} - -PVCTEST_F(PvcProductHelper, givenDebugVariableSetWhenConfiguringThenEnableCccs) { - DebugManagerStateRestore restore; - DebugManager.flags.NodeOrdinal.set(static_cast(aub_stream::EngineType::ENGINE_CCCS)); - - HardwareInfo hwInfo = *defaultHwInfo; - - productHelper->configureHardwareCustom(&hwInfo, nullptr); - EXPECT_TRUE(hwInfo.featureTable.flags.ftrRcsNode); -} - PVCTEST_F(PvcProductHelper, givenDeviceIdThenProperMaxThreadsForWorkgroupIsReturned) { HardwareInfo hwInfo = *defaultHwInfo; diff --git a/shared/test/unit_test/xe_hpg_core/dg2/gfx_core_helper_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/gfx_core_helper_tests_dg2.cpp index 8d0971a66f..56cddada25 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/gfx_core_helper_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/gfx_core_helper_tests_dg2.cpp @@ -40,14 +40,12 @@ DG2TEST_F(GfxCoreHelperTestDg2, givenRcsDisabledWhenGetGpgpuEnginesCalledThenDon HardwareInfo hwInfo = *defaultHwInfo; MockExecutionEnvironment mockExecutionEnvironment{}; - auto &productHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); hwInfo.featureTable.flags.ftrCCSNode = true; hwInfo.featureTable.ftrBcsInfo = 1; - hwInfo.featureTable.flags.ftrRcsNode = true; + hwInfo.featureTable.flags.ftrRcsNode = false; hwInfo.capabilityTable.blitterOperationsSupported = true; hwInfo.capabilityTable.defaultEngineType = aub_stream::ENGINE_CCS; hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4; - productHelper.configureHardwareCustom(&hwInfo, nullptr); auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper();