From 4f4b8fed1510a6df0d21470d0b984cdb6121bc04 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Fri, 5 Jul 2024 08:09:09 +0000 Subject: [PATCH] refactor: remove not needed code related to deprecated device ip version Signed-off-by: Mateusz Jablonski --- opencl/source/cl_device/cl_device_info.cpp | 9 ++----- .../source/gen11/cl_gfx_core_helper_gen11.cpp | 7 +----- .../gen12lp/cl_gfx_core_helper_gen12lp.cpp | 7 +----- .../source/gen8/cl_gfx_core_helper_gen8.cpp | 7 +----- .../source/gen9/cl_gfx_core_helper_gen9.cpp | 7 +----- opencl/source/helpers/cl_gfx_core_helper.cpp | 10 +------- opencl/source/helpers/cl_gfx_core_helper.h | 3 --- .../cl_gfx_core_helper_xe_hpc_core.cpp | 7 +----- .../cl_gfx_core_helper_xe_hpg_core.cpp | 7 +----- .../device/get_device_info_tests.cpp | 21 ++-------------- .../gen11/cl_gfx_core_helper_tests_gen11.cpp | 7 +----- .../gen12lp/gfx_core_helper_tests_gen12lp.inl | 25 ------------------- .../gen8/cl_gfx_core_helper_tests_gen8.cpp | 7 +----- .../gen9/cl_gfx_core_helper_tests_gen9.cpp | 7 +----- .../unit_test/mocks/mock_cl_gfx_core_helper.h | 4 +-- .../gfx_core_helper_tests_xe_hpc_core.cpp | 6 ----- .../cl_gfx_core_helper_tests_xe_hpg_core.cpp | 12 +-------- .../debug_settings/debug_variables_base.inl | 1 - shared/test/common/test_files/igdrcl.config | 1 - 19 files changed, 16 insertions(+), 139 deletions(-) diff --git a/opencl/source/cl_device/cl_device_info.cpp b/opencl/source/cl_device/cl_device_info.cpp index 7b11cd4d89..09dcff44b5 100644 --- a/opencl/source/cl_device/cl_device_info.cpp +++ b/opencl/source/cl_device/cl_device_info.cpp @@ -259,13 +259,8 @@ cl_int ClDevice::getDeviceInfo(cl_device_info paramName, retSize = srcSize = deviceInfo.supportedThreadArbitrationPolicies.size() * sizeof(cl_uint); break; case CL_DEVICE_IP_VERSION_INTEL: { - if (debugManager.flags.UseDeprecatedClDeviceIpVersion.get()) { - auto &clGfxCoreHelper = this->getRootDeviceEnvironment().getHelper(); - param.uint = clGfxCoreHelper.getDeviceIpVersion(getHardwareInfo()); - } else { - auto &compilerProductHelper = device.getCompilerProductHelper(); - param.uint = static_cast(compilerProductHelper.getHwIpVersion(getHardwareInfo())); - } + auto &compilerProductHelper = device.getCompilerProductHelper(); + param.uint = static_cast(compilerProductHelper.getHwIpVersion(getHardwareInfo())); src = ¶m.uint; retSize = srcSize = sizeof(cl_version); break; diff --git a/opencl/source/gen11/cl_gfx_core_helper_gen11.cpp b/opencl/source/gen11/cl_gfx_core_helper_gen11.cpp index b91c756415..7bfc3d452e 100644 --- a/opencl/source/gen11/cl_gfx_core_helper_gen11.cpp +++ b/opencl/source/gen11/cl_gfx_core_helper_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,11 +18,6 @@ static auto gfxCore = IGFX_GEN11_CORE; #include "opencl/source/helpers/cl_gfx_core_helper_factory_init.inl" -template <> -cl_version ClGfxCoreHelperHw::getDeviceIpVersion(const HardwareInfo &hwInfo) const { - return makeDeviceIpVersion(11, 0, 0); -} - template class ClGfxCoreHelperHw; } // namespace NEO diff --git a/opencl/source/gen12lp/cl_gfx_core_helper_gen12lp.cpp b/opencl/source/gen12lp/cl_gfx_core_helper_gen12lp.cpp index c340482b72..860b9410e9 100644 --- a/opencl/source/gen12lp/cl_gfx_core_helper_gen12lp.cpp +++ b/opencl/source/gen12lp/cl_gfx_core_helper_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,11 +23,6 @@ cl_device_feature_capabilities_intel ClGfxCoreHelperHw::getSupportedDevi return CL_DEVICE_FEATURE_FLAG_DP4A_INTEL; } -template <> -cl_version ClGfxCoreHelperHw::getDeviceIpVersion(const HardwareInfo &hwInfo) const { - return makeDeviceIpVersion(12, 0, makeDeviceRevision(hwInfo)); -} - template class ClGfxCoreHelperHw; } // namespace NEO diff --git a/opencl/source/gen8/cl_gfx_core_helper_gen8.cpp b/opencl/source/gen8/cl_gfx_core_helper_gen8.cpp index 0c8155edab..bd8c9e2650 100644 --- a/opencl/source/gen8/cl_gfx_core_helper_gen8.cpp +++ b/opencl/source/gen8/cl_gfx_core_helper_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,11 +18,6 @@ static auto gfxCore = IGFX_GEN8_CORE; #include "opencl/source/helpers/cl_gfx_core_helper_factory_init.inl" -template <> -cl_version ClGfxCoreHelperHw::getDeviceIpVersion(const HardwareInfo &hwInfo) const { - return makeDeviceIpVersion(8, 0, 0); -} - template class ClGfxCoreHelperHw; } // namespace NEO diff --git a/opencl/source/gen9/cl_gfx_core_helper_gen9.cpp b/opencl/source/gen9/cl_gfx_core_helper_gen9.cpp index ba3ca708c1..c235cb3556 100644 --- a/opencl/source/gen9/cl_gfx_core_helper_gen9.cpp +++ b/opencl/source/gen9/cl_gfx_core_helper_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,11 +18,6 @@ static auto gfxCore = IGFX_GEN9_CORE; #include "opencl/source/helpers/cl_gfx_core_helper_factory_init.inl" -template <> -cl_version ClGfxCoreHelperHw::getDeviceIpVersion(const HardwareInfo &hwInfo) const { - return makeDeviceIpVersion(9, 0, 0); -} - template class ClGfxCoreHelperHw; } // namespace NEO diff --git a/opencl/source/helpers/cl_gfx_core_helper.cpp b/opencl/source/helpers/cl_gfx_core_helper.cpp index ba5c2d11a3..820dc8cac3 100644 --- a/opencl/source/helpers/cl_gfx_core_helper.cpp +++ b/opencl/source/helpers/cl_gfx_core_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,14 +23,6 @@ std::unique_ptr ClGfxCoreHelper::create(GFXCORE_FAMILY gfxCore) return clGfxCoreHelper; } -uint8_t ClGfxCoreHelper::makeDeviceRevision(const HardwareInfo &hwInfo) { - return static_cast(!hwInfo.capabilityTable.isIntegratedDevice); -} - -cl_version ClGfxCoreHelper::makeDeviceIpVersion(uint16_t major, uint8_t minor, uint8_t revision) { - return (major << 16) | (minor << 8) | revision; -} - template <> ClGfxCoreHelper &RootDeviceEnvironment::getHelper() const { return *static_cast(apiGfxCoreHelper.get()); diff --git a/opencl/source/helpers/cl_gfx_core_helper.h b/opencl/source/helpers/cl_gfx_core_helper.h index 3f1cd33d38..15112db137 100644 --- a/opencl/source/helpers/cl_gfx_core_helper.h +++ b/opencl/source/helpers/cl_gfx_core_helper.h @@ -43,7 +43,6 @@ class ClGfxCoreHelper : public ApiGfxCoreHelper { virtual bool preferBlitterForLocalToLocalTransfers() const = 0; virtual bool isSupportedKernelThreadArbitrationPolicy() const = 0; virtual std::vector getSupportedThreadArbitrationPolicies() const = 0; - virtual cl_version getDeviceIpVersion(const HardwareInfo &hwInfo) const = 0; virtual cl_device_feature_capabilities_intel getSupportedDeviceFeatureCapabilities(const RootDeviceEnvironment &rootDeviceEnvironment) const = 0; virtual bool allowImageCompression(cl_image_format format) const = 0; virtual bool isFormatRedescribable(cl_image_format format) const = 0; @@ -53,7 +52,6 @@ class ClGfxCoreHelper : public ApiGfxCoreHelper { virtual bool hasStatelessAccessToBuffer(const KernelInfo &kernelInfo) const = 0; static uint8_t makeDeviceRevision(const HardwareInfo &hwInfo); - static cl_version makeDeviceIpVersion(uint16_t major, uint8_t minor, uint8_t revision); ClGfxCoreHelper() = default; }; @@ -73,7 +71,6 @@ class ClGfxCoreHelperHw : public ClGfxCoreHelper { bool preferBlitterForLocalToLocalTransfers() const override; bool isSupportedKernelThreadArbitrationPolicy() const override; std::vector getSupportedThreadArbitrationPolicies() const override; - cl_version getDeviceIpVersion(const HardwareInfo &hwInfo) const override; cl_device_feature_capabilities_intel getSupportedDeviceFeatureCapabilities(const RootDeviceEnvironment &rootDeviceEnvironment) const override; bool allowImageCompression(cl_image_format format) const override; bool isFormatRedescribable(cl_image_format format) const override; diff --git a/opencl/source/xe_hpc_core/cl_gfx_core_helper_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/cl_gfx_core_helper_xe_hpc_core.cpp index fe79524b00..fc1f1f3703 100644 --- a/opencl/source/xe_hpc_core/cl_gfx_core_helper_xe_hpc_core.cpp +++ b/opencl/source/xe_hpc_core/cl_gfx_core_helper_xe_hpc_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -24,11 +24,6 @@ bool ClGfxCoreHelperHw::requiresAuxResolves(const KernelInfo &kernelInfo return false; } -template <> -cl_version ClGfxCoreHelperHw::getDeviceIpVersion(const HardwareInfo &hwInfo) const { - return makeDeviceIpVersion(12, 8, makeDeviceRevision(hwInfo)); -} - template class ClGfxCoreHelperHw; } // namespace NEO diff --git a/opencl/source/xe_hpg_core/cl_gfx_core_helper_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/cl_gfx_core_helper_xe_hpg_core.cpp index 454dc33666..dcdc628f82 100644 --- a/opencl/source/xe_hpg_core/cl_gfx_core_helper_xe_hpg_core.cpp +++ b/opencl/source/xe_hpg_core/cl_gfx_core_helper_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -51,11 +51,6 @@ std::vector ClGfxCoreHelperHw::getSupportedThreadArbitrationPo template <> bool ClGfxCoreHelperHw::isSupportedKernelThreadArbitrationPolicy() const { return false; } -template <> -cl_version ClGfxCoreHelperHw::getDeviceIpVersion(const HardwareInfo &hwInfo) const { - return makeDeviceIpVersion(12, 7, makeDeviceRevision(hwInfo)); -} - static const std::vector incompressibleFormats = { {CL_LUMINANCE, CL_UNORM_INT8}, {CL_LUMINANCE, CL_UNORM_INT16}, diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp index a49ff5a57f..90c91424e2 100644 --- a/opencl/test/unit_test/device/get_device_info_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_tests.cpp @@ -1122,13 +1122,8 @@ struct DeviceAttributeQueryTest : public ::testing::TestWithParam(object.get()); auto &hwInfo = device.getHardwareInfo(); - if (debugManager.flags.UseDeprecatedClDeviceIpVersion.get()) { - auto &clGfxCoreHelper = device.getRootDeviceEnvironment().getHelper(); - EXPECT_EQ(clGfxCoreHelper.getDeviceIpVersion(hwInfo), *pDeviceIpVersion); - } else { - auto &compilerProductHelper = device.getCompilerProductHelper(); - EXPECT_EQ(static_cast(compilerProductHelper.getHwIpVersion(hwInfo)), *pDeviceIpVersion); - } + auto &compilerProductHelper = device.getCompilerProductHelper(); + EXPECT_EQ(static_cast(compilerProductHelper.getHwIpVersion(hwInfo)), *pDeviceIpVersion); EXPECT_EQ(sizeof(cl_version), sizeReturned); break; } @@ -1183,18 +1178,6 @@ struct DeviceAttributeQueryTest : public ::testing::TestWithParam(MockDevice::createWithNewExecutionEnvironment(nullptr)); - verifyDeviceAttribute(*pClDevice); -} - -TEST_P(DeviceAttributeQueryTest, givenNewDeviceIpVersionWhenVerifyDeviceAttributeThenCorrectResultsAreReturned) { - debugManager.flags.UseDeprecatedClDeviceIpVersion.set(false); - auto pClDevice = std::make_unique(MockDevice::createWithNewExecutionEnvironment(nullptr)); - verifyDeviceAttribute(*pClDevice); -} - TEST_P(DeviceAttributeQueryTest, givenGetDeviceInfoWhenDeviceAttributeIsQueriedOnRootDeviceAndSubDevicesThenReturnCorrectAttributeValues) { debugManager.flags.CreateMultipleSubDevices.set(2); VariableBackup mockDeviceFlagBackup(&MockDevice::createSingleDevice, false); diff --git a/opencl/test/unit_test/gen11/cl_gfx_core_helper_tests_gen11.cpp b/opencl/test/unit_test/gen11/cl_gfx_core_helper_tests_gen11.cpp index 0d79819a5e..904d638272 100644 --- a/opencl/test/unit_test/gen11/cl_gfx_core_helper_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/cl_gfx_core_helper_tests_gen11.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2023 Intel Corporation + * Copyright (C) 2019-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,11 +16,6 @@ using ClGfxCoreHelperTestGen11 = Test; -GEN11TEST_F(ClGfxCoreHelperTestGen11, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { - auto &clGfxCoreHelper = getHelper(); - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(11, 0, 0), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); -} - GEN11TEST_F(ClGfxCoreHelperTestGen11, WhenGettingSupportedDeviceFeatureCapabilitiesThenReturnCorrectValue) { auto &clGfxCoreHelper = getHelper(); EXPECT_EQ(0u, clGfxCoreHelper.getSupportedDeviceFeatureCapabilities(getRootDeviceEnvironment())); diff --git a/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl index aa33270940..db0a8e50ab 100644 --- a/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/gfx_core_helper_tests_gen12lp.inl @@ -36,31 +36,6 @@ GEN12LPTEST_F(ClGfxCoreHelperTestsGen12Lp, givenTglLpThenAuxTranslationIsRequire } } -HWTEST2_F(ClGfxCoreHelperTestsGen12Lp, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion, IsTGLLP) { - auto &clGfxCoreHelper = getHelper(); - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(12, 0, 0), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); -} - -HWTEST2_F(ClGfxCoreHelperTestsGen12Lp, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion, IsRKL) { - auto &clGfxCoreHelper = getHelper(); - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(12, 0, 0), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); -} - -HWTEST2_F(ClGfxCoreHelperTestsGen12Lp, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion, IsADLS) { - auto &clGfxCoreHelper = getHelper(); - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(12, 0, 0), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); -} - -HWTEST2_F(ClGfxCoreHelperTestsGen12Lp, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion, IsADLP) { - auto &clGfxCoreHelper = getHelper(); - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(12, 0, 0), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); -} - -HWTEST2_F(ClGfxCoreHelperTestsGen12Lp, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion, IsDG1) { - auto &clGfxCoreHelper = getHelper(); - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(12, 0, 1), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); -} - GEN12LPTEST_F(ClGfxCoreHelperTestsGen12Lp, WhenGettingSupportedDeviceFeatureCapabilitiesThenReturnCorrectValue) { auto &clGfxCoreHelper = getHelper(); cl_device_feature_capabilities_intel expectedCapabilities = CL_DEVICE_FEATURE_FLAG_DP4A_INTEL; diff --git a/opencl/test/unit_test/gen8/cl_gfx_core_helper_tests_gen8.cpp b/opencl/test/unit_test/gen8/cl_gfx_core_helper_tests_gen8.cpp index 0152302236..2801c47a28 100644 --- a/opencl/test/unit_test/gen8/cl_gfx_core_helper_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/cl_gfx_core_helper_tests_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,11 +18,6 @@ using namespace NEO; using ClGfxCoreHelperTestGen8 = Test; -GEN8TEST_F(ClGfxCoreHelperTestGen8, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { - auto &clGfxCoreHelper = getHelper(); - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(8, 0, 0), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); -} - GEN8TEST_F(ClGfxCoreHelperTestGen8, WhenGettingSupportedDeviceFeatureCapabilitiesThenReturnCorrectValue) { auto &clGfxCoreHelper = getHelper(); EXPECT_EQ(0u, clGfxCoreHelper.getSupportedDeviceFeatureCapabilities(getRootDeviceEnvironment())); diff --git a/opencl/test/unit_test/gen9/cl_gfx_core_helper_tests_gen9.cpp b/opencl/test/unit_test/gen9/cl_gfx_core_helper_tests_gen9.cpp index 0061c12199..9a657bdca8 100644 --- a/opencl/test/unit_test/gen9/cl_gfx_core_helper_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/cl_gfx_core_helper_tests_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2023 Intel Corporation + * Copyright (C) 2018-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,11 +15,6 @@ using ClGfxCoreHelperTestGen9 = Test; -GEN9TEST_F(ClGfxCoreHelperTestGen9, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { - auto &clGfxCoreHelper = getHelper(); - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(9, 0, 0), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); -} - GEN9TEST_F(ClGfxCoreHelperTestGen9, WhenGettingSupportedDeviceFeatureCapabilitiesThenReturnCorrectValue) { auto &clGfxCoreHelper = getHelper(); EXPECT_EQ(0u, clGfxCoreHelper.getSupportedDeviceFeatureCapabilities(getRootDeviceEnvironment())); diff --git a/opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h b/opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h index 7fa2d247c7..4a148d24c7 100644 --- a/opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h +++ b/opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2023 Intel Corporation + * Copyright (C) 2021-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,8 +11,6 @@ namespace NEO { struct ClGfxCoreHelperMock : public ClGfxCoreHelper { - using ClGfxCoreHelper::makeDeviceIpVersion; - using ClGfxCoreHelper::makeDeviceRevision; }; } // namespace NEO diff --git a/opencl/test/unit_test/xe_hpc_core/gfx_core_helper_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/gfx_core_helper_tests_xe_hpc_core.cpp index 86b4634b6a..60a7e962c5 100644 --- a/opencl/test/unit_test/xe_hpc_core/gfx_core_helper_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/gfx_core_helper_tests_xe_hpc_core.cpp @@ -801,9 +801,3 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenCommandBufferAllocationWhenS gfxCoreHelper.setExtraAllocationData(allocData, allTilesAllocProperties, pDevice->getRootDeviceEnvironment()); EXPECT_FALSE(allocData.flags.useSystemMemory); } - -XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { - auto &clGfxCoreHelper = getHelper(); - - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(12, 8, 1), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); -} diff --git a/opencl/test/unit_test/xe_hpg_core/cl_gfx_core_helper_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/cl_gfx_core_helper_tests_xe_hpg_core.cpp index 8d1d8d4a32..d357495be2 100644 --- a/opencl/test/unit_test/xe_hpg_core/cl_gfx_core_helper_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/cl_gfx_core_helper_tests_xe_hpg_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2023 Intel Corporation + * Copyright (C) 2022-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,16 +22,6 @@ using ClGfxCoreHelperTestsXeHpgCore = Test; using namespace NEO; -XE_HPG_CORETEST_F(ClGfxCoreHelperTestsXeHpgCore, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) { - auto &clGfxCoreHelper = getHelper(); - - if (defaultHwInfo->capabilityTable.isIntegratedDevice) { - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(12, 7, 0), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); - } else { - EXPECT_EQ(ClGfxCoreHelperMock::makeDeviceIpVersion(12, 7, 1), clGfxCoreHelper.getDeviceIpVersion(*defaultHwInfo)); - } -} - XE_HPG_CORETEST_F(ClGfxCoreHelperTestsXeHpgCore, givenGenHelperWhenKernelArgumentIsNotPureStatefulThenRequireNonAuxMode) { auto &clGfxCoreHelper = getHelper(); diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl index cb4e0bea52..d7e59441ba 100644 --- a/shared/source/debug_settings/debug_variables_base.inl +++ b/shared/source/debug_settings/debug_variables_base.inl @@ -448,7 +448,6 @@ DECLARE_DEBUG_VARIABLE(bool, ForceSamplerLowFilteringPrecision, false, "Force Lo DECLARE_DEBUG_VARIABLE(bool, EngineInstancedSubDevices, false, "Create subdevices assigned to specific engine") DECLARE_DEBUG_VARIABLE(bool, AllowSingleTileEngineInstancedSubDevices, false, "Create subdevices assigned to specific engine on single tile config") DECLARE_DEBUG_VARIABLE(bool, EnablePrivateBO, false, "Enable PRELIM_I915_GEM_CREATE_EXT_VM_PRIVATE extension creating VM_PRIVATE BOs") -DECLARE_DEBUG_VARIABLE(bool, UseDeprecatedClDeviceIpVersion, false, "When enabled, the deprecated ip version scheme distinguishing between families and integrated devices will be queried in OCL") DECLARE_DEBUG_VARIABLE(bool, EnableAIL, true, "Enables AIL") DECLARE_DEBUG_VARIABLE(int64_t, VmBindWaitUserFenceTimeout, -1, "-1: default, >0: time in ns for wait function timeout") DECLARE_DEBUG_VARIABLE(int32_t, ForceRunAloneContext, -1, "Control creation of run-alone HW context, -1:default, 0:disable, 1:enable") diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config index cff68707e5..bb5145cc30 100644 --- a/shared/test/common/test_files/igdrcl.config +++ b/shared/test/common/test_files/igdrcl.config @@ -529,7 +529,6 @@ ExperimentalForceCopyThroughLock = -1 AppendAubStreamContextFlags = -1 ContextGroupSize=-1 DirectSubmissionRelaxedOrderingMinNumberOfClients = -1 -UseDeprecatedClDeviceIpVersion = 0 ExperimentalCopyThroughLockWaitlistSizeThreshold= -1 ForceDummyBlitWa = -1 DetectIndirectAccessInKernel = -1