From b37c2970ce8ef3922c8020c329a92c60532c167b Mon Sep 17 00:00:00 2001 From: Slawomir Milczarek Date: Fri, 10 May 2024 16:29:31 +0000 Subject: [PATCH] test: Rename regkey BcsNumberOverride to BlitterEnableMaskOverride BlitterEnableMaskOverride is a bitmask with BCS engines available on device Related-To: NEO-11152 Signed-off-by: Slawomir Milczarek --- shared/source/debug_settings/debug_variables_base.inl | 2 +- shared/source/os_interface/device_factory.cpp | 4 ++-- shared/test/common/test_files/igdrcl.config | 2 +- .../test/unit_test/os_interface/hw_info_override_tests.cpp | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl index 1a9f84546f..7d7c3c4819 100644 --- a/shared/source/debug_settings/debug_variables_base.inl +++ b/shared/source/debug_settings/debug_variables_base.inl @@ -17,7 +17,7 @@ DECLARE_DEBUG_VARIABLE(std::string, AUBDumpFilterKernelName, std::string("unk"), DECLARE_DEBUG_VARIABLE(std::string, AUBDumpToggleFileName, std::string("unk"), "Name of file to save AUB in toggle mode") DECLARE_DEBUG_VARIABLE(std::string, OverrideGdiPath, std::string("unk"), "When different value than \"unk\", will override default path to gdi library.") DECLARE_DEBUG_VARIABLE(std::string, AubDumpAddMmioRegistersList, std::string("unk"), "Semicolon separated sequence of additional MMIO registers offset;values pairs i.e. 0x111;0x123;0x222;0x456") -DECLARE_DEBUG_VARIABLE(int32_t, BcsNumberOverride, -1, "Specify number of BCS engines available on the platform, for use in AUB/TBX mode") +DECLARE_DEBUG_VARIABLE(int32_t, BlitterEnableMaskOverride, 0, "Specify bitmask with BCS engines available on the device, for use in AUB/TBX mode") DECLARE_DEBUG_VARIABLE(int32_t, AUBDumpFilterNamedKernelStartIdx, 0, "Start index of named kernel to AUB capture") DECLARE_DEBUG_VARIABLE(int32_t, AUBDumpFilterNamedKernelEndIdx, -1, "End index of named kernel to AUB capture") DECLARE_DEBUG_VARIABLE(int32_t, AUBDumpSubCaptureMode, 0, "AUB dump subcapture mode (0 - off, 1 - filter by kernel name and/or index range, 2 - toggle on/off with dynamic regkey)") diff --git a/shared/source/os_interface/device_factory.cpp b/shared/source/os_interface/device_factory.cpp index e4531ad306..d383525a5d 100644 --- a/shared/source/os_interface/device_factory.cpp +++ b/shared/source/os_interface/device_factory.cpp @@ -97,8 +97,8 @@ bool DeviceFactory::prepareDeviceEnvironmentsForProductFamilyOverride(ExecutionE setHwInfoValuesFromConfig(hwInfoConfig, *hardwareInfo); hardwareInfoSetup[hwInfoConst->platform.eProductFamily](hardwareInfo, true, hwInfoConfig, rootDeviceEnvironment.getReleaseHelper()); - if (debugManager.flags.BcsNumberOverride.get() != -1) { - hardwareInfo->featureTable.ftrBcsInfo = maxNBitValue(static_cast(debugManager.flags.BcsNumberOverride.get())); + if (debugManager.flags.BlitterEnableMaskOverride.get() > 0) { + hardwareInfo->featureTable.ftrBcsInfo = debugManager.flags.BlitterEnableMaskOverride.get(); } auto &productHelper = rootDeviceEnvironment.getProductHelper(); diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config index 6f57ba2135..48a257e28c 100644 --- a/shared/test/common/test_files/igdrcl.config +++ b/shared/test/common/test_files/igdrcl.config @@ -1,7 +1,7 @@ TbxServer = 127.0.0.1 ProductFamilyOverride = unk HardwareInfoOverride = default -BcsNumberOverride = -1 +BlitterEnableMaskOverride = 0 ForceCompilerUsePlatform = unk AUBDumpBufferFormat = unk AUBDumpImageFormat = unk diff --git a/shared/test/unit_test/os_interface/hw_info_override_tests.cpp b/shared/test/unit_test/os_interface/hw_info_override_tests.cpp index eebadc8a35..da91f2d47a 100644 --- a/shared/test/unit_test/os_interface/hw_info_override_tests.cpp +++ b/shared/test/unit_test/os_interface/hw_info_override_tests.cpp @@ -31,9 +31,9 @@ HWTEST2_F(HwInfoOverrideTest, givenAnyHwConfigStringWhenPrepareDeviceEnvironment EXPECT_EQ(hwInfo->gtSystemInfo.EUCount, 6u); } -HWTEST2_F(HwInfoOverrideTest, givenBcsNumberOverrideWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenCorrectBcsNumberIsReturned, IsAtLeastXeHpCore) { +HWTEST2_F(HwInfoOverrideTest, givenBlitterEnableMaskOverrideWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenCorrectBcsInfoMaskIsReturned, IsAtLeastXeHpCore) { DebugManagerStateRestore stateRestore; - debugManager.flags.BcsNumberOverride.set(2); + debugManager.flags.BlitterEnableMaskOverride.set(0x6); MockExecutionEnvironment executionEnvironment{}; @@ -41,5 +41,5 @@ HWTEST2_F(HwInfoOverrideTest, givenBcsNumberOverrideWhenPrepareDeviceEnvironment EXPECT_TRUE(success); auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo(); - EXPECT_EQ(hwInfo->featureTable.ftrBcsInfo, maxNBitValue(2)); + EXPECT_EQ(hwInfo->featureTable.ftrBcsInfo, 0x6); }