From c5229e9514c94b8cae6c8b60d115ecc98c0d9766 Mon Sep 17 00:00:00 2001 From: Adam Cetnerowski Date: Fri, 22 Nov 2019 20:36:17 -0800 Subject: [PATCH] ULT renaming: Read image tests Related-To: NEO-2236 Change-Id: I426f311702630db48f952d5a265804839db162d2 Signed-off-by: Adam Cetnerowski --- .../enqueue_read_image_tests.cpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/unit_tests/command_queue/enqueue_read_image_tests.cpp b/unit_tests/command_queue/enqueue_read_image_tests.cpp index 128822fef2..a67d724c45 100644 --- a/unit_tests/command_queue/enqueue_read_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_image_tests.cpp @@ -20,7 +20,7 @@ using namespace NEO; -HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, gpgpuWalker) { +HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, WhenReadingImageThenGpgpuWalkerIsProgrammedCorrectly) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; enqueueReadImage(); @@ -51,7 +51,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, gpgpuWalker) { } } -HWTEST_F(EnqueueReadImageTest, alignsToCSR_Blocking) { +HWTEST_F(EnqueueReadImageTest, GivenBlockingEnqueueWhenReadingImageThenTaskLevelIsNotIncremented) { //this test case assumes IOQ auto &csr = pDevice->getUltCommandStreamReceiver(); csr.taskCount = pCmdQ->taskCount + 100; @@ -63,7 +63,7 @@ HWTEST_F(EnqueueReadImageTest, alignsToCSR_Blocking) { EXPECT_EQ(oldCsrTaskLevel, pCmdQ->taskLevel); } -HWTEST_F(EnqueueReadImageTest, alignsToCSR_NonBlocking) { +HWTEST_F(EnqueueReadImageTest, GivenNonBlockingEnqueueWhenReadingImageThenTaskLevelIsIncremented) { //this test case assumes IOQ auto &csr = pDevice->getUltCommandStreamReceiver(); csr.taskCount = pCmdQ->taskCount + 100; @@ -74,21 +74,21 @@ HWTEST_F(EnqueueReadImageTest, alignsToCSR_NonBlocking) { EXPECT_EQ(csr.peekTaskLevel(), pCmdQ->taskLevel + 1); } -HWTEST_F(EnqueueReadImageTest, bumpsTaskLevel) { +HWTEST_F(EnqueueReadImageTest, WhenReadingImageThenTaskLevelIsIncremented) { auto taskLevelBefore = pCmdQ->taskLevel; EnqueueReadImageHelper<>::enqueueReadImage(pCmdQ, srcImage, EnqueueReadImageTraits::blocking); EXPECT_GT(pCmdQ->taskLevel, taskLevelBefore); } -HWTEST_F(EnqueueReadImageTest, addsCommands) { +HWTEST_F(EnqueueReadImageTest, WhenReadingImageThenCommandsAreAdded) { auto usedCmdBufferBefore = pCS->getUsed(); EnqueueReadImageHelper<>::enqueueReadImage(pCmdQ, srcImage, EnqueueReadImageTraits::blocking); EXPECT_NE(usedCmdBufferBefore, pCS->getUsed()); } -HWTEST_F(EnqueueReadImageTest, addsIndirectData) { +HWTEST_F(EnqueueReadImageTest, WhenReadingImageThenIndirectDataIsAdded) { auto dshBefore = pDSH->getUsed(); auto iohBefore = pIOH->getUsed(); auto sshBefore = pSSH->getUsed(); @@ -99,7 +99,7 @@ HWTEST_F(EnqueueReadImageTest, addsIndirectData) { EXPECT_NE(sshBefore, pSSH->getUsed()); } -HWTEST_F(EnqueueReadImageTest, loadRegisterImmediateL3CNTLREG) { +HWTEST_F(EnqueueReadImageTest, WhenReadingImageThenL3ProgrammingIsCorrect) { enqueueReadImage(); validateL3Programming(cmdList, itorWalker); } @@ -111,7 +111,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, WhenEnqueueIsDoneThenStateBase pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu); } -HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, mediaInterfaceDescriptorLoad) { +HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, WhenReadingImageThenMediaInterfaceDescriptorIsCorrect) { typedef typename FamilyType::MEDIA_INTERFACE_DESCRIPTOR_LOAD MEDIA_INTERFACE_DESCRIPTOR_LOAD; typedef typename FamilyType::INTERFACE_DESCRIPTOR_DATA INTERFACE_DESCRIPTOR_DATA; @@ -137,7 +137,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, mediaInterfaceDescriptorLoad) FamilyType::PARSE::template validateCommand(cmdList.begin(), itorMediaInterfaceDescriptorLoad); } -HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, interfaceDescriptorData) { +HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, WhenReadingImageThenInterfaceDescriptorData) { typedef typename FamilyType::STATE_BASE_ADDRESS STATE_BASE_ADDRESS; typedef typename FamilyType::INTERFACE_DESCRIPTOR_DATA INTERFACE_DESCRIPTOR_DATA; @@ -162,7 +162,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, interfaceDescriptorData) { EXPECT_NE(kernelStartPointer, interfaceDescriptorData.getBindingTablePointer()); } -HWTEST_F(EnqueueReadImageTest, surfaceState) { +HWTEST_F(EnqueueReadImageTest, WhenReadingImageThenSurfaceStateIsCorrect) { typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE; enqueueReadImage(); @@ -183,18 +183,18 @@ HWTEST_F(EnqueueReadImageTest, surfaceState) { EXPECT_EQ(srcImage->getGraphicsAllocation()->getGpuAddress(), surfaceState.getSurfaceBaseAddress()); } -HWTEST_F(EnqueueReadImageTest, pipelineSelect) { +HWTEST_F(EnqueueReadImageTest, WhenReadingImageThenPipelineSelectIsProgrammed) { enqueueReadImage(); int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect(); EXPECT_EQ(1, numCommands); } -HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, mediaVFEState) { +HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, WhenReadingImageThenMediaVfeStateIsCorrect) { enqueueReadImage(); validateMediaVFEState(&pDevice->getHardwareInfo(), cmdMediaVfeState, cmdList, itorMediaVfeState); } -HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, blockingEnqueueRequiresPCWithDCFlushSetAfterWalker) { +HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, GivenBlockingEnqueueWhenReadingImageThenPipeControlWithDcFlushIsSetAfterWalker) { typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; bool blocking = true;