Skip to content

Commit c75dc23

Browse files
fhazubski-IntelCompute-Runtime-Automation
fhazubski-Intel
authored and
Compute-Runtime-Automation
committed
Change HWCMDTEST_F() tests to HWTEST_F() where possible
Change-Id: Ibfe147a12b53f832723f83809770e1b203159f8f Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
1 parent 6dfcb91 commit c75dc23

31 files changed

+124
-118
lines changed

‎unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, AUBSimpleArg, simple) {
253253
EXPECT_EQ(0, memcmp(pISA, pExpectedISA, expectedSize));
254254
}
255255

256-
HWCMDTEST_F(IGFX_GEN8_CORE, AUBSimpleArg, givenAubCommandStreamerReceiverWhenBatchBufferFlateningIsForcedThenDumpedAubIsStillValid) {
256+
HWTEST_F(AUBSimpleArg, givenAubCommandStreamerReceiverWhenBatchBufferFlateningIsForcedThenDumpedAubIsStillValid) {
257257

258258
cl_uint workDim = 1;
259259
size_t globalWorkOffset[3] = {0, 0, 0};

‎unit_tests/command_queue/dispatch_walker_tests.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ HWTEST_F(DispatchWalkerTest, computeDimensions) {
103103
EXPECT_EQ(3u, computeDimensions(workItems3D));
104104
}
105105

106-
HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, shouldntChangeCommandStreamMemory) {
106+
HWTEST_F(DispatchWalkerTest, shouldntChangeCommandStreamMemory) {
107107
MockKernel kernel(program.get(), kernelInfo, *pDevice);
108108
ASSERT_EQ(CL_SUCCESS, kernel.initialize());
109109

110110
auto &commandStream = pCmdQ->getCS(4096);
111111

112112
// Consume all memory except what is needed for this enqueue
113-
auto sizeDispatchWalkerNeeds = sizeof(typename FamilyType::GPGPU_WALKER) +
113+
auto sizeDispatchWalkerNeeds = sizeof(typename FamilyType::WALKER_TYPE) +
114114
KernelCommandsHelper<FamilyType>::getSizeRequiredCS();
115115

116116
//cs has a minimum required size
@@ -147,7 +147,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, shouldntChangeCommandStreamMemor
147147
EXPECT_EQ(sizeDispatchWalkerNeeds, commandStream.getUsed() - commandStreamStart);
148148
}
149149

150-
HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, noLocalIdsShouldntCrash) {
150+
HWTEST_F(DispatchWalkerTest, noLocalIdsShouldntCrash) {
151151
threadPayload.LocalIDXPresent = 0;
152152
threadPayload.LocalIDYPresent = 0;
153153
threadPayload.LocalIDZPresent = 0;
@@ -159,7 +159,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, noLocalIdsShouldntCrash) {
159159
auto &commandStream = pCmdQ->getCS(4096);
160160

161161
// Consume all memory except what is needed for this enqueue
162-
auto sizeDispatchWalkerNeeds = sizeof(typename FamilyType::GPGPU_WALKER) +
162+
auto sizeDispatchWalkerNeeds = sizeof(typename FamilyType::WALKER_TYPE) +
163163
KernelCommandsHelper<FamilyType>::getSizeRequiredCS();
164164

165165
//cs has a minimum required size
@@ -1055,7 +1055,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, dispatchWalkerWithMultipleDispat
10551055
}
10561056
}
10571057

1058-
HWCMDTEST_F(IGFX_GEN8_CORE, DispatchWalkerTest, givenMultiDispatchWhenWhitelistedRegisterForCoherencySwitchThenDontProgramLriInTaskStream) {
1058+
HWTEST_F(DispatchWalkerTest, givenMultiDispatchWhenWhitelistedRegisterForCoherencySwitchThenDontProgramLriInTaskStream) {
10591059
typedef typename FamilyType::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM;
10601060
WhitelistedRegisters registers = {0};
10611061
registers.chicken0hdc_0xE5F0 = true;

‎unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture,
7777
protected:
7878
template <typename FamilyType>
7979
void enqueueCopyBufferRect2D() {
80-
typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER;
80+
typedef typename FamilyType::WALKER_TYPE GPGPU_WALKER;
8181
typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT;
8282

8383
size_t srcOrigin[] = {0, 0, 0};
@@ -104,7 +104,7 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture,
104104

105105
template <typename FamilyType>
106106
void enqueueCopyBufferRect3D() {
107-
typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER;
107+
typedef typename FamilyType::WALKER_TYPE GPGPU_WALKER;
108108
typedef typename FamilyType::PIPELINE_SELECT PIPELINE_SELECT;
109109

110110
size_t srcOrigin[] = {0, 0, 0};

‎unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ HWTEST_F(EnqueueCopyBufferRectTest, returnSuccess) {
9090
EXPECT_EQ(CL_SUCCESS, retVal);
9191
}
9292

93-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, alignsToCSR) {
93+
HWTEST_F(EnqueueCopyBufferRectTest, alignsToCSR) {
9494
//this test case assumes IOQ
9595
auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
9696
csr.taskCount = pCmdQ->taskCount + 100;
@@ -133,14 +133,14 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 2D_GPGPUWalker) {
133133
}
134134
}
135135

136-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 2D_bumpsTaskLevel) {
136+
HWTEST_F(EnqueueCopyBufferRectTest, 2D_bumpsTaskLevel) {
137137
auto taskLevelBefore = pCmdQ->taskLevel;
138138

139139
enqueueCopyBufferRect2D<FamilyType>();
140140
EXPECT_GT(pCmdQ->taskLevel, taskLevelBefore);
141141
}
142142

143-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 2D_addsCommands) {
143+
HWTEST_F(EnqueueCopyBufferRectTest, 2D_addsCommands) {
144144
auto usedCmdBufferBefore = pCS->getUsed();
145145

146146
enqueueCopyBufferRect2D<FamilyType>();
@@ -183,7 +183,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 2D_addsIndirectData) {
183183
}
184184
}
185185

186-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 2D_LoadRegisterImmediateL3CNTLREG) {
186+
HWTEST_F(EnqueueCopyBufferRectTest, 2D_LoadRegisterImmediateL3CNTLREG) {
187187
enqueueCopyBufferRect2D<FamilyType>();
188188
validateL3Programming<FamilyType>(cmdList, itorWalker);
189189
}
@@ -238,7 +238,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 2D_InterfaceDescriptorDat
238238
EXPECT_NE(0u, IDD.getConstantIndirectUrbEntryReadLength());
239239
}
240240

241-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 2D_PipelineSelect) {
241+
HWTEST_F(EnqueueCopyBufferRectTest, 2D_PipelineSelect) {
242242
enqueueCopyBufferRect2D<FamilyType>();
243243
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
244244
EXPECT_EQ(1, numCommands);
@@ -284,14 +284,14 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 3D_GPGPUWalker) {
284284
//EXPECT_EQ( expectedWorkItems, numWorkItems );
285285
}
286286

287-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 3D_bumpsTaskLevel) {
287+
HWTEST_F(EnqueueCopyBufferRectTest, 3D_bumpsTaskLevel) {
288288
auto taskLevelBefore = pCmdQ->taskLevel;
289289

290290
enqueueCopyBufferRect3D<FamilyType>();
291291
EXPECT_GT(pCmdQ->taskLevel, taskLevelBefore);
292292
}
293293

294-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 3D_addsCommands) {
294+
HWTEST_F(EnqueueCopyBufferRectTest, 3D_addsCommands) {
295295
auto usedCmdBufferBefore = pCS->getUsed();
296296

297297
enqueueCopyBufferRect3D<FamilyType>();
@@ -305,7 +305,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 3D_addsIndirectData) {
305305
EXPECT_NE(usedIndirectHeapBefore, pDSH->getUsed());
306306
}
307307

308-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 3D_LoadRegisterImmediateL3CNTLREG) {
308+
HWTEST_F(EnqueueCopyBufferRectTest, 3D_LoadRegisterImmediateL3CNTLREG) {
309309
enqueueCopyBufferRect3D<FamilyType>();
310310
validateL3Programming<FamilyType>(cmdList, itorWalker);
311311
}
@@ -360,7 +360,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 3D_InterfaceDescriptorDat
360360
EXPECT_NE(0u, IDD.getConstantIndirectUrbEntryReadLength());
361361
}
362362

363-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferRectTest, 3D_PipelineSelect) {
363+
HWTEST_F(EnqueueCopyBufferRectTest, 3D_PipelineSelect) {
364364
enqueueCopyBufferRect3D<FamilyType>();
365365
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
366366
EXPECT_EQ(1, numCommands);

‎unit_tests/command_queue/enqueue_copy_buffer_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ HWTEST_F(EnqueueCopyBufferTest, addsIndirectData) {
152152
}
153153
}
154154

155-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferTest, LoadRegisterImmediateL3CNTLREG) {
155+
HWTEST_F(EnqueueCopyBufferTest, LoadRegisterImmediateL3CNTLREG) {
156156
enqueueCopyBufferAndParse<FamilyType>();
157157
validateL3Programming<FamilyType>(cmdList, itorWalker);
158158
}
@@ -207,7 +207,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferTest, InterfaceDescriptorData) {
207207
EXPECT_NE(0u, cmdIDD->getConstantIndirectUrbEntryReadLength());
208208
}
209209

