Skip to content

Commit d36a383

Browse files
RafalMaziejukIntelCompute-Runtime-Automation
RafalMaziejukIntel
authored and
Compute-Runtime-Automation
committed
Delete redundant matchers and use common matchers instead
Signed-off-by: Rafal Maziejuk <rafal.maziejuk@intel.com>
1 parent 6c38b36 commit d36a383

File tree

10 files changed

+22
-29
lines changed

10 files changed

+22
-29
lines changed

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel_3.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,7 @@ HWTEST2_F(CommandListAppendLaunchKernel, givenCooperativeAndNonCooperativeKernel
453453
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
454454
}
455455

456-
using WithinXeHPAndXeHPC = IsWithinGfxCore<IGFX_XE_HP_CORE, IGFX_XE_HPC_CORE>;
457-
HWTEST2_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenAppendingKernelWithImmediateListWithoutFlushTaskThenNewCmdBufferAllocated, WithinXeHPAndXeHPC) {
456+
HWTEST2_F(CommandListAppendLaunchKernel, givenNotEnoughSpaceInCommandStreamWhenAppendingKernelWithImmediateListWithoutFlushTaskThenNewCmdBufferAllocated, IsWithinXeGfxFamily) {
458457
DebugManagerStateRestore restorer;
459458
NEO::DebugManager.flags.EnableFlushTaskSubmission.set(0);
460459
using MI_BATCH_BUFFER_END = typename FamilyType::MI_BATCH_BUFFER_END;

‎level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_xehp_and_later.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ HWTEST2_F(MultiTileAppendMemoryCopyXeHpAndLater,
405405

406406
HWTEST2_F(AppendMemoryCopyXeHpAndLater,
407407
givenCommandListAndEventWithSignalScopeWhenTimestampProvidedByComputeWalkerPostSyncPassedToMemoryCopyThenAppendProfilingCalledForThreeSeparateKernelsAndL3FlushWithPostSyncAddedOnce,
408-
isXeHpOrXeHpgCore) {
408+
IsXeHpOrXeHpgCore) {
409409
using GfxFamily = typename NEO::GfxFamilyMapper<gfxCoreFamily>::GfxFamily;
410410
using COMPUTE_WALKER = typename GfxFamily::COMPUTE_WALKER;
411411
using POSTSYNC_DATA = typename FamilyType::POSTSYNC_DATA;
@@ -491,7 +491,7 @@ HWTEST2_F(AppendMemoryCopyXeHpAndLater,
491491

492492
HWTEST2_F(MultiTileAppendMemoryCopyXeHpAndLater,
493493
givenMultiTileCommandListAndEventWithSignalScopeWhenTimestampProvidedByComputeWalkerPostSyncPassedToMemoryCopyThenAppendProfilingCalledForThreeSeparateMultiTileKernelsAndL3FlushWithPostSyncAddedForScopedEvent,
494-
isXeHpOrXeHpgCore) {
494+
IsXeHpOrXeHpgCore) {
495495
using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER;
496496
using POSTSYNC_DATA = typename FamilyType::POSTSYNC_DATA;
497497
using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
@@ -586,7 +586,7 @@ HWTEST2_F(MultiTileAppendMemoryCopyXeHpAndLater,
586586
}
587587

588588
HWTEST2_F(AppendMemoryCopyXeHpAndLater,
589-
givenCommandListWhenMemoryCopyWithSignalEventScopeSetToSubDeviceThenB2BPipeControlIsAddedWithDcFlushWithPostSyncForLastPC, isXeHpOrXeHpgCore) {
589+
givenCommandListWhenMemoryCopyWithSignalEventScopeSetToSubDeviceThenB2BPipeControlIsAddedWithDcFlushWithPostSyncForLastPC, IsXeHpOrXeHpgCore) {
590590
using COMPUTE_WALKER = typename FamilyType::COMPUTE_WALKER;
591591
using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
592592
using POST_SYNC_OPERATION = typename PIPE_CONTROL::POST_SYNC_OPERATION;

‎level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -530,13 +530,11 @@ HWTEST2_F(L0DebuggerSimpleTest, givenUseCsrImmediateSubmissionDisabledCommandLis
530530
commandList->destroy();
531531
}
532532

533-
using NotXeHPOrDG2 = AreNotGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
534-
HWTEST2_F(L0DebuggerTest, givenNotAtsOrDg2AndDebugIsActiveThenDisableL3CacheInGmmHelperIsNotSet, NotXeHPOrDG2) {
533+
HWTEST2_F(L0DebuggerTest, givenNotXeHpOrXeHpgCoreAndDebugIsActiveThenDisableL3CacheInGmmHelperIsNotSet, IsNotXeHpOrXeHpgCore) {
535534
EXPECT_FALSE(static_cast<MockGmmHelper *>(neoDevice->getGmmHelper())->allResourcesUncached);
536535
}
537536

538-
using ATSOrDG2 = IsWithinGfxCore<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
539-
HWTEST2_F(L0DebuggerTest, givenAtsOrDg2AndDebugIsActiveThenDisableL3CacheInGmmHelperIsSet, ATSOrDG2) {
537+
HWTEST2_F(L0DebuggerTest, givenXeHpOrXeHpgCoreAndDebugIsActiveThenDisableL3CacheInGmmHelperIsSet, IsXeHpOrXeHpgCore) {
540538
EXPECT_TRUE(static_cast<MockGmmHelper *>(neoDevice->getGmmHelper())->allResourcesUncached);
541539
}
542540

‎level_zero/core/test/unit_tests/sources/event/test_event.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ TEST_F(EventCreate, givenAnEventCreateWithInvalidIndexUsingThisEventPoolThenErro
714714
ASSERT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, value);
715715
}
716716

717-
HWTEST2_F(EventCreate, givenPlatformSupportMultTileWhenDebugKeyIsSetToNotUseContextEndThenDoNotUseContextEndOffset, isXeHpOrXeHpcCore) {
717+
HWTEST2_F(EventCreate, givenPlatformSupportMultTileWhenDebugKeyIsSetToNotUseContextEndThenDoNotUseContextEndOffset, IsXeHpOrXeHpcCore) {
718718
DebugManagerStateRestore restorer;
719719
NEO::DebugManager.flags.UseContextEndOffsetForEventCompletion.set(0);
720720

@@ -751,7 +751,7 @@ HWTEST2_F(EventCreate, givenPlatformSupportMultTileWhenDebugKeyIsSetToNotUseCont
751751
event->destroy();
752752
}
753753

754-
HWTEST2_F(EventCreate, givenPlatformNotSupportsMultTileWhenDebugKeyIsSetToUseContextEndThenUseContextEndOffset, isNotXeHpOrXeHpcCore) {
754+
HWTEST2_F(EventCreate, givenPlatformNotSupportsMultTileWhenDebugKeyIsSetToUseContextEndThenUseContextEndOffset, IsNotXeHpOrXeHpcCore) {
755755
DebugManagerStateRestore restorer;
756756
NEO::DebugManager.flags.UseContextEndOffsetForEventCompletion.set(1);
757757

‎opencl/test/unit_test/helpers/hw_helper_tests.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,14 +1393,12 @@ TEST(HwHelperTests, whenBlitterSupportIsDisabledThenDontExposeAnyBcsEngine) {
13931393
}
13941394
}
13951395

1396-
using NotXeHPOrDG2 = AreNotGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
1397-
HWTEST2_F(HwHelperTest, givenNotAtsOrDg2WhenDisableL3ForDebugCalledThenFalseIsReturned, NotXeHPOrDG2) {
1396+
HWTEST2_F(HwHelperTest, givenNotXeHpOrXeHpgCoreWhenDisableL3ForDebugCalledThenFalseIsReturned, IsNotXeHpOrXeHpgCore) {
13981397
const auto &hwHelper = HwHelper::get(renderCoreFamily);
13991398
EXPECT_FALSE(hwHelper.disableL3CacheForDebug(*defaultHwInfo));
14001399
}
14011400

1402-
using ATSOrDG2 = IsWithinGfxCore<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
1403-
HWTEST2_F(HwHelperTest, givenAtsOrDg2WhenDisableL3ForDebugCalledThenTrueIsReturned, ATSOrDG2) {
1401+
HWTEST2_F(HwHelperTest, givenXeHpOrXeHpgCoreWhenDisableL3ForDebugCalledThenTrueIsReturned, IsXeHpOrXeHpgCore) {
14041402
const auto &hwHelper = HwHelper::get(renderCoreFamily);
14051403
EXPECT_TRUE(hwHelper.disableL3CacheForDebug(*defaultHwInfo));
14061404
}
@@ -1488,7 +1486,7 @@ HWTEST_F(LogicalStateHelperTest, whenCreatingLogicalStateHelperThenReturnNullptr
14881486
EXPECT_EQ(nullptr, LogicalStateHelper::create<FamilyType>());
14891487
}
14901488

1491-
HWTEST2_F(HwHelperTest, GivenVariousValuesAndXeHpAndLaterPlatformsWhenCallingCalculateAvailableThreadCountThenCorrectValueIsReturned, ATSOrDG2) {
1489+
HWTEST2_F(HwHelperTest, GivenVariousValuesAndXeHpOrXeHpgCoreWhenCallingCalculateAvailableThreadCountThenCorrectValueIsReturned, IsXeHpOrXeHpgCore) {
14921490
std::array<std::pair<uint32_t, uint32_t>, 3> grfTestInputs = {{{64, 8},
14931491
{128, 8},
14941492
{256, 4}}};
@@ -1502,7 +1500,7 @@ HWTEST2_F(HwHelperTest, GivenVariousValuesAndXeHpAndLaterPlatformsWhenCallingCal
15021500
}
15031501
}
15041502

1505-
HWTEST2_F(HwHelperTest, GivenModifiedGtSystemInfoAndXeHpAndLaterPlatformsWhenCallingCalculateAvailableThreadCountThenCorrectValueIsReturned, ATSOrDG2) {
1503+
HWTEST2_F(HwHelperTest, GivenModifiedGtSystemInfoAndXeHpOrXeHpgCoreWhenCallingCalculateAvailableThreadCountThenCorrectValueIsReturned, IsXeHpOrXeHpgCore) {
15061504
std::array<std::tuple<uint32_t, uint32_t, uint32_t>, 3> testInputs = {{{1, 64, 1},
15071505
{5, 128, 5},
15081506
{8, 256, 4}}};

‎opencl/test/unit_test/helpers/test_preamble_xehp_and_later.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
using namespace NEO;
2424

2525
using ThreadArbitrationXeHPAndLater = PreambleFixture;
26-
using Platforms = IsWithinGfxCore<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
27-
HWTEST2_F(ThreadArbitrationXeHPAndLater, whenGetDefaultThreadArbitrationPolicyIsCalledThenCorrectPolicyIsReturned, Platforms) {
26+
HWTEST2_F(ThreadArbitrationXeHPAndLater, whenGetDefaultThreadArbitrationPolicyIsCalledThenCorrectPolicyIsReturned, IsXeHpOrXeHpgCore) {
2827
EXPECT_EQ(ThreadArbitrationPolicy::AgeBased, HwHelperHw<FamilyType>::get().getDefaultThreadArbitrationPolicy());
2928
}
3029

‎opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -887,8 +887,7 @@ TEST(SourceLevelDebugger, givenDebuggerLibraryAvailableAndExperimentalEnableSour
887887

888888
using LegacyDebuggerTest = ::testing::Test;
889889

890-
using NotXeHPOrDG2 = AreNotGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
891-
HWTEST2_F(LegacyDebuggerTest, givenNotAtsOrDg2AndDebugIsActiveThenDisableL3CacheInGmmHelperIsNotSet, NotXeHPOrDG2) {
890+
HWTEST2_F(LegacyDebuggerTest, givenNotXeHpOrXeHpgCoreAndDebugIsActiveThenDisableL3CacheInGmmHelperIsNotSet, IsNotXeHpOrXeHpgCore) {
892891
DebugManagerStateRestore stateRestore;
893892
DebugManager.flags.EnableMockSourceLevelDebugger.set(1);
894893
auto executionEnvironment = new ExecutionEnvironment();
@@ -898,8 +897,7 @@ HWTEST2_F(LegacyDebuggerTest, givenNotAtsOrDg2AndDebugIsActiveThenDisableL3Cache
898897
EXPECT_FALSE(static_cast<MockGmmHelper *>(platform.getClDevice(0)->getDevice().getGmmHelper())->allResourcesUncached);
899898
}
900899

901-
using ATSOrDG2 = IsWithinGfxCore<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
902-
HWTEST2_F(LegacyDebuggerTest, givenAtsOrDg2AndDebugIsActiveThenDisableL3CacheInGmmHelperIsSet, ATSOrDG2) {
900+
HWTEST2_F(LegacyDebuggerTest, givenXeHpOrXeHpgCoreAndDebugIsActiveThenDisableL3CacheInGmmHelperIsSet, IsXeHpOrXeHpgCore) {
903901
DebugManagerStateRestore stateRestore;
904902
DebugManager.flags.EnableMockSourceLevelDebugger.set(1);
905903
auto executionEnvironment = new ExecutionEnvironment();

‎shared/test/common/test_macros/header/common_matchers.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@ using IsAtMostXeHpgCore = IsAtMostGfxCore<IGFX_XE_HPG_CORE>;
3535
using IsAtLeastXeHpcCore = IsAtLeastGfxCore<IGFX_XE_HPC_CORE>;
3636
using IsAtMostXeHpcCore = IsAtMostGfxCore<IGFX_XE_HPC_CORE>;
3737

38-
using isXeHpOrXeHpgCore = IsAnyGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
39-
using isXeHpOrXeHpcCore = IsAnyGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPC_CORE>;
40-
using isXeHpcOrXeHpgCore = IsAnyGfxCores<IGFX_XE_HPC_CORE, IGFX_XE_HPG_CORE>;
38+
using IsXeHpOrXeHpgCore = IsAnyGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
39+
using IsXeHpOrXeHpcCore = IsAnyGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPC_CORE>;
40+
using IsXeHpcOrXeHpgCore = IsAnyGfxCores<IGFX_XE_HPC_CORE, IGFX_XE_HPG_CORE>;
4141

42-
using isNotXeHpOrXeHpcCore = IsNotAnyGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPC_CORE>;
42+
using IsNotXeHpOrXeHpgCore = IsNotAnyGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPG_CORE>;
43+
using IsNotXeHpOrXeHpcCore = IsNotAnyGfxCores<IGFX_XE_HP_CORE, IGFX_XE_HPC_CORE>;
4344

4445
using IsSKL = IsProduct<IGFX_SKYLAKE>;
4546
using IsKBL = IsProduct<IGFX_KABYLAKE>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ HWTEST2_F(BlitTests, givenLinearResourceInfoWithNotZeroPitchWhenAppendImageComma
952952
EXPECT_NE(bltCmd.getSourcePitch(), gmm->gmmResourceInfo->getRenderPitch());
953953
}
954954

955-
HWTEST2_F(BlitTests, givenCompressionInfoWhenAppendImageCommandsThenCorrectPropertiesAreSet, isXeHpOrXeHpgCore) {
955+
HWTEST2_F(BlitTests, givenCompressionInfoWhenAppendImageCommandsThenCorrectPropertiesAreSet, IsXeHpOrXeHpgCore) {
956956
auto verifyCompressionFormat = [](bool mediaCompressed, bool renderCompressed, uint32_t compressionFormat) {
957957
if (mediaCompressed || renderCompressed) {
958958
EXPECT_GT(compressionFormat, 0u);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ HWTEST_F(HwInfoConfigTest, givenForceThreadArbitrationPolicyProgrammingWithScmFl
8282
EXPECT_TRUE(hwInfoConfig.isThreadArbitrationPolicyReportedWithScm());
8383
}
8484

85-
HWTEST2_F(HwInfoConfigTest, givenHwInfoConfigWhenIsImplicitScalingSupportedThenExpectFalse, isNotXeHpOrXeHpcCore) {
85+
HWTEST2_F(HwInfoConfigTest, givenHwInfoConfigWhenIsImplicitScalingSupportedThenExpectFalse, IsNotXeHpOrXeHpcCore) {
8686
const auto &hwInfoConfig = *HwInfoConfig::get(defaultHwInfo->platform.eProductFamily);
8787
EXPECT_FALSE(hwInfoConfig.isImplicitScalingSupported(*defaultHwInfo));
8888
}

0 commit comments

Comments
 (0)