From bef6b641489280b9991c42ca7e6eaba6279f3439 Mon Sep 17 00:00:00 2001 From: Compute-Runtime-Validation Date: Mon, 21 Aug 2023 12:47:11 +0200 Subject: [PATCH] Revert "feature: add AIL for selected apps on MTL" This reverts commit 68909a895af954ecad2a1627ee5df4fd84d9d016. Signed-off-by: Compute-Runtime-Validation --- shared/source/ail/ail_configuration.h | 1 - .../xe_hpg_core/mtl/ail_configuration_mtl.cpp | 26 +----------- .../unit_test/xe_hpg_core/mtl/CMakeLists.txt | 1 - .../xe_hpg_core/mtl/ail_tests_mtl.cpp | 42 ------------------- 4 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 shared/test/unit_test/xe_hpg_core/mtl/ail_tests_mtl.cpp diff --git a/shared/source/ail/ail_configuration.h b/shared/source/ail/ail_configuration.h index 38778ef287..1a728c6852 100644 --- a/shared/source/ail/ail_configuration.h +++ b/shared/source/ail/ail_configuration.h @@ -35,7 +35,6 @@ enum class AILEnumeration : uint32_t { DISABLE_COMPRESSION, ENABLE_FP64, DISABLE_HOST_PTR_TRACKING, - DISABLE_DEFAULT_CCS, AIL_MAX_OPTIONS_COUNT }; diff --git a/shared/source/ail/xe_hpg_core/mtl/ail_configuration_mtl.cpp b/shared/source/ail/xe_hpg_core/mtl/ail_configuration_mtl.cpp index f6af3fca42..e5513b32fa 100644 --- a/shared/source/ail/xe_hpg_core/mtl/ail_configuration_mtl.cpp +++ b/shared/source/ail/xe_hpg_core/mtl/ail_configuration_mtl.cpp @@ -6,8 +6,6 @@ */ #include "shared/source/ail/ail_configuration_base.inl" -#include "shared/source/helpers/debug_helpers.h" -#include "shared/source/helpers/hw_info.h" #include #include @@ -15,29 +13,7 @@ namespace NEO { static EnableAIL enableAILMTL; -std::map> applicationMapMTL = { - {"Photoshop", {AILEnumeration::DISABLE_DEFAULT_CCS}}, - {"AfterFX (Beta)", {AILEnumeration::DISABLE_DEFAULT_CCS}}, - {"AfterFX", {AILEnumeration::DISABLE_DEFAULT_CCS}}, - {"Adobe Premiere Pro", {AILEnumeration::DISABLE_DEFAULT_CCS}}, -}; - -template <> -inline void AILConfigurationHw::applyExt(RuntimeCapabilityTable &runtimeCapabilityTable) { - - auto search = applicationMapMTL.find(processName); - - if (search != applicationMapMTL.end()) { - for (size_t i = 0; i < search->second.size(); ++i) { - switch (search->second[i]) { - case AILEnumeration::DISABLE_DEFAULT_CCS: - runtimeCapabilityTable.defaultEngineType = aub_stream::ENGINE_RCS; - default: - break; - } - } - } -} +std::map> applicationMapMTL = {}; template class AILConfigurationHw; diff --git a/shared/test/unit_test/xe_hpg_core/mtl/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/mtl/CMakeLists.txt index cd0f01fc6a..38357e579e 100644 --- a/shared/test/unit_test/xe_hpg_core/mtl/CMakeLists.txt +++ b/shared/test/unit_test/xe_hpg_core/mtl/CMakeLists.txt @@ -11,7 +11,6 @@ if(TESTS_MTL) target_sources(neo_shared_tests PRIVATE ${NEO_CORE_tests_xe_hpg_core_mtl_excludes} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/ail_tests_mtl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_mtl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core_mtl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_aot_config_tests_mtl.cpp diff --git a/shared/test/unit_test/xe_hpg_core/mtl/ail_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/ail_tests_mtl.cpp deleted file mode 100644 index 8c79e16f7a..0000000000 --- a/shared/test/unit_test/xe_hpg_core/mtl/ail_tests_mtl.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2023 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#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/test_macros/hw_test.h" - -namespace NEO { - -using AILTestsMTL = ::testing::Test; - -HWTEST2_F(AILTestsMTL, givenMtlWhenAdobeAppIsDetectedThenCCSItNotDefaultEngine, IsMTL) { - class AILMock : public AILConfigurationHw { - public: - using AILConfiguration::apply; - using AILConfiguration::processName; - }; - - VariableBackup ailConfigurationBackup(&ailConfigurationTable[productFamily]); - AILMock ail; - ailConfigurationTable[productFamily] = &ail; - - auto capabilityTable = defaultHwInfo->capabilityTable; - - for (auto &processName : {"Photoshop", "Adobe Premiere Pro", "AfterFX", "AfterFX (Beta)"}) { - ail.processName = processName; - capabilityTable.defaultEngineType = aub_stream::ENGINE_CCS2; - ail.apply(capabilityTable); - EXPECT_EQ(aub_stream::ENGINE_RCS, capabilityTable.defaultEngineType); - } - - ail.processName = "UnknownProcess"; - capabilityTable.defaultEngineType = aub_stream::ENGINE_CCS3; - ail.apply(capabilityTable); - EXPECT_EQ(aub_stream::ENGINE_CCS3, capabilityTable.defaultEngineType); -} -} // namespace NEO