210-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferTest, PipelineSelect) {
210+
HWTEST_F(EnqueueCopyBufferTest, PipelineSelect) {
211211
enqueueCopyBufferAndParse<FamilyType>();
212212
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
213213
EXPECT_EQ(1, numCommands);
@@ -218,7 +218,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferTest, MediaVFEState) {
218218
validateMediaVFEState<FamilyType>(&pDevice->getHardwareInfo(), cmdMediaVfeState, cmdList, itorMediaVfeState);
219219
}
220220

221-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferTest, argumentZeroShouldMatchSourceAddress) {
221+
HWTEST_F(EnqueueCopyBufferTest, argumentZeroShouldMatchSourceAddress) {
222222
enqueueCopyBufferAndParse<FamilyType>();
223223

224224
// Extract the kernel used
@@ -245,7 +245,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferTest, argumentZeroShouldMatchSource
245245
EXPECT_EQ((void *)((uintptr_t)srcBuffer->getGraphicsAllocation()->getGpuAddress()), *pArgument);
246246
}
247247

248-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferTest, argumentOneShouldMatchDestAddress) {
248+
HWTEST_F(EnqueueCopyBufferTest, argumentOneShouldMatchDestAddress) {
249249
enqueueCopyBufferAndParse<FamilyType>();
250250

251251
// Extract the kernel used

‎unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ HWTEST_F(EnqueueCopyBufferToImageTest, addsIndirectData) {
8383
EXPECT_NE(sshBefore, pSSH->getUsed());
8484
}
8585

86-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferToImageTest, loadRegisterImmediateL3CNTLREG) {
86+
HWTEST_F(EnqueueCopyBufferToImageTest, loadRegisterImmediateL3CNTLREG) {
8787
enqueueCopyBufferToImage<FamilyType>();
8888
validateL3Programming<FamilyType>(cmdList, itorWalker);
8989
}
@@ -147,7 +147,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferToImageTest, interfaceDescriptorDat
147147
EXPECT_NE(kernelStartPointer, interfaceDescriptorData.getBindingTablePointer());
148148
}
149149

150-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferToImageTest, surfaceState) {
150+
HWTEST_F(EnqueueCopyBufferToImageTest, surfaceState) {
151151
typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
152152

153153
enqueueCopyBufferToImage<FamilyType>();
@@ -172,7 +172,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferToImageTest, surfaceState) {
172172
EXPECT_EQ(reinterpret_cast<uint64_t>(dstImage->getCpuAddress()), surfaceState.getSurfaceBaseAddress());
173173
}
174174

175-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferToImageTest, pipelineSelect) {
175+
HWTEST_F(EnqueueCopyBufferToImageTest, pipelineSelect) {
176176
enqueueCopyBufferToImage<FamilyType>();
177177
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
178178
EXPECT_EQ(1, numCommands);

‎unit_tests/command_queue/enqueue_copy_image_tests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ HWTEST_F(EnqueueCopyImageTest, addsIndirectData) {
8686
EXPECT_NE(sshBefore, pSSH->getUsed());
8787
}
8888

89-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageTest, loadRegisterImmediateL3CNTLREG) {
89+
HWTEST_F(EnqueueCopyImageTest, loadRegisterImmediateL3CNTLREG) {
9090
enqueueCopyImage<FamilyType>();
9191
validateL3Programming<FamilyType>(cmdList, itorWalker);
9292
}
@@ -150,7 +150,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageTest, interfaceDescriptorData) {
150150
EXPECT_NE(kernelStartPointer, interfaceDescriptorData.getBindingTablePointer());
151151
}
152152

153-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageTest, surfaceState) {
153+
HWTEST_F(EnqueueCopyImageTest, surfaceState) {
154154
typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
155155

156156
enqueueCopyImage<FamilyType>();
@@ -181,7 +181,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageTest, surfaceState) {
181181
EXPECT_EQ(reinterpret_cast<uint64_t>(dstImage->getCpuAddress()), dstSurfaceState.getSurfaceBaseAddress());
182182
}
183183

184-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageTest, pipelineSelect) {
184+
HWTEST_F(EnqueueCopyImageTest, pipelineSelect) {
185185
enqueueCopyImage<FamilyType>();
186186
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
187187
EXPECT_EQ(1, numCommands);

‎unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, gpgpuWalker) {
4848
}
4949
}
5050

