From a23bfbc8ed32a8bc6df68adce381b01edc3f61ee Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Tue, 22 Mar 2022 13:04:16 +0000 Subject: [PATCH] Shorten the names of aub tests Signed-off-by: Kamil Kopryk Related-To: NEO-6738 --- .../copy_engine_aub_tests_xehp_and_later.h | 2 +- .../copy_engine_aub_tests_xe_hpc_core.cpp | 38 +++++++++---------- .../system_memfence_aub_tests_xe_hpc_core.cpp | 12 +++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h b/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h index 438bb24e87..bf72ae98dd 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h +++ b/opencl/test/unit_test/aub_tests/command_stream/copy_engine_aub_tests_xehp_and_later.h @@ -133,7 +133,7 @@ struct CopyEngineXeHPAndLater : public MulticontextAubFixture, public ::testing: template void givenSrcSystemBufferWhenBlitCommandToDstSystemBufferIsDispatchedThenCopiedDataIsValidImpl(); template - void GivenReadOnlyMultiStorageFlagsWhenAllocatingBufferThenAllocationIsCopiedWithBlitterToEveryTileImpl(); + void GivenReadOnlyMultiStorageWhenAllocatingBufferThenAllocationIsCopiedWithBlitterToEveryTileImpl(); template void givenReadBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopiedImpl(); template diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp index 2e15488091..33d18427b3 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/copy_engine_aub_tests_xe_hpc_core.cpp @@ -33,76 +33,76 @@ constexpr uint32_t allSupportedCopyEngines[] = { aub_stream::EngineType::ENGINE_BCS8, }; -using SingleTilePvcTests = CopyEnginesPvcFixture<1, XE_HPC_COREFamily>; +using OneTilePvcTests = CopyEnginesPvcFixture<1, XE_HPC_COREFamily>; INSTANTIATE_TEST_CASE_P( MemCopyBcsCmd, - SingleTilePvcTests, + OneTilePvcTests, testing::ValuesIn(allSupportedCopyEngines)); -XE_HPC_CORETEST_P(SingleTilePvcTests, givenNotCompressedBufferWhenBltExecutedThenCompressDataAndResolve) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenNotCompressedBufferWhenBltExecutedThenCompressDataAndResolve) { givenNotCompressedBufferWhenBltExecutedThenCompressDataAndResolveImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenHostPtrWhenBlitCommandToCompressedBufferIsDispatchedThenCopiedDataIsValid) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenHostPtrWhenBlitCommandToCompressedBufferIsDispatchedThenCopiedDataIsValid) { givenHostPtrWhenBlitCommandToCompressedBufferIsDispatchedThenCopiedDataIsValidImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenDstHostPtrWhenBlitCommandFromCompressedBufferIsDispatchedThenCopiedDataIsValid) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenDstHostPtrWhenBlitCommandFromCompressedBufferIsDispatchedThenCopiedDataIsValid) { givenDstHostPtrWhenBlitCommandFromCompressedBufferIsDispatchedThenCopiedDataIsValidImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenDstHostPtrWhenBlitCommandFromNotCompressedBufferIsDispatchedThenCopiedDataIsValid) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenDstHostPtrWhenBlitCommandFromNotCompressedBufferIsDispatchedThenCopiedDataIsValid) { givenDstHostPtrWhenBlitCommandFromNotCompressedBufferIsDispatchedThenCopiedDataIsValidImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenSrcHostPtrWhenBlitCommandToNotCompressedBufferIsDispatchedThenCopiedDataIsValid) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenSrcHostPtrWhenBlitCommandToNotCompressedBufferIsDispatchedThenCopiedDataIsValid) { givenSrcHostPtrWhenBlitCommandToNotCompressedBufferIsDispatchedThenCopiedDataIsValidImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenBufferWithOffsetWhenHostPtrBlitCommandIsDispatchedFromHostPtrThenDataIsCorrectlyCopied) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenBufferWithOffsetWhenHostPtrBlitCommandIsDispatchedFromHostPtrThenDataIsCorrectlyCopied) { givenBufferWithOffsetWhenHostPtrBlitCommandIsDispatchedFromHostPtrThenDataIsCorrectlyCopiedImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenBufferWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenBufferWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { givenBufferWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopiedImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenOffsetsWhenBltExecutedThenCopiedDataIsValid) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenOffsetsWhenBltExecutedThenCopiedDataIsValid) { givenOffsetsWhenBltExecutedThenCopiedDataIsValidImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenSrcCompressedBufferWhenBlitCommandToDstCompressedBufferIsDispatchedThenCopiedDataIsValid) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenSrcCompressedBufferWhenBlitCommandToDstCompressedBufferIsDispatchedThenCopiedDataIsValid) { givenSrcCompressedBufferWhenBlitCommandToDstCompressedBufferIsDispatchedThenCopiedDataIsValidImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenCompressedBufferWhenAuxTranslationCalledThenResolveAndCompress) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenCompressedBufferWhenAuxTranslationCalledThenResolveAndCompress) { givenCompressedBufferWhenAuxTranslationCalledThenResolveAndCompressImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenCopyBufferRectWithBigSizesWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenCopyBufferRectWithBigSizesWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { givenCopyBufferRectWithBigSizesWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopiedImpl(); } -using SingleTileSystemMemoryPvcTests = CopyEnginesPvcFixture<1, XE_HPC_COREFamily, false>; +using OneTileSystemMemoryPvcTests = CopyEnginesPvcFixture<1, XE_HPC_COREFamily, false>; INSTANTIATE_TEST_CASE_P( MemCopyBcsCmd, - SingleTileSystemMemoryPvcTests, + OneTileSystemMemoryPvcTests, testing::ValuesIn(allSupportedCopyEngines)); -XE_HPC_CORETEST_P(SingleTileSystemMemoryPvcTests, givenSrcSystemBufferWhenBlitCommandToDstSystemBufferIsDispatchedThenCopiedDataIsValid) { +XE_HPC_CORETEST_P(OneTileSystemMemoryPvcTests, givenSrcSystemBufferWhenBlitCommandToDstSystemBufferIsDispatchedThenCopiedDataIsValid) { givenSrcSystemBufferWhenBlitCommandToDstSystemBufferIsDispatchedThenCopiedDataIsValidImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenReadBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenReadBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { givenReadBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopiedImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenWriteBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenWriteBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { givenWriteBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopiedImpl(); } -XE_HPC_CORETEST_P(SingleTilePvcTests, givenCopyBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { +XE_HPC_CORETEST_P(OneTilePvcTests, givenCopyBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopied) { givenCopyBufferRectWithOffsetWhenHostPtrBlitCommandIsDispatchedToHostPtrThenDataIsCorrectlyCopiedImpl(); } diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp index 212db5d012..209e8059bb 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/system_memfence_aub_tests_xe_hpc_core.cpp @@ -34,7 +34,7 @@ class SystemMemFenceViaMiMemFence : public AUBFixture, cl_int retVal = CL_SUCCESS; }; -XE_HPC_CORETEST_F(SystemMemFenceViaMiMemFence, givenSystemMemFenceWhenGeneratedAsMiMemFenceCommandInCommandStreamThenWritesToSystemMemoryAreGloballyObservable) { +XE_HPC_CORETEST_F(SystemMemFenceViaMiMemFence, givenSystemMemFenceWhenMiMemFenceInCommandStreamThenWritesToSystemMemoryAreGloballyObservable) { const size_t bufferSize = MemoryConstants::kiloByte; std::vector buffer(bufferSize, 0x11); @@ -80,7 +80,7 @@ class SystemMemFenceViaComputeWalker : public AUBFixture, cl_int retVal = CL_SUCCESS; }; -XE_HPC_CORETEST_F(SystemMemFenceViaComputeWalker, givenSystemMemFenceWhenGeneratedAsPostSyncOperationInWalkerThenWritesToSystemMemoryAreGloballyObservable) { +XE_HPC_CORETEST_F(SystemMemFenceViaComputeWalker, givenSystemMemFenceWhenPostSyncOperationThenWritesToSystemMemoryAreGloballyObservable) { const size_t bufferSize = MemoryConstants::kiloByte; std::vector buffer(bufferSize, 0x11); @@ -159,9 +159,9 @@ XE_HPC_CORETEST_F(SystemMemFenceWithBlitter, givenSystemMemFenceWhenGeneratedAsM EXPECT_EQ(CL_SUCCESS, retVal); } -class SystemMemFenceViaKernelInstruction : public ProgramFixture, - public MulticontextAubFixture, - public ::testing::Test { +class SystemMemFenceViaKernel : public ProgramFixture, + public MulticontextAubFixture, + public ::testing::Test { public: void SetUp() override { DebugManager.flags.ProgramGlobalFenceAsMiMemFenceCommandInCommandStream.set(0); @@ -180,7 +180,7 @@ class SystemMemFenceViaKernelInstruction : public ProgramFixture, cl_int retVal = CL_SUCCESS; }; -XE_HPC_CORETEST_F(SystemMemFenceViaKernelInstruction, givenSystemMemFenceWhenGeneratedAsKernelInstructionThenWritesToSystemMemoryAreGloballyObservable) { +XE_HPC_CORETEST_F(SystemMemFenceViaKernel, givenSystemMemFenceWhenKernelInstructionThenWritesToSystemMemoryAreGloballyObservable) { const size_t bufferSize = MemoryConstants::kiloByte; std::vector buffer(bufferSize, 0x11);