Skip to content

Commit d7b0495

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
test: remove usage of IGFX_BROADWELL in tests
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent b72b437 commit d7b0495

File tree

6 files changed

+12
-61
lines changed

6 files changed

+12
-61
lines changed

‎opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2024 Intel Corporation
2+
* Copyright (C) 2018-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -393,11 +393,7 @@ HWCMDTEST_F(IGFX_GEN12LP_CORE, CommandStreamReceiverFlushTaskTests, WhenForcePip
393393
switch (counterPC) {
394394
case 0: // First pipe control with CS Stall
395395
EXPECT_EQ(bool(pipeControl->getCommandStreamerStallEnable()), true);
396-
if (pDevice->getHardwareInfo().platform.eProductFamily == IGFX_BROADWELL) {
397-
EXPECT_EQ(bool(pipeControl->getDcFlushEnable()), true);
398-
} else {
399-
EXPECT_EQ(bool(pipeControl->getDcFlushEnable()), false);
400-
}
396+
EXPECT_EQ(bool(pipeControl->getDcFlushEnable()), false);
401397
EXPECT_EQ(bool(pipeControl->getRenderTargetCacheFlushEnable()), false);
402398
EXPECT_EQ(bool(pipeControl->getInstructionCacheInvalidateEnable()), false);
403399
EXPECT_EQ(bool(pipeControl->getTextureCacheInvalidationEnable()), false);

‎opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2019-2024 Intel Corporation
2+
* Copyright (C) 2019-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -20,18 +20,10 @@ struct ExcludeTest : ::testing::Test {
2020
}
2121
};
2222

23-
using ExcludeTestBdw = ExcludeTest<IGFX_BROADWELL>;
24-
HWCMDTEST_F(IGFX_GEN12LP_CORE, ExcludeTestBdw, givenHwCmdTestWhenBdwExcludedThenDontRunOnBdw) {
25-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
23+
using ExcludeTestPtl = ExcludeTest<IGFX_PTL>;
24+
HWCMDTEST_F(IGFX_GEN12LP_CORE, ExcludeTestPtl, givenHwCmdTestWhenPtlExcludedThenDontRunOnPtl) {
25+
EXPECT_NE(IGFX_PTL, ::productFamily);
2626
}
27-
HWTEST_F(ExcludeTestBdw, givenHwTestWhenBdwExcludedThenDontRunOnBdw) {
28-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
29-
}
30-
31-
using ExcludeTestSkl = ExcludeTest<IGFX_SKYLAKE>;
32-
HWCMDTEST_F(IGFX_GEN12LP_CORE, ExcludeTestSkl, givenHwCmdTestWhenSklExcludedThenDontRunOnSkl) {
33-
EXPECT_NE(IGFX_SKYLAKE, ::productFamily);
34-
}
35-
HWTEST_F(ExcludeTestSkl, givenHwTestWhenSklExcludedThenDontRunOnSkl) {
36-
EXPECT_NE(IGFX_SKYLAKE, ::productFamily);
27+
HWTEST_F(ExcludeTestPtl, givenHwTestWhenPtlExcludedThenDontRunOnPtl) {
28+
EXPECT_NE(IGFX_PTL, ::productFamily);
3729
}

‎opencl/test/unit_test/gen_common/exclude_tests/exclude_test_exclude.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/*
2-
* Copyright (C) 2019-2022 Intel Corporation
2+
* Copyright (C) 2019-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
66
*/
77

88
#include "shared/test/common/test_macros/hw_test_base.h"
99

10-
HWTEST_EXCLUDE_PRODUCT(ExcludeTestBdw, givenHwCmdTestWhenBdwExcludedThenDontRunOnBdw, IGFX_BROADWELL);
11-
HWTEST_EXCLUDE_PRODUCT(ExcludeTestBdw, givenHwTestWhenBdwExcludedThenDontRunOnBdw, IGFX_BROADWELL);
12-
HWTEST_EXCLUDE_PRODUCT(ExcludeTestSkl, givenHwCmdTestWhenSklExcludedThenDontRunOnSkl, IGFX_SKYLAKE);
13-
HWTEST_EXCLUDE_PRODUCT(ExcludeTestSkl, givenHwTestWhenSklExcludedThenDontRunOnSkl, IGFX_SKYLAKE);
10+
HWTEST_EXCLUDE_PRODUCT(ExcludeTestPtl, givenHwCmdTestWhenPtlExcludedThenDontRunOnPtl, IGFX_PTL);
11+
HWTEST_EXCLUDE_PRODUCT(ExcludeTestPtl, givenHwTestWhenPtlExcludedThenDontRunOnPtl, IGFX_PTL);

‎shared/test/common/gen12lp/ryf/mock_product_helper_ryf.cpp

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎shared/test/unit_test/helpers/gfx_core_helper_tests.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,17 +1326,13 @@ HWTEST_F(GfxCoreHelperTest, givenGfxCoreHelperWhenGettingIsPlatformFlushTaskEnab
13261326
struct CoherentWANotNeeded {
13271327
template <PRODUCT_FAMILY productFamily>
13281328
static constexpr bool isMatched() {
1329-
if (productFamily == IGFX_BROADWELL)
1330-
return false;
13311329
return !TestTraits<NEO::ToGfxCoreFamily<productFamily>::get()>::forceGpuNonCoherent;
13321330
}
13331331
};
13341332

13351333
struct ForceNonCoherentMode {
13361334
template <PRODUCT_FAMILY productFamily>
13371335
static constexpr bool isMatched() {
1338-
if (productFamily == IGFX_BROADWELL)
1339-
return false;
13401336
return TestTraits<NEO::ToGfxCoreFamily<productFamily>::get()>::forceGpuNonCoherent;
13411337
}
13421338
};

‎shared/test/unit_test/helpers/state_base_address_tests.cpp

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2020-2024 Intel Corporation
2+
* Copyright (C) 2020-2025 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -22,8 +22,6 @@ using IsBetweenSklAndTgllp = IsWithinProducts<IGFX_SKYLAKE, IGFX_TIGERLAKE_LP>;
2222
HWTEST2_F(SbaTest, WhenAppendStateBaseAddressParametersIsCalledThenSBACmdHasBindingSurfaceStateProgrammed, IsBetweenSklAndTgllp) {
2323
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
2424

25-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
26-
2725
STATE_BASE_ADDRESS stateBaseAddress;
2826
stateBaseAddress.setBindlessSurfaceStateSize(0);
2927
stateBaseAddress.setBindlessSurfaceStateBaseAddress(0);
@@ -41,8 +39,6 @@ HWTEST2_F(SbaTest, WhenAppendStateBaseAddressParametersIsCalledThenSBACmdHasBind
4139
HWTEST2_F(SbaTest, WhenProgramStateBaseAddressParametersIsCalledThenSBACmdHasBindingSurfaceStateProgrammed, MatchAny) {
4240
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
4341

44-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
45-
4642
STATE_BASE_ADDRESS stateBaseAddress;
4743
stateBaseAddress.setBindlessSurfaceStateSize(0);
4844
stateBaseAddress.setBindlessSurfaceStateBaseAddress(0);
@@ -67,8 +63,6 @@ HWTEST2_F(SbaTest,
6763
givenProgramSurfaceStateBaseAddressUsingHeapBaseWhenOverrideSurfaceStateBaseAddressUsedThenSbaDispatchedWithOverrideValue, MatchAny) {
6864
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
6965

70-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
71-
7266
constexpr uint64_t surfaceStateBaseAddress = 0xBADA550000;
7367

7468
STATE_BASE_ADDRESS cmd;
@@ -88,8 +82,6 @@ using SbaForBindlessTests = SbaTest;
8882
HWTEST2_F(SbaForBindlessTests, givenGlobalBindlessBaseAddressWhenProgramStateBaseAddressThenSbaProgrammedCorrectly, MatchAny) {
8983
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
9084

91-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
92-
9385
constexpr uint64_t globalBindlessHeapsBaseAddress = 0x12340000;
9486

9587
StackVec<char, 4096> buffer(4096);
@@ -125,8 +117,6 @@ HWTEST2_F(SbaForBindlessTests,
125117
givenGlobalBindlessBaseAddressOverridenSurfaceStateBaseAddressWhenProgramStateBaseAddressThenSbaProgrammedCorrectly, MatchAny) {
126118
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
127119

128-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
129-
130120
constexpr uint64_t globalBindlessHeapsBaseAddress = 0x12340000;
131121
constexpr uint64_t surfaceStateBaseAddress = 0xBADA550000;
132122

@@ -164,8 +154,6 @@ using IohSupported = IsGen12LP;
164154
HWTEST2_F(SbaForBindlessTests, givenGlobalBindlessBaseAddressWhenPassingIndirectBaseAddressThenIndirectBaseAddressIsSet, IohSupported) {
165155
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
166156

167-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
168-
169157
constexpr uint64_t globalBindlessHeapsBaseAddress = 0x12340000;
170158
constexpr uint64_t indirectObjectBaseAddress = 0x12340000;
171159

@@ -186,8 +174,6 @@ HWTEST2_F(SbaForBindlessTests, givenGlobalBindlessBaseAddressWhenPassingIndirect
186174
HWTEST2_F(SbaTest, givenSbaWhenOverrideBindlessSurfaceBaseIsFalseThenBindlessSurfaceBaseIsNotSet, MatchAny) {
187175
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
188176

189-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
190-
191177
STATE_BASE_ADDRESS stateBaseAddress;
192178
stateBaseAddress.setBindlessSurfaceStateSize(0);
193179
stateBaseAddress.setBindlessSurfaceStateBaseAddress(0);
@@ -204,8 +190,6 @@ HWTEST2_F(SbaTest, givenSbaWhenOverrideBindlessSurfaceBaseIsFalseThenBindlessSur
204190
HWTEST2_F(SbaTest, givenGlobalBindlessBaseAddressWhenSshIsPassedThenBindlessSurfaceBaseIsGlobalHeapBase, MatchAny) {
205191
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
206192

207-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
208-
209193
constexpr uint64_t globalBindlessHeapsBaseAddress = 0x12340000;
210194

211195
StackVec<char, 4096> buffer(4096);
@@ -223,8 +207,6 @@ HWTEST2_F(SbaTest, givenGlobalBindlessBaseAddressWhenSshIsPassedThenBindlessSurf
223207
HWTEST2_F(SbaTest, givenSurfaceStateHeapWhenNotUsingGlobalHeapBaseThenBindlessSurfaceBaseIsSshBase, MatchAny) {
224208
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
225209

226-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
227-
228210
constexpr uint64_t globalBindlessHeapsBaseAddress = 0x12340000;
229211

230212
StackVec<char, 4096> buffer(4096);
@@ -242,8 +224,6 @@ HWTEST2_F(SbaTest, givenSurfaceStateHeapWhenNotUsingGlobalHeapBaseThenBindlessSu
242224
HWTEST2_F(SbaTest, givenNotUsedGlobalHeapBaseAndSshPassedWhenBindlessSurfStateBaseIsPassedThenBindlessSurfaceBaseIsSetToPassedValue, MatchAny) {
243225
using STATE_BASE_ADDRESS = typename FamilyType::STATE_BASE_ADDRESS;
244226

245-
EXPECT_NE(IGFX_BROADWELL, ::productFamily);
246-
247227
constexpr uint64_t globalBindlessHeapsBaseAddress = 0x12340000;
248228

249229
StackVec<char, 4096> buffer(4096);

0 commit comments

Comments
 (0)