diff --git a/opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp b/opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp index 1d9c1565ab..68e06794a3 100644 --- a/opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp @@ -84,6 +84,7 @@ TEST(EhlHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp b/opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp index 9ab9ad9d65..d050a84d00 100644 --- a/opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp @@ -86,6 +86,7 @@ TYPED_TEST(IcllpHwInfoTests, WhenGettingSystemInfoThenParamsAreValid) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 5u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp index 6a581c6c73..007e1e93a0 100644 --- a/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp @@ -22,6 +22,7 @@ TEST(IcllpHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectT EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp b/opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp index 5fcd9b7164..8b064872f3 100644 --- a/opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp @@ -86,6 +86,7 @@ TYPED_TEST(LkfHwInfoTests, gtSetupIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp b/opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp index cd274ac9a7..6c7990f780 100644 --- a/opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp @@ -21,6 +21,7 @@ TEST(LkfHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThr EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp b/opencl/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp index 0342157e5d..1a40421820 100644 --- a/opencl/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp +++ b/opencl/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp @@ -87,6 +87,7 @@ TEST(AdlsHwInfoTests, WhenSettingUpHwInfoThenConfigIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp index d38fe3c9d6..ffabab53c2 100644 --- a/opencl/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -24,6 +24,7 @@ TEST(Dg1HwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThr EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp index d945384355..5074c485d1 100644 --- a/opencl/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp +++ b/opencl/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp @@ -87,6 +87,7 @@ TEST(RklHwInfoTests, WhenSettingUpHwInfoThenConfigIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp index 01a849c077..d421f4e117 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp @@ -105,9 +105,10 @@ TYPED_TEST(TgllpHwInfoTests, gtSetupIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT(gtSystemInfo.MaxDualSubSlicesSupported, 0u); -} \ No newline at end of file +} diff --git a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp index 5f737ba253..5c46bb2882 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp @@ -24,6 +24,7 @@ TGLLPTEST_F(TgllpHwInfoConfig, givenHwInfoErrorneousConfigStringThenThrow) { EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp index d844227820..78566d31d2 100644 --- a/opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp @@ -171,6 +171,7 @@ TYPED_TEST(BdwHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp b/opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp index 2ab2951351..b62134676b 100644 --- a/opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,6 +21,7 @@ TEST(BdwHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThr EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp index 48a2229001..7a55513585 100644 --- a/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp @@ -21,6 +21,7 @@ TEST(BxtHwInfoConfig, givenInvalidSystemInfoWhenSettingHardwareInfoThenExpectThr EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp index 9b7bfd16f8..93ff4655b7 100644 --- a/opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp @@ -185,6 +185,7 @@ TYPED_TEST(CflHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp index bac4930aef..abb32d16eb 100644 --- a/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,6 +21,7 @@ TEST(CflHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp b/opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp index 32a172cbf3..3f48480b50 100644 --- a/opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp @@ -221,6 +221,7 @@ TYPED_TEST(GlkHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp b/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp index 347951ae80..983ff663fb 100644 --- a/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,6 +22,7 @@ TEST(GlkHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp b/opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp index 9e237eb874..0951c4390d 100644 --- a/opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp @@ -240,6 +240,7 @@ TYPED_TEST(KblHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp index b0af1d8606..1add977d2b 100644 --- a/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,6 +21,7 @@ TEST(KblHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp index da27146554..496c169b18 100644 --- a/opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp @@ -264,6 +264,7 @@ TYPED_TEST(SklHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) { EXPECT_GT(gtSystemInfo.ThreadCount, 0u); EXPECT_GT(gtSystemInfo.SliceCount, 0u); EXPECT_GT(gtSystemInfo.SubSliceCount, 0u); + EXPECT_GT(gtSystemInfo.DualSubSliceCount, 0u); EXPECT_GT_VAL(gtSystemInfo.L3CacheSizeInKb, 0u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); diff --git a/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp index 45d8b47f1b..ea1e84e122 100644 --- a/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,6 +21,7 @@ TEST(SklHwInfoConfig, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned EXPECT_ANY_THROW(hardwareInfoSetup[productFamily](&hwInfo, false, config)); EXPECT_EQ(0u, gtSystemInfo.SliceCount); EXPECT_EQ(0u, gtSystemInfo.SubSliceCount); + EXPECT_EQ(0u, gtSystemInfo.DualSubSliceCount); EXPECT_EQ(0u, gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp index fa1c6bf635..74c447c6f7 100644 --- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp @@ -1414,6 +1414,7 @@ TEST(OfflineCompilerTest, whenDeviceIsSpecifiedThenDefaultConfigFromTheDeviceIsU EXPECT_EQ(actualHwInfo.gtSystemInfo.SliceCount, expectedHwInfo.gtSystemInfo.SliceCount); EXPECT_EQ(actualHwInfo.gtSystemInfo.SubSliceCount, expectedHwInfo.gtSystemInfo.SubSliceCount); + EXPECT_EQ(actualHwInfo.gtSystemInfo.DualSubSliceCount, expectedHwInfo.gtSystemInfo.SubSliceCount); EXPECT_EQ(actualHwInfo.gtSystemInfo.EUCount, expectedHwInfo.gtSystemInfo.EUCount); } diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp index 936caf56cb..c95a957c04 100644 --- a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp +++ b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp @@ -56,6 +56,7 @@ TEST_F(HwInfoConfigTest, WhenParsingHwInfoConfigThenCorrectValuesAreReturned) { setHwInfoValuesFromConfig(hwInfoConfig, outHwInfo); EXPECT_EQ(outHwInfo.gtSystemInfo.SliceCount, 1u); EXPECT_EQ(outHwInfo.gtSystemInfo.SubSliceCount, 1u); + EXPECT_EQ(outHwInfo.gtSystemInfo.DualSubSliceCount, 1u); EXPECT_EQ(outHwInfo.gtSystemInfo.EUCount, 1u); success = parseHwInfoConfigString("7x1x1", hwInfoConfig); @@ -64,6 +65,7 @@ TEST_F(HwInfoConfigTest, WhenParsingHwInfoConfigThenCorrectValuesAreReturned) { setHwInfoValuesFromConfig(hwInfoConfig, outHwInfo); EXPECT_EQ(outHwInfo.gtSystemInfo.SliceCount, 7u); EXPECT_EQ(outHwInfo.gtSystemInfo.SubSliceCount, 7u); + EXPECT_EQ(outHwInfo.gtSystemInfo.DualSubSliceCount, 7u); EXPECT_EQ(outHwInfo.gtSystemInfo.EUCount, 7u); success = parseHwInfoConfigString("1x7x1", hwInfoConfig); @@ -72,6 +74,7 @@ TEST_F(HwInfoConfigTest, WhenParsingHwInfoConfigThenCorrectValuesAreReturned) { setHwInfoValuesFromConfig(hwInfoConfig, outHwInfo); EXPECT_EQ(outHwInfo.gtSystemInfo.SliceCount, 1u); EXPECT_EQ(outHwInfo.gtSystemInfo.SubSliceCount, 7u); + EXPECT_EQ(outHwInfo.gtSystemInfo.DualSubSliceCount, 7u); EXPECT_EQ(outHwInfo.gtSystemInfo.EUCount, 7u); success = parseHwInfoConfigString("1x1x7", hwInfoConfig); @@ -80,6 +83,7 @@ TEST_F(HwInfoConfigTest, WhenParsingHwInfoConfigThenCorrectValuesAreReturned) { setHwInfoValuesFromConfig(hwInfoConfig, outHwInfo); EXPECT_EQ(outHwInfo.gtSystemInfo.SliceCount, 1u); EXPECT_EQ(outHwInfo.gtSystemInfo.SubSliceCount, 1u); + EXPECT_EQ(outHwInfo.gtSystemInfo.DualSubSliceCount, 1u); EXPECT_EQ(outHwInfo.gtSystemInfo.EUCount, 7u); success = parseHwInfoConfigString("2x4x16", hwInfoConfig); @@ -88,6 +92,7 @@ TEST_F(HwInfoConfigTest, WhenParsingHwInfoConfigThenCorrectValuesAreReturned) { setHwInfoValuesFromConfig(hwInfoConfig, outHwInfo); EXPECT_EQ(outHwInfo.gtSystemInfo.SliceCount, 2u); EXPECT_EQ(outHwInfo.gtSystemInfo.SubSliceCount, 8u); + EXPECT_EQ(outHwInfo.gtSystemInfo.DualSubSliceCount, 8u); EXPECT_EQ(outHwInfo.gtSystemInfo.EUCount, 128u); } diff --git a/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp index 9a8323b9cb..0ca777c611 100644 --- a/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp @@ -25,6 +25,7 @@ TEST_F(DeviceFactoryLinuxTest, WhenPreparingDeviceEnvironmentsThenInitializedCor EXPECT_EQ(refHwinfo->platform.eDisplayCoreFamily, hwInfo->platform.eDisplayCoreFamily); EXPECT_EQ((int)hwInfo->gtSystemInfo.EUCount, 16); EXPECT_EQ((int)hwInfo->gtSystemInfo.SubSliceCount, 8); + EXPECT_EQ((int)hwInfo->gtSystemInfo.DualSubSliceCount, 8); //temporararily return GT2. EXPECT_EQ(1u, hwInfo->featureTable.ftrGT2); @@ -46,6 +47,7 @@ TEST_F(DeviceFactoryLinuxTest, givenSomeDisabledSSAndEUWhenPrepareDeviceEnvironm EXPECT_EQ(refHwinfo->platform.eDisplayCoreFamily, hwInfo->platform.eDisplayCoreFamily); EXPECT_EQ((int)hwInfo->gtSystemInfo.SliceCount, 1); EXPECT_EQ((int)hwInfo->gtSystemInfo.SubSliceCount, 2); + EXPECT_EQ((int)hwInfo->gtSystemInfo.DualSubSliceCount, 2); EXPECT_EQ((int)hwInfo->gtSystemInfo.EUCount, 12); } diff --git a/shared/source/helpers/hw_info.cpp b/shared/source/helpers/hw_info.cpp index c6c15c0600..10297a4879 100644 --- a/shared/source/helpers/hw_info.cpp +++ b/shared/source/helpers/hw_info.cpp @@ -70,6 +70,7 @@ void setHwInfoValuesFromConfig(const uint64_t hwInfoConfig, HardwareInfo &hwInfo hwInfoIn.gtSystemInfo.SliceCount = sliceCount; hwInfoIn.gtSystemInfo.SubSliceCount = subSlicePerSliceCount * sliceCount; + hwInfoIn.gtSystemInfo.DualSubSliceCount = subSlicePerSliceCount * sliceCount; hwInfoIn.gtSystemInfo.EUCount = euPerSubSliceCount * subSlicePerSliceCount * sliceCount; } diff --git a/shared/source/os_interface/linux/drm_neo.cpp b/shared/source/os_interface/linux/drm_neo.cpp index 2904caed25..e559bb1941 100644 --- a/shared/source/os_interface/linux/drm_neo.cpp +++ b/shared/source/os_interface/linux/drm_neo.cpp @@ -338,6 +338,7 @@ int Drm::setupHardwareInfo(DeviceDescriptor *device, bool setupFeatureTableAndWo hwInfo->gtSystemInfo.SliceCount = static_cast(topologyData.sliceCount); hwInfo->gtSystemInfo.SubSliceCount = static_cast(topologyData.subSliceCount); + hwInfo->gtSystemInfo.DualSubSliceCount = static_cast(topologyData.subSliceCount); hwInfo->gtSystemInfo.EUCount = static_cast(topologyData.euCount); status = querySystemInfo(); diff --git a/shared/source/os_interface/linux/hw_info_config_drm.cpp b/shared/source/os_interface/linux/hw_info_config_drm.cpp index 3d0a36c81e..89c3b3fa95 100644 --- a/shared/source/os_interface/linux/hw_info_config_drm.cpp +++ b/shared/source/os_interface/linux/hw_info_config_drm.cpp @@ -117,6 +117,7 @@ int HwInfoConfig::configureHwInfoDrm(const HardwareInfo *inHwInfo, HardwareInfo gtSystemInfo->SliceCount = static_cast(topologyData.sliceCount); gtSystemInfo->SubSliceCount = static_cast(topologyData.subSliceCount); + gtSystemInfo->DualSubSliceCount = static_cast(topologyData.subSliceCount); gtSystemInfo->EUCount = static_cast(topologyData.euCount); gtSystemInfo->ThreadCount = this->threadsPerEu * gtSystemInfo->EUCount; diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp index 0ae1a77e47..1621f1557f 100644 --- a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp +++ b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp @@ -936,6 +936,7 @@ TEST_F(CompilerInterfaceTest, givenDbgKeyForceUseDifferentPlatformWhenRequestFor EXPECT_EQ(dbgPlatform.eRenderCoreFamily, igcPlatform->GetRenderCoreFamily()); EXPECT_EQ(dbgSystemInfo.SliceCount, igcSysInfo->GetSliceCount()); EXPECT_EQ(dbgSystemInfo.SubSliceCount, igcSysInfo->GetSubSliceCount()); + EXPECT_EQ(dbgSystemInfo.DualSubSliceCount, igcSysInfo->GetSubSliceCount()); EXPECT_EQ(dbgSystemInfo.EUCount, igcSysInfo->GetEUCount()); EXPECT_EQ(dbgSystemInfo.ThreadCount, igcSysInfo->GetThreadCount()); }