Skip to content

Commit 0ba31a4

Browse files
AdamCetnerowskiCompute-Runtime-Automation
AdamCetnerowski
authored and
Compute-Runtime-Automation
committed
ULT renaming: Write image & buffer tests
Related-To: NEO-2236 Change-Id: Ida866017f17795140817f9fbdca80def8d00e4c8 Signed-off-by: Adam Cetnerowski <adam.cetnerowski@intel.com>
1 parent a08fb12 commit 0ba31a4

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎unit_tests/command_queue/enqueue_write_buffer_tests.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
using namespace NEO;
2525

26-
HWTEST_F(EnqueueWriteBufferTypeTest, null_mem_object) {
26+
HWTEST_F(EnqueueWriteBufferTypeTest, GivenNullBufferWhenWrtingBufferThenInvalidMemObjectErrorIsReturned) {
2727
auto data = 1;
2828
auto retVal = clEnqueueWriteBuffer(
2929
pCmdQ,
@@ -39,7 +39,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, null_mem_object) {
3939
EXPECT_EQ(CL_INVALID_MEM_OBJECT, retVal);
4040
}
4141

42-
HWTEST_F(EnqueueWriteBufferTypeTest, null_user_pointer) {
42+
HWTEST_F(EnqueueWriteBufferTypeTest, GivenNullUserPointerWhenWritingBufferThenInvalidValueErrorIsReturned) {
4343
auto data = 1;
4444

4545
auto retVal = clEnqueueWriteBuffer(
@@ -56,7 +56,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, null_user_pointer) {
5656
EXPECT_EQ(CL_INVALID_VALUE, retVal);
5757
}
5858

59-
HWTEST_F(EnqueueWriteBufferTypeTest, alignsToCSR_Blocking) {
59+
HWTEST_F(EnqueueWriteBufferTypeTest, GivenBlockingEnqueueWhenWritingBufferThenTaskLevelIsNotIncremented) {
6060
//this test case assumes IOQ
6161
auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
6262
csr.taskCount = pCmdQ->taskCount + 100;
@@ -69,7 +69,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, alignsToCSR_Blocking) {
6969
EXPECT_EQ(oldCsrTaskLevel, pCmdQ->taskLevel);
7070
}
7171

72-
HWTEST_F(EnqueueWriteBufferTypeTest, alignsToCSR_NonBlocking) {
72+
HWTEST_F(EnqueueWriteBufferTypeTest, GivenNonBlockingEnqueueWhenWritingBufferThenTaskLevelIsIncremented) {
7373
//this test case assumes IOQ
7474
auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
7575
csr.taskCount = pCmdQ->taskCount + 100;
@@ -80,7 +80,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, alignsToCSR_NonBlocking) {
8080
EXPECT_EQ(csr.peekTaskLevel(), pCmdQ->taskLevel + 1);
8181
}
8282

83-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, GPGPUWalker) {
83+
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, WhenWritingBufferThenCommandsAreProgrammedCorrectly) {
8484
typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER;
8585

8686
srcBuffer->forceDisallowCPUCopy = true;
@@ -113,23 +113,23 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, GPGPUWalker) {
113113
}
114114
}
115115

116-
HWTEST_F(EnqueueWriteBufferTypeTest, bumpsTaskLevel) {
116+
HWTEST_F(EnqueueWriteBufferTypeTest, WhenWritingBufferThenTaskLevelIsIncremented) {
117117
auto taskLevelBefore = pCmdQ->taskLevel;
118118

119119
srcBuffer->forceDisallowCPUCopy = true;
120120
EnqueueWriteBufferHelper<>::enqueueWriteBuffer(pCmdQ, srcBuffer.get(), EnqueueWriteBufferTraits::blocking);
121121
EXPECT_GT(pCmdQ->taskLevel, taskLevelBefore);
122122
}
123123

124-
HWTEST_F(EnqueueWriteBufferTypeTest, addsCommands) {
124+
HWTEST_F(EnqueueWriteBufferTypeTest, WhenWritingBufferThenCommandsAreAdded) {
125125
auto usedCmdBufferBefore = pCS->getUsed();
126126

127127
srcBuffer->forceDisallowCPUCopy = true;
128128
EnqueueWriteBufferHelper<>::enqueueWriteBuffer(pCmdQ, srcBuffer.get(), EnqueueWriteBufferTraits::blocking);
129129
EXPECT_NE(usedCmdBufferBefore, pCS->getUsed());
130130
}
131131

132-
HWTEST_F(EnqueueWriteBufferTypeTest, addsIndirectData) {
132+
HWTEST_F(EnqueueWriteBufferTypeTest, WhenWritingBufferThenIndirectDataIsAdded) {
133133
auto dshBefore = pDSH->getUsed();
134134
auto iohBefore = pIOH->getUsed();
135135
auto sshBefore = pSSH->getUsed();
@@ -159,7 +159,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, addsIndirectData) {
159159
}
160160
}
161161

162-
HWTEST_F(EnqueueWriteBufferTypeTest, LoadRegisterImmediateL3CNTLREG) {
162+
HWTEST_F(EnqueueWriteBufferTypeTest, WhenWritingBufferThenL3ProgrammingIsCorrect) {
163163
srcBuffer->forceDisallowCPUCopy = true;
164164
enqueueWriteBuffer<FamilyType>();
165165
validateL3Programming<FamilyType>(cmdList, itorWalker);
@@ -173,7 +173,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, WhenEnqueueIsDoneThenSta
173173
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
174174
}
175175

176-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, MediaInterfaceDescriptorLoad) {
176+
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, WhenWritingBufferThenMediaInterfaceDescriptorIsCorrect) {
177177
typedef typename FamilyType::MEDIA_INTERFACE_DESCRIPTOR_LOAD MEDIA_INTERFACE_DESCRIPTOR_LOAD;
178178
typedef typename FamilyType::INTERFACE_DESCRIPTOR_DATA INTERFACE_DESCRIPTOR_DATA;
179179

@@ -202,7 +202,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, MediaInterfaceDescriptor
202202
FamilyType::PARSE::template validateCommand<MEDIA_INTERFACE_DESCRIPTOR_LOAD *>(cmdList.begin(), itorCmd);
203203
}
204204

205-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, InterfaceDescriptorData) {
205+
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, WhenWritingBufferThenInterfaceDescriptorDataIsCorrect) {
206206
typedef typename FamilyType::MEDIA_INTERFACE_DESCRIPTOR_LOAD MEDIA_INTERFACE_DESCRIPTOR_LOAD;
207207
typedef typename FamilyType::STATE_BASE_ADDRESS STATE_BASE_ADDRESS;
208208
typedef typename FamilyType::INTERFACE_DESCRIPTOR_DATA INTERFACE_DESCRIPTOR_DATA;
@@ -240,14 +240,14 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, InterfaceDescriptorData)
240240
EXPECT_NE(0u, IDD.getConstantIndirectUrbEntryReadLength());
241241
}
242242

243-
HWTEST_F(EnqueueWriteBufferTypeTest, PipelineSelect) {
243+
HWTEST_F(EnqueueWriteBufferTypeTest, WhenWritingBufferThenOnePipelineSelectIsProgrammed) {
244244
srcBuffer->forceDisallowCPUCopy = true;
245245
enqueueWriteBuffer<FamilyType>();
246246
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
247247
EXPECT_EQ(1, numCommands);
248248
}
249249

250-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, MediaVFEState) {
250+
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteBufferTypeTest, WhenWritingBufferThenMediaVfeStateIsCorrect) {
251251
srcBuffer->forceDisallowCPUCopy = true;
252252
enqueueWriteBuffer<FamilyType>();
253253
validateMediaVFEState<FamilyType>(&pDevice->getHardwareInfo(), cmdMediaVfeState, cmdList, itorMediaVfeState);

‎unit_tests/command_queue/enqueue_write_image_tests.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
using namespace NEO;
2121

22-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, gpgpuWalker) {
22+
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, WhenWritingImageThenCommandsAreProgrammedCorrectly) {
2323
typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER;
2424
enqueueWriteImage<FamilyType>();
2525

@@ -50,7 +50,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, gpgpuWalker) {
5050
}
5151
}
5252

53-
HWTEST_F(EnqueueWriteImageTest, alignsToCSR_Blocking) {
53+
HWTEST_F(EnqueueWriteImageTest, GivenBlockingEnqueueWhenWritingImageThenTaskLevelIsNotIncremented) {
5454
//this test case assumes IOQ
5555
auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
5656
csr.taskCount = pCmdQ->taskCount + 100;
@@ -62,7 +62,7 @@ HWTEST_F(EnqueueWriteImageTest, alignsToCSR_Blocking) {
6262
EXPECT_EQ(oldCsrTaskLevel, pCmdQ->taskLevel);
6363
}
6464

65-
HWTEST_F(EnqueueWriteImageTest, alignsToCSR_NonBlocking) {
65+
HWTEST_F(EnqueueWriteImageTest, GivenNonBlockingEnqueueWhenWritingImageThenTaskLevelIsIncremented) {
6666
//this test case assumes IOQ
6767
auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
6868
csr.taskCount = pCmdQ->taskCount + 100;
@@ -73,21 +73,21 @@ HWTEST_F(EnqueueWriteImageTest, alignsToCSR_NonBlocking) {
7373
EXPECT_EQ(csr.peekTaskLevel(), pCmdQ->taskLevel + 1);
7474
}
7575

76-
HWTEST_F(EnqueueWriteImageTest, bumpsTaskLevel) {
76+
HWTEST_F(EnqueueWriteImageTest, WhenWritingImageThenTaskLevelIsIncremented) {
7777
auto taskLevelBefore = pCmdQ->taskLevel;
7878

7979
EnqueueWriteImageHelper<>::enqueueWriteImage(pCmdQ, dstImage, EnqueueWriteImageTraits::blocking);
8080
EXPECT_GT(pCmdQ->taskLevel, taskLevelBefore);
8181
}
8282

83-
HWTEST_F(EnqueueWriteImageTest, addsCommands) {
83+
HWTEST_F(EnqueueWriteImageTest, WhenWritingImageThenCommandsAreAdded) {
8484
auto usedCmdBufferBefore = pCS->getUsed();
8585

8686
EnqueueWriteImageHelper<>::enqueueWriteImage(pCmdQ, dstImage, EnqueueWriteImageTraits::blocking);
8787
EXPECT_NE(usedCmdBufferBefore, pCS->getUsed());
8888
}
8989

90-
HWTEST_F(EnqueueWriteImageTest, addsIndirectData) {
90+
HWTEST_F(EnqueueWriteImageTest, WhenWritingImageThenIndirectDataIsAdded) {
9191
auto dshBefore = pDSH->getUsed();
9292
auto iohBefore = pIOH->getUsed();
9393
auto sshBefore = pSSH->getUsed();
@@ -98,7 +98,7 @@ HWTEST_F(EnqueueWriteImageTest, addsIndirectData) {
9898
EXPECT_NE(sshBefore, pSSH->getUsed());
9999
}
100100

101-
HWTEST_F(EnqueueWriteImageTest, loadRegisterImmediateL3CNTLREG) {
101+
HWTEST_F(EnqueueWriteImageTest, WhenWritingImageThenL3ProgrammingIsCorrect) {
102102
enqueueWriteImage<FamilyType>();
103103
validateL3Programming<FamilyType>(cmdList, itorWalker);
104104
}
@@ -110,7 +110,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, WhenEnqueueIsDoneThenStateBas
110110
pDSH, pIOH, pSSH, itorPipelineSelect, itorWalker, cmdList, 0llu);
111111
}
112112

113-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, mediaInterfaceDescriptorLoad) {
113+
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, WhenWritingImageThenMediaInterfaceDescriptorIsCorrect) {
114114
typedef typename FamilyType::MEDIA_INTERFACE_DESCRIPTOR_LOAD MEDIA_INTERFACE_DESCRIPTOR_LOAD;
115115
typedef typename FamilyType::INTERFACE_DESCRIPTOR_DATA INTERFACE_DESCRIPTOR_DATA;
116116

@@ -136,7 +136,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, mediaInterfaceDescriptorLoad)
136136
FamilyType::PARSE::template validateCommand<MEDIA_INTERFACE_DESCRIPTOR_LOAD *>(cmdList.begin(), itorMediaInterfaceDescriptorLoad);
137137
}
138138

139-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, interfaceDescriptorData) {
139+
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, WhenWritingImageThenInterfaceDescriptorDataIsCorrect) {
140140
typedef typename FamilyType::STATE_BASE_ADDRESS STATE_BASE_ADDRESS;
141141
typedef typename FamilyType::INTERFACE_DESCRIPTOR_DATA INTERFACE_DESCRIPTOR_DATA;
142142

@@ -162,7 +162,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, interfaceDescriptorData) {
162162
EXPECT_NE(kernelStartPointer, interfaceDescriptorData.getBindingTablePointer());
163163
}
164164

165-
HWTEST_F(EnqueueWriteImageTest, surfaceState) {
165+
HWTEST_F(EnqueueWriteImageTest, WhenWritingImageThenSurfaceStateIsProgrammedCorrectly) {
166166
typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
167167

168168
enqueueWriteImage<FamilyType>();
@@ -183,13 +183,13 @@ HWTEST_F(EnqueueWriteImageTest, surfaceState) {
183183
EXPECT_EQ(dstImage->getGraphicsAllocation()->getGpuAddress(), surfaceState.getSurfaceBaseAddress());
184184
}
185185

186-
HWTEST_F(EnqueueWriteImageTest, pipelineSelect) {
186+
HWTEST_F(EnqueueWriteImageTest, WhenWritingImageThenOnePipelineSelectIsProgrammed) {
187187
enqueueWriteImage<FamilyType>();
188188
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
189189
EXPECT_EQ(1, numCommands);
190190
}
191191

192-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, mediaVFEState) {
192+
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, WhenWritingImageThenMediaVfeStateIsCorrect) {
193193
enqueueWriteImage<FamilyType>();
194194
validateMediaVFEState<FamilyType>(&pDevice->getHardwareInfo(), cmdMediaVfeState, cmdList, itorMediaVfeState);
195195
}

0 commit comments

Comments
 (0)