From 425fd9bf7428ccc96fde40184577073616f34a4e Mon Sep 17 00:00:00 2001 From: Adam Cetnerowski Date: Tue, 28 Apr 2020 13:40:41 +0200 Subject: [PATCH] ULT renaming: Multiple Kernel Arg tests Related-To: NEO-2236 Change-Id: I53f4dca19c38475cebe1611a337ccd8571474835 Signed-off-by: Adam Cetnerowski --- .../unit_test/kernel/kernel_arg_pipe_tests.cpp | 18 +++++++++--------- .../unit_test/kernel/kernel_arg_svm_tests.cpp | 18 +++++++++--------- .../kernel/kernel_image_arg_tests.cpp | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp index cb717a5499..f3e96fd696 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp @@ -83,7 +83,7 @@ class KernelArgPipeFixture : public ContextFixture, public DeviceFixture { typedef Test KernelArgPipeTest; -TEST_F(KernelArgPipeTest, SetKernelArgValidPipe) { +TEST_F(KernelArgPipeTest, GivenValidPipeWhenSettingKernelArgThenPipeAddressIsCorrect) { Pipe *pipe = new MockPipe(pContext); auto val = (cl_mem)pipe; @@ -99,7 +99,7 @@ TEST_F(KernelArgPipeTest, SetKernelArgValidPipe) { delete pipe; } -TEST_F(KernelArgPipeTest, SetKernelArgValidSvmPtrStateless) { +TEST_F(KernelArgPipeTest, GivenSvmPtrStatelessWhenSettingKernelArgThenArgumentsAreSetCorrectly) { Pipe *pipe = new MockPipe(pContext); auto val = (cl_mem)pipe; @@ -116,7 +116,7 @@ TEST_F(KernelArgPipeTest, SetKernelArgValidSvmPtrStateless) { delete pipe; } -HWTEST_F(KernelArgPipeTest, SetKernelArgValidSvmPtrStateful) { +HWTEST_F(KernelArgPipeTest, GivenSvmPtrStatefulWhenSettingKernelArgThenArgumentsAreSetCorrectly) { Pipe *pipe = new MockPipe(pContext); auto val = (cl_mem)pipe; @@ -141,7 +141,7 @@ HWTEST_F(KernelArgPipeTest, SetKernelArgValidSvmPtrStateful) { delete pipe; } -TEST_F(KernelArgPipeTest, SetKernelArgFakePipe) { +TEST_F(KernelArgPipeTest, GivenInvalidPipeWhenSettingKernelArgThenInvalidMemObjectErrorIsReturned) { char *ptr = new char[sizeof(Pipe)]; auto val = (cl_mem *)ptr; @@ -152,7 +152,7 @@ TEST_F(KernelArgPipeTest, SetKernelArgFakePipe) { delete[] ptr; } -TEST_F(KernelArgPipeTest, SetKernelArgBufferAsPipe) { +TEST_F(KernelArgPipeTest, GivenBufferWhenSettingKernelArgThenInvalidArgValueErrorIsReturned) { Buffer *buffer = new MockBuffer(); auto val = (cl_mem)buffer; @@ -163,7 +163,7 @@ TEST_F(KernelArgPipeTest, SetKernelArgBufferAsPipe) { delete buffer; } -TEST_F(KernelArgPipeTest, SetKernelArgPipeFromDifferentContext) { +TEST_F(KernelArgPipeTest, GivenPipeFromDifferentContextWhenSettingKernelArgThenInvalidMemObjectErrorIsReturned) { Pipe *pipe = new MockPipe(pContext); Context *oldContext = &pKernel->getContext(); MockContext newContext; @@ -179,7 +179,7 @@ TEST_F(KernelArgPipeTest, SetKernelArgPipeFromDifferentContext) { delete pipe; } -TEST_F(KernelArgPipeTest, SetKernelArgInvalidSize) { +TEST_F(KernelArgPipeTest, GivenInvalidSizeWhenSettingKernelArgThenInvalidArgSizeErrorIsReturned) { Pipe *pipe = new MockPipe(pContext); auto val = (cl_mem *)pipe; @@ -190,14 +190,14 @@ TEST_F(KernelArgPipeTest, SetKernelArgInvalidSize) { delete pipe; } -TEST_F(KernelArgPipeTest, SetKernelArgPtrToNull) { +TEST_F(KernelArgPipeTest, GivenPtrToNullWhenSettingKernelArgThenInvalidMemObjectErrorIsReturned) { auto val = (cl_mem *)nullptr; auto pVal = &val; auto retVal = this->pKernel->setArg(0, sizeof(cl_mem *), pVal); EXPECT_EQ(CL_INVALID_MEM_OBJECT, retVal); } -TEST_F(KernelArgPipeTest, SetKernelArgNull) { +TEST_F(KernelArgPipeTest, GivenNullWhenSettingKernelArgThenInvalidMemObjectErrorIsReturned) { auto pVal = nullptr; auto retVal = this->pKernel->setArg(0, sizeof(cl_mem *), pVal); EXPECT_EQ(CL_INVALID_MEM_OBJECT, retVal); diff --git a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp index fa4ce90038..2f457d03ae 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp @@ -80,7 +80,7 @@ class KernelArgSvmFixture_ : public ContextFixture, public DeviceFixture { typedef Test KernelArgSvmTest; -TEST_F(KernelArgSvmTest, SetKernelArgValidSvmPtr) { +TEST_F(KernelArgSvmTest, GivenValidSvmPtrWhenSettingKernelArgThenSvmPtrIsCorrect) { char *svmPtr = new char[256]; auto retVal = pKernel->setArgSvm(0, 256, svmPtr, nullptr, 0u); @@ -93,7 +93,7 @@ TEST_F(KernelArgSvmTest, SetKernelArgValidSvmPtr) { delete[] svmPtr; } -TEST_F(KernelArgSvmTest, SetKernelArgValidSvmPtrStateless) { +TEST_F(KernelArgSvmTest, GivenSvmPtrStatelessWhenSettingKernelArgThenArgumentsAreSetCorrectly) { char *svmPtr = new char[256]; pKernelInfo->usesSsh = false; @@ -107,7 +107,7 @@ TEST_F(KernelArgSvmTest, SetKernelArgValidSvmPtrStateless) { delete[] svmPtr; } -HWTEST_F(KernelArgSvmTest, SetKernelArgValidSvmPtrStateful) { +HWTEST_F(KernelArgSvmTest, GivenSvmPtrStatefulWhenSettingKernelArgThenArgumentsAreSetCorrectly) { char *svmPtr = new char[256]; pKernelInfo->usesSsh = true; @@ -129,7 +129,7 @@ HWTEST_F(KernelArgSvmTest, SetKernelArgValidSvmPtrStateful) { delete[] svmPtr; } -TEST_F(KernelArgSvmTest, SetKernelArgValidSvmAlloc) { +TEST_F(KernelArgSvmTest, GivenValidSvmAllocWhenSettingKernelArgThenArgumentsAreSetCorrectly) { char *svmPtr = new char[256]; MockGraphicsAllocation svmAlloc(svmPtr, 256); @@ -144,7 +144,7 @@ TEST_F(KernelArgSvmTest, SetKernelArgValidSvmAlloc) { delete[] svmPtr; } -TEST_F(KernelArgSvmTest, SetKernelArgValidSvmAllocStateless) { +TEST_F(KernelArgSvmTest, GivenValidSvmAllocStatelessWhenSettingKernelArgThenArgumentsAreSetCorrectly) { char *svmPtr = new char[256]; MockGraphicsAllocation svmAlloc(svmPtr, 256); @@ -160,7 +160,7 @@ TEST_F(KernelArgSvmTest, SetKernelArgValidSvmAllocStateless) { delete[] svmPtr; } -HWTEST_F(KernelArgSvmTest, SetKernelArgValidSvmAllocStateful) { +HWTEST_F(KernelArgSvmTest, GivenValidSvmAllocStatefulWhenSettingKernelArgThenArgumentsAreSetCorrectly) { char *svmPtr = new char[256]; MockGraphicsAllocation svmAlloc(svmPtr, 256); @@ -225,12 +225,12 @@ HWTEST_F(KernelArgSvmTest, givenDeviceSupportingSharedSystemAllocationsWhenSetAr EXPECT_EQ(16384u, surfaceState->getHeight()); } -TEST_F(KernelArgSvmTest, SetKernelArgImmediateInvalidArgValue) { +TEST_F(KernelArgSvmTest, WhenSettingKernelArgImmediateThenInvalidArgValueErrorIsReturned) { auto retVal = pKernel->setArgImmediate(0, 256, nullptr); EXPECT_EQ(CL_INVALID_ARG_VALUE, retVal); } -HWTEST_F(KernelArgSvmTest, PatchWithImplicitSurface) { +HWTEST_F(KernelArgSvmTest, WhenPatchingWithImplicitSurfaceThenPatchIsApplied) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; constexpr size_t rendSurfSize = sizeof(RENDER_SURFACE_STATE); @@ -284,7 +284,7 @@ HWTEST_F(KernelArgSvmTest, PatchWithImplicitSurface) { } } -TEST_F(KernelArgSvmTest, patchBufferOffset) { +TEST_F(KernelArgSvmTest, WhenPatchingBufferOffsetThenPatchIsApplied) { std::vector svmPtr; svmPtr.resize(256); diff --git a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp index 27b52c7572..a5ee0058f9 100644 --- a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp @@ -25,7 +25,7 @@ using namespace NEO; -TEST_F(KernelImageArgTest, GIVENkernelWithImageArgsWHENcheckDifferentScenariosTHENproperBehaviour) { +TEST_F(KernelImageArgTest, GivenKernelWithImageArgsWhenCheckingDifferentScenariosThenBehaviourIsCorrect) { size_t imageWidth = image->getImageDesc().image_width; size_t imageHeight = image->getImageDesc().image_height; size_t imageDepth = image->getImageDesc().image_depth;