51-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, alignsToCSR) {
51+
HWTEST_F(EnqueueCopyImageToBufferTest, alignsToCSR) {
5252
//this test case assumes IOQ
5353
auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
5454
csr.taskCount = pCmdQ->taskCount + 100;
@@ -59,21 +59,21 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, alignsToCSR) {
5959
EXPECT_EQ(csr.peekTaskLevel(), pCmdQ->taskLevel + 1);
6060
}
6161

62-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, bumpsTaskLevel) {
62+
HWTEST_F(EnqueueCopyImageToBufferTest, bumpsTaskLevel) {
6363
auto taskLevelBefore = pCmdQ->taskLevel;
6464

6565
enqueueCopyImageToBuffer<FamilyType>();
6666
EXPECT_GT(pCmdQ->taskLevel, taskLevelBefore);
6767
}
6868

69-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, addsCommands) {
69+
HWTEST_F(EnqueueCopyImageToBufferTest, addsCommands) {
7070
auto usedCmdBufferBefore = pCS->getUsed();
7171

7272
enqueueCopyImageToBuffer<FamilyType>();
7373
EXPECT_NE(usedCmdBufferBefore, pCS->getUsed());
7474
}
7575

76-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, addsIndirectData) {
76+
HWTEST_F(EnqueueCopyImageToBufferTest, addsIndirectData) {
7777
auto dshBefore = pDSH->getUsed();
7878
auto iohBefore = pIOH->getUsed();
7979
auto sshBefore = pSSH->getUsed();
@@ -84,7 +84,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, addsIndirectData) {
8484
EXPECT_NE(sshBefore, pSSH->getUsed());
8585
}
8686

87-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, loadRegisterImmediateL3CNTLREG) {
87+
HWTEST_F(EnqueueCopyImageToBufferTest, loadRegisterImmediateL3CNTLREG) {
8888
enqueueCopyImageToBuffer<FamilyType>();
8989
validateL3Programming<FamilyType>(cmdList, itorWalker);
9090
}
@@ -148,7 +148,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, interfaceDescriptorDat
148148
EXPECT_NE(kernelStartPointer, interfaceDescriptorData.getBindingTablePointer());
149149
}
150150

151-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, surfaceState) {
151+
HWTEST_F(EnqueueCopyImageToBufferTest, surfaceState) {
152152
typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
153153

154154
enqueueCopyImageToBuffer<FamilyType>();
@@ -173,7 +173,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, surfaceState) {
173173
EXPECT_EQ(reinterpret_cast<uint64_t>(srcImage->getCpuAddress()), surfaceState.getSurfaceBaseAddress());
174174
}
175175

176-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, pipelineSelect) {
176+
HWTEST_F(EnqueueCopyImageToBufferTest, pipelineSelect) {
177177
enqueueCopyImageToBuffer<FamilyType>();
178178
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
179179
EXPECT_EQ(1, numCommands);

‎unit_tests/command_queue/enqueue_fill_buffer_tests.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ HWTEST_F(EnqueueFillBufferCmdTests, FillBufferLeftLeftover) {
198198
context.getMemoryManager()->freeGraphicsMemory(patternAllocation);
199199
}
200200

201-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, LoadRegisterImmediateL3CNTLREG) {
201+
HWTEST_F(EnqueueFillBufferCmdTests, LoadRegisterImmediateL3CNTLREG) {
202202
enqueueFillBuffer<FamilyType>();
203203
validateL3Programming<FamilyType>(cmdList, itorWalker);
204204
}
@@ -252,7 +252,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, InterfaceDescriptorData)
252252
EXPECT_NE(0u, IDD.getConstantIndirectUrbEntryReadLength());
253253
}
254254

255-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, PipelineSelect) {
255+
HWTEST_F(EnqueueFillBufferCmdTests, PipelineSelect) {
256256
enqueueFillBuffer<FamilyType>();
257257
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
258258
EXPECT_EQ(1, numCommands);
@@ -263,7 +263,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, MediaVFEState) {
263263
validateMediaVFEState<FamilyType>(&pDevice->getHardwareInfo(), cmdMediaVfeState, cmdList, itorMediaVfeState);
264264
}
265265

266-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, argumentZeroShouldMatchDestAddress) {
266+
HWTEST_F(EnqueueFillBufferCmdTests, argumentZeroShouldMatchDestAddress) {
267267
auto patternAllocation = context.getMemoryManager()->allocateGraphicsMemory(EnqueueFillBufferTraits::patternSize);
268268

269269
enqueueFillBuffer<FamilyType>();
@@ -299,7 +299,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, argumentZeroShouldMatchDe
299299
// This test case should be re-enabled once getStatelessArgumentPointer gets support for SVM pointers.
300300
// This could happen if KernelInfo.kernelArgInfo was accessible given a Kernel. Just need an offset
301301
// into CrossThreadData.
302-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, DISABLED_argumentOneShouldMatchOffset) {
302+
HWTEST_F(EnqueueFillBufferCmdTests, DISABLED_argumentOneShouldMatchOffset) {
303303
auto patternAllocation = context.getMemoryManager()->allocateGraphicsMemory(EnqueueFillBufferTraits::patternSize);
304304

305305
enqueueFillBuffer<FamilyType>();
@@ -332,7 +332,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, DISABLED_argumentOneShoul
332332
context.getMemoryManager()->freeGraphicsMemory(patternAllocation);
333333
}
334334

335-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillBufferCmdTests, argumentTwoShouldMatchPatternPtr) {
335+
HWTEST_F(EnqueueFillBufferCmdTests, argumentTwoShouldMatchPatternPtr) {
336336
auto patternAllocation = context.getMemoryManager()->allocateGraphicsMemory(EnqueueFillBufferTraits::patternSize);
337337

338338
enqueueFillBuffer<FamilyType>();

‎unit_tests/command_queue/enqueue_fill_image_tests.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ HWTEST_F(EnqueueFillImageTest, addsIndirectData) {
9393
EXPECT_NE(sshBefore, pSSH->getUsed());
9494
}
9595

96-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillImageTest, loadRegisterImmediateL3CNTLREG) {
96+
HWTEST_F(EnqueueFillImageTest, loadRegisterImmediateL3CNTLREG) {
9797
enqueueFillImage<FamilyType>();
9898
validateL3Programming<FamilyType>(cmdList, itorWalker);
9999
}
@@ -157,7 +157,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillImageTest, interfaceDescriptorData) {
157157
EXPECT_NE(kernelStartPointer, interfaceDescriptorData.getBindingTablePointer());
158158
}
159159

160-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillImageTest, surfaceState) {
160+
HWTEST_F(EnqueueFillImageTest, surfaceState) {
161161
typedef typename FamilyType::RENDER_SURFACE_STATE RENDER_SURFACE_STATE;
162162

163163
enqueueFillImage<FamilyType>();
@@ -175,7 +175,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillImageTest, surfaceState) {
175175
EXPECT_EQ(reinterpret_cast<uint64_t>(image->getCpuAddress()), srcSurfaceState.getSurfaceBaseAddress());
176176
}
177177

178-
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueFillImageTest, pipelineSelect) {
178+
HWTEST_F(EnqueueFillImageTest, pipelineSelect) {
179179
enqueueFillImage<FamilyType>();
180180
int numCommands = getNumberOfPipelineSelectsThatEnablePipelineSelect<FamilyType>();
181181
EXPECT_EQ(1, numCommands);

0 commit comments

Comments
 (0)