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

Revert "fix: allow legacy device binary validation logic for Blender on DG2 p...

Browse Source 
This reverts commit d3d15542fb.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2023-10-24 20:25:42 +02:00
committed by Compute-Runtime-Automation
parent dfae4f0fc9
commit 69f614a8c2
10 changed files with 1 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
shared/test/common/mocks/mock_ail_configuration.h
View File

@@ -28,11 +28,6 @@ class MockAILConfiguration : public AILConfiguration {
return contextSyncFlagReturn;
}
bool fallbackToLegacyValidationLogic = false;
bool useLegacyValidationLogic() override {
return fallbackToLegacyValidationLogic;
}
protected:
void applyExt(RuntimeCapabilityTable &runtimeCapabilityTable) override {}
};

1
shared/test/common/test_files/igdrcl.config
View File

@@ -556,5 +556,4 @@ OverridePatIndexForDeviceMemory = -1
PrintGmmCompressionParams = 0
SkipInOrderNonWalkerSignalingAllowed = 0
PrintKernelDispatchParameters = 0
DoNotUseProductConfigForValidationWa = 0
# Please don't edit below this line

47
shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
View File

@@ -5,7 +5,6 @@
*
*/
#include "shared/source/ail/ail_configuration.h"
#include "shared/source/compiler_interface/external_functions.h"
#include "shared/source/compiler_interface/linker.h"
#include "shared/source/device_binary_format/device_binary_formats.h"
@@ -20,8 +19,6 @@
#include "shared/source/program/kernel_info.h"
#include "shared/source/program/program_info.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/helpers/variable_backup.h"
#include "shared/test/common/mocks/mock_ail_configuration.h"
#include "shared/test/common/mocks/mock_elf.h"
#include "shared/test/common/mocks/mock_execution_environment.h"
#include "shared/test/common/mocks/mock_modules_zebin.h"
@@ -5987,50 +5984,6 @@ TEST(ValidateTargetDeviceTests, givenSteppingBiggerThanMaxHwRevisionWhenValidati
EXPECT_FALSE(res);
}
TEST(ValidateTargetDeviceTests, givenAILEnabledAndUseLegacyValidationLogicReturningTrueWhenValidatingTargetDeviceThenDoNotUseProductConfigForValidationWa) {
VariableBackup<AILConfiguration *> ailConfiguration(&ailConfigurationTable[productFamily]);
MockAILConfiguration mockAilConfig;
mockAilConfig.fallbackToLegacyValidationLogic = true;
ASSERT_TRUE(mockAilConfig.useLegacyValidationLogic());
ailConfigurationTable[productFamily] = &mockAilConfig;
NEO::HardwareIpVersion aotConfig = {0};
aotConfig.value = 0x00001234;
TargetDevice targetDevice;
targetDevice.maxPointerSizeInBytes = 8u;
targetDevice.productFamily = productFamily;
targetDevice.coreFamily = renderCoreFamily;
targetDevice.aotConfig.value = aotConfig.value + 0x10; // assert mismatch on aotConfig values, rest of values should result in validation success
Zebin::Elf::ZebinTargetFlags targetMetadata;
targetMetadata.validateRevisionId = false; // in this test case, AOT config should be skipped and productFamily and coreFamily used only
auto res = validateTargetDevice(targetDevice, Zebin::Elf::EI_CLASS_64, productFamily, renderCoreFamily, static_cast<AOT::PRODUCT_CONFIG>(aotConfig.value), targetMetadata);
EXPECT_TRUE(res);
}
TEST(ValidateTargetDeviceTests, givenDoNotUseProductConfigForValidationWaFlagSetWhenValidatingTargetDeviceThenDoNotUseProductConfigForValidation) {
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.DoNotUseProductConfigForValidationWa.set(true);
NEO::HardwareIpVersion aotConfig = {0};
aotConfig.value = 0x00001234;
TargetDevice targetDevice;
targetDevice.maxPointerSizeInBytes = 8u;
targetDevice.productFamily = productFamily;
targetDevice.coreFamily = renderCoreFamily;
targetDevice.aotConfig.value = aotConfig.value + 0x10; // assert mismatch on aotConfig values, rest of values should result in validation success
Zebin::Elf::ZebinTargetFlags targetMetadata;
targetMetadata.validateRevisionId = false; // in this test case, AOT config should be skipped and productFamily and coreFamily used only
auto res = validateTargetDevice(targetDevice, Zebin::Elf::EI_CLASS_64, productFamily, renderCoreFamily, static_cast<AOT::PRODUCT_CONFIG>(aotConfig.value), targetMetadata);
EXPECT_TRUE(res);
}
TEST(PopulateGlobalDeviceHostNameMapping, givenValidZebinWithGlobalHostAccessTableSectionThenPopulateHostDeviceNameMapCorrectly) {
NEO::MockExecutionEnvironment mockExecutionEnvironment{};
auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<NEO::GfxCoreHelper>();

20
shared/test/unit_test/xe_hpg_core/dg2/ail_tests_dg2.cpp
View File

@@ -8,7 +8,6 @@
#include "shared/source/ail/ail_configuration.h"
#include "shared/test/common/helpers/default_hw_info.h"
#include "shared/test/common/helpers/variable_backup.h"
#include "shared/test/common/mocks/mock_ail_configuration.h"
#include "shared/test/common/test_macros/hw_test.h"
namespace NEO {
@@ -109,23 +108,4 @@ HWTEST2_F(AILTestsDg2, givenFixesForApplicationsWhenModifyKernelIfRequiredIsCall
EXPECT_STREQ(copyKernelSources.c_str(), kernelSources.c_str());
}
}
HWTEST2_F(AILTestsDg2, givenApplicationNameRequiringCrossTargetCompabilityWhenCallingUseValidationLogicThenReturnProperValue, IsDG2) {
VariableBackup<AILConfiguration *> ailConfigurationBackup(&ailConfigurationTable[productFamily]);
AILMock<productFamily> ail;
ailConfigurationTable[productFamily] = &ail;
auto ailConfiguration = AILConfiguration::get(defaultHwInfo->platform.eProductFamily);
ASSERT_NE(nullptr, ailConfiguration);
ail.processName = "unknown";
EXPECT_FALSE(ail.useLegacyValidationLogic());
std::array<std::string_view, 1> applicationNamesRequiringLegacyValidation = {
"blender"};
for (auto appName : applicationNamesRequiringLegacyValidation) {
ail.processName = appName;
EXPECT_TRUE(ail.useLegacyValidationLogic());
}
}
} // namespace NEO