diff --git a/opencl/source/program/create.inl b/opencl/source/program/create.inl index 60ddd28744..367d431437 100644 --- a/opencl/source/program/create.inl +++ b/opencl/source/program/create.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -78,9 +78,6 @@ T *Program::create( } program = new T(pContext, false, pContext->getDevices()); - if (ail && ail->isFallbackToPatchtokensRequired()) { - pContext->setContextAsNonZebin(); - } program->sourceCode.swap(combinedString); program->createdFrom = CreatedFrom::source; } diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index f4dd02c9c9..eed18839ac 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -702,38 +702,6 @@ TEST_F(MinimumProgramFixture, givenEmptyAilWhenCreateProgramWithSourcesThenSourc pProgram->release(); } -TEST_F(MinimumProgramFixture, givenAILReturningTrueForFallbackRequirementWhenBuildingProgramThenMarkContextAsNonZebin) { - class MockAIL : public MockAILConfiguration { - public: - bool isFallbackToPatchtokensRequired() override { - return true; - } - }; - auto pDevice = pContext->getDevice(0); - auto rootDeviceEnvironment = pDevice->getExecutionEnvironment()->rootDeviceEnvironments[rootDeviceIndex].get(); - rootDeviceEnvironment->ailConfiguration.reset(new MockAIL()); - - ASSERT_FALSE(pContext->checkIfContextIsNonZebin()); - - const char *kernelSources[] = {"some source code"}; - size_t knownSourceSize = strlen(kernelSources[0]); - MockProgram *pProgram = nullptr; - pProgram = Program::create( - pContext, - 1, - kernelSources, - &knownSourceSize, - retVal); - - ASSERT_NE(nullptr, pProgram); - ASSERT_EQ(CL_SUCCESS, retVal); - - retVal = pProgram->build(pProgram->getDevices(), ""); - EXPECT_EQ(CL_SUCCESS, retVal); - EXPECT_TRUE(pContext->checkIfContextIsNonZebin()); - pProgram->release(); -} - TEST_F(MinimumProgramFixture, givenApplicationContextMarkedAsNonZebinWhenBuildingProgramThenInternalOptionsShouldContainDisableZebinOption) { const char *kernelSources[] = {"some source code"}; size_t knownSourceSize = strlen(kernelSources[0]); diff --git a/shared/source/ail/ail_configuration.h b/shared/source/ail/ail_configuration.h index a0d17487dd..360259d370 100644 --- a/shared/source/ail/ail_configuration.h +++ b/shared/source/ail/ail_configuration.h @@ -89,8 +89,6 @@ class AILConfiguration { virtual bool isRunAloneContextRequired() = 0; - virtual bool isFallbackToPatchtokensRequired() = 0; - virtual bool isAdjustMicrosecondResolutionRequired() = 0; virtual uint32_t getMicrosecondResolution() = 0; @@ -112,7 +110,6 @@ extern const std::set applicationsBufferPoolDisabledXe; extern const std::set applicationsOverfetchDisabled; extern const std::set applicationsDrainHostptrsDisabled; extern const std::set applicationsDeviceUSMRecyclingLimited; -extern const std::set applicationsFallbackToPatchtokensRequiredDg2; extern const std::set applicationsMicrosecontResolutionAdjustment; extern const uint32_t microsecondAdjustment; @@ -138,7 +135,6 @@ class AILConfigurationHw : public AILConfiguration { bool disableBindlessAddressing() override; bool limitAmountOfDeviceMemoryForRecycling() override; bool isRunAloneContextRequired() override; - bool isFallbackToPatchtokensRequired() override; bool isAdjustMicrosecondResolutionRequired() override; uint32_t getMicrosecondResolution() override; diff --git a/shared/source/ail/ail_configuration_base.inl b/shared/source/ail/ail_configuration_base.inl index 6915bb5095..eddf6c23e1 100644 --- a/shared/source/ail/ail_configuration_base.inl +++ b/shared/source/ail/ail_configuration_base.inl @@ -76,11 +76,6 @@ inline bool AILConfigurationHw::limitAmountOfDeviceMemoryForRecycling() return false; } -template -inline bool AILConfigurationHw::isFallbackToPatchtokensRequired() { - return false; -} - template inline bool AILConfigurationHw::isAdjustMicrosecondResolutionRequired() { return shouldAdjustMicrosecondResolution; diff --git a/shared/source/ail/ail_configuration_extra.cpp b/shared/source/ail/ail_configuration_extra.cpp index e62f2dee38..172e47c317 100644 --- a/shared/source/ail/ail_configuration_extra.cpp +++ b/shared/source/ail/ail_configuration_extra.cpp @@ -42,8 +42,6 @@ const std::set applicationsDrainHostptrsDisabled = {}; const std::set applicationsDeviceUSMRecyclingLimited = {}; -const std::set applicationsFallbackToPatchtokensRequiredDg2 = {}; - const std::set applicationsMicrosecontResolutionAdjustment = {}; const uint32_t microsecondAdjustment = 1000; diff --git a/shared/source/ail/xe_hpg_core/dg2/ail_configuration_dg2.cpp b/shared/source/ail/xe_hpg_core/dg2/ail_configuration_dg2.cpp index 5c0a59919c..749a4b1167 100644 --- a/shared/source/ail/xe_hpg_core/dg2/ail_configuration_dg2.cpp +++ b/shared/source/ail/xe_hpg_core/dg2/ail_configuration_dg2.cpp @@ -70,12 +70,6 @@ bool AILConfigurationHw::isBufferPoolEnabled() { return iterator == applicationsBufferPoolDisabledXe.end(); } -template <> -inline bool AILConfigurationHw::isFallbackToPatchtokensRequired() { - auto iterator = applicationsFallbackToPatchtokensRequiredDg2.find(processName); - return iterator != applicationsFallbackToPatchtokensRequiredDg2.end(); -} - template class AILConfigurationHw; } // namespace NEO diff --git a/shared/test/common/mocks/mock_ail_configuration.h b/shared/test/common/mocks/mock_ail_configuration.h index 7e296f63a0..94a6c6c5f0 100644 --- a/shared/test/common/mocks/mock_ail_configuration.h +++ b/shared/test/common/mocks/mock_ail_configuration.h @@ -72,10 +72,6 @@ class MockAILConfiguration : public AILConfiguration { return true; } - bool isFallbackToPatchtokensRequired() override { - return false; - } - bool isAdjustMicrosecondResolutionRequired() override { return adjustMicrosecondResolution; } diff --git a/shared/test/unit_test/ail/ail_tests.cpp b/shared/test/unit_test/ail/ail_tests.cpp index c29dd150b8..f795d52945 100644 --- a/shared/test/unit_test/ail/ail_tests.cpp +++ b/shared/test/unit_test/ail/ail_tests.cpp @@ -132,12 +132,6 @@ HWTEST2_F(AILTests, givenAilWhenCheckingDrainHostptrsRequiredThenExpectTrue, Mat EXPECT_TRUE(ail.drainHostptrs()); } -HWTEST2_F(AILTests, givenAilWhenCheckingIfPatchtokenFallbackIsRequiredThenExpectFalse, MatchAny) { - AILWhitebox ail; - ail.processName = "other"; - EXPECT_FALSE(ail.isFallbackToPatchtokensRequired()); -} - HWTEST2_F(AILTests, givenAilWhenGetMicrosecondResolutionCalledThenCorrectValueReturned, MatchAny) { AILWhitebox ail; EXPECT_EQ(ail.getMicrosecondResolution(), microsecondAdjustment);