diff --git a/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp b/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp index 38e22998e2..91e83ca15f 100644 --- a/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp +++ b/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp @@ -27,7 +27,7 @@ class MediaImageSetArgTest : public ClDeviceFixture, protected: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = new MockContext(pClDevice); pKernelInfo = std::make_unique(); @@ -63,7 +63,7 @@ class MediaImageSetArgTest : public ClDeviceFixture, delete pMultiDeviceKernel; program.reset(); delete context; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/api/cl_api_tests.cpp b/opencl/test/unit_test/api/cl_api_tests.cpp index f9b29a5021..4f199eab7a 100644 --- a/opencl/test/unit_test/api/cl_api_tests.cpp +++ b/opencl/test/unit_test/api/cl_api_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,7 +19,7 @@ void CL_CALLBACK notifyFuncProgram( void *userData) { *((char *)userData) = 'a'; } -void api_fixture_using_aligned_memory_manager::SetUp() { +void ApiFixtureUsingAlignedMemoryManager::setUp() { retVal = CL_SUCCESS; retSize = 0; @@ -39,7 +39,7 @@ void api_fixture_using_aligned_memory_manager::SetUp() { ASSERT_NE(nullptr, kernel); } -void api_fixture_using_aligned_memory_manager::TearDown() { +void ApiFixtureUsingAlignedMemoryManager::tearDown() { delete kernel; delete commandQueue; context->release(); diff --git a/opencl/test/unit_test/api/cl_api_tests.h b/opencl/test/unit_test/api/cl_api_tests.h index 60de68b6d1..6911450e92 100644 --- a/opencl/test/unit_test/api/cl_api_tests.h +++ b/opencl/test/unit_test/api/cl_api_tests.h @@ -28,7 +28,7 @@ namespace NEO { template struct ApiFixture { - virtual void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { DebugManager.flags.CreateMultipleRootDevices.set(numRootDevices); executionEnvironment = new ClExecutionEnvironment(); prepareDeviceEnvironments(*executionEnvironment); @@ -56,7 +56,7 @@ struct ApiFixture { ASSERT_NE(nullptr, pKernel); } - virtual void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { pMultiDeviceKernel->release(); pCommandQueue->release(); pContext->release(); @@ -95,17 +95,17 @@ struct ApiFixture { struct api_tests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } }; -struct api_fixture_using_aligned_memory_manager { +struct ApiFixtureUsingAlignedMemoryManager { public: - virtual void SetUp(); // NOLINT(readability-identifier-naming) - virtual void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); cl_int retVal; size_t retSize; @@ -117,7 +117,7 @@ struct api_fixture_using_aligned_memory_manager { MockClDevice *device; }; -using api_test_using_aligned_memory_manager = TestLegacy; +using api_test_using_aligned_memory_manager = Test; void CL_CALLBACK notifyFuncProgram( cl_program program, diff --git a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp index 1d94b5c178..8ecf2eab6b 100644 --- a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp @@ -26,11 +26,11 @@ namespace ClCreateBufferTests { class ClCreateBufferTemplateTests : public ApiFixture<>, public testing::TestWithParam { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp index f060d1670b..1c89200e3c 100644 --- a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp @@ -34,11 +34,11 @@ struct CommandQueueWithPropertiesTest : public ApiFixture<>, void SetUp() override { std::tie(commandQueueProperties, queueSize, queuePriority, queueThrottle) = GetParam(); - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_command_queue_properties commandQueueProperties = 0; @@ -56,11 +56,11 @@ struct clCreateCommandQueueWithPropertiesApi : public ApiFixture<>, void SetUp() override { platformsImpl->clear(); MemoryManagementFixture::setUp(); - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); MemoryManagementFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl b/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl index 46f107b5f2..56fcc03aae 100644 --- a/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl +++ b/opencl/test/unit_test/api/cl_create_context_from_type_tests.inl @@ -12,7 +12,7 @@ using namespace NEO; -struct clCreateContextFromTypeTests : TestLegacy { +struct clCreateContextFromTypeTests : Test { cl_int retVal = CL_DEVICE_NOT_AVAILABLE; }; diff --git a/opencl/test/unit_test/api/cl_create_image_tests.cpp b/opencl/test/unit_test/api/cl_create_image_tests.cpp index 2feb9c53ce..a7183d5e0b 100644 --- a/opencl/test/unit_test/api/cl_create_image_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_image_tests.cpp @@ -28,7 +28,7 @@ struct clCreateImageTests : public ApiFixture<>, public T { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_RGBA; @@ -48,7 +48,7 @@ struct clCreateImageTests : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl b/opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl index cf297924b7..ecc54136e2 100644 --- a/opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_create_perf_counters_command_queue_tests.inl @@ -20,8 +20,8 @@ struct clCreatePerfCountersCommandQueueINTELTests : public DeviceInstrumentation public PerformanceCountersDeviceFixture, ::testing::Test { void SetUp() override { - PerformanceCountersDeviceFixture::SetUp(); - DeviceInstrumentationFixture::SetUp(true); + PerformanceCountersDeviceFixture::setUp(); + DeviceInstrumentationFixture::setUp(true); deviceId = device.get(); retVal = CL_SUCCESS; @@ -29,7 +29,7 @@ struct clCreatePerfCountersCommandQueueINTELTests : public DeviceInstrumentation nullptr, nullptr, retVal)); } void TearDown() override { - PerformanceCountersDeviceFixture::TearDown(); + PerformanceCountersDeviceFixture::tearDown(); } std::unique_ptr context; diff --git a/opencl/test/unit_test/api/cl_create_pipe_tests.inl b/opencl/test/unit_test/api/cl_create_pipe_tests.inl index 06cd17dde5..bfaf5efc6e 100644 --- a/opencl/test/unit_test/api/cl_create_pipe_tests.inl +++ b/opencl/test/unit_test/api/cl_create_pipe_tests.inl @@ -25,20 +25,20 @@ namespace ClCreatePipeTests { class ClCreatePipeWithParamTests : public ApiFixture<>, public testing::TestWithParam { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } VariableBackup supportsPipesBackup{&defaultHwInfo->capabilityTable.supportsPipes, true}; }; class ClCreatePipeWithParamNegativeTests : public ApiFixture<>, public testing::TestWithParam { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } VariableBackup supportsPipesBackup{&defaultHwInfo->capabilityTable.supportsPipes, true}; }; diff --git a/opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl b/opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl index d8a39690a5..7d96583c27 100644 --- a/opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl +++ b/opencl/test/unit_test/api/cl_create_sampler_with_properties_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,11 +23,11 @@ struct SamplerWithPropertiesTest : public ApiFixture<>, void SetUp() override { std::tie(NormalizdProperties, AddressingProperties, FilterProperties) = GetParam(); - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_sampler_properties NormalizdProperties = 0; diff --git a/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl b/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl index 0106a9f058..57af50f6fc 100644 --- a/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl @@ -17,7 +17,7 @@ template class ClCreateSubBufferTemplateTests : public ApiFixture<>, public testing::TestWithParam { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); cl_mem_flags flg = parentFlags; void *ptr = nullptr; @@ -33,7 +33,7 @@ class ClCreateSubBufferTemplateTests : public ApiFixture<>, void TearDown() override { clReleaseMemObject(buffer); - ApiFixture::TearDown(); + ApiFixture::tearDown(); } protected: @@ -113,7 +113,7 @@ class ClCreateSubBufferTests : public api_tests { void TearDown() override { clReleaseMemObject(buffer); - ApiFixture::TearDown(); + ApiFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl index 8967884daa..63d73d50da 100644 --- a/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,10 +16,10 @@ using namespace NEO; struct clEnqueueCopyBufferRectTests : public ApiFixture<0>, ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl index 1f59c24a73..db2a329ac6 100644 --- a/opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_to_image_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,7 +21,7 @@ namespace ULT { struct clEnqueueCopyBufferToImageTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_YUYV_INTEL; @@ -41,7 +41,7 @@ struct clEnqueueCopyBufferToImageTests : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl index 77a62b366c..95c50ab720 100644 --- a/opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,7 +22,7 @@ namespace ULT { struct clEnqueueCopyImageTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_YUYV_INTEL; @@ -42,7 +42,7 @@ struct clEnqueueCopyImageTests : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl index 5ea28cbbc0..37d416c7b5 100644 --- a/opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_copy_image_to_buffer_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,7 +20,7 @@ namespace ULT { struct clEnqueueCopyImageToBufferTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_YUYV_INTEL; @@ -40,7 +40,7 @@ struct clEnqueueCopyImageToBufferTests : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl index f13c035804..65ae40a97b 100644 --- a/opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_map_buffer_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -140,7 +140,7 @@ class EnqueueMapBufferFlagsTest : public ApiFixture<>, protected: void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); buffer_flags = GetParam(); unsigned int bufferSize = 16; @@ -161,7 +161,7 @@ class EnqueueMapBufferFlagsTest : public ApiFixture<>, retVal = clReleaseMemObject(buffer); EXPECT_EQ(CL_SUCCESS, retVal); delete[] pHostMem; - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl index 9ae11ea4b3..939b3ac212 100644 --- a/opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_map_image_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,7 +20,7 @@ struct clEnqueueMapImageTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_RGBA; @@ -40,7 +40,7 @@ struct clEnqueueMapImageTests : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; @@ -106,7 +106,7 @@ struct clEnqueueMapImageYUVTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_YUYV_INTEL; @@ -126,7 +126,7 @@ struct clEnqueueMapImageYUVTests : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl index 851915009a..a9c55f4876 100644 --- a/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -273,7 +273,7 @@ class EnqueueReadBufferRectFlagsTest : public ApiFixture<>, protected: void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); buffer_flags = GetParam(); unsigned int bufferSize = 16; @@ -294,7 +294,7 @@ class EnqueueReadBufferRectFlagsTest : public ApiFixture<>, retVal = clReleaseMemObject(buffer); EXPECT_EQ(CL_SUCCESS, retVal); delete[] pHostMem; - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl index 8487802add..220520704c 100644 --- a/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -76,7 +76,7 @@ class EnqueueReadBufferFlagsTest : public ApiFixture<>, public testing::TestWithParam { protected: void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); buffer_flags = GetParam(); unsigned int bufferSize = 16; @@ -97,7 +97,7 @@ class EnqueueReadBufferFlagsTest : public ApiFixture<>, retVal = clReleaseMemObject(buffer); EXPECT_EQ(CL_SUCCESS, retVal); delete[] pHostMem; - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/api/cl_enqueue_read_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_image_tests.inl index 86290df81f..25f50531b6 100644 --- a/opencl/test/unit_test/api/cl_enqueue_read_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_read_image_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,7 +21,7 @@ namespace ULT { struct clEnqueueReadImageTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_YUYV_INTEL; @@ -41,7 +41,7 @@ struct clEnqueueReadImageTests : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_enqueue_write_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_write_image_tests.inl index 392505da93..fa53d54cf4 100644 --- a/opencl/test/unit_test/api/cl_enqueue_write_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_write_image_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,7 +21,7 @@ namespace ULT { struct clEnqueueWriteImageTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_YUYV_INTEL; @@ -41,7 +41,7 @@ struct clEnqueueWriteImageTests : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl index b284570034..08ecf7ce28 100644 --- a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl +++ b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl @@ -15,7 +15,7 @@ using namespace NEO; -using clGetDeviceIDsTests = TestLegacy; +using clGetDeviceIDsTests = Test; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_get_device_info_tests.inl b/opencl/test/unit_test/api/cl_get_device_info_tests.inl index 3444b606b2..8e7e18955d 100644 --- a/opencl/test/unit_test/api/cl_get_device_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_device_info_tests.inl @@ -364,11 +364,11 @@ struct GetDeviceInfoP : public ApiFixture<>, public ::testing::TestWithParam { void SetUp() override { param = GetParam(); - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_device_info param; diff --git a/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl b/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl index 4ee6a1bec3..3f2790d041 100644 --- a/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl @@ -22,11 +22,11 @@ template class EventFixture : public ApiFixture<>, public T { public: void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } }; @@ -274,8 +274,8 @@ class ClEventProfilingWithPerfCountersTests : public DeviceInstrumentationFixtur public ::testing::Test { public: void SetUp() override { - PerformanceCountersDeviceFixture::SetUp(); - DeviceInstrumentationFixture::SetUp(true); + PerformanceCountersDeviceFixture::setUp(); + DeviceInstrumentationFixture::setUp(true); cl_device_id deviceId = device.get(); cl_int retVal = CL_SUCCESS; @@ -291,7 +291,7 @@ class ClEventProfilingWithPerfCountersTests : public DeviceInstrumentationFixtur } void TearDown() override { - PerformanceCountersDeviceFixture::TearDown(); + PerformanceCountersDeviceFixture::tearDown(); } std::unique_ptr context; diff --git a/opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl b/opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl index ff84d7b75c..345871e701 100644 --- a/opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl +++ b/opencl/test/unit_test/api/cl_get_extension_function_address_for_platform_tests.inl @@ -11,7 +11,7 @@ using namespace NEO; -using clGetExtensionFunctionAddressForPlatformTests = TestLegacy; +using clGetExtensionFunctionAddressForPlatformTests = Test; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_get_image_info_tests.inl b/opencl/test/unit_test/api/cl_get_image_info_tests.inl index 2706aef4d3..4e09069cb1 100644 --- a/opencl/test/unit_test/api/cl_get_image_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_image_info_tests.inl @@ -18,7 +18,7 @@ struct clGetImageInfoTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); imageFormat.image_channel_order = CL_RGBA; imageFormat.image_channel_data_type = CL_UNORM_INT8; @@ -44,7 +44,7 @@ struct clGetImageInfoTests : public ApiFixture<>, retVal = clReleaseMemObject(image); EXPECT_EQ(CL_SUCCESS, retVal); - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_get_image_params_tests.inl b/opencl/test/unit_test/api/cl_get_image_params_tests.inl index 2b9306d463..8fb8c4e2bf 100644 --- a/opencl/test/unit_test/api/cl_get_image_params_tests.inl +++ b/opencl/test/unit_test/api/cl_get_image_params_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,7 +21,7 @@ struct clGetImageParams : public ApiFixture<>, public T { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_RGBA; @@ -41,7 +41,7 @@ struct clGetImageParams : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl index 14a21b9e66..d66363573a 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_khr_tests.inl @@ -12,16 +12,16 @@ using namespace NEO; struct KernelSubGroupInfoKhrFixture : HelloWorldFixture { typedef HelloWorldFixture ParentClass; - void SetUp() override { - ParentClass::SetUp(); + void setUp() { + ParentClass::setUp(); MaxSimdSize = static_cast(pKernel->getKernelInfo().getMaxSimdSize()); ASSERT_GE(MaxSimdSize, 8u); MaxWorkDim = static_cast(pClDevice->getDeviceInfo().maxWorkItemDimensions); ASSERT_EQ(MaxWorkDim, 3u); } - void TearDown() override { - ParentClass::TearDown(); + void tearDown() { + ParentClass::tearDown(); } size_t inputValue[3]; @@ -34,17 +34,17 @@ struct KernelSubGroupInfoKhrFixture : HelloWorldFixture KernelSubGroupInfoKhrTest; +typedef Test KernelSubGroupInfoKhrTest; template struct KernelSubGroupInfoKhrParamFixture : KernelSubGroupInfoKhrFixture, ::testing::TestWithParam { void SetUp() override { - KernelSubGroupInfoKhrFixture::SetUp(); + KernelSubGroupInfoKhrFixture::setUp(); } void TearDown() override { - KernelSubGroupInfoKhrFixture::TearDown(); + KernelSubGroupInfoKhrFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl index b2bfead795..fb88b74c78 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_sub_group_info_tests.inl @@ -13,8 +13,8 @@ using namespace NEO; struct KernelSubGroupInfoFixture : HelloWorldFixture { typedef HelloWorldFixture ParentClass; - void SetUp() override { - ParentClass::SetUp(); + void setUp() { + ParentClass::setUp(); pKernel->maxKernelWorkGroupSize = static_cast(pDevice->getDeviceInfo().maxWorkGroupSize / 2); maxSimdSize = static_cast(pKernel->getKernelInfo().getMaxSimdSize()); ASSERT_LE(8u, maxSimdSize); @@ -35,8 +35,8 @@ struct KernelSubGroupInfoFixture : HelloWorldFixture { } } - void TearDown() override { - ParentClass::TearDown(); + void tearDown() { + ParentClass::tearDown(); } size_t inputValue[3]; @@ -51,17 +51,17 @@ struct KernelSubGroupInfoFixture : HelloWorldFixture { namespace ULT { -typedef TestLegacy KernelSubGroupInfoTest; +typedef Test KernelSubGroupInfoTest; template struct KernelSubGroupInfoParamFixture : KernelSubGroupInfoFixture, ::testing::TestWithParam { void SetUp() override { - KernelSubGroupInfoFixture::SetUp(); + KernelSubGroupInfoFixture::setUp(); } void TearDown() override { - KernelSubGroupInfoFixture::TearDown(); + KernelSubGroupInfoFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl index a9500b2980..3509ca968a 100644 --- a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl @@ -12,14 +12,14 @@ using namespace NEO; -struct clGetPlatformInfoTests : TestLegacy { +struct clGetPlatformInfoTests : Test { void SetUp() override { - TestLegacy::SetUp(); + Test::SetUp(); } void TearDown() override { delete[] paramValue; - TestLegacy::TearDown(); + Test::TearDown(); } char *getPlatformInfoString(Platform *pPlatform, cl_platform_info paramName) { @@ -213,7 +213,7 @@ TEST_F(clGetPlatformInfoTests, WhenCheckingPlatformExtensionsWithVersionThenThey class GetPlatformInfoTests : public PlatformFixture, public testing::TestWithParam { - using PlatformFixture::SetUp; + using PlatformFixture::setUp; public: GetPlatformInfoTests() {} @@ -221,11 +221,11 @@ class GetPlatformInfoTests : public PlatformFixture, protected: void SetUp() override { platformInfo = GetParam(); - PlatformFixture::SetUp(); + PlatformFixture::setUp(); } void TearDown() override { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } char *getPlatformInfoString(Platform *pPlatform, cl_platform_info paramName) { diff --git a/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl index 81a39194b2..ebc30d59d3 100644 --- a/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl +++ b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl @@ -12,7 +12,7 @@ using namespace NEO; -using clIcdGetPlatformIDsKHRTests = TestLegacy; +using clIcdGetPlatformIDsKHRTests = Test; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp index 12f22b3b21..a909f2d82d 100644 --- a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp @@ -56,7 +56,7 @@ const size_t n = 512; [[maybe_unused]] const cl_mem_properties_intel propertiesUncacheable[] = {CL_MEM_FLAGS_INTEL, CL_MEM_LOCALLY_UNCACHED_RESOURCE, 0}; [[maybe_unused]] const cl_mem_properties_intel propertiesUncacheableInSurfaceState[] = {CL_MEM_FLAGS_INTEL, CL_MEM_LOCALLY_UNCACHED_SURFACE_STATE_RESOURCE, 0}; -using clMemLocallyUncachedResourceFixture = TestLegacy>; +using clMemLocallyUncachedResourceFixture = Test>; HWCMDTEST_F(IGFX_GEN8_CORE, clMemLocallyUncachedResourceFixture, GivenAtLeastOneLocallyUncacheableResourceWhenSettingKernelArgumentsThenKernelIsUncacheable) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/api/cl_release_event_tests.inl b/opencl/test/unit_test/api/cl_release_event_tests.inl index a77e62152a..67fefca709 100644 --- a/opencl/test/unit_test/api/cl_release_event_tests.inl +++ b/opencl/test/unit_test/api/cl_release_event_tests.inl @@ -19,11 +19,11 @@ template class EventFixture : public ApiFixture<>, public T { public: void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl b/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl index cecbdbd475..073df49e08 100644 --- a/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl @@ -18,10 +18,10 @@ class ClRetainReleaseCommandQueueTests : public ApiFixture<>, public ::testing::Test { public: void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_command_queue createClQueue() { diff --git a/opencl/test/unit_test/api/cl_retain_release_device_tests.inl b/opencl/test/unit_test/api/cl_retain_release_device_tests.inl index 375acacf85..e818b6b324 100644 --- a/opencl/test/unit_test/api/cl_retain_release_device_tests.inl +++ b/opencl/test/unit_test/api/cl_retain_release_device_tests.inl @@ -11,10 +11,10 @@ using namespace NEO; -struct clRetainReleaseDeviceTests : TestLegacy { +struct clRetainReleaseDeviceTests : Test { void SetUp() override { DebugManager.flags.CreateMultipleRootDevices.set(maxRootDeviceCount); - TestLegacy::SetUp(); + Test::SetUp(); } DebugManagerStateRestore restorer; const uint32_t rootDeviceIndex = 1u; diff --git a/opencl/test/unit_test/api/cl_set_event_callback_tests.inl b/opencl/test/unit_test/api/cl_set_event_callback_tests.inl index d34f1a389e..d1121fde75 100644 --- a/opencl/test/unit_test/api/cl_set_event_callback_tests.inl +++ b/opencl/test/unit_test/api/cl_set_event_callback_tests.inl @@ -27,13 +27,13 @@ class ClSetEventCallbackTests : public ApiFixture<>, void SetUp() override { dbgRestore.reset(new DebugManagerStateRestore()); DebugManager.flags.EnableAsyncEventsHandler.set(false); - ApiFixture::SetUp(); + ApiFixture::setUp(); cbInvoked = 0; cbData = nullptr; } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } std::unique_ptr dbgRestore; diff --git a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl index 6d9a114709..264536f944 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl @@ -20,8 +20,8 @@ using namespace NEO; class KernelArgSvmApiFixture : public ApiFixture<> { protected: - void SetUp() override { - ApiFixture::SetUp(); + void setUp() { + ApiFixture::setUp(); REQUIRE_SVM_OR_SKIP(defaultHwInfo); pKernelInfo = std::make_unique(); @@ -39,12 +39,12 @@ class KernelArgSvmApiFixture : public ApiFixture<> { pMockKernel->setCrossThreadData(pCrossThreadData, sizeof(pCrossThreadData)); } - void TearDown() override { + void tearDown() { if (pMockMultiDeviceKernel) { delete pMockMultiDeviceKernel; } - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -55,7 +55,7 @@ class KernelArgSvmApiFixture : public ApiFixture<> { char pCrossThreadData[64]{}; }; -typedef TestLegacy clSetKernelArgSVMPointerTests; +typedef Test clSetKernelArgSVMPointerTests; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl index 7a52366375..447669deea 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl @@ -17,8 +17,8 @@ using namespace NEO; class KernelExecInfoFixture : public ApiFixture<> { protected: - void SetUp() override { - ApiFixture::SetUp(); + void setUp() { + ApiFixture::setUp(); pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 1; @@ -33,7 +33,7 @@ class KernelExecInfoFixture : public ApiFixture<> { } } - void TearDown() override { + void tearDown() { if (svmCapabilities != 0) { clSVMFree(pContext, ptrSvm); } @@ -42,7 +42,7 @@ class KernelExecInfoFixture : public ApiFixture<> { delete pMockMultiDeviceKernel; } - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -53,7 +53,7 @@ class KernelExecInfoFixture : public ApiFixture<> { cl_device_svm_capabilities svmCapabilities = 0; }; -typedef TestLegacy clSetKernelExecInfoTests; +typedef Test clSetKernelExecInfoTests; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests.inl b/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests.inl index 7f71faf3e7..f37f51dcd5 100644 --- a/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests.inl +++ b/opencl/test/unit_test/api/cl_set_mem_object_destructor_callback_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -25,7 +25,7 @@ struct clSetMemObjectDestructorCallbackTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); // clang-format off imageFormat.image_channel_order = CL_RGBA; @@ -47,7 +47,7 @@ struct clSetMemObjectDestructorCallbackTests : public ApiFixture<>, } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl b/opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl index a21108eea8..73a4f7d0f4 100644 --- a/opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl +++ b/opencl/test/unit_test/api/cl_set_performance_configuration_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,11 +16,11 @@ struct clSetPerformanceConfigurationINTELTests : public DeviceInstrumentationFix public PerformanceCountersDeviceFixture, ::testing::Test { void SetUp() override { - PerformanceCountersDeviceFixture::SetUp(); - DeviceInstrumentationFixture::SetUp(true); + PerformanceCountersDeviceFixture::setUp(); + DeviceInstrumentationFixture::setUp(true); } void TearDown() override { - PerformanceCountersDeviceFixture::TearDown(); + PerformanceCountersDeviceFixture::tearDown(); } }; namespace ULT { diff --git a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl index c7916d8a29..08b9d72b40 100644 --- a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl +++ b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl @@ -25,12 +25,12 @@ class ClSvmAllocTemplateTests : public ApiFixture<>, public testing::TestWithParam { public: void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); REQUIRE_SVM_OR_SKIP(pDevice); } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl index eadaea0940..02871dfd89 100644 --- a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl +++ b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl @@ -1002,7 +1002,7 @@ class ClUnifiedSharedMemoryEventTests : public CommandQueueHwFixture, } void TearDown() override { clReleaseEvent(event); - CommandQueueHwFixture::TearDown(); + CommandQueueHwFixture::tearDown(); } cl_event event = nullptr; diff --git a/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp index 6cf0da18e1..2f1763a7d2 100644 --- a/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,10 +20,10 @@ namespace ULT { struct GetDeviceInfoP : public ApiFixture<>, public ::testing::TestWithParam { void SetUp() override { param = GetParam(); - ApiFixture::SetUp(); + ApiFixture::setUp(); } - void TearDown() override { ApiFixture::TearDown(); } + void TearDown() override { ApiFixture::tearDown(); } cl_device_info param; }; diff --git a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp index e1731fe91f..77f32343c3 100644 --- a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp +++ b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp @@ -22,7 +22,7 @@ using namespace NEO; -typedef TestLegacy AubAllocDumpTests; +typedef Test AubAllocDumpTests; struct AubFileStreamMock : public AubMemDump::AubFileStream { void write(const char *data, size_t size) override { diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_enqueue_resource_barrier_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_enqueue_resource_barrier_xehp_and_later.cpp index 5fc31e83f1..6e49750204 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_enqueue_resource_barrier_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_enqueue_resource_barrier_xehp_and_later.cpp @@ -20,7 +20,7 @@ using namespace NEO; -using ResourceBarrierAubTest = TestLegacy>; +using ResourceBarrierAubTest = Test>; struct L3ControlSupportedMatcher { template diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp index 2bcdb412e5..9a0fc238be 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_inline_data_local_id_tests_xehp_and_later.cpp @@ -35,8 +35,8 @@ struct AubDispatchThreadDataFixture : public KernelAUBFixture::SetUp(); + void setUp() { + KernelAUBFixture::setUp(); variablesCount = arrayCount(variables); BufferDefaults::context = context; @@ -54,7 +54,7 @@ struct AubDispatchThreadDataFixture : public KernelAUBFixtureflush(); for (size_t i = 0; i < variablesCount; i++) { @@ -72,7 +72,7 @@ struct AubDispatchThreadDataFixture : public KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } std::unique_ptr debugRestorer; @@ -83,14 +83,14 @@ struct AubDispatchThreadDataFixture : public KernelAUBFixture(); DebugManager.flags.EnablePassInlineData.set(true); initializeKernel3Variables(); initializeKernel4Variables(); - AubDispatchThreadDataFixture::SetUp(); + AubDispatchThreadDataFixture::setUp(); setUpKernel3(); } @@ -128,7 +128,7 @@ struct InlineDataFixture : AubDispatchThreadDataFixture { } }; -using XeHPAndLaterAubInlineDataTest = TestLegacy; +using XeHPAndLaterAubInlineDataTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubInlineDataTest, givenCrossThreadFitIntoSingleGrfWhenInlineDataAllowedThenCopyAllCrossThreadIntoInline) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; @@ -250,13 +250,13 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubInlineDataTest, givenCrossThreadSize } struct HwLocalIdsFixture : AubDispatchThreadDataFixture { - void SetUp() override { + void setUp() { debugRestorer = std::make_unique(); DebugManager.flags.EnableHwGenerationLocalIds.set(1); initializeKernel2Variables(); - AubDispatchThreadDataFixture::SetUp(); + AubDispatchThreadDataFixture::setUp(); if (kernels[2]->getKernelInfo().kernelDescriptor.kernelAttributes.flags.passInlineData) { DebugManager.flags.EnablePassInlineData.set(true); @@ -297,7 +297,7 @@ struct HwLocalIdsFixture : AubDispatchThreadDataFixture { } }; -using XeHPAndLaterAubHwLocalIdsTest = TestLegacy; +using XeHPAndLaterAubHwLocalIdsTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubHwLocalIdsTest, WhenEnqueueDimensionsArePow2ThenSetEmitLocalIdsAndGenerateLocalIdsFields) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; @@ -403,13 +403,13 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubHwLocalIdsTest, givenNonPowOf2LocalW } struct HwLocalIdsWithSubGroups : AubDispatchThreadDataFixture { - void SetUp() override { + void setUp() { debugRestorer = std::make_unique(); DebugManager.flags.EnableHwGenerationLocalIds.set(1); kernelIds |= (1 << 9); variables[0].sizeUserMemory = 16 * KB; - AubDispatchThreadDataFixture::SetUp(); + AubDispatchThreadDataFixture::setUp(); memset(variables[0].destMemory, 0, variables[0].sizeUserMemory); variables[0].expectedMemory = alignedMalloc(variables[0].sizeUserMemory, 4096); @@ -417,7 +417,7 @@ struct HwLocalIdsWithSubGroups : AubDispatchThreadDataFixture { } }; -using XeHPAndLaterAubHwLocalIdsWithSubgroupsTest = TestLegacy; +using XeHPAndLaterAubHwLocalIdsWithSubgroupsTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubHwLocalIdsWithSubgroupsTest, givenKernelUsingSubgroupsWhenLocalIdsAreGeneratedByHwThenValuesAreCorrect) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; @@ -471,4 +471,4 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterAubHwLocalIdsWithSubgroupsTest, givenKe } expectMemory(variables[0].destMemory, variables[0].expectedMemory, ptrDiff(expectedMemory, variables[0].expectedMemory)); -} \ No newline at end of file +} diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp index e09ebe460c..1400b29496 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_multicontext_tests_xehp_and_later.cpp @@ -31,10 +31,10 @@ using namespace NEO; template struct MultitileMulticontextTests : public MulticontextAubFixture, public ::testing::Test { void SetUp() override { - MulticontextAubFixture::SetUp(numberOfTiles, enabledCommandStreamers, false); + MulticontextAubFixture::setUp(numberOfTiles, enabledCommandStreamers, false); } void TearDown() override { - MulticontextAubFixture::TearDown(); + MulticontextAubFixture::tearDown(); } template @@ -230,7 +230,7 @@ struct EnqueueWithWalkerPartitionFourTilesTests : public FourTilesSingleContextT kernelIds |= (1 << 8); FourTilesSingleContextTest::SetUp(); - SimpleKernelFixture::SetUp(rootDevice, context.get()); + SimpleKernelFixture::setUp(rootDevice, context.get()); rootCsr = rootDevice->getDefaultEngine().commandStreamReceiver; EXPECT_EQ(4u, rootCsr->getOsContext().getNumSupportedDevices()); @@ -248,7 +248,7 @@ struct EnqueueWithWalkerPartitionFourTilesTests : public FourTilesSingleContextT } void TearDown() override { - SimpleKernelFixture::TearDown(); + SimpleKernelFixture::tearDown(); FourTilesSingleContextTest::TearDown(); } diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp index e93ffffd6c..2adc64db91 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_one_va_multi_physical_tests_xehp_and_later.cpp @@ -17,10 +17,10 @@ using namespace NEO; struct OneVAFourPhysicalStoragesTest : public MulticontextAubFixture, public ::testing::Test { static const uint32_t numTiles = 4; void SetUp() override { - MulticontextAubFixture::SetUp(numTiles, MulticontextAubFixture::EnabledCommandStreamers::Single, false); + MulticontextAubFixture::setUp(numTiles, MulticontextAubFixture::EnabledCommandStreamers::Single, false); } void TearDown() override { - MulticontextAubFixture::TearDown(); + MulticontextAubFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_postsync_write_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_postsync_write_tests_xehp_and_later.cpp index fd243f1d6e..8fc38a4d8d 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_postsync_write_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_postsync_write_tests_xehp_and_later.cpp @@ -23,12 +23,12 @@ struct PostSyncWriteXeHPTests : public HelloWorldFixture::SetUp(); + HelloWorldFixture::setUp(); EXPECT_TRUE(pCommandStreamReceiver->peekTimestampPacketWriteEnabled()); }; void TearDown() override { - HelloWorldFixture::TearDown(); + HelloWorldFixture::tearDown(); } DebugManagerStateRestore restore; diff --git a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp index fe51e6fe65..03eb5cb71e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/aub_scratch_space_tests_xehp_and_later.cpp @@ -22,12 +22,12 @@ using namespace NEO; struct Gen12AubScratchSpaceForPrivateFixture : public KernelAUBFixture { - void SetUp() override { + void setUp() { debugRestorer = std::make_unique(); kernelIdx = 6; kernelIds |= (1 << kernelIdx); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); arraySize = 32; vectorSize = 2; @@ -86,7 +86,7 @@ struct Gen12AubScratchSpaceForPrivateFixture : public KernelAUBFixturesetArg(4, sizeof(uint32_t), &maxIterations2); } - void TearDown() override { + void tearDown() { pCmdQ->flush(); if (expectedMemory) { @@ -102,7 +102,7 @@ struct Gen12AubScratchSpaceForPrivateFixture : public KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } std::unique_ptr debugRestorer; @@ -127,7 +127,7 @@ struct Gen12AubScratchSpaceForPrivateFixture : public KernelAUBFixture; +using Gen12AubScratchSpaceForPrivateTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, Gen12AubScratchSpaceForPrivateTest, WhenKernelUsesScratchSpaceForPrivateThenExpectCorrectResults) { cl_uint workDim = 1; @@ -156,14 +156,14 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, Gen12AubScratchSpaceForPrivateTest, WhenKernelUsesS class DefaultGrfKernelFixture : public ProgramFixture { public: - using ProgramFixture::SetUp; + using ProgramFixture::setUp; protected: - void SetUp(ClDevice *device, Context *context) { - ProgramFixture::SetUp(); + void setUp(ClDevice *device, Context *context) { + ProgramFixture::setUp(); std::string programName("simple_spill_fill_kernel"); - CreateProgramFromBinary( + createProgramFromBinary( context, context->getDevices(), programName); @@ -182,12 +182,12 @@ class DefaultGrfKernelFixture : public ProgramFixture { &retVal)); } - void TearDown() override { + void tearDown() { if (kernel) { kernel.reset(nullptr); } - ProgramFixture::TearDown(); + ProgramFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -195,10 +195,10 @@ class DefaultGrfKernelFixture : public ProgramFixture { }; struct Gen12AubScratchSpaceForSpillFillFixture : public KernelAUBFixture { - void SetUp() override { + void setUp() { debugRestorer = std::make_unique(); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); arraySize = 32; typeSize = sizeof(cl_int); @@ -252,7 +252,7 @@ struct Gen12AubScratchSpaceForSpillFillFixture : public KernelAUBFixtureflush(); if (expectedMemory) { @@ -272,7 +272,7 @@ struct Gen12AubScratchSpaceForSpillFillFixture : public KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } std::unique_ptr debugRestorer; @@ -297,7 +297,7 @@ struct Gen12AubScratchSpaceForSpillFillFixture : public KernelAUBFixture; +using Gen12AubScratchSpaceForSpillFillTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, Gen12AubScratchSpaceForSpillFillTest, givenSurfaceStateScratchSpaceEnabledWhenKernelUsesScratchForSpillFillThenExpectCorrectResults) { cl_uint workDim = 1; diff --git a/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h b/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h index a829f32eb1..46b68bbf5a 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,15 +19,15 @@ namespace NEO { struct CommandEnqueueAUBFixture : public CommandEnqueueBaseFixture, public AUBCommandStreamFixture { - using AUBCommandStreamFixture::SetUp; - void SetUp() override { - CommandEnqueueBaseFixture::SetUp(cl_command_queue_properties(0)); - AUBCommandStreamFixture::SetUp(pCmdQ); + using AUBCommandStreamFixture::setUp; + void setUp() { + CommandEnqueueBaseFixture::setUp(cl_command_queue_properties(0)); + AUBCommandStreamFixture::setUp(pCmdQ); } - void TearDown() override { - AUBCommandStreamFixture::TearDown(); - CommandEnqueueBaseFixture::TearDown(); + void tearDown() { + AUBCommandStreamFixture::tearDown(); + CommandEnqueueBaseFixture::tearDown(); } }; } // namespace NEO diff --git a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp index fd899e78d4..c46afeca00 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp @@ -52,7 +52,7 @@ struct CompressionXeHPAndLater : public AUBFixture, GTEST_SKIP(); } - AUBFixture::SetUp(defaultHwInfo.get()); + AUBFixture::setUp(defaultHwInfo.get()); auto &ftrTable = device->getHardwareInfo().featureTable; if ((!ftrTable.flags.ftrFlatPhysCCS) || (!ftrTable.flags.ftrLocalMemory && useLocalMemory)) { @@ -61,7 +61,7 @@ struct CompressionXeHPAndLater : public AUBFixture, context->contextType = ContextType::CONTEXT_TYPE_SPECIALIZED; } void TearDown() override { - AUBFixture::TearDown(); + AUBFixture::tearDown(); } std::unique_ptr debugRestorer; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp index c2624179c2..eede25404e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,11 +21,11 @@ struct CopyBufferHw public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp index 1c94d8140f..4d4253236b 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp @@ -22,12 +22,12 @@ struct CopyBufferRectHw public ::testing::TestWithParam> { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); std::tie(srcOrigin0, srcOrigin1, srcOrigin2, dstOrigin0, dstOrigin1, dstOrigin2, copy3D) = GetParam(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } size_t srcOrigin0; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp index 2f905d9eb9..9af93726af 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp @@ -20,14 +20,14 @@ struct AUBCopyImage public ::testing::WithParamInterface>, public ::testing::Test { void SetUp() override { - ImageAubFixture::SetUp(enableBlitter); + ImageAubFixture::setUp(enableBlitter); } void TearDown() override { srcImage.reset(); dstImage.reset(); - ImageAubFixture::TearDown(); + ImageAubFixture::tearDown(); } template diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp index 8b516e7a5c..ee946b3b42 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,11 +22,11 @@ struct FillBufferHw public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp index c690d6d887..e0ddd415e3 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp @@ -80,7 +80,7 @@ struct AubFillImage public ::testing::WithParamInterface>, public ::testing::Test { - using AUBCommandStreamFixture::SetUp; + using AUBCommandStreamFixture::setUp; typedef AUBCommandStreamFixture CommandStreamFixture; @@ -95,8 +95,8 @@ struct AubFillImage //sRGBA and sBGRA support only unorm int8 type GTEST_SKIP(); } - CommandDeviceFixture::SetUp(cl_command_queue_properties(0)); - CommandStreamFixture::SetUp(pCmdQ); + CommandDeviceFixture::setUp(cl_command_queue_properties(0)); + CommandStreamFixture::setUp(pCmdQ); context = std::make_unique(pClDevice); if ((pClDevice->getHardwareInfo().capabilityTable.supportsOcl21Features == false) && (channelOrder == CL_sRGBA || channelOrder == CL_sBGRA)) { @@ -108,8 +108,8 @@ struct AubFillImage image.reset(); context.reset(); - CommandStreamFixture::TearDown(); - CommandDeviceFixture::TearDown(); + CommandStreamFixture::tearDown(); + CommandDeviceFixture::tearDown(); } std::unique_ptr context; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp index 981f795729..5bcc5470fa 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp @@ -51,13 +51,13 @@ struct AUBHelloWorld public ::testing::Test { void SetUp() override { - HelloWorldFixture::SetUp(); + HelloWorldFixture::setUp(); ClHardwareParse::setUp(); } void TearDown() override { ClHardwareParse::tearDown(); - HelloWorldFixture::TearDown(); + HelloWorldFixture::tearDown(); } }; @@ -125,12 +125,12 @@ struct AUBHelloWorldIntegrateTest : public HelloWorldFixtureplatform.eRenderCoreFamily).getMinimalSIMDSize()) { GTEST_SKIP(); } - ParentClass::SetUp(); + ParentClass::setUp(); } void TearDown() override { if (!IsSkipped()) { - ParentClass::TearDown(); + ParentClass::tearDown(); } } @@ -209,16 +209,16 @@ struct AUBSimpleArg public ClHardwareParse, public ::testing::Test { - using SimpleArgKernelFixture::SetUp; + using SimpleArgKernelFixture::setUp; void SetUp() override { - SimpleArgFixture::SetUp(); + SimpleArgFixture::setUp(); ClHardwareParse::setUp(); } void TearDown() override { ClHardwareParse::tearDown(); - SimpleArgFixture::TearDown(); + SimpleArgFixture::tearDown(); } }; @@ -316,12 +316,12 @@ struct AUBSimpleArgIntegrateTest : public SimpleArgFixtureplatform.eRenderCoreFamily).getMinimalSIMDSize()) { GTEST_SKIP(); } - ParentClass::SetUp(); + ParentClass::setUp(); } void TearDown() override { if (!IsSkipped()) { - ParentClass::TearDown(); + ParentClass::tearDown(); } } cl_uint simd; @@ -372,9 +372,9 @@ INSTANTIATE_TEST_CASE_P( } // namespace ULT struct AUBSimpleArgNonUniformFixture : public KernelAUBFixture { - void SetUp() override { + void setUp() { REQUIRE_OCL_21_OR_SKIP(NEO::defaultHwInfo); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); sizeUserMemory = alignUp(typeItems * typeSize, 64); @@ -430,7 +430,7 @@ struct AUBSimpleArgNonUniformFixture : public KernelAUBFixturecapabilityTable.supportsOcl21Features == false) { return; } @@ -446,7 +446,7 @@ struct AUBSimpleArgNonUniformFixture : public KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } unsigned int deviceClVersionSupport; @@ -466,7 +466,7 @@ struct AUBSimpleArgNonUniformFixture : public KernelAUBFixture>; +using AUBSimpleKernelStatelessTest = Test>; HWTEST_F(AUBSimpleKernelStatelessTest, givenSimpleKernelWhenStatelessPathIsUsedThenExpectCorrectBuffer) { @@ -512,7 +512,7 @@ HWTEST_F(AUBSimpleKernelStatelessTest, givenSimpleKernelWhenStatelessPathIsUsedT bufferExpected, bufferSize); } -using AUBSimpleArgNonUniformTest = TestLegacy; +using AUBSimpleArgNonUniformTest = Test; HWTEST_F(AUBSimpleArgNonUniformTest, givenOpenCL20SupportWhenProvidingWork1DimNonUniformGroupThenExpectTwoWalkers) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; cl_uint workDim = 1; @@ -871,11 +871,11 @@ struct AUBBindlessKernel : public KernelAUBFixture, void SetUp() override { DebugManager.flags.UseBindlessMode.set(1); DebugManager.flags.UseExternalAllocatorForSshAndDsh.set(1); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); } void TearDown() override { - KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } DebugManagerStateRestore restorer; }; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp index 2bc3ce3e50..7b5696770f 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,11 +18,11 @@ struct AUBMapBuffer public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp index a7f6b56cff..662906a7e4 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp @@ -35,14 +35,14 @@ struct AUBMapImage public ::testing::Test { typedef AUBCommandStreamFixture CommandStreamFixture; - using AUBCommandStreamFixture::SetUp; + using AUBCommandStreamFixture::setUp; void SetUp() override { if (!(defaultHwInfo->capabilityTable.supportsImages)) { GTEST_SKIP(); } - CommandDeviceFixture::SetUp(cl_command_queue_properties(0)); - CommandStreamFixture::SetUp(pCmdQ); + CommandDeviceFixture::setUp(cl_command_queue_properties(0)); + CommandStreamFixture::setUp(pCmdQ); context = std::make_unique(pClDevice); } @@ -50,8 +50,8 @@ struct AUBMapImage void TearDown() override { srcImage.reset(); context.reset(); - CommandStreamFixture::TearDown(); - CommandDeviceFixture::TearDown(); + CommandStreamFixture::tearDown(); + CommandDeviceFixture::tearDown(); } std::unique_ptr context; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_printf_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_printf_kernel_aub_tests.cpp index 9add25608d..daffa3e9b0 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_printf_kernel_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_printf_kernel_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,19 +19,19 @@ class AUBPrintfKernelFixture : public AUBFixture, public HelloWorldKernelFixture, public testing::Test { public: - using HelloWorldKernelFixture::SetUp; + using HelloWorldKernelFixture::setUp; void SetUp() override { - AUBFixture::SetUp(nullptr); + AUBFixture::setUp(nullptr); ASSERT_NE(nullptr, device.get()); - HelloWorldKernelFixture::SetUp(device.get(), programFile, kernelName); + HelloWorldKernelFixture::setUp(device.get(), programFile, kernelName); } void TearDown() override { if (IsSkipped()) { return; } - HelloWorldKernelFixture::TearDown(); - AUBFixture::TearDown(); + HelloWorldKernelFixture::tearDown(); + AUBFixture::tearDown(); } const char *programFile = "printf"; const char *kernelName = "test_printf_number"; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp index f87805238e..1ec3b5087b 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp @@ -25,11 +25,11 @@ struct ReadBufferHw public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } }; @@ -162,11 +162,11 @@ struct AUBReadBufferUnaligned public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } template diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp index a521d9d911..17016585b4 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,11 +22,11 @@ struct ReadBufferRectHw public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } }; @@ -118,11 +118,11 @@ struct AUBReadBufferRectUnaligned public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } template diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp index 5c8b3d8e32..a75e5577de 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp @@ -34,13 +34,13 @@ struct AUBReadImage public ::testing::WithParamInterface>, public ::testing::Test { void SetUp() override { - ImageAubFixture::SetUp(enableBlitter); + ImageAubFixture::setUp(enableBlitter); } void TearDown() override { srcImage.reset(); - ImageAubFixture::TearDown(); + ImageAubFixture::tearDown(); } template diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp index c73fa9e63f..ef95e21193 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,11 +22,11 @@ struct VerifyMemoryBufferHw public ::testing::TestWithParam> { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp index ace7935d3f..f87bc7cc92 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp @@ -27,14 +27,14 @@ struct VerifyMemoryImageHw public ::testing::TestWithParam { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); if (!pDevice->getDeviceInfo().imageSupport) { GTEST_SKIP(); } } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp index 8b9b9a318d..20376cf9b7 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -22,11 +22,11 @@ struct WriteBufferHw public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } }; @@ -115,11 +115,11 @@ struct AUBWriteBufferUnaligned public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } template diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp index f50b6cd1f4..83142c27a6 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp @@ -23,11 +23,11 @@ struct WriteBufferRectHw public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } }; @@ -116,11 +116,11 @@ struct AUBWriteBufferRectUnaligned public ::testing::Test { void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + CommandEnqueueAUBFixture::setUp(); } void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + CommandEnqueueAUBFixture::tearDown(); } template diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h index e4bfb83ee4..4a4462b342 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h @@ -19,11 +19,11 @@ struct AubWriteCopyReadBuffer : public AUBFixture, public ::testing::Test { void SetUp() override { - AUBFixture::SetUp(nullptr); + AUBFixture::setUp(nullptr); } void TearDown() override { - AUBFixture::TearDown(); + AUBFixture::tearDown(); } template diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp index 0abe730e7c..95901de8ba 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp @@ -33,13 +33,13 @@ struct AUBWriteImage public ::testing::WithParamInterface>, public ::testing::Test { void SetUp() override { - ImageAubFixture::SetUp(enableBlitter); + ImageAubFixture::setUp(enableBlitter); } void TearDown() override { dstImage.reset(); - ImageAubFixture::TearDown(); + ImageAubFixture::tearDown(); } template diff --git a/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp index 2cfeaa92dd..1d2557ea43 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/multi_tile_buffers_aub_tests_xehp_and_later.cpp @@ -19,10 +19,10 @@ struct MultiTileBuffersXeHPAndLater : public MulticontextAubFixture, public ::te static constexpr uint32_t numTiles = 2; void SetUp() override { - MulticontextAubFixture::SetUp(numTiles, EnabledCommandStreamers::Single, false); + MulticontextAubFixture::setUp(numTiles, EnabledCommandStreamers::Single, false); } void TearDown() override { - MulticontextAubFixture::TearDown(); + MulticontextAubFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp index bdd3221fb7..002137ae49 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp @@ -21,7 +21,7 @@ namespace NEO { -void AUBCommandStreamFixture::SetUp(CommandQueue *pCmdQ) { +void AUBCommandStreamFixture::setUp(CommandQueue *pCmdQ) { ASSERT_NE(pCmdQ, nullptr); auto &device = reinterpret_cast(pCmdQ->getDevice()); const auto &hwInfo = device.getHardwareInfo(); @@ -39,13 +39,13 @@ void AUBCommandStreamFixture::SetUp(CommandQueue *pCmdQ) { AUBFixture::prepareCopyEngines(device, strfilename.str()); - CommandStreamFixture::SetUp(pCmdQ); + CommandStreamFixture::setUp(pCmdQ); pTagMemory = pCommandStreamReceiver->getTagAddress(); this->commandQueue = pCmdQ; } -void AUBCommandStreamFixture::TearDown() { - CommandStreamFixture::TearDown(); +void AUBCommandStreamFixture::tearDown() { + CommandStreamFixture::tearDown(); } } // namespace NEO diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h index 96ea0ce389..77db4d267b 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h @@ -26,8 +26,8 @@ class CommandStreamReceiver; class AUBCommandStreamFixture : public CommandStreamFixture { public: - virtual void SetUp(CommandQueue *pCommandQueue); - void TearDown() override; + void setUp(CommandQueue *pCommandQueue); + void tearDown(); template AUBCommandStreamReceiverHw *getAubCsr() const { diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp index 3a9c28042b..378f509cb3 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp @@ -26,19 +26,19 @@ struct AUBFixture : public AUBCommandStreamFixture, public CommandQueueFixture, public ClDeviceFixture { - using AUBCommandStreamFixture::SetUp; - using CommandQueueFixture::SetUp; + using AUBCommandStreamFixture::setUp; + using CommandQueueFixture::setUp; - void SetUp() { - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(nullptr, pClDevice, 0); - AUBCommandStreamFixture::SetUp(pCmdQ); + void setUp() { + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(nullptr, pClDevice, 0); + AUBCommandStreamFixture::setUp(pCmdQ); } - void TearDown() override { - AUBCommandStreamFixture::TearDown(); - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + void tearDown() { + AUBCommandStreamFixture::tearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } template @@ -70,7 +70,7 @@ struct AUBFixture : public AUBCommandStreamFixture, } }; -typedef TestLegacy AUBcommandstreamTests; +using AUBcommandstreamTests = Test; HWTEST_F(AUBcommandstreamTests, WhenFlushingTwiceThenCompletes) { CommandStreamReceiverHw::addBatchBufferEnd(*pCS, nullptr); diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp index 1354c93128..3e204c5c02 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp @@ -43,7 +43,7 @@ TEST(PageTableTraits, when32BitTraitsAreUsedThenPageTableAddressesAreCorrect) { EXPECT_EQ(BIT(36), AubMemDump::PageTableTraits<32>::pdpBaseAddress); } -typedef TestLegacy AubMemDumpTests; +typedef Test AubMemDumpTests; HWTEST_F(AubMemDumpTests, givenAubFileStreamWhenOpenAndCloseIsCalledThenFileNameIsReportedCorrectly) { AUBCommandStreamReceiver::AubFileStream aubFile; diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp index 328e4ed93e..78a9809591 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mi_atomic_tests.cpp @@ -17,8 +17,8 @@ using namespace NEO; struct MiAtomicAubFixture : public AUBFixture { - void SetUp() override { - AUBFixture::SetUp(nullptr); + void setUp() { + AUBFixture::setUp(nullptr); auto memoryManager = this->device->getMemoryManager(); AllocationProperties commandBufferProperties = {device->getRootDeviceIndex(), @@ -53,13 +53,13 @@ struct MiAtomicAubFixture : public AUBFixture { streamAllocation->getUnderlyingBufferSize()); } - void TearDown() override { + void tearDown() { auto memoryManager = this->device->getMemoryManager(); memoryManager->freeGraphicsMemory(streamAllocation); memoryManager->freeGraphicsMemory(deviceSurface); memoryManager->freeGraphicsMemory(systemSurface); - AUBFixture::TearDown(); + AUBFixture::tearDown(); } void flushStream() { @@ -83,7 +83,7 @@ struct MiAtomicAubFixture : public AUBFixture { GraphicsAllocation *systemSurface = nullptr; }; -using MiAtomicAubTest = TestLegacy; +using MiAtomicAubTest = Test; HWTEST_F(MiAtomicAubTest, WhenDispatchingAtomicMoveOperationThenExpectCorrectEndValues) { using MI_ATOMIC = typename FamilyType::MI_ATOMIC; diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_range_based_flush_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_range_based_flush_tests_xehp_and_later.cpp index 5467801163..c0803ab81a 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_range_based_flush_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_range_based_flush_tests_xehp_and_later.cpp @@ -30,11 +30,11 @@ struct RangeBasedFlushTest : public KernelAUBFixture, publi void SetUp() override { DebugManager.flags.PerformImplicitFlushForNewResource.set(0); DebugManager.flags.PerformImplicitFlushForIdleGpu.set(0); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); }; void TearDown() override { - KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp index bdcd1327b5..1a6d894513 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_walker_partition_tests_xehp_and_later.cpp @@ -43,11 +43,11 @@ struct DispatchParamters { }; struct AubWalkerPartitionFixture : public KernelAUBFixture { - void SetUp() override { + void setUp() { debugRestorer = std::make_unique(); DebugManager.flags.EnableTimestampPacket.set(1); kernelIds |= (1 << 5); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); size_t userMemorySize = 16 * MemoryConstants::kiloByte; if (generateRandomInput) { @@ -66,10 +66,10 @@ struct AubWalkerPartitionFixture : public KernelAUBFixture kernels[5]->setArg(0, dstBuffer.get()); } - void TearDown() override { + void tearDown() { pCmdQ->flush(); - KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } template void validatePartitionProgramming(uint64_t postSyncAddress, int32_t partitionCount) { @@ -160,7 +160,7 @@ struct AubWalkerPartitionFixture : public KernelAUBFixture struct AubWalkerPartitionTest : public AubWalkerPartitionFixture, public ::testing::TestWithParam> { void SetUp() override { - AubWalkerPartitionFixture::SetUp(); + AubWalkerPartitionFixture::setUp(); std::tie(partitionCount, partitionType, dispatchParamters, workingDimensions) = GetParam(); if (generateRandomInput) { @@ -204,13 +204,13 @@ struct AubWalkerPartitionTest : public AubWalkerPartitionFixture, DebugManager.flags.EnableWalkerPartition.set(1u); } void TearDown() override { - AubWalkerPartitionFixture::TearDown(); + AubWalkerPartitionFixture::tearDown(); } }; struct AubWalkerPartitionZeroFixture : public AubWalkerPartitionFixture { - void SetUp() override { - AubWalkerPartitionFixture::SetUp(); + void setUp() { + AubWalkerPartitionFixture::setUp(); partitionCount = 0; partitionType = 0; @@ -227,11 +227,11 @@ struct AubWalkerPartitionZeroFixture : public AubWalkerPartitionFixture { memset(helperSurface->getUnderlyingBuffer(), 0, MemoryConstants::pageSize); taskStream = std::make_unique(streamAllocation); } - void TearDown() override { + void tearDown() { auto memoryManager = this->device->getMemoryManager(); memoryManager->freeGraphicsMemory(streamAllocation); memoryManager->freeGraphicsMemory(helperSurface); - AubWalkerPartitionFixture::TearDown(); + AubWalkerPartitionFixture::tearDown(); } void flushStream() { @@ -253,7 +253,7 @@ struct AubWalkerPartitionZeroFixture : public AubWalkerPartitionFixture { std::unique_ptr commandBufferProperties; }; -using AubWalkerPartitionZeroTest = TestLegacy; +using AubWalkerPartitionZeroTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, AubWalkerPartitionZeroTest, whenPartitionCountSetToZeroThenProvideEqualSingleWalker) { using WALKER_TYPE = typename FamilyType::WALKER_TYPE; @@ -583,7 +583,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, AubWalkerPartitionZeroTest, givenVariousCompareMode } template struct MultiLevelBatchAubFixture : public AUBFixture { - void SetUp() override { + void setUp() { if (enableNesting) { //turn on Batch Buffer nesting DebugManager.flags.AubDumpAddMmioRegistersList.set( @@ -593,7 +593,7 @@ struct MultiLevelBatchAubFixture : public AUBFixture { DebugManager.flags.AubDumpAddMmioRegistersList.set( "0x1A09C;0x10000000"); } - AUBFixture::SetUp(nullptr); + AUBFixture::setUp(nullptr); auto memoryManager = this->device->getMemoryManager(); @@ -608,7 +608,7 @@ struct MultiLevelBatchAubFixture : public AUBFixture { secondLevelBatchStream = std::make_unique(secondLevelBatch); thirdLevelBatchStream = std::make_unique(thirdLevelBatch); }; - void TearDown() override { + void tearDown() { DebugManager.flags.AubDumpAddMmioRegistersList.getRef() = "unk"; DebugManager.flags.AubDumpAddMmioRegistersList.getRef().shrink_to_fit(); @@ -618,7 +618,7 @@ struct MultiLevelBatchAubFixture : public AUBFixture { memoryManager->freeGraphicsMemory(streamAllocation); memoryManager->freeGraphicsMemory(helperSurface); - AUBFixture::TearDown(); + AUBFixture::tearDown(); }; void flushStream() { @@ -649,7 +649,7 @@ struct MultiLevelBatchAubFixture : public AUBFixture { GraphicsAllocation *thirdLevelBatch = nullptr; }; -using MultiLevelBatchTestsWithNesting = TestLegacy>; +using MultiLevelBatchTestsWithNesting = Test>; HWCMDTEST_F(IGFX_XE_HP_CORE, MultiLevelBatchTestsWithNesting, givenConditionalBatchBufferEndWhenItExitsThirdLevelCommandBufferThenSecondLevelBatchIsResumed) { auto writeAddress = helperSurface->getGpuAddress(); @@ -802,7 +802,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, MultiLevelBatchTestsWithNesting, givenCommandBuffer flushStream(); expectMemory(reinterpret_cast(writeAddress), &writeValue, sizeof(writeValue)); } -using MultiLevelBatchTestsWithoutNesting = TestLegacy>; +using MultiLevelBatchTestsWithoutNesting = Test>; HWCMDTEST_F(IGFX_XE_HP_CORE, MultiLevelBatchTestsWithoutNesting, givenConditionalBBEndWhenItExitsFromSecondLevelThenUpperLevelIsResumed) { auto writeAddress = helperSurface->getGpuAddress(); @@ -1184,7 +1184,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(DispatchParamtersForTests), ::testing::ValuesIn(testWorkingDimensions))); -using AubWparidTests = TestLegacy; +using AubWparidTests = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, AubWparidTests, whenPartitionCountSetAndPartitionIdSpecifiedViaWPARIDThenProvideEqualNumberWalkers) { size_t globalWorkOffset[3] = {0, 0, 0}; 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 91ab6e8ead..96031f334a 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 @@ -48,7 +48,7 @@ struct CopyEngineXeHPAndLater : public MulticontextAubFixture, public ::testing: DebugManager.flags.RenderCompressedBuffersEnabled.set(true); DebugManager.flags.RenderCompressedImagesEnabled.set(true); - MulticontextAubFixture::SetUp(numTiles, EnabledCommandStreamers::Single, true); + MulticontextAubFixture::setUp(numTiles, EnabledCommandStreamers::Single, true); defaultCommandQueue = commandQueues[0][0].get(); bcsCsr = tileDevices[0]->getNearestGenericSubDevice(0)->getEngine(bcsEngineType, EngineUsage::Regular).commandStreamReceiver; @@ -67,7 +67,7 @@ struct CopyEngineXeHPAndLater : public MulticontextAubFixture, public ::testing: } void TearDown() override { - MulticontextAubFixture::TearDown(); + MulticontextAubFixture::tearDown(); } virtual bool compressionSupported() const { diff --git a/opencl/test/unit_test/aub_tests/command_stream/mi_math_aub_tests_dg2_and_later.cpp b/opencl/test/unit_test/aub_tests/command_stream/mi_math_aub_tests_dg2_and_later.cpp index dbc78c396b..2be76317db 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/mi_math_aub_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/mi_math_aub_tests_dg2_and_later.cpp @@ -28,14 +28,14 @@ enum class NewAluOpcodes : uint32_t { struct MiMath : public AUBFixture, public ::testing::Test { void SetUp() override { - AUBFixture::SetUp(defaultHwInfo.get()); + AUBFixture::setUp(defaultHwInfo.get()); streamAllocation = this->device->getMemoryManager()->allocateGraphicsMemoryWithProperties({device->getRootDeviceIndex(), MemoryConstants::pageSize, AllocationType::COMMAND_BUFFER, device->getDeviceBitfield()}); taskStream = std::make_unique(streamAllocation); } void TearDown() override { this->device->getMemoryManager()->freeGraphicsMemory(streamAllocation); - AUBFixture::TearDown(); + AUBFixture::tearDown(); } void flushStream() { diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h index d937b16d40..e1acbdbf5d 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h @@ -53,7 +53,7 @@ class AUBFixture : public CommandQueueHwFixture { } } - void SetUp(const HardwareInfo *hardwareInfo) { + void setUp(const HardwareInfo *hardwareInfo) { const HardwareInfo &hwInfo = hardwareInfo ? *hardwareInfo : *defaultHwInfo; auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily); @@ -77,10 +77,10 @@ class AUBFixture : public CommandQueueHwFixture { prepareCopyEngines(*pDevice, strfilename.str()); - CommandQueueHwFixture::SetUp(AUBFixture::device.get(), cl_command_queue_properties(0)); + CommandQueueHwFixture::setUp(AUBFixture::device.get(), cl_command_queue_properties(0)); } - void TearDown() override { - CommandQueueHwFixture::TearDown(); + void tearDown() { + CommandQueueHwFixture::tearDown(); } GraphicsAllocation *createHostPtrAllocationFromSvmPtr(void *svmPtr, size_t size); @@ -172,20 +172,20 @@ class AUBFixture : public CommandQueueHwFixture { ExecutionEnvironment *executionEnvironment; private: - using CommandQueueHwFixture::SetUp; + using CommandQueueHwFixture::setUp; }; // namespace NEO template struct KernelAUBFixture : public AUBFixture, public KernelFixture { - void SetUp() override { - AUBFixture::SetUp(nullptr); - KernelFixture::SetUp(device.get(), context); + void setUp() { + AUBFixture::setUp(nullptr); + KernelFixture::setUp(device.get(), context); } - void TearDown() override { - KernelFixture::TearDown(); - AUBFixture::TearDown(); + void tearDown() { + KernelFixture::tearDown(); + AUBFixture::tearDown(); } }; } // namespace NEO diff --git a/opencl/test/unit_test/aub_tests/fixtures/image_aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/image_aub_fixture.h index 67c19e448a..a2986b3889 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/image_aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/image_aub_fixture.h @@ -25,9 +25,9 @@ namespace NEO { struct ImageAubFixture : public ClDeviceFixture, public AUBCommandStreamFixture { typedef AUBCommandStreamFixture CommandStreamFixture; - using AUBCommandStreamFixture::SetUp; + using AUBCommandStreamFixture::setUp; - void SetUp(bool enableBlitter) { + void setUp(bool enableBlitter) { if (enableBlitter) { if (!(HwInfoConfig::get(defaultHwInfo->platform.eProductFamily)->isBlitterForImagesSupported())) { GTEST_SKIP(); @@ -37,7 +37,7 @@ struct ImageAubFixture : public ClDeviceFixture, public AUBCommandStreamFixture hardwareInfo.capabilityTable.blitterOperationsSupported = true; ClDeviceFixture::setUpImpl(&hardwareInfo); } else { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); } context = new MockContext(pClDevice); @@ -47,10 +47,10 @@ struct ImageAubFixture : public ClDeviceFixture, public AUBCommandStreamFixture EXPECT_EQ(CL_SUCCESS, retVal); pCmdQ = castToObject(clQueue); - CommandStreamFixture::SetUp(pCmdQ); + CommandStreamFixture::setUp(pCmdQ); } - void TearDown() override { + void tearDown() { if (pCmdQ) { auto blocked = pCmdQ->isQueueBlocked(); UNRECOVERABLE_IF(blocked); @@ -60,8 +60,8 @@ struct ImageAubFixture : public ClDeviceFixture, public AUBCommandStreamFixture context->release(); } - CommandStreamFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandStreamFixture::tearDown(); + ClDeviceFixture::tearDown(); } DebugManagerStateRestore restorer; diff --git a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp index 52c8d04aec..6dbab99cae 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp @@ -23,7 +23,7 @@ namespace NEO { -void MulticontextAubFixture::SetUp(uint32_t numberOfTiles, EnabledCommandStreamers enabledCommandStreamers, bool enableCompression) { +void MulticontextAubFixture::setUp(uint32_t numberOfTiles, EnabledCommandStreamers enabledCommandStreamers, bool enableCompression) { this->numberOfEnabledTiles = numberOfTiles; const ::testing::TestInfo *const testInfo = ::testing::UnitTest::GetInstance()->current_test_info(); @@ -153,7 +153,7 @@ void MulticontextAubFixture::SetUp(uint32_t numberOfTiles, EnabledCommandStreame } } -void MulticontextAubFixture::TearDown() { +void MulticontextAubFixture::tearDown() { auto filename = DebugManager.flags.AUBDumpCaptureFileName.get(); std::string tileString = std::to_string(numberOfEnabledTiles) + "tx"; diff --git a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h index 818c919bea..b721268221 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.h @@ -30,8 +30,8 @@ struct MulticontextAubFixture { All, // RCS + CCS0-3 }; - void SetUp(uint32_t numberOfTiles, EnabledCommandStreamers enabledCommandStreamers, bool enableCompression); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(uint32_t numberOfTiles, EnabledCommandStreamers enabledCommandStreamers, bool enableCompression); + void tearDown(); template CommandStreamReceiverSimulatedCommonHw *getSimulatedCsr(uint32_t tile, uint32_t engine) { diff --git a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h index 31d976bba3..0fdb729da4 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h @@ -41,16 +41,16 @@ class RunKernelFixture : public CommandEnqueueAUBFixture { RunKernelFixture() { } - void SetUp() override { - CommandEnqueueAUBFixture::SetUp(); + void setUp() { + CommandEnqueueAUBFixture::setUp(); } - void TearDown() override { - CommandEnqueueAUBFixture::TearDown(); + void tearDown() { + CommandEnqueueAUBFixture::tearDown(); } protected: - Program *CreateProgramFromBinary( // NOLINT(readability-identifier-naming) + Program *createProgramFromBinary( const std::string &binaryFileName) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h index 0761c1a61b..f7d9b6303d 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h @@ -43,23 +43,23 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture, typedef typename FixtureFactory::CommandQueueFixture CommandQueueFixture; typedef typename FixtureFactory::KernelFixture KernelFixture; - using AUBCommandStreamFixture::SetUp; + using AUBCommandStreamFixture::setUp; using CommandQueueFixture::pCmdQ; using CommandStreamFixture::pCS; - using IndirectHeapFixture::SetUp; + using IndirectHeapFixture::setUp; using KernelFixture::pKernel; - using KernelFixture::SetUp; + using KernelFixture::setUp; public: - void SetUp() override { - ClDeviceFixture::SetUp(); + void setUp() { + ClDeviceFixture::setUp(); ASSERT_NE(nullptr, pClDevice); - CommandQueueFixture::SetUp(pClDevice, 0); + CommandQueueFixture::setUp(pClDevice, 0); ASSERT_NE(nullptr, pCmdQ); - CommandStreamFixture::SetUp(pCmdQ); + CommandStreamFixture::setUp(pCmdQ); ASSERT_NE(nullptr, pCS); - IndirectHeapFixture::SetUp(pCmdQ); - KernelFixture::SetUp(pClDevice); + IndirectHeapFixture::setUp(pCmdQ); + KernelFixture::setUp(pClDevice); ASSERT_NE(nullptr, pKernel); argVal = static_cast(0x22222222); @@ -82,7 +82,7 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture, outBuffer->setMemObjectsAllocationWithWritableFlags(true); } - void TearDown() override { + void tearDown() { if (pExpectedMemory) { alignedFree(pExpectedMemory); pExpectedMemory = nullptr; @@ -92,11 +92,11 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture, pDestMemory = nullptr; } - KernelFixture::TearDown(); - IndirectHeapFixture::TearDown(); - CommandStreamFixture::TearDown(); - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + KernelFixture::tearDown(); + IndirectHeapFixture::tearDown(); + CommandStreamFixture::tearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } int argVal = 0; diff --git a/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h index 1eb2497fb4..4a5437c263 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2020 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,18 +20,18 @@ extern bool disabled; class UnifiedMemoryAubFixture : public AUBFixture { public: - using AUBFixture::TearDown; + using AUBFixture::tearDown; cl_int retVal = CL_SUCCESS; const size_t dataSize = MemoryConstants::megaByte; bool skipped = false; - void SetUp() override { + void setUp() { if (PagaFaultManagerTestConfig::disabled) { skipped = true; GTEST_SKIP(); } - AUBFixture::SetUp(nullptr); + AUBFixture::setUp(nullptr); if (!platform()->peekExecutionEnvironment()->memoryManager->getPageFaultManager()) { skipped = true; GTEST_SKIP(); diff --git a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp index dade98b0e4..435c2defc5 100644 --- a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp +++ b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.cpp @@ -9,7 +9,7 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -using Gen11AubBatchBufferTests = TestLegacy; +using Gen11AubBatchBufferTests = Test; static constexpr auto gpuBatchBufferAddr = 0x800400001000; // 48-bit GPU address diff --git a/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp index b1fe1275d9..08306a67f5 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/aub_mem_dump_tests_gen12lp.cpp @@ -10,7 +10,7 @@ namespace NEO { -using Gen12LPAubMemDumpTests = TestLegacy; +using Gen12LPAubMemDumpTests = Test; GEN12LPTEST_F(Gen12LPAubMemDumpTests, GivenCcsThenExpectationsAreMet) { setupAUB(pDevice, aub_stream::ENGINE_CCS); diff --git a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp index 02754558de..2147f9c62c 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp @@ -16,8 +16,8 @@ #include "opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -using Gen12LPAubBatchBufferTests = TestLegacy; -using Gen12LPTimestampTests = TestLegacy>; +using Gen12LPAubBatchBufferTests = Test; +using Gen12LPTimestampTests = Test>; static constexpr auto gpuBatchBufferAddr = 0x400400001000; // 47-bit GPU address diff --git a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp index 16ecea3761..193eec092c 100644 --- a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp +++ b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp @@ -9,7 +9,7 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -using AubBatchBufferTests = TestLegacy; +using AubBatchBufferTests = Test; static constexpr auto gpuBatchBufferAddr = 0x800400001000ull; // 48-bit GPU address diff --git a/opencl/test/unit_test/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp b/opencl/test/unit_test/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp index d0daa98cb5..70085c581a 100644 --- a/opencl/test/unit_test/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp +++ b/opencl/test/unit_test/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp @@ -18,11 +18,11 @@ class AUBRunKernelIntegrateTest : public RunKernelFixturebuild( @@ -262,7 +262,7 @@ SKLTEST_F(AUBRunKernelIntegrateTest, GivenDeviceSideVmeThenExpectationsMet) { std::string kernelFilename; retrieveBinaryKernelFilename(kernelFilename, "vme_kernels_", ".bin"); - Program *pProgram = CreateProgramFromBinary(kernelFilename); + Program *pProgram = createProgramFromBinary(kernelFilename); ASSERT_NE(nullptr, pProgram); retVal = pProgram->build( diff --git a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp index db8f8ebfcd..30ef4463d8 100644 --- a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp @@ -30,14 +30,14 @@ struct AUBCreateImage public ::testing::Test { typedef AUBCommandStreamFixture CommandStreamFixture; - using AUBCommandStreamFixture::SetUp; + using AUBCommandStreamFixture::setUp; void SetUp() override { if (!(defaultHwInfo->capabilityTable.supportsImages)) { GTEST_SKIP(); } - CommandDeviceFixture::SetUp(cl_command_queue_properties(0)); - CommandStreamFixture::SetUp(pCmdQ); + CommandDeviceFixture::setUp(cl_command_queue_properties(0)); + CommandStreamFixture::setUp(pCmdQ); imageFormat.image_channel_data_type = CL_UNORM_INT8; imageFormat.image_channel_order = CL_RGBA; @@ -56,8 +56,8 @@ struct AUBCreateImage void TearDown() override { image.reset(); - CommandStreamFixture::TearDown(); - CommandDeviceFixture::TearDown(); + CommandStreamFixture::tearDown(); + CommandDeviceFixture::tearDown(); } std::unique_ptr image; diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp index bf47742bc1..fdc402d176 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_aub_tests.cpp @@ -14,14 +14,18 @@ namespace NEO { class UnifiedMemoryAubTest : public UnifiedMemoryAubFixture, public ::testing::Test { public: - using UnifiedMemoryAubFixture::TearDown; + using UnifiedMemoryAubFixture::tearDown; std::vector values; void SetUp() override { - UnifiedMemoryAubFixture::SetUp(); + UnifiedMemoryAubFixture::setUp(); values = std::vector(dataSize, 11); }; + + void TearDown() override { + UnifiedMemoryAubFixture::tearDown(); + } }; HWTEST_F(UnifiedMemoryAubTest, givenDeviceMemoryAllocWhenWriteIntoItThenValuesMatch) { diff --git a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp index b9ab4455a8..0ce5d9b18c 100644 --- a/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/unified_memory/unified_memory_copy_aub_tests.cpp @@ -18,7 +18,7 @@ class UnifiedMemoryCopyAubTest : public UnifiedMemoryAubFixture, std::vector srcValues, dstValues; void SetUp() override { - UnifiedMemoryAubFixture::SetUp(); + UnifiedMemoryAubFixture::setUp(); srcMemoryType = std::get<0>(GetParam()); dstMemoryType = std::get<1>(GetParam()); @@ -36,7 +36,7 @@ class UnifiedMemoryCopyAubTest : public UnifiedMemoryAubFixture, void TearDown() override { this->freeUSM(srcPtr, srcMemoryType); this->freeUSM(dstPtr, dstMemoryType); - UnifiedMemoryAubFixture::TearDown(); + UnifiedMemoryAubFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_mem_dump_tests_xe_hp_core.cpp b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_mem_dump_tests_xe_hp_core.cpp index 6949dc2046..f918c858ef 100644 --- a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_mem_dump_tests_xe_hp_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_mem_dump_tests_xe_hp_core.cpp @@ -14,7 +14,7 @@ namespace NEO { extern bool overrideCommandStreamReceiverCreation; -using XeHpCoreAubMemDumpTests = TestLegacy; +using XeHpCoreAubMemDumpTests = Test; XE_HP_CORE_TEST_F(XeHpCoreAubMemDumpTests, GivenCcsThenExpectationsAreMet) { setupAUB(pDevice, aub_stream::ENGINE_CCS); diff --git a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp index 12c82d1594..244be209d9 100644 --- a/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hp_core/aub_tests_stateless_compression_in_sba_xe_hp_core.cpp @@ -31,11 +31,11 @@ struct StatelessCompressionInSBA : public KernelAUBFixture(AuxTranslationMode::Builtin)); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); } void TearDown() override { - KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -261,12 +261,12 @@ struct UmStatelessCompressionInSBA : public KernelAUBFixture(AuxTranslationMode::Builtin)); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); EXPECT_TRUE(multiDeviceKernel->getKernel(rootDeviceIndex)->getKernelInfo().hasIndirectStatelessAccess); } void TearDown() override { - KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -481,16 +481,16 @@ struct StatelessCompressionInSBAWithBCS : public MulticontextAubFixture, DebugManager.flags.EnableStatelessCompression.set(1); DebugManager.flags.ForceAuxTranslationMode.set(static_cast(AuxTranslationMode::Blit)); DebugManager.flags.EnableBlitterOperationsSupport.set(true); - MulticontextAubFixture::SetUp(1, EnabledCommandStreamers::Single, true); - StatelessCopyKernelFixture::SetUp(tileDevices[0], context.get()); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); + StatelessCopyKernelFixture::setUp(tileDevices[0], context.get()); if (!tileDevices[0]->getHardwareInfo().featureTable.flags.ftrLocalMemory) { GTEST_SKIP(); } } void TearDown() override { - MulticontextAubFixture::TearDown(); - StatelessCopyKernelFixture::TearDown(); + MulticontextAubFixture::tearDown(); + StatelessCopyKernelFixture::tearDown(); } DebugManagerStateRestore debugRestorer; diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_mem_dump_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_mem_dump_tests_xe_hpc_core.cpp index 3c94ca6efb..c1f6c4b034 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_mem_dump_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/aub_mem_dump_tests_xe_hpc_core.cpp @@ -12,7 +12,7 @@ #include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -using XeHpcCoreAubMemDumpTests = TestLegacy; +using XeHpcCoreAubMemDumpTests = Test; XE_HPC_CORETEST_F(XeHpcCoreAubMemDumpTests, GivenCcsThenExpectationsAreMet) { setupAUB(pDevice, aub_stream::ENGINE_CCS); diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp index 515ae11620..cdf41a6fe9 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/enqueue_kernel_aub_tests_xe_hpc_core.cpp @@ -17,7 +17,7 @@ using namespace NEO; extern const HardwareInfo *defaultHwInfo; -using AUBSimpleKernelStatelessTest = TestLegacy>; +using AUBSimpleKernelStatelessTest = Test>; HWTEST_F(AUBSimpleKernelStatelessTest, givenPrefetchEnabledWhenEnqueuedKernelThenDataIsCorrect) { DebugManagerStateRestore restore; 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 3f455e40a7..0bfedce73f 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 @@ -27,10 +27,10 @@ class SystemMemFenceViaMiMemFence : public AUBFixture, DebugManager.flags.ProgramGlobalFenceAsMiMemFenceCommandInCommandStream.set(1); DebugManager.flags.ProgramGlobalFenceAsPostSyncOperationInComputeWalker.set(0); DebugManager.flags.ProgramGlobalFenceAsKernelInstructionInEUKernel.set(0); - AUBFixture::SetUp(defaultHwInfo.get()); + AUBFixture::setUp(defaultHwInfo.get()); } void TearDown() override { - AUBFixture::TearDown(); + AUBFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -73,10 +73,10 @@ class SystemMemFenceViaComputeWalker : public AUBFixture, DebugManager.flags.ProgramGlobalFenceAsMiMemFenceCommandInCommandStream.set(0); DebugManager.flags.ProgramGlobalFenceAsPostSyncOperationInComputeWalker.set(1); DebugManager.flags.ProgramGlobalFenceAsKernelInstructionInEUKernel.set(0); - AUBFixture::SetUp(defaultHwInfo.get()); + AUBFixture::setUp(defaultHwInfo.get()); } void TearDown() override { - AUBFixture::TearDown(); + AUBFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -123,10 +123,10 @@ class SystemMemFenceWithBlitter : public MulticontextAubFixture, DebugManager.flags.EnableBlitterOperationsSupport.set(1); DebugManager.flags.EnableBlitterForEnqueueOperations.set(1); - MulticontextAubFixture::SetUp(1, EnabledCommandStreamers::Single, true); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); } void TearDown() override { - MulticontextAubFixture::TearDown(); + MulticontextAubFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -171,12 +171,12 @@ class SystemMemFenceViaKernel : public ProgramFixture, DebugManager.flags.ProgramGlobalFenceAsPostSyncOperationInComputeWalker.set(0); DebugManager.flags.ProgramGlobalFenceAsKernelInstructionInEUKernel.set(1); - ProgramFixture::SetUp(); - MulticontextAubFixture::SetUp(1, EnabledCommandStreamers::Single, true); + ProgramFixture::setUp(); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); } void TearDown() override { - MulticontextAubFixture::TearDown(); - ProgramFixture::TearDown(); + MulticontextAubFixture::tearDown(); + ProgramFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -200,7 +200,7 @@ XE_HPC_CORETEST_F(SystemMemFenceViaKernel, givenSystemMemFenceWhenKernelInstruct EXPECT_EQ(CL_SUCCESS, retVal); ASSERT_NE(nullptr, hostMemAlloc); - CreateProgramFromBinary(context.get(), context->getDevices(), "system_memfence"); + createProgramFromBinary(context.get(), context->getDevices(), "system_memfence"); retVal = pProgram->build(pProgram->getDevices(), nullptr, false); ASSERT_EQ(CL_SUCCESS, retVal); diff --git a/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp index 40f60138fb..0df54e5ade 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpc_core/um_stateless_compression_aub_tests_xe_hpc_core.cpp @@ -25,10 +25,10 @@ class UmStatelessCompression : public AUBFixture, void SetUp() override { DebugManager.flags.EnableStatelessCompressionWithUnifiedMemory.set(1); compareCompressedMemory = GetParam(); - AUBFixture::SetUp(defaultHwInfo.get()); + AUBFixture::setUp(defaultHwInfo.get()); } void TearDown() override { - AUBFixture::TearDown(); + AUBFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -83,10 +83,10 @@ class UmStatelessCompressionWithBlitter : public MulticontextAubFixture, DebugManager.flags.EnableBlitterForEnqueueOperations.set(1); compareCompressedMemory = GetParam(); - MulticontextAubFixture::SetUp(1, EnabledCommandStreamers::Single, true); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); } void TearDown() override { - MulticontextAubFixture::TearDown(); + MulticontextAubFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -141,12 +141,12 @@ class UmStatelessCompressionWithStatefulAccess : public ProgramFixture, DebugManager.flags.EnableSharedSystemUsmSupport.set(0); compareCompressedMemory = GetParam(); - ProgramFixture::SetUp(); - MulticontextAubFixture::SetUp(1, EnabledCommandStreamers::Single, true); + ProgramFixture::setUp(); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); } void TearDown() override { - MulticontextAubFixture::TearDown(); - ProgramFixture::TearDown(); + MulticontextAubFixture::tearDown(); + ProgramFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -175,7 +175,7 @@ XE_HPC_CORETEST_P(UmStatelessCompressionWithStatefulAccess, givenDeviceMemAllocW EXPECT_EQ(CL_SUCCESS, retVal); ASSERT_NE(nullptr, hostMemAlloc); - CreateProgramFromBinary(context.get(), context->getDevices(), "stateful_copy_buffer"); + createProgramFromBinary(context.get(), context->getDevices(), "stateful_copy_buffer"); retVal = pProgram->build(context->getDevices(), nullptr, false); ASSERT_EQ(CL_SUCCESS, retVal); diff --git a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_mem_dump_tests_xe_hpg_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_mem_dump_tests_xe_hpg_core.cpp index 8ec7efc395..a2f92314ff 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_mem_dump_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_mem_dump_tests_xe_hpg_core.cpp @@ -14,7 +14,7 @@ namespace NEO { extern bool overrideCommandStreamReceiverCreation; -using XeHpgCoreAubMemDumpTests = TestLegacy; +using XeHpgCoreAubMemDumpTests = Test; XE_HPG_CORETEST_F(XeHpgCoreAubMemDumpTests, GivenCcsThenExpectationsAreMet) { setupAUB(pDevice, aub_stream::ENGINE_CCS); diff --git a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp index e3ab840b4f..3d820661e1 100644 --- a/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp +++ b/opencl/test/unit_test/aub_tests/xe_hpg_core/aub_tests_stateless_compression_in_sba_xe_hpg_core.cpp @@ -34,14 +34,14 @@ struct XeHpgCoreStatelessCompressionInSBA : public KernelAUBFixture(AuxTranslationMode::Builtin)); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); if (!device->getHardwareInfo().featureTable.flags.ftrLocalMemory) { GTEST_SKIP(); } } void TearDown() override { - KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -267,7 +267,7 @@ struct XeHpgCoreUmStatelessCompressionInSBA : public KernelAUBFixture(AuxTranslationMode::Builtin)); - KernelAUBFixture::SetUp(); + KernelAUBFixture::setUp(); if (!device->getHardwareInfo().featureTable.flags.ftrLocalMemory) { GTEST_SKIP(); } @@ -275,7 +275,7 @@ struct XeHpgCoreUmStatelessCompressionInSBA : public KernelAUBFixture::TearDown(); + KernelAUBFixture::tearDown(); } DebugManagerStateRestore debugRestorer; @@ -490,16 +490,16 @@ struct XeHpgCoreStatelessCompressionInSBAWithBCS : public MulticontextAubFixture DebugManager.flags.EnableStatelessCompression.set(1); DebugManager.flags.ForceAuxTranslationMode.set(static_cast(AuxTranslationMode::Blit)); DebugManager.flags.EnableBlitterOperationsSupport.set(true); - MulticontextAubFixture::SetUp(1, EnabledCommandStreamers::Single, true); - StatelessCopyKernelFixture::SetUp(tileDevices[0], context.get()); + MulticontextAubFixture::setUp(1, EnabledCommandStreamers::Single, true); + StatelessCopyKernelFixture::setUp(tileDevices[0], context.get()); if (!tileDevices[0]->getHardwareInfo().featureTable.flags.ftrLocalMemory) { GTEST_SKIP(); } } void TearDown() override { - MulticontextAubFixture::TearDown(); - StatelessCopyKernelFixture::TearDown(); + MulticontextAubFixture::tearDown(); + StatelessCopyKernelFixture::tearDown(); } DebugManagerStateRestore debugRestorer; diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index db5c29b2a9..9a822faa8e 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -59,7 +59,7 @@ class BuiltInTests public ::testing::Test { using BuiltInFixture::SetUp; - using ContextFixture::SetUp; + using ContextFixture::setUp; public: BuiltInTests() { @@ -70,17 +70,17 @@ class BuiltInTests void SetUp() override { DebugManager.flags.ForceAuxTranslationMode.set(static_cast(AuxTranslationMode::Builtin)); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); BuiltInFixture::SetUp(pDevice); } void TearDown() override { allBuiltIns.clear(); BuiltInFixture::TearDown(); - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } void appendBuiltInStringFromFile(std::string builtInFile, size_t &size) { diff --git a/opencl/test/unit_test/command_queue/buffer_operations_fixture.h b/opencl/test/unit_test/command_queue/buffer_operations_fixture.h index a3d5183094..64d603f2f1 100644 --- a/opencl/test/unit_test/command_queue/buffer_operations_fixture.h +++ b/opencl/test/unit_test/command_queue/buffer_operations_fixture.h @@ -22,7 +22,7 @@ struct EnqueueWriteBufferTypeTest : public CommandEnqueueFixture, } void SetUp() override { - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext; zeroCopyBuffer.reset(BufferHelper<>::create()); @@ -33,7 +33,7 @@ struct EnqueueWriteBufferTypeTest : public CommandEnqueueFixture, srcBuffer.reset(nullptr); zeroCopyBuffer.reset(nullptr); delete BufferDefaults::context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/command_enqueue_fixture.h b/opencl/test/unit_test/command_queue/command_enqueue_fixture.h index ba2af1e7d7..5c8eee65b3 100644 --- a/opencl/test/unit_test/command_queue/command_enqueue_fixture.h +++ b/opencl/test/unit_test/command_queue/command_enqueue_fixture.h @@ -21,51 +21,51 @@ namespace NEO { struct CommandDeviceFixture : public ClDeviceFixture, public CommandQueueHwFixture { - using CommandQueueHwFixture::SetUp; - void SetUp(cl_command_queue_properties cmdQueueProperties = 0) { - ClDeviceFixture::SetUp(); - CommandQueueHwFixture::SetUp(pClDevice, cmdQueueProperties); + using CommandQueueHwFixture::setUp; + void setUp(cl_command_queue_properties cmdQueueProperties = 0) { + ClDeviceFixture::setUp(); + CommandQueueHwFixture::setUp(pClDevice, cmdQueueProperties); } - void TearDown() override { - CommandQueueHwFixture::TearDown(); - ClDeviceFixture::TearDown(); + void tearDown() { + CommandQueueHwFixture::tearDown(); + ClDeviceFixture::tearDown(); } }; struct CommandEnqueueBaseFixture : CommandDeviceFixture, public IndirectHeapFixture, public ClHardwareParse { - using IndirectHeapFixture::SetUp; - void SetUp(cl_command_queue_properties cmdQueueProperties = 0) { - CommandDeviceFixture::SetUp(cmdQueueProperties); - IndirectHeapFixture::SetUp(pCmdQ); + using IndirectHeapFixture::setUp; + void setUp(cl_command_queue_properties cmdQueueProperties = 0) { + CommandDeviceFixture::setUp(cmdQueueProperties); + IndirectHeapFixture::setUp(pCmdQ); ClHardwareParse::setUp(); } - void TearDown() override { + void tearDown() { ClHardwareParse::tearDown(); - IndirectHeapFixture::TearDown(); - CommandDeviceFixture::TearDown(); + IndirectHeapFixture::tearDown(); + CommandDeviceFixture::tearDown(); } }; struct CommandEnqueueFixture : public CommandEnqueueBaseFixture, public CommandStreamFixture { - void SetUp(cl_command_queue_properties cmdQueueProperties = 0) { - CommandEnqueueBaseFixture::SetUp(cmdQueueProperties); - CommandStreamFixture::SetUp(pCmdQ); + void setUp(cl_command_queue_properties cmdQueueProperties = 0) { + CommandEnqueueBaseFixture::setUp(cmdQueueProperties); + CommandStreamFixture::setUp(pCmdQ); } - void TearDown() override { - CommandEnqueueBaseFixture::TearDown(); - CommandStreamFixture::TearDown(); + void tearDown() { + CommandEnqueueBaseFixture::tearDown(); + CommandStreamFixture::tearDown(); } }; struct NegativeFailAllocationCommandEnqueueBaseFixture : public CommandEnqueueBaseFixture { - void SetUp() override { - CommandEnqueueBaseFixture::SetUp(); + void setUp() { + CommandEnqueueBaseFixture::setUp(); failMemManager.reset(new FailMemoryManager(*pDevice->getExecutionEnvironment())); BufferDefaults::context = context; @@ -77,13 +77,13 @@ struct NegativeFailAllocationCommandEnqueueBaseFixture : public CommandEnqueueBa pDevice->injectMemoryManager(failMemManager.release()); } - void TearDown() override { + void tearDown() { pDevice->injectMemoryManager(oldMemManager); buffer.reset(nullptr); image.reset(nullptr); BufferDefaults::context = nullptr; Image2dDefaults::context = nullptr; - CommandEnqueueBaseFixture::TearDown(); + CommandEnqueueBaseFixture::tearDown(); } std::unique_ptr buffer; diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp index c87aeebfd0..f04b96f6ba 100644 --- a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp @@ -67,12 +67,12 @@ void CommandQueueHwFixture::forceMapBufferOnGpu(Buffer &buffer) { } } -void CommandQueueHwFixture::SetUp() { +void CommandQueueHwFixture::setUp() { ASSERT_NE(nullptr, pCmdQ); context = new MockContext(); } -void CommandQueueHwFixture::SetUp( +void CommandQueueHwFixture::setUp( ClDevice *pDevice, cl_command_queue_properties properties) { ASSERT_NE(nullptr, pDevice); @@ -81,7 +81,7 @@ void CommandQueueHwFixture::SetUp( ASSERT_NE(nullptr, pCmdQ); } -void CommandQueueHwFixture::TearDown() { +void CommandQueueHwFixture::tearDown() { //resolve event dependencies if (pCmdQ) { auto blocked = pCmdQ->isQueueBlocked(); @@ -109,7 +109,7 @@ CommandQueue *CommandQueueFixture::createCommandQueue( internalUsage); } -void CommandQueueFixture::SetUp( +void CommandQueueFixture::setUp( Context *context, ClDevice *device, cl_command_queue_properties properties) { @@ -120,41 +120,41 @@ void CommandQueueFixture::SetUp( false); } -void CommandQueueFixture::TearDown() { +void CommandQueueFixture::tearDown() { delete pCmdQ; pCmdQ = nullptr; } -void OOQueueFixture ::SetUp(ClDevice *pDevice, cl_command_queue_properties properties) { +void OOQueueFixture ::setUp(ClDevice *pDevice, cl_command_queue_properties properties) { ASSERT_NE(nullptr, pDevice); BaseClass::pCmdQ = BaseClass::createCommandQueue(pDevice, CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE); ASSERT_NE(nullptr, BaseClass::pCmdQ); } void CommandQueueHwTest::SetUp() { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); - CommandQueueHwFixture::SetUp(pClDevice, 0); + ContextFixture::setUp(1, &device); + CommandQueueHwFixture::setUp(pClDevice, 0); } void CommandQueueHwTest::TearDown() { - CommandQueueHwFixture::TearDown(); - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueHwFixture::tearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } void OOQueueHwTest::SetUp() { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); - OOQueueFixture::SetUp(pClDevice, 0); + ContextFixture::setUp(1, &device); + OOQueueFixture::setUp(pClDevice, 0); } void OOQueueHwTest::TearDown() { - OOQueueFixture::TearDown(); - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + OOQueueFixture::tearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } } // namespace NEO diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.h b/opencl/test/unit_test/command_queue/command_queue_fixture.h index ef5bff7723..95549894bd 100644 --- a/opencl/test/unit_test/command_queue/command_queue_fixture.h +++ b/opencl/test/unit_test/command_queue/command_queue_fixture.h @@ -39,10 +39,10 @@ struct CommandQueueHwFixture { static void forceMapBufferOnGpu(Buffer &buffer); - virtual void SetUp(); // NOLINT(readability-identifier-naming) - virtual void SetUp(ClDevice *pDevice, cl_command_queue_properties properties); // NOLINT(readability-identifier-naming) + void setUp(); + void setUp(ClDevice *pDevice, cl_command_queue_properties properties); - virtual void TearDown(); // NOLINT(readability-identifier-naming) + void tearDown(); CommandQueue *pCmdQ = nullptr; MockClDevice *device = nullptr; @@ -53,15 +53,15 @@ struct CommandQueueHwFixture { struct OOQueueFixture : public CommandQueueHwFixture { typedef CommandQueueHwFixture BaseClass; - void SetUp(ClDevice *pDevice, cl_command_queue_properties properties) override; + void setUp(ClDevice *pDevice, cl_command_queue_properties properties); }; struct CommandQueueFixture { - virtual void SetUp( // NOLINT(readability-identifier-naming) + void setUp( Context *context, ClDevice *device, cl_command_queue_properties properties); - virtual void TearDown(); // NOLINT(readability-identifier-naming) + void tearDown(); CommandQueue *createCommandQueue( Context *context, @@ -88,7 +88,7 @@ static const cl_command_queue_properties DefaultCommandQueueProperties[] = { template struct CommandQueueHwBlitTest : ClDeviceFixture, ContextFixture, CommandQueueHwFixture, ::testing::Test { - using ContextFixture::SetUp; + using ContextFixture::setUp; void SetUp() override { hwInfo = *::defaultHwInfo; @@ -100,15 +100,15 @@ struct CommandQueueHwBlitTest : ClDeviceFixture, ContextFixture, CommandQueueHwF DebugManager.flags.PreferCopyEngineForCopyBufferToBuffer.set(1); ClDeviceFixture::setUpImpl(&hwInfo); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); cl_command_queue_properties queueProperties = ooq ? CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE : 0; - CommandQueueHwFixture::SetUp(pClDevice, queueProperties); + CommandQueueHwFixture::setUp(pClDevice, queueProperties); } void TearDown() override { - CommandQueueHwFixture::TearDown(); - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueHwFixture::tearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } HardwareInfo hwInfo{}; @@ -124,7 +124,7 @@ struct CommandQueueHwTest public CommandQueueHwFixture, ::testing::Test { - using ContextFixture::SetUp; + using ContextFixture::setUp; void SetUp() override; @@ -138,14 +138,14 @@ struct OOQueueHwTest : public ClDeviceFixture, public ContextFixture, public OOQueueFixture, ::testing::Test { - using ContextFixture::SetUp; + using ContextFixture::setUp; OOQueueHwTest() { } void SetUp() override; - void SetUp(ClDevice *pDevice, cl_command_queue_properties properties) override { + void setUp(ClDevice *pDevice, cl_command_queue_properties properties) { } void TearDown() override; diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp index 6370c98400..764c524467 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -60,11 +60,11 @@ struct CommandQueueMemoryDevice void setUp() { MemoryManagementFixture::setUp(); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); } void tearDown() { - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); platformsImpl->clear(); MemoryManagementFixture::tearDown(); } @@ -76,8 +76,8 @@ struct CommandQueueTest public CommandQueueFixture, ::testing::TestWithParam { - using CommandQueueFixture::SetUp; - using ContextFixture::SetUp; + using CommandQueueFixture::setUp; + using ContextFixture::setUp; CommandQueueTest() { } @@ -87,13 +87,13 @@ struct CommandQueueTest properties = GetParam(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); - CommandQueueFixture::SetUp(pContext, pClDevice, properties); + ContextFixture::setUp(1, &device); + CommandQueueFixture::setUp(pContext, pClDevice, properties); } void TearDown() override { - CommandQueueFixture::TearDown(); - ContextFixture::TearDown(); + CommandQueueFixture::tearDown(); + ContextFixture::tearDown(); CommandQueueMemoryDevice::tearDown(); } @@ -183,18 +183,18 @@ struct GetTagTest : public ClDeviceFixture, public CommandStreamFixture, public ::testing::Test { - using CommandQueueFixture::SetUp; + using CommandQueueFixture::setUp; void SetUp() override { - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(nullptr, pClDevice, 0); - CommandStreamFixture::SetUp(pCmdQ); + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(nullptr, pClDevice, 0); + CommandStreamFixture::setUp(pCmdQ); } void TearDown() override { - CommandStreamFixture::TearDown(); - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandStreamFixture::tearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index 0caa6fa9fc..18d5c08734 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -37,13 +37,13 @@ using namespace NEO; struct DispatchWalkerTest : public CommandQueueFixture, public ClDeviceFixture, public ::testing::Test { - using CommandQueueFixture::SetUp; + using CommandQueueFixture::setUp; void SetUp() override { DebugManager.flags.EnableTimestampPacket.set(0); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = std::make_unique(pClDevice); - CommandQueueFixture::SetUp(context.get(), pClDevice, 0); + CommandQueueFixture::setUp(context.get(), pClDevice, 0); program = std::make_unique(toClDeviceVector(*pClDevice)); @@ -64,9 +64,9 @@ struct DispatchWalkerTest : public CommandQueueFixture, public ClDeviceFixture, } void TearDown() override { - CommandQueueFixture::TearDown(); + CommandQueueFixture::tearDown(); context.reset(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } std::unique_ptr createBlockedCommandsData(CommandQueue &commandQueue) { diff --git a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp index df5523fd14..d5df8cabbb 100644 --- a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp @@ -19,7 +19,7 @@ using namespace NEO; -using BarrierTest = TestLegacy; +using BarrierTest = Test; HWTEST_F(BarrierTest, givenCsrWithHigherLevelThenCommandQueueWhenEnqueueBarrierIsCalledThenCommandQueueAlignsToCsrWithoutSendingAnyCommands) { auto pCmdQ = this->pCmdQ; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h index db3c1a5680..4ba861288d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h @@ -44,7 +44,7 @@ struct EnqueueCopyBufferTest : public CommandEnqueueFixture, public ::testing::Test { void SetUp(void) override { - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext; @@ -56,7 +56,7 @@ struct EnqueueCopyBufferTest : public CommandEnqueueFixture, delete srcBuffer; delete dstBuffer; delete BufferDefaults::context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h index 5370096834..7d2d541d52 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h @@ -55,7 +55,7 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture, }; void SetUp(void) override { - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext; srcBuffer = BufferHelper::create(); @@ -66,7 +66,7 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture, delete srcBuffer; delete dstBuffer; delete BufferDefaults::context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h index b9acad054f..8585bb3cd1 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h @@ -22,7 +22,7 @@ struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture, void SetUp() override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext(pClDevice); context = new MockContext(pClDevice); @@ -38,7 +38,7 @@ struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture, delete srcBuffer; delete BufferDefaults::context; delete context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: @@ -63,7 +63,7 @@ struct EnqueueCopyBufferToImageMipMapTest : public CommandEnqueueFixture, void SetUp(void) override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext(pClDevice); context = new MockContext(pClDevice); srcBuffer = BufferHelper<>::create(context); @@ -76,7 +76,7 @@ struct EnqueueCopyBufferToImageMipMapTest : public CommandEnqueueFixture, delete srcBuffer; delete BufferDefaults::context; delete context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } MockContext *context = nullptr; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index 6cc94290d8..417c3e0dd7 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -372,7 +372,7 @@ HWTEST_F(EnqueueCopyBufferToImageStatefulTest, givenBigBufferWhenCopyingBufferTo EXPECT_EQ(CL_SUCCESS, retVal); } -using OneMipLevelCopyBufferToImageImageTests = TestLegacy; +using OneMipLevelCopyBufferToImageImageTests = Test; HWTEST_F(OneMipLevelCopyBufferToImageImageTests, GivenNotMippedImageWhenCopyingBufferToImageThenDoNotProgramDestinationMipLevel) { auto srcBuffer = std::unique_ptr(createBuffer()); diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h index 6a242a923b..73841354cc 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h @@ -21,7 +21,7 @@ struct EnqueueCopyImageTest : public CommandEnqueueFixture, void SetUp(void) override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); context = new MockContext(pClDevice); srcImage = Image2dHelper<>::create(context); dstImage = Image2dHelper<>::create(context); @@ -34,7 +34,7 @@ struct EnqueueCopyImageTest : public CommandEnqueueFixture, delete dstImage; delete srcImage; delete context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: @@ -59,7 +59,7 @@ struct EnqueueCopyImageMipMapTest : public CommandEnqueueFixture, void SetUp(void) override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); context = new MockContext(pClDevice); } @@ -68,7 +68,7 @@ struct EnqueueCopyImageMipMapTest : public CommandEnqueueFixture, return; } delete context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } MockContext *context = nullptr; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp index 672dce8ef8..d4189b3573 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp @@ -347,7 +347,7 @@ INSTANTIATE_TEST_CASE_P(MipMapCopyImageTest_GivenImagesWithNonZeroMipLevelsWhenC ::testing::ValuesIn(types), ::testing::ValuesIn(types))); -using OneMipLevelCopyImageImageTests = TestLegacy; +using OneMipLevelCopyImageImageTests = Test; HWTEST_F(OneMipLevelCopyImageImageTests, GivenNotMippedImageWhenCopyingImageThenDoNotProgramSourceAndDestinationMipLevels) { auto dstImage = std::unique_ptr(createImage()); diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h index 89c8feb46c..7695394dbf 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h @@ -22,7 +22,7 @@ struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture, void SetUp(void) override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext(pClDevice); context = new MockContext(pClDevice); srcImage = Image2dHelper<>::create(context); @@ -37,7 +37,7 @@ struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture, delete dstBuffer; delete BufferDefaults::context; delete context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: @@ -62,7 +62,7 @@ struct EnqueueCopyImageToBufferMipMapTest : public CommandEnqueueFixture, void SetUp(void) override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext(pClDevice); context = new MockContext(pClDevice); dstBuffer = BufferHelper<>::create(context); @@ -75,7 +75,7 @@ struct EnqueueCopyImageToBufferMipMapTest : public CommandEnqueueFixture, delete dstBuffer; delete BufferDefaults::context; delete context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } MockContext *context = nullptr; diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp index 3a413dbee0..99e1df1f4d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -365,7 +365,7 @@ HWTEST_F(EnqueueCopyImageToBufferStatefulTest, givenBufferWhenCopyingImageToBuff EXPECT_EQ(CL_SUCCESS, retVal); } -using OneMipLevelCopyImageToBufferImageTests = TestLegacy; +using OneMipLevelCopyImageToBufferImageTests = Test; HWTEST_F(OneMipLevelCopyImageToBufferImageTests, GivenNotMippedImageWhenCopyingImageToBufferThenDoNotProgramSourceMipLevel) { auto dstBuffer = std::unique_ptr(createBuffer()); diff --git a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp index b34a1d9426..1f7e51faeb 100644 --- a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp @@ -32,7 +32,7 @@ class EnqueueDebugKernelTest : public ProgramSimpleFixture, public ::testing::Test { public: void SetUp() override { - ProgramSimpleFixture::SetUp(); + ProgramSimpleFixture::setUp(); device = pClDevice; pDevice->executionEnvironment->rootDeviceEnvironments[pDevice->getRootDeviceIndex()]->debugger.reset(new SourceLevelDebugger(nullptr)); @@ -46,7 +46,7 @@ class EnqueueDebugKernelTest : public ProgramSimpleFixture, KernelFilenameHelper::getKernelFilenameFromInternalOption(kernelOption, filename); kbHelper = new KernelBinaryHelper(filename, false); - CreateProgramWithSource( + createProgramWithSource( pContext, "copybuffer.cl"); pProgram->enableKernelDebug(); @@ -82,7 +82,7 @@ class EnqueueDebugKernelTest : public ProgramSimpleFixture, delete kbHelper; pMultiDeviceKernel->release(); } - ProgramSimpleFixture::TearDown(); + ProgramSimpleFixture::tearDown(); } cl_device_id device; Kernel *debugKernel = nullptr; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp index 60e67bab45..8617689ffb 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_event_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,11 +20,11 @@ struct FillBufferEventTests : public EnqueueFillBufferFixture, typedef EnqueueFillBufferFixture BaseClass; void SetUp() override { - BaseClass::SetUp(); + BaseClass::setUp(); } void TearDown() override { - BaseClass::TearDown(); + BaseClass::tearDown(); } }; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h index 6ff05ee3d5..fcbefa5cbf 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h @@ -15,19 +15,19 @@ namespace NEO { struct EnqueueFillBufferFixture : public CommandEnqueueFixture { - void SetUp() override { - CommandEnqueueFixture::SetUp(); + void setUp() { + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext; buffer = BufferHelper<>::create(); } - void TearDown() override { + void tearDown() { delete buffer; delete BufferDefaults::context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } template diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp index 02842a321f..08af778e45 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp @@ -23,11 +23,11 @@ struct EnqueueFillBuffer : public EnqueueFillBufferFixture, typedef EnqueueFillBufferFixture BaseClass; void SetUp() override { - BaseClass::SetUp(); + BaseClass::setUp(); } void TearDown() override { - BaseClass::TearDown(); + BaseClass::tearDown(); } }; @@ -133,14 +133,14 @@ struct InvalidPatternSize : public EnqueueFillBufferFixture, } void SetUp() override { - BaseClass::SetUp(); + BaseClass::setUp(); patternSize = GetParam(); pattern = new char[patternSize]; } void TearDown() override { delete[] pattern; - BaseClass::TearDown(); + BaseClass::tearDown(); } size_t patternSize = 0; diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp index 704665ad78..1fee627681 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp @@ -29,7 +29,7 @@ using namespace NEO; -typedef TestLegacy EnqueueFillBufferCmdTests; +typedef Test EnqueueFillBufferCmdTests; HWTEST_F(EnqueueFillBufferCmdTests, WhenFillingBufferThenTaskCountIsAlignedWithCsr) { //this test case assumes IOQ diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h index f009bf2f70..5bbbf5682f 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_fixture.h @@ -15,20 +15,20 @@ namespace NEO { struct EnqueueFillImageTestFixture : public CommandEnqueueFixture { - void SetUp(void) override { + void setUp() { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); context = new MockContext(pClDevice); image = Image2dHelper<>::create(context); } - void TearDown(void) override { + void tearDown() { if (testing::Test::IsSkipped()) { return; } delete image; delete context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp index 21dae5e6e4..0d2e377445 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp @@ -26,11 +26,11 @@ class EnqueueFillImageTest : public EnqueueFillImageTestFixture, public ::testing::Test { public: void SetUp(void) override { - EnqueueFillImageTestFixture::SetUp(); + EnqueueFillImageTestFixture::setUp(); } void TearDown(void) override { - EnqueueFillImageTestFixture::TearDown(); + EnqueueFillImageTestFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp index 1c8fb71931..c8d5e9e310 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp @@ -25,7 +25,7 @@ using namespace NEO; typedef HelloWorldFixture EnqueueKernelFixture; -typedef TestLegacy EnqueueKernelTest; +typedef Test EnqueueKernelTest; TEST_F(EnqueueKernelTest, GivenNullKernelWhenEnqueuingKernelThenInvalidKernelErrorIsReturned) { size_t globalWorkSize[3] = {1, 1, 1}; diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp index 28903d6c4d..b7e322c485 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp @@ -118,12 +118,12 @@ struct EnqueueKernelTypeTest : public HelloWorldFixture EnqueueKernelFixture; -typedef TestLegacy EnqueueKernelTest; +typedef Test EnqueueKernelTest; template class MyCmdQ : public MockCommandQueueHw { diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp index dd7f32f2a3..372dfbde2a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_mt_tests.cpp @@ -14,7 +14,7 @@ #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" typedef HelloWorldFixture EnqueueKernelFixture; -typedef TestLegacy EnqueueKernelTest; +typedef Test EnqueueKernelTest; HWTEST_F(EnqueueKernelTest, givenCsrInBatchingModeWhenFinishIsCalledThenBatchesSubmissionsAreFlushed) { auto mockCsr = new MockCsrHw2(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); diff --git a/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h index 20e17dfc70..8368e7d9f8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h @@ -17,7 +17,7 @@ struct EnqueueMapBufferTypeTest : public CommandEnqueueFixture, public ::testing::Test { void SetUp() override { - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext; srcBuffer = BufferHelper<>::create(); } @@ -25,7 +25,7 @@ struct EnqueueMapBufferTypeTest : public CommandEnqueueFixture, void TearDown() override { delete srcBuffer; delete BufferDefaults::context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp index ea8684bf6b..65c7071568 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp @@ -33,8 +33,8 @@ struct EnqueueMapBufferTest : public ClDeviceFixture, } void SetUp() override { - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(pClDevice, 0); + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(pClDevice, 0); BufferDefaults::context = new MockContext; buffer = BufferHelper>::create(); @@ -43,8 +43,8 @@ struct EnqueueMapBufferTest : public ClDeviceFixture, void TearDown() override { delete buffer; delete BufferDefaults::context; - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp index 41e8992cb7..267b6b537a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp @@ -36,8 +36,8 @@ struct EnqueueMapImageTest : public ClDeviceFixture, void SetUp() override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(pClDevice, 0); + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(pClDevice, 0); context = new MockContext(pClDevice); image = ImageHelper>::create(context); } @@ -48,8 +48,8 @@ struct EnqueueMapImageTest : public ClDeviceFixture, } delete image; context->release(); - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } MockContext *context; @@ -995,13 +995,13 @@ struct EnqueueMapImageTypeTest : public CommandEnqueueFixture, } void SetUp() override { - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); image = ImageHelper>::create(&context); } void TearDown() override { delete image; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp index 23296f0cd3..b03959b686 100644 --- a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp @@ -18,7 +18,7 @@ using namespace NEO; -using MarkerTest = TestLegacy; +using MarkerTest = Test; HWTEST_F(MarkerTest, GivenCsrAndCmdqWithSameTaskLevelWhenEnqueingMarkerThenPipeControlIsAdded) { typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; diff --git a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp index 2a53ccb5df..e363cce7a7 100644 --- a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp @@ -21,19 +21,19 @@ class MigrateMemObjectsFixture : public ClDeviceFixture, public CommandQueueHwFixture { public: - void SetUp() override { - ClDeviceFixture::SetUp(); - CommandQueueHwFixture::SetUp(pClDevice, 0); + void setUp() { + ClDeviceFixture::setUp(); + CommandQueueHwFixture::setUp(pClDevice, 0); ASSERT_NE(nullptr, pCmdQ); } - void TearDown() override { - CommandQueueHwFixture::TearDown(); - ClDeviceFixture::TearDown(); + void tearDown() { + CommandQueueHwFixture::tearDown(); + ClDeviceFixture::tearDown(); } }; -typedef TestLegacy MigrateMemObjectsTest; +typedef Test MigrateMemObjectsTest; TEST_F(MigrateMemObjectsTest, GivenNullEventWhenMigratingEventsThenSuccessIsReturned) { diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h index c71cccdb7d..092511d1b9 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h @@ -21,7 +21,7 @@ struct EnqueueReadBufferTypeTest : public CommandEnqueueFixture, } void SetUp() override { - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); BufferDefaults::context = new MockContext; srcBuffer.reset(BufferHelper<>::create()); nonZeroCopyBuffer.reset(BufferHelper>::create()); @@ -31,7 +31,7 @@ struct EnqueueReadBufferTypeTest : public CommandEnqueueFixture, srcBuffer.reset(nullptr); nonZeroCopyBuffer.reset(nullptr); delete BufferDefaults::context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h index db7922db30..cfc29052d1 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h @@ -18,7 +18,7 @@ namespace NEO { struct EnqueueReadBufferRectTest : public CommandEnqueueFixture, public ::testing::Test { void SetUp() override { - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); context.reset(new MockContext(pCmdQ->getDevice().getSpecializedDevice())); BufferDefaults::context = context.get(); @@ -43,7 +43,7 @@ struct EnqueueReadBufferRectTest : public CommandEnqueueFixture, ::alignedFree(hostPtr); context.reset(); - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp index c93ec455d6..142c31a199 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -632,7 +632,7 @@ HWTEST_F(EnqueueReadWriteBufferRectDispatch, givenOffsetResultingInMisalignedPtr } } -using NegativeFailAllocationTest = TestLegacy; +using NegativeFailAllocationTest = Test; HWTEST_F(NegativeFailAllocationTest, givenEnqueueReadBufferRectWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp index b2df099a2a..eab3648819 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp @@ -720,7 +720,7 @@ HWTEST_F(EnqueueReadBufferTypeTest, givenEnqueueReadBufferNonBlockingWhenAUBDump EXPECT_FALSE(srcBuffer->forceDisallowCPUCopy); } -using NegativeFailAllocationTest = TestLegacy; +using NegativeFailAllocationTest = Test; HWTEST_F(NegativeFailAllocationTest, givenEnqueueReadBufferWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h index 8f564db1d3..263c15724f 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h @@ -24,7 +24,7 @@ struct EnqueueReadImageTest : public CommandEnqueueFixture, void SetUp(void) override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); context = new MockContext(pClDevice); srcImage = Image2dHelper<>::create(context); @@ -40,7 +40,7 @@ struct EnqueueReadImageTest : public CommandEnqueueFixture, delete srcImage; delete[] dstPtr; delete context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index f27edfecc4..e13b9abb20 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -1036,7 +1036,7 @@ HWTEST_P(MipMapReadImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalled INSTANTIATE_TEST_CASE_P(MipMapReadImageTest_GivenImageWithMipLevelNonZeroWhenWriteImageIsCalledThenProperMipLevelIsSet, MipMapReadImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); -using NegativeFailAllocationTest = TestLegacy; +using NegativeFailAllocationTest = Test; HWTEST_F(NegativeFailAllocationTest, givenEnqueueWriteImageWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; @@ -1063,7 +1063,7 @@ HWTEST_F(NegativeFailAllocationTest, givenEnqueueWriteImageWhenHostPtrAllocation EXPECT_EQ(CL_OUT_OF_RESOURCES, retVal); } -using OneMipLevelReadImageTests = TestLegacy; +using OneMipLevelReadImageTests = Test; HWTEST_F(OneMipLevelReadImageTests, GivenNotMippedImageWhenReadingImageThenDoNotProgramSourceMipLevel) { auto queue = createQueue(); diff --git a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp index 849e3faf55..1d54dd3ccd 100644 --- a/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_resource_barier_tests.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using ResourceBarrierTest = TestLegacy; +using ResourceBarrierTest = Test; HWTEST_F(ResourceBarrierTest, givenNullArgsAndHWCommandQueueWhenEnqueueResourceBarrierCalledThenCorrectStatusReturned) { cl_resource_barrier_descriptor_intel descriptor{}; diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp index ffb6a5c2ce..bfd19488b9 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -31,13 +31,13 @@ struct EnqueueSvmMemCopyTest : public ClDeviceFixture, } void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); if (!pDevice->isFullRangeSvm()) { return; } - CommandQueueFixture::SetUp(pClDevice, 0); + CommandQueueFixture::setUp(pClDevice, 0); srcSvmPtr = context->getSVMAllocsManager()->createSVMAlloc(256, {}, context->getRootDeviceIndices(), context->getDeviceBitfields()); ASSERT_NE(nullptr, srcSvmPtr); dstSvmPtr = context->getSVMAllocsManager()->createSVMAlloc(256, {}, context->getRootDeviceIndices(), context->getDeviceBitfields()); @@ -56,9 +56,9 @@ struct EnqueueSvmMemCopyTest : public ClDeviceFixture, if (pDevice->isFullRangeSvm()) { context->getSVMAllocsManager()->freeSVMAlloc(srcSvmPtr); context->getSVMAllocsManager()->freeSVMAlloc(dstSvmPtr); - CommandQueueFixture::TearDown(); + CommandQueueFixture::tearDown(); } - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } void *srcSvmPtr = nullptr; diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp index 3b7df7d950..cc6ffba8b9 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -27,8 +27,8 @@ struct EnqueueSvmMemFillTest : public ClDeviceFixture, } void SetUp() override { - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(pClDevice, 0); + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(pClDevice, 0); REQUIRE_SVM_OR_SKIP(pDevice); patternSize = (size_t)GetParam(); ASSERT_TRUE((0 < patternSize) && (patternSize <= 128)); @@ -46,8 +46,8 @@ struct EnqueueSvmMemFillTest : public ClDeviceFixture, if (svmPtr) { context->getSVMAllocsManager()->freeSVMAlloc(svmPtr); } - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } const uint64_t pattern[16] = {0x0011223344556677, 0x8899AABBCCDDEEFF, 0xFFEEDDCCBBAA9988, 0x7766554433221100, diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp index e4af618292..0593bb1054 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp @@ -43,8 +43,8 @@ struct EnqueueSvmTest : public ClDeviceFixture, void SetUp() override { REQUIRE_SVM_OR_SKIP(defaultHwInfo); - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(pClDevice, 0); + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(pClDevice, 0); ptrSVM = context->getSVMAllocsManager()->createSVMAlloc(256, {}, context->getRootDeviceIndices(), context->getDeviceBitfields()); } @@ -53,8 +53,8 @@ struct EnqueueSvmTest : public ClDeviceFixture, return; } context->getSVMAllocsManager()->freeSVMAlloc(ptrSVM); - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } std::pair, void *> createBufferAndMapItOnGpu() { @@ -1094,7 +1094,7 @@ struct EnqueueSvmTestLocalMemory : public ClDeviceFixture, dbgRestore = std::make_unique(); DebugManager.flags.EnableLocalMemory.set(1); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = std::make_unique(pClDevice, true); size = 256; svmPtr = context->getSVMAllocsManager()->createSVMAlloc(size, {}, context->getRootDeviceIndices(), context->getDeviceBitfields()); @@ -1108,7 +1108,7 @@ struct EnqueueSvmTestLocalMemory : public ClDeviceFixture, } context->getSVMAllocsManager()->freeSVMAlloc(svmPtr); context.reset(nullptr); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp index bd05178494..e86b6ab611 100644 --- a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp @@ -66,16 +66,16 @@ class CommandStreamReceiverMock : public UltCommandStreamReceiver { }; struct EnqueueThreadingFixture : public ClDeviceFixture { - void SetUp() { - ClDeviceFixture::SetUp(); + void setUp() { + ClDeviceFixture::setUp(); context = new MockContext(pClDevice); pCmdQ = nullptr; } - void TearDown() { + void tearDown() { delete pCmdQ; context->release(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } template @@ -133,7 +133,7 @@ struct EnqueueThreadingFixture : public ClDeviceFixture { } }; -typedef TestLegacy EnqueueThreading; +typedef Test EnqueueThreading; struct EnqueueThreadingImage : EnqueueThreading { void SetUp() override { diff --git a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp index 4a60152b9c..533abd2fa7 100644 --- a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -30,8 +30,8 @@ struct EnqueueUnmapMemObjTest : public ClDeviceFixture, } void SetUp() override { - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(pClDevice, 0); + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(pClDevice, 0); BufferDefaults::context = new MockContext; buffer = BufferHelper>::create(); mappedPtr = pCmdQ->enqueueMapBuffer(buffer, CL_TRUE, CL_MAP_READ, 0, 8, 0, nullptr, nullptr, retVal); @@ -40,8 +40,8 @@ struct EnqueueUnmapMemObjTest : public ClDeviceFixture, void TearDown() override { delete buffer; delete BufferDefaults::context; - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp index 3988166b68..6b70f8e55b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp @@ -52,12 +52,8 @@ struct EnqueueWaitlistTest : public EnqueueWaitlistFixture, typedef CommandQueueHwFixture CommandQueueFixture; using CommandQueueHwFixture::pCmdQ; - EnqueueWaitlistTest(void) { - buffer = nullptr; - } - void SetUp() override { - EnqueueWaitlistFixture::SetUp(); + EnqueueWaitlistFixture::setUp(); buffer = BufferHelper<>::create(); bufferNonZeroCopy = new UnalignedBuffer(BufferDefaults::context, &bufferNonZeroCopyAlloc); image = Image1dHelper<>::create(BufferDefaults::context); @@ -69,17 +65,17 @@ struct EnqueueWaitlistTest : public EnqueueWaitlistFixture, bufferNonZeroCopy->decRefInternal(); image->decRefInternal(); imageNonZeroCopy->decRefInternal(); - EnqueueWaitlistFixture::TearDown(); + EnqueueWaitlistFixture::tearDown(); } cl_int retVal = CL_SUCCESS; cl_int error = CL_SUCCESS; MockGraphicsAllocation bufferNonZeroCopyAlloc{nullptr, MemoryConstants::pageSize}; - Buffer *buffer; - Buffer *bufferNonZeroCopy; - Image *image; - Image *imageNonZeroCopy; + Buffer *buffer = nullptr; + Buffer *bufferNonZeroCopy = nullptr; + Image *image = nullptr; + Image *imageNonZeroCopy = nullptr; void testError(cl_int error, std::string str) { EXPECT_EQ(CL_SUCCESS, error) << str << std::endl; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h index 302604ae4c..1bb5ea02f8 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h @@ -19,7 +19,7 @@ namespace NEO { struct EnqueueWriteBufferRectTest : public CommandEnqueueFixture, public ::testing::Test { void SetUp() override { - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); context.reset(new MockContext(pClDevice)); BufferDefaults::context = context.get(); @@ -44,7 +44,7 @@ struct EnqueueWriteBufferRectTest : public CommandEnqueueFixture, nonZeroCopyBuffer.reset(); ::alignedFree(hostPtr); context.reset(); - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp index d51f05dd18..20b9115b56 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -631,7 +631,7 @@ HWTEST_F(EnqueueReadWriteBufferRectDispatch, givenOffsetResultingInMisalignedPtr } } -using NegativeFailAllocationTest = TestLegacy; +using NegativeFailAllocationTest = Test; HWTEST_F(NegativeFailAllocationTest, givenEnqueueWriteBufferRectWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp index 29ce25c87c..ad5c54d9a7 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp @@ -505,7 +505,7 @@ HWTEST_F(EnqueueWriteBufferTypeTest, givenEnqueueWriteBufferCalledWhenLockedPtrI EXPECT_EQ(0u, memoryManager.unlockResourceCalled); } -using NegativeFailAllocationTest = TestLegacy; +using NegativeFailAllocationTest = Test; HWTEST_F(NegativeFailAllocationTest, givenEnqueueWriteBufferWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h index d7d10c6e13..c0064f4b2a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h @@ -21,7 +21,7 @@ struct EnqueueWriteImageTest : public CommandEnqueueFixture, void SetUp(void) override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); context = new MockContext(pClDevice); dstImage = Image2dHelper<>::create(context); @@ -38,7 +38,7 @@ struct EnqueueWriteImageTest : public CommandEnqueueFixture, delete dstImage; delete[] srcPtr; delete context; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index 28cc8f2994..bb67e74822 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -514,7 +514,7 @@ HWTEST_P(MipMapWriteImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalle INSTANTIATE_TEST_CASE_P(MipMapWriteImageTest_GivenImageWithMipLevelNonZeroWhenReadImageIsCalledThenProperMipLevelIsSet, MipMapWriteImageTest, ::testing::Values(CL_MEM_OBJECT_IMAGE1D, CL_MEM_OBJECT_IMAGE1D_ARRAY, CL_MEM_OBJECT_IMAGE2D, CL_MEM_OBJECT_IMAGE2D_ARRAY, CL_MEM_OBJECT_IMAGE3D)); -using NegativeFailAllocationTest = TestLegacy; +using NegativeFailAllocationTest = Test; HWTEST_F(NegativeFailAllocationTest, givenEnqueueReadImageWhenHostPtrAllocationCreationFailsThenReturnOutOfResource) { cl_int retVal = CL_SUCCESS; @@ -541,7 +541,7 @@ HWTEST_F(NegativeFailAllocationTest, givenEnqueueReadImageWhenHostPtrAllocationC EXPECT_EQ(CL_OUT_OF_RESOURCES, retVal); } -using OneMipLevelWriteImageTests = TestLegacy; +using OneMipLevelWriteImageTests = Test; HWTEST_F(OneMipLevelWriteImageTests, GivenNotMippedImageWhenWritingImageThenDoNotProgramDestinationMipLevel) { auto queue = createQueue(); diff --git a/opencl/test/unit_test/command_queue/finish_tests.cpp b/opencl/test/unit_test/command_queue/finish_tests.cpp index 4a89df1306..b7c3960182 100644 --- a/opencl/test/unit_test/command_queue/finish_tests.cpp +++ b/opencl/test/unit_test/command_queue/finish_tests.cpp @@ -24,24 +24,24 @@ struct FinishFixture : public ClDeviceFixture, public CommandStreamFixture, public HardwareParse { - void SetUp() override { - ClDeviceFixture::SetUp(); - CommandQueueHwFixture::SetUp(pClDevice, 0); + void setUp() { + ClDeviceFixture::setUp(); + CommandQueueHwFixture::setUp(pClDevice, 0); ASSERT_NE(nullptr, pCmdQ); - CommandStreamFixture::SetUp(pCmdQ); + CommandStreamFixture::setUp(pCmdQ); ASSERT_NE(nullptr, pCS); HardwareParse::setUp(); } - void TearDown() override { + void tearDown() { HardwareParse::tearDown(); - CommandStreamFixture::TearDown(); - CommandQueueHwFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandStreamFixture::tearDown(); + CommandQueueHwFixture::tearDown(); + ClDeviceFixture::tearDown(); } }; -typedef TestLegacy FinishTest; +typedef Test FinishTest; HWTEST_F(FinishTest, GivenCsGreaterThanCqWhenFinishIsCalledThenPipeControlIsNotAdded) { typedef typename FamilyType::PIPE_CONTROL PIPE_CONTROL; diff --git a/opencl/test/unit_test/command_queue/flush_tests.cpp b/opencl/test/unit_test/command_queue/flush_tests.cpp index 865e6c3bd6..193e7ac4f2 100644 --- a/opencl/test/unit_test/command_queue/flush_tests.cpp +++ b/opencl/test/unit_test/command_queue/flush_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -20,18 +20,18 @@ struct FlushTest public CommandStreamFixture, public ::testing::Test { - using CommandQueueFixture::SetUp; + using CommandQueueFixture::setUp; void SetUp() override { - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(nullptr, pClDevice, 0); - CommandStreamFixture::SetUp(pCmdQ); + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(nullptr, pClDevice, 0); + CommandStreamFixture::setUp(pCmdQ); } void TearDown() override { - CommandStreamFixture::TearDown(); - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandStreamFixture::tearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp index a7a2d2df73..817655e996 100644 --- a/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_command_queue_info_tests.cpp @@ -20,25 +20,25 @@ struct GetCommandQueueInfoTest : public ClDeviceFixture, public ContextFixture, public CommandQueueFixture, ::testing::TestWithParam { - using CommandQueueFixture::SetUp; - using ContextFixture::SetUp; + using CommandQueueFixture::setUp; + using ContextFixture::setUp; GetCommandQueueInfoTest() { } void SetUp() override { properties = GetParam(); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); - CommandQueueFixture::SetUp(pContext, pClDevice, properties); + ContextFixture::setUp(1, &device); + CommandQueueFixture::setUp(pContext, pClDevice, properties); } void TearDown() override { - CommandQueueFixture::TearDown(); - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueFixture::tearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } const HardwareInfo *pHwInfo = nullptr; diff --git a/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp index a7ff2d86a0..68e1038d82 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_buffer_tests.cpp @@ -31,16 +31,13 @@ struct GetSizeRequiredBufferTest : public CommandEnqueueFixture, public HelloWorldKernelFixture, public ::testing::Test { - using HelloWorldKernelFixture::SetUp; - using SimpleArgKernelFixture::SetUp; - - GetSizeRequiredBufferTest() { - } + using HelloWorldKernelFixture::setUp; + using SimpleArgKernelFixture::setUp; void SetUp() override { - CommandEnqueueFixture::SetUp(); - SimpleArgKernelFixture::SetUp(pClDevice); - HelloWorldKernelFixture::SetUp(pClDevice, "CopyBuffer_simd", "CopyBuffer"); + CommandEnqueueFixture::setUp(); + SimpleArgKernelFixture::setUp(pClDevice); + HelloWorldKernelFixture::setUp(pClDevice, "CopyBuffer_simd", "CopyBuffer"); BufferDefaults::context = new MockContext; srcBuffer = BufferHelper<>::create(); dstBuffer = BufferHelper<>::create(); @@ -53,9 +50,9 @@ struct GetSizeRequiredBufferTest : public CommandEnqueueFixture, delete dstBuffer; delete srcBuffer; delete BufferDefaults::context; - HelloWorldKernelFixture::TearDown(); - SimpleArgKernelFixture::TearDown(); - CommandEnqueueFixture::TearDown(); + HelloWorldKernelFixture::tearDown(); + SimpleArgKernelFixture::tearDown(); + CommandEnqueueFixture::tearDown(); } Buffer *srcBuffer = nullptr; diff --git a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp index 6470a062fb..7173800851 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_image_tests.cpp @@ -36,7 +36,7 @@ struct GetSizeRequiredImageTest : public CommandEnqueueFixture, void SetUp() override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); srcImage = Image2dHelper<>::create(context); dstImage = Image2dHelper<>::create(context); @@ -51,7 +51,7 @@ struct GetSizeRequiredImageTest : public CommandEnqueueFixture, delete dstImage; delete srcImage; - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } Image *srcImage = nullptr; diff --git a/opencl/test/unit_test/command_queue/get_size_required_tests.cpp b/opencl/test/unit_test/command_queue/get_size_required_tests.cpp index 751bdaf355..a44b816831 100644 --- a/opencl/test/unit_test/command_queue/get_size_required_tests.cpp +++ b/opencl/test/unit_test/command_queue/get_size_required_tests.cpp @@ -21,7 +21,7 @@ struct GetSizeRequiredTest : public CommandEnqueueFixture, public ::testing::Test { void SetUp() override { - CommandEnqueueFixture::SetUp(); + CommandEnqueueFixture::setUp(); dsh = &pCmdQ->getIndirectHeap(IndirectHeap::Type::DYNAMIC_STATE, 0u); ioh = &pCmdQ->getIndirectHeap(IndirectHeap::Type::INDIRECT_OBJECT, 0u); ssh = &pCmdQ->getIndirectHeap(IndirectHeap::Type::SURFACE_STATE, 0u); @@ -32,7 +32,7 @@ struct GetSizeRequiredTest : public CommandEnqueueFixture, } void TearDown() override { - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } IndirectHeap *dsh; diff --git a/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp b/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp index 0e50353075..01be2012fd 100644 --- a/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp +++ b/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp @@ -24,7 +24,7 @@ using namespace NEO; typedef HelloWorldFixture EnqueueKernelFixture; -typedef TestLegacy EnqueueKernelTest; +typedef Test EnqueueKernelTest; TEST_F(EnqueueKernelTest, givenKernelWithSharedObjArgsWhenEnqueueIsCalledThenResetPatchAddress) { diff --git a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp index 88d893c00b..f7c349861c 100644 --- a/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/multiple_map_buffer_tests.cpp @@ -112,13 +112,13 @@ struct MultipleMapBufferTest : public ClDeviceFixture, public ::testing::Test { } void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = new MockContext(pClDevice); } void TearDown() override { delete context; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } MockContext *context = nullptr; diff --git a/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp b/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp index ef0e224737..72f3aeec3a 100644 --- a/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/multiple_map_image_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -130,13 +130,13 @@ struct MultipleMapImageTest : public ClDeviceFixture, public ::testing::Test { } void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = new MockContext(pClDevice); } void TearDown() override { delete context; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } MockContext *context = nullptr; diff --git a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp index df0e13ecae..eb2b5bc374 100644 --- a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp @@ -37,22 +37,19 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture, public HelloWorldKernelFixture, public ::testing::TestWithParam { - using CommandQueueFixture::SetUp; - using HelloWorldKernelFixture::SetUp; - using SimpleArgKernelFixture::SetUp; - - OOMCommandQueueBufferTest() { - } + using CommandQueueFixture::setUp; + using HelloWorldKernelFixture::setUp; + using SimpleArgKernelFixture::setUp; void SetUp() override { MemoryManagement::breakOnAllocationEvent = 77; MemoryManagementFixture::setUp(); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = new MockContext(pClDevice); BufferDefaults::context = context; - CommandQueueFixture::SetUp(context, pClDevice, 0); - SimpleArgKernelFixture::SetUp(pClDevice); - HelloWorldKernelFixture::SetUp(pClDevice, "CopyBuffer_simd", "CopyBuffer"); + CommandQueueFixture::setUp(context, pClDevice, 0); + SimpleArgKernelFixture::setUp(pClDevice); + HelloWorldKernelFixture::setUp(pClDevice, "CopyBuffer_simd", "CopyBuffer"); srcBuffer = BufferHelper<>::create(); dstBuffer = BufferHelper<>::create(); @@ -80,14 +77,14 @@ struct OOMCommandQueueBufferTest : public MemoryManagementFixture, delete dstBuffer; delete srcBuffer; context->release(); - HelloWorldKernelFixture::TearDown(); - SimpleArgKernelFixture::TearDown(); - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + HelloWorldKernelFixture::tearDown(); + SimpleArgKernelFixture::tearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); MemoryManagementFixture::tearDown(); } - MockContext *context; + MockContext *context = nullptr; Buffer *srcBuffer = nullptr; Buffer *dstBuffer = nullptr; }; diff --git a/opencl/test/unit_test/command_queue/oom_image_tests.cpp b/opencl/test/unit_test/command_queue/oom_image_tests.cpp index 15fe49b2dc..c6aef0026f 100644 --- a/opencl/test/unit_test/command_queue/oom_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_image_tests.cpp @@ -31,16 +31,16 @@ struct OOMCommandQueueImageTest : public ClDeviceFixture, public CommandQueueFixture, public ::testing::TestWithParam { - using CommandQueueFixture::SetUp; + using CommandQueueFixture::setUp; OOMCommandQueueImageTest() { } void SetUp() override { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = new MockContext(pClDevice); - CommandQueueFixture::SetUp(context, pClDevice, 0); + CommandQueueFixture::setUp(context, pClDevice, 0); srcImage = Image2dHelper<>::create(context); dstImage = Image2dHelper<>::create(context); @@ -72,8 +72,8 @@ struct OOMCommandQueueImageTest : public ClDeviceFixture, delete srcImage; context->release(); - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } MockContext *context; diff --git a/opencl/test/unit_test/command_queue/oom_tests.cpp b/opencl/test/unit_test/command_queue/oom_tests.cpp index 432cae3b5f..0967c951ab 100644 --- a/opencl/test/unit_test/command_queue/oom_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_tests.cpp @@ -30,15 +30,15 @@ struct OOMCommandQueueTest : public ClDeviceFixture, public CommandQueueFixture, public ::testing::TestWithParam { - using CommandQueueFixture::SetUp; + using CommandQueueFixture::setUp; OOMCommandQueueTest() { } void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = new MockContext(pClDevice); - CommandQueueFixture::SetUp(context, pClDevice, 0); + CommandQueueFixture::setUp(context, pClDevice, 0); const auto &oomSetting = GetParam(); auto oomSize = 10u; @@ -60,9 +60,9 @@ struct OOMCommandQueueTest : public ClDeviceFixture, } void TearDown() override { - CommandQueueFixture::TearDown(); + CommandQueueFixture::tearDown(); context->release(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } MockContext *context; diff --git a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp index 6f56dcb14f..f566c408ab 100644 --- a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp @@ -19,7 +19,7 @@ using namespace NEO; -class ZeroSizeEnqueueHandlerTest : public TestLegacy { +class ZeroSizeEnqueueHandlerTest : public Test { public: MockContext context; cl_int retVal; diff --git a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp index 17df3f1282..0db68dbe6a 100644 --- a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp @@ -18,7 +18,7 @@ using namespace NEO; -using ClTbxCommandStreamTests = TestLegacy; +using ClTbxCommandStreamTests = Test; HWTEST_F(ClTbxCommandStreamTests, givenTbxCsrWhenDispatchBlitEnqueueThenProcessCorrectly) { DebugManagerStateRestore dbgRestore; DebugManager.flags.EnableBlitterOperationsSupport.set(1); diff --git a/opencl/test/unit_test/command_stream/command_stream_fixture.h b/opencl/test/unit_test/command_stream/command_stream_fixture.h index e0c86fc118..868559655d 100644 --- a/opencl/test/unit_test/command_stream/command_stream_fixture.h +++ b/opencl/test/unit_test/command_stream/command_stream_fixture.h @@ -13,12 +13,12 @@ namespace NEO { struct CommandStreamFixture { - void SetUp(CommandQueue *pCmdQ) { // NOLINT(readability-identifier-naming) + void setUp(CommandQueue *pCmdQ) { pCS = &pCmdQ->getCS(1024); pCmdBuffer = pCS->getCpuBase(); } - virtual void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { } LinearStream *pCS = nullptr; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp index afe8e95d68..e7573ad14f 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -1019,7 +1019,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, GivenBothCsWhenFlushingTaskThenCha EXPECT_EQ(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT, bbs->getAddressSpaceIndicator()); } -typedef TestLegacy CommandStreamReceiverCQFlushTaskTests; +typedef Test CommandStreamReceiverCQFlushTaskTests; HWTEST_F(CommandStreamReceiverCQFlushTaskTests, WhenGettingCsThenReturnCsWithEnoughSize) { CommandQueueHw commandQueue(nullptr, pClDevice, 0, false); auto &commandStreamReceiver = commandQueue.getGpgpuCommandStreamReceiver(); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp index 1d2ff014e2..aa7b3be262 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp @@ -508,7 +508,7 @@ HWTEST_F(CommandStreamReceiverFlushTests, WhenAddingBatchBufferEndThenBatchBuffe ptrOffset(commandStream.getCpuBase(), usedPrevious)); EXPECT_NE(nullptr, batchBufferEnd); } -typedef TestLegacy CommandStreamReceiverHwTest; +typedef Test CommandStreamReceiverHwTest; HWTEST_F(CommandStreamReceiverHwTest, givenCsrHwWhenTypeIsCheckedThenCsrHwIsReturned) { auto csr = std::unique_ptr(CommandStreamReceiverHw::create(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield())); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_3_tests.cpp index c05bf5f87a..c25a5efe77 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_3_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_3_tests.cpp @@ -19,7 +19,7 @@ struct MockScratchSpaceController : ScratchSpaceControllerBase { using ScratchSpaceControllerBase::ScratchSpaceControllerBase; }; -using ScratchSpaceControllerTest = TestLegacy; +using ScratchSpaceControllerTest = Test; TEST_F(ScratchSpaceControllerTest, whenScratchSpaceControllerIsDestroyedThenItReleasePrivateScratchSpaceAllocation) { MockScratchSpaceController scratchSpaceController(pDevice->getRootDeviceIndex(), *pDevice->getExecutionEnvironment(), *pDevice->getGpgpuCommandStreamReceiver().getInternalAllocationStorage()); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h index cbb5aba91e..23b3638149 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_fixture.h @@ -11,15 +11,15 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" using namespace NEO; -struct BcsTests : public TestLegacy { +struct BcsTests : public Test { void SetUp() override { - TestLegacy::SetUp(); + Test::SetUp(); context = std::make_unique(pClDevice); } void TearDown() override { context.reset(); - TestLegacy::TearDown(); + Test::TearDown(); } std::optional flushBcsTask(CommandStreamReceiver *bcsCsr, const BlitProperties &blitProperties, bool blocking, Device &device) { diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl index 12d83a3b72..c63c45bb53 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.inl @@ -13,13 +13,13 @@ struct CommandStreamReceiverHwTest : public ClDeviceFixture, public ::testing::Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); HardwareParse::setUp(); } void TearDown() override { HardwareParse::tearDown(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } void givenKernelWithSlmWhenPreviousNOSLML3WasSentThenProgramL3WithSLML3ConfigImpl(); diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp index 7f839f7e71..0e9758ab11 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_dg2_and_later.cpp @@ -24,13 +24,13 @@ struct CommandStreamReceiverHwTestDg2AndLater : public ClDeviceFixture, public ::testing::Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); HardwareParse::setUp(); } void TearDown() override { HardwareParse::tearDown(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp index 67e8d74558..67f1266abb 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests_xehp_and_later.cpp @@ -62,13 +62,13 @@ struct CommandStreamReceiverHwTestXeHPAndLater : public ClDeviceFixture, public ::testing::Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); HardwareParse::setUp(); } void TearDown() override { HardwareParse::tearDown(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp index d43f1c13b8..9145d51b0c 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_mt_tests.cpp @@ -17,14 +17,14 @@ using namespace NEO; struct CommandStreamReceiverMtTest : public ClDeviceFixture, public ::testing::Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); commandStreamReceiver = &pDevice->getGpgpuCommandStreamReceiver(); ASSERT_NE(nullptr, commandStreamReceiver); } void TearDown() override { - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } CommandStreamReceiver *commandStreamReceiver; diff --git a/opencl/test/unit_test/compiler_interface/cl_compiler_interface_tests.cpp b/opencl/test/unit_test/compiler_interface/cl_compiler_interface_tests.cpp index 80aeeb7787..a8dc6d3b83 100644 --- a/opencl/test/unit_test/compiler_interface/cl_compiler_interface_tests.cpp +++ b/opencl/test/unit_test/compiler_interface/cl_compiler_interface_tests.cpp @@ -20,7 +20,7 @@ class ClCompilerInterfaceTest : public ClDeviceFixture, public ::testing::Test { public: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); // create the compiler interface this->pCompilerInterface = new MockCompilerInterface(); @@ -47,7 +47,7 @@ class ClCompilerInterfaceTest : public ClDeviceFixture, void TearDown() override { pSource.reset(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } MockCompilerInterface *pCompilerInterface; diff --git a/opencl/test/unit_test/context/context_get_info_tests.cpp b/opencl/test/unit_test/context/context_get_info_tests.cpp index a671f90ef1..60c111f528 100644 --- a/opencl/test/unit_test/context/context_get_info_tests.cpp +++ b/opencl/test/unit_test/context/context_get_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,20 +17,20 @@ struct ContextGetInfoTest : public PlatformFixture, public ContextFixture, public ::testing::Test { - using ContextFixture::SetUp; - using PlatformFixture::SetUp; + using ContextFixture::setUp; + using PlatformFixture::setUp; ContextGetInfoTest() { } void SetUp() override { - PlatformFixture::SetUp(); - ContextFixture::SetUp(num_devices, devices); + PlatformFixture::setUp(); + ContextFixture::setUp(num_devices, devices); } void TearDown() override { - ContextFixture::TearDown(); - PlatformFixture::TearDown(); + ContextFixture::tearDown(); + PlatformFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index f308c08753..a710adbe04 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -51,10 +51,10 @@ class WhiteBoxContext : public Context { struct ContextTest : public PlatformFixture, public ::testing::Test { - using PlatformFixture::SetUp; + using PlatformFixture::setUp; void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); properties.push_back(CL_CONTEXT_PLATFORM); properties.push_back(reinterpret_cast(pPlatform)); @@ -66,7 +66,7 @@ struct ContextTest : public PlatformFixture, void TearDown() override { delete context; - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } uint32_t getRootDeviceIndex() { @@ -734,7 +734,7 @@ struct GTPinContextDestroyTest : ContextTest { } void TearDown() override { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/context/driver_diagnostics_tests.h b/opencl/test/unit_test/context/driver_diagnostics_tests.h index da7e1316f8..f25e8c767f 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.h +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.h @@ -32,14 +32,14 @@ void CL_CALLBACK callbackFunction(const char *providedHint, const void *flags, s struct DriverDiagnosticsTest : public PlatformFixture, public ::testing::Test { - using PlatformFixture::SetUp; + using PlatformFixture::setUp; void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); memset(userData, 0, maxHintCounter * DriverDiagnostics::maxHintStringSize); } void TearDown() override { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -78,7 +78,7 @@ struct PerformanceHintTest : public DriverDiagnosticsTest, } void TearDown() override { - CommandQueueHwFixture::TearDown(); + CommandQueueHwFixture::tearDown(); DriverDiagnosticsTest::TearDown(); } }; @@ -225,7 +225,7 @@ struct PerformanceHintEnqueueKernelTest : public PerformanceHintEnqueueTest, void SetUp() override { PerformanceHintEnqueueTest::SetUp(); - CreateProgramFromBinary(context, context->getDevices(), "CopyBuffer_simd32"); + createProgramFromBinary(context, context->getDevices(), "CopyBuffer_simd32"); retVal = pProgram->build(pProgram->getDevices(), nullptr, false); ASSERT_EQ(CL_SUCCESS, retVal); kernel = Kernel::create(pProgram, pProgram->getKernelInfoForKernel("CopyBuffer"), *context->getDevice(0), &retVal); @@ -236,7 +236,7 @@ struct PerformanceHintEnqueueKernelTest : public PerformanceHintEnqueueTest, void TearDown() override { delete kernel; - ProgramFixture::TearDown(); + ProgramFixture::tearDown(); PerformanceHintEnqueueTest::TearDown(); } MockKernel *kernel = nullptr; @@ -262,7 +262,7 @@ struct PerformanceHintEnqueueKernelPrintfTest : public PerformanceHintEnqueueTes void SetUp() override { PerformanceHintEnqueueTest::SetUp(); - CreateProgramFromBinary(context, context->getDevices(), "printf"); + createProgramFromBinary(context, context->getDevices(), "printf"); retVal = pProgram->build(pProgram->getDevices(), nullptr, false); ASSERT_EQ(CL_SUCCESS, retVal); kernel = Kernel::create(pProgram, pProgram->getKernelInfoForKernel("test"), *context->getDevice(0), &retVal); @@ -272,7 +272,7 @@ struct PerformanceHintEnqueueKernelPrintfTest : public PerformanceHintEnqueueTes void TearDown() override { delete kernel; - ProgramFixture::TearDown(); + ProgramFixture::tearDown(); PerformanceHintEnqueueTest::TearDown(); } Kernel *kernel = nullptr; diff --git a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp index ea4f6c44c2..cc10c6a27b 100644 --- a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp +++ b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp @@ -24,20 +24,20 @@ struct GetSupportedImageFormatsTest : public PlatformFixture, public ContextFixture, public ::testing::TestWithParam> { - using ContextFixture::SetUp; - using PlatformFixture::SetUp; + using ContextFixture::setUp; + using PlatformFixture::setUp; GetSupportedImageFormatsTest() { } void SetUp() override { - PlatformFixture::SetUp(); - ContextFixture::SetUp(num_devices, devices); + PlatformFixture::setUp(); + ContextFixture::setUp(num_devices, devices); } void TearDown() override { - ContextFixture::TearDown(); - PlatformFixture::TearDown(); + ContextFixture::tearDown(); + PlatformFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/context/gl/context_gl_tests.h b/opencl/test/unit_test/context/gl/context_gl_tests.h index 4b2e58521d..918ff9e44f 100644 --- a/opencl/test/unit_test/context/gl/context_gl_tests.h +++ b/opencl/test/unit_test/context/gl/context_gl_tests.h @@ -17,10 +17,10 @@ namespace NEO { struct GlContextTest : public PlatformFixture, public ::testing::Test { - using PlatformFixture::SetUp; + using PlatformFixture::setUp; void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); properties[0] = CL_CONTEXT_PLATFORM; properties[1] = reinterpret_cast(static_cast(pPlatform)); @@ -32,7 +32,7 @@ struct GlContextTest : public PlatformFixture, public ::testing::Test { void TearDown() override { delete context; - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } void testContextCreation(cl_context_properties contextType) { diff --git a/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp b/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp index b7d2a0ecd1..0daab87ee7 100644 --- a/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp @@ -152,7 +152,7 @@ struct clIntelSharingFormatQueryDX1X : public PlatformFixture, public ::testing: size_t retSize; void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); context = new MockContext(pPlatform->getClDevice(0)); mockSharingFcns = new MockD3DSharingFunctions(); context->setSharingFunctions(mockSharingFcns); @@ -165,7 +165,7 @@ struct clIntelSharingFormatQueryDX1X : public PlatformFixture, public ::testing: } void TearDown() override { delete context; - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp index 5bb5050291..ef7ff09e65 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp @@ -90,7 +90,7 @@ class D3D9Tests : public PlatformFixture, public ::testing::Test { } void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); memoryManager = std::make_unique(*pPlatform->peekExecutionEnvironment()); context = new MockContext(pPlatform->getClDevice(0)); context->preferD3dSharedResources = true; @@ -116,7 +116,7 @@ class D3D9Tests : public PlatformFixture, public ::testing::Test { if (!memoryManager->gmmOwnershipPassed) { delete gmm; } - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } MockD3DSharingFunctions *mockSharingFcns; diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index 3ab0fbdfab..c5ef320d9c 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -35,7 +35,7 @@ using namespace NEO; -typedef TestLegacy DeviceTest; +typedef Test DeviceTest; TEST_F(DeviceTest, givenDeviceWhenGetProductAbbrevThenReturnsHardwarePrefix) { const auto productAbbrev = pDevice->getProductAbbrev(); diff --git a/opencl/test/unit_test/event/event_fixture.h b/opencl/test/unit_test/event/event_fixture.h index 5be39fcb18..f4482e9717 100644 --- a/opencl/test/unit_test/event/event_fixture.h +++ b/opencl/test/unit_test/event/event_fixture.h @@ -29,18 +29,18 @@ struct EventTest public CommandStreamFixture, public ::testing::Test { - using CommandQueueFixture::SetUp; + using CommandQueueFixture::setUp; void SetUp() override { - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(&mockContext, pClDevice, 0); - CommandStreamFixture::SetUp(pCmdQ); + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(&mockContext, pClDevice, 0); + CommandStreamFixture::setUp(pCmdQ); } void TearDown() override { - CommandStreamFixture::TearDown(); - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandStreamFixture::tearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } MockContext mockContext; }; @@ -53,13 +53,13 @@ struct InternalsEventTest } void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); mockContext = new MockContext(pClDevice); } void TearDown() override { delete mockContext; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } MockContext *mockContext = nullptr; @@ -123,7 +123,7 @@ class MockEventTests : public HelloWorldTest { uEvent->setStatus(-1); uEvent.reset(); } - HelloWorldFixture::TearDown(); + HelloWorldFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp index e1984a32ed..ef9e6fa011 100644 --- a/opencl/test/unit_test/event/event_tests.cpp +++ b/opencl/test/unit_test/event/event_tests.cpp @@ -1048,14 +1048,14 @@ struct InternalsEventWithPerfCountersTest : public InternalsEventTest, public PerformanceCountersFixture { void SetUp() override { - PerformanceCountersFixture::SetUp(); + PerformanceCountersFixture::setUp(); InternalsEventTest::SetUp(); pDevice->setPerfCounters(MockPerformanceCounters::create()); } void TearDown() override { InternalsEventTest::TearDown(); - PerformanceCountersFixture::TearDown(); + PerformanceCountersFixture::tearDown(); } }; HWTEST_F(InternalsEventWithPerfCountersTest, givenCpuProfilingPerfCountersPathWhenEnqueuedMarkerThenDontUseTimeStampNodePerfCounterNode) { diff --git a/opencl/test/unit_test/fixtures/cl_device_fixture.cpp b/opencl/test/unit_test/fixtures/cl_device_fixture.cpp index 09ea0dc779..d92cdf49e6 100644 --- a/opencl/test/unit_test/fixtures/cl_device_fixture.cpp +++ b/opencl/test/unit_test/fixtures/cl_device_fixture.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" namespace NEO { -void ClDeviceFixture::SetUp() { +void ClDeviceFixture::setUp() { hardwareInfo = *defaultHwInfo; setUpImpl(&hardwareInfo); } @@ -30,7 +30,7 @@ void ClDeviceFixture::setUpImpl(const NEO::HardwareInfo *hardwareInfo) { this->osContext = pDevice->getDefaultEngine().osContext; } -void ClDeviceFixture::TearDown() { +void ClDeviceFixture::tearDown() { delete pClDevice; pClDevice = nullptr; pDevice = nullptr; diff --git a/opencl/test/unit_test/fixtures/cl_device_fixture.h b/opencl/test/unit_test/fixtures/cl_device_fixture.h index 93e53ef9a9..56363b401f 100644 --- a/opencl/test/unit_test/fixtures/cl_device_fixture.h +++ b/opencl/test/unit_test/fixtures/cl_device_fixture.h @@ -14,9 +14,9 @@ namespace NEO { struct HardwareInfo; struct ClDeviceFixture { - void SetUp(); // NOLINT(readability-identifier-naming) + void setUp(); void setUpImpl(const NEO::HardwareInfo *hardwareInfo); - void TearDown(); // NOLINT(readability-identifier-naming) + void tearDown(); MockDevice *createWithUsDeviceId(unsigned short usDeviceId); diff --git a/opencl/test/unit_test/fixtures/cl_preemption_fixture.cpp b/opencl/test/unit_test/fixtures/cl_preemption_fixture.cpp index a73757983b..6b9f2b4c2d 100644 --- a/opencl/test/unit_test/fixtures/cl_preemption_fixture.cpp +++ b/opencl/test/unit_test/fixtures/cl_preemption_fixture.cpp @@ -67,14 +67,14 @@ void ThreadGroupPreemptionEnqueueKernelTest::SetUp() { originalPreemptionMode = globalHwInfo->capabilityTable.defaultPreemptionMode; globalHwInfo->capabilityTable.defaultPreemptionMode = PreemptionMode::ThreadGroup; - HelloWorldFixture::SetUp(); + HelloWorldFixture::setUp(); pDevice->setPreemptionMode(PreemptionMode::ThreadGroup); } void ThreadGroupPreemptionEnqueueKernelTest::TearDown() { globalHwInfo->capabilityTable.defaultPreemptionMode = originalPreemptionMode; - HelloWorldFixture::TearDown(); + HelloWorldFixture::tearDown(); } void MidThreadPreemptionEnqueueKernelTest::SetUp() { @@ -85,12 +85,12 @@ void MidThreadPreemptionEnqueueKernelTest::SetUp() { originalPreemptionMode = globalHwInfo->capabilityTable.defaultPreemptionMode; globalHwInfo->capabilityTable.defaultPreemptionMode = PreemptionMode::MidThread; - HelloWorldFixture::SetUp(); + HelloWorldFixture::setUp(); pDevice->setPreemptionMode(PreemptionMode::MidThread); } void MidThreadPreemptionEnqueueKernelTest::TearDown() { globalHwInfo->capabilityTable.defaultPreemptionMode = originalPreemptionMode; - HelloWorldFixture::TearDown(); + HelloWorldFixture::tearDown(); } diff --git a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h index 3ba3638908..3d3d7fb46f 100644 --- a/opencl/test/unit_test/fixtures/cl_preemption_fixture.h +++ b/opencl/test/unit_test/fixtures/cl_preemption_fixture.h @@ -24,7 +24,7 @@ struct KernelInfo; struct WorkaroundTable; using PreemptionEnqueueKernelFixture = HelloWorldFixture; -using PreemptionEnqueueKernelTest = TestLegacy; +using PreemptionEnqueueKernelTest = Test; } // namespace NEO class DevicePreemptionTests : public ::testing::Test { diff --git a/opencl/test/unit_test/fixtures/context_fixture.cpp b/opencl/test/unit_test/fixtures/context_fixture.cpp index 96a8c535fd..181a5e54f8 100644 --- a/opencl/test/unit_test/fixtures/context_fixture.cpp +++ b/opencl/test/unit_test/fixtures/context_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ namespace NEO { -void ContextFixture::SetUp(cl_uint numDevices, cl_device_id *pDeviceList) { +void ContextFixture::setUp(cl_uint numDevices, cl_device_id *pDeviceList) { auto retVal = CL_SUCCESS; pContext = Context::create(nullptr, ClDeviceVector(pDeviceList, numDevices), nullptr, nullptr, retVal); @@ -21,7 +21,7 @@ void ContextFixture::SetUp(cl_uint numDevices, cl_device_id *pDeviceList) { ASSERT_EQ(CL_SUCCESS, retVal); } -void ContextFixture::TearDown() { +void ContextFixture::tearDown() { if (pContext != nullptr) { pContext->release(); } diff --git a/opencl/test/unit_test/fixtures/context_fixture.h b/opencl/test/unit_test/fixtures/context_fixture.h index 12086f84a5..3ea39ee54a 100644 --- a/opencl/test/unit_test/fixtures/context_fixture.h +++ b/opencl/test/unit_test/fixtures/context_fixture.h @@ -13,8 +13,8 @@ class MockContext; class ContextFixture { protected: - void SetUp(cl_uint numDevices, cl_device_id *pDeviceList); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(cl_uint numDevices, cl_device_id *pDeviceList); + void tearDown(); MockContext *pContext = nullptr; }; diff --git a/opencl/test/unit_test/fixtures/d3d_test_fixture.h b/opencl/test/unit_test/fixtures/d3d_test_fixture.h index 25fb4e328f..fd04dffd3e 100644 --- a/opencl/test/unit_test/fixtures/d3d_test_fixture.h +++ b/opencl/test/unit_test/fixtures/d3d_test_fixture.h @@ -97,7 +97,7 @@ class D3DTests : public PlatformFixture, public ::testing::Test { void SetUp() override { VariableBackup backup(&ultHwConfig); ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false; - PlatformFixture::SetUp(); + PlatformFixture::setUp(); rootDeviceIndex = pPlatform->getClDevice(0)->getRootDeviceIndex(); context = new MockContext(pPlatform->getClDevice(0)); context->preferD3dSharedResources = true; @@ -134,7 +134,7 @@ class D3DTests : public PlatformFixture, public ::testing::Test { if (!mockMM->gmmOwnershipPassed) { delete gmm; } - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } cl_int pickParam(cl_int d3d10, cl_int d3d11) { diff --git a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp index c6b29a6e1a..119d625e2c 100644 --- a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp +++ b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ #include "opencl/test/unit_test/mocks/mock_platform.h" namespace NEO { -void DeviceInstrumentationFixture::SetUp(bool instrumentation) { +void DeviceInstrumentationFixture::setUp(bool instrumentation) { ExecutionEnvironment *executionEnvironment = getExecutionEnvironmentImpl(hwInfo, 1); hwInfo->capabilityTable.instrumentationEnabled = instrumentation; device = std::make_unique(*Device::create(executionEnvironment, 0), platform()); diff --git a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.h b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.h index 25e77d6d9d..e56c97a3f6 100644 --- a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.h +++ b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.h @@ -16,7 +16,7 @@ class Device; struct HardwareInfo; struct DeviceInstrumentationFixture { - void SetUp(bool instrumentation); // NOLINT(readability-identifier-naming) + void setUp(bool instrumentation); std::unique_ptr device = nullptr; HardwareInfo *hwInfo = nullptr; diff --git a/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h b/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h index 9f65b9a3ca..99f76aa168 100644 --- a/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h +++ b/opencl/test/unit_test/fixtures/enqueue_handler_fixture.h @@ -13,13 +13,13 @@ class EnqueueHandlerTest : public NEO::ClDeviceFixture, public testing::Test { public: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = new NEO::MockContext(pClDevice); } void TearDown() override { context->decRefInternal(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } NEO::MockContext *context; }; diff --git a/opencl/test/unit_test/fixtures/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h index a4dd6eaf2b..ab1bab3f6b 100644 --- a/opencl/test/unit_test/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_fixture.h @@ -39,23 +39,23 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, typedef typename FixtureFactory::KernelFixture KernelFixture; using CommandQueueFixture::pCmdQ; - using CommandQueueFixture::SetUp; + using CommandQueueFixture::setUp; using CommandStreamFixture::pCS; - using CommandStreamFixture::SetUp; - using HelloWorldKernelFixture::SetUp; - using IndirectHeapFixture::SetUp; + using CommandStreamFixture::setUp; + using HelloWorldKernelFixture::setUp; + using IndirectHeapFixture::setUp; using KernelFixture::pKernel; public: - void SetUp() override { - ClDeviceFixture::SetUp(); + void setUp() { + ClDeviceFixture::setUp(); ASSERT_NE(nullptr, pClDevice); - CommandQueueFixture::SetUp(pClDevice, 0); + CommandQueueFixture::setUp(pClDevice, 0); ASSERT_NE(nullptr, pCmdQ); - CommandStreamFixture::SetUp(pCmdQ); + CommandStreamFixture::setUp(pCmdQ); ASSERT_NE(nullptr, pCS); - IndirectHeapFixture::SetUp(pCmdQ); - KernelFixture::SetUp(pClDevice, kernelFilename, kernelName); + IndirectHeapFixture::setUp(pCmdQ); + KernelFixture::setUp(pClDevice, kernelFilename, kernelName); ASSERT_NE(nullptr, pKernel); auto retVal = CL_INVALID_VALUE; @@ -85,18 +85,18 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, pKernel->setArg(1, destBuffer); } - void TearDown() override { + void tearDown() { pCmdQ->flush(); srcBuffer->release(); destBuffer->release(); - KernelFixture::TearDown(); - IndirectHeapFixture::TearDown(); - CommandStreamFixture::TearDown(); - CommandQueueFixture::TearDown(); + KernelFixture::tearDown(); + IndirectHeapFixture::tearDown(); + CommandStreamFixture::tearDown(); + CommandQueueFixture::tearDown(); BufferDefaults::context->release(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } Buffer *srcBuffer = nullptr; Buffer *destBuffer = nullptr; @@ -128,7 +128,7 @@ struct HelloWorldFixture : public FixtureFactory::IndirectHeapFixture, }; template -struct HelloWorldTest : TestLegacy> { +struct HelloWorldTest : Test> { }; template diff --git a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h index 03e9eac7e1..ba8871c702 100644 --- a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h @@ -27,13 +27,13 @@ class Kernel; class Program; struct HelloWorldKernelFixture : public ProgramFixture { - using ProgramFixture::SetUp; + using ProgramFixture::setUp; - void SetUp(ClDevice *pDevice, const char *kernelFilenameStr, const char *kernelNameStr) { - SetUp(pDevice, kernelFilenameStr, kernelNameStr, nullptr); + void setUp(ClDevice *pDevice, const char *kernelFilenameStr, const char *kernelNameStr) { + setUp(pDevice, kernelFilenameStr, kernelNameStr, nullptr); } - void SetUp(ClDevice *pDevice, const char *kernelFilenameStr, const char *kernelNameStr, const char *options) { - ProgramFixture::SetUp(); + void setUp(ClDevice *pDevice, const char *kernelFilenameStr, const char *kernelNameStr, const char *options) { + ProgramFixture::setUp(); pTestFilename = new std::string(kernelFilenameStr); pKernelName = new std::string(kernelNameStr); @@ -50,13 +50,13 @@ struct HelloWorldKernelFixture : public ProgramFixture { if (options) { std::string optionsToProgram(options); - CreateProgramFromBinary( + createProgramFromBinary( pContext, deviceVector, *pTestFilename, optionsToProgram); } else { - CreateProgramFromBinary( + createProgramFromBinary( pContext, deviceVector, *pTestFilename); @@ -81,13 +81,13 @@ struct HelloWorldKernelFixture : public ProgramFixture { EXPECT_EQ(CL_SUCCESS, retVal); } - void TearDown() override { + void tearDown() { delete pKernelName; delete pTestFilename; pMultiDeviceKernel->release(); pContext->release(); - ProgramFixture::TearDown(); + ProgramFixture::tearDown(); } std::string *pTestFilename = nullptr; diff --git a/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp b/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp index d4386d1d6a..3b88dcca99 100644 --- a/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp +++ b/opencl/test/unit_test/fixtures/kernel_arg_fixture.cpp @@ -51,7 +51,7 @@ void KernelImageArgTest::SetUp() { pKernelInfo->kernelDescriptor.kernelAttributes.bufferAddressingMode = ApiSpecificConfig::getBindlessConfiguration() ? KernelDescriptor::AddressingMode::BindlessAndStateless : KernelDescriptor::AddressingMode::BindfulAndStateless; pKernelInfo->kernelDescriptor.kernelAttributes.imageAddressingMode = ApiSpecificConfig::getBindlessConfiguration() ? KernelDescriptor::AddressingMode::Bindless : KernelDescriptor::AddressingMode::Bindful; - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context.reset(new MockContext(pClDevice)); program = std::make_unique(context.get(), false, toClDeviceVector(*pClDevice)); int32_t retVal = CL_INVALID_VALUE; @@ -78,5 +78,5 @@ void KernelImageArgTest::TearDown() { pMultiDeviceKernel.reset(); program.reset(); context.reset(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } diff --git a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h index 5f1d6ddedd..c9a1aa10f3 100644 --- a/opencl/test/unit_test/fixtures/kernel_arg_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_arg_fixture.h @@ -27,7 +27,7 @@ namespace iOpenCL { struct SKernelBinaryHeaderCommon; } -class KernelImageArgTest : public TestLegacy { +class KernelImageArgTest : public Test { public: KernelImageArgTest() { } diff --git a/opencl/test/unit_test/fixtures/kernel_work_group_info_fixture.h b/opencl/test/unit_test/fixtures/kernel_work_group_info_fixture.h index da5353952d..ece6fd24f5 100644 --- a/opencl/test/unit_test/fixtures/kernel_work_group_info_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_work_group_info_fixture.h @@ -18,7 +18,7 @@ struct clGetKernelWorkGroupInfoTest : public ApiFixture<>, typedef ApiFixture BaseClass; void SetUp() override { - BaseClass::SetUp(); + BaseClass::setUp(); std::unique_ptr pSource = nullptr; size_t sourceSize = 0; @@ -68,7 +68,7 @@ struct clGetKernelWorkGroupInfoTest : public ApiFixture<>, EXPECT_EQ(CL_SUCCESS, retVal); delete kbHelper; - BaseClass::TearDown(); + BaseClass::tearDown(); } cl_program pProgram = nullptr; diff --git a/opencl/test/unit_test/fixtures/media_kernel_fixture.h b/opencl/test/unit_test/fixtures/media_kernel_fixture.h index 92de877a45..a8082e8477 100644 --- a/opencl/test/unit_test/fixtures/media_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/media_kernel_fixture.h @@ -65,7 +65,7 @@ struct MediaKernelFixture : public HelloWorldFixture, Parent::kernelFilename = "vme_kernels"; Parent::kernelName = "non_vme_kernel"; - Parent::SetUp(); + Parent::setUp(); ClHardwareParse::setUp(); ASSERT_NE(nullptr, pKernel); @@ -91,7 +91,7 @@ struct MediaKernelFixture : public HelloWorldFixture, pMultiDeviceVmeKernel->release(); ClHardwareParse::tearDown(); - Parent::TearDown(); + Parent::tearDown(); } GenCmdList::iterator itorWalker1; diff --git a/opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h b/opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h index d5bb6c1302..2a22063e2f 100644 --- a/opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h +++ b/opencl/test/unit_test/fixtures/one_mip_level_image_fixture.h @@ -27,7 +27,7 @@ struct OneMipLevelImageFixture { } }; - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { REQUIRE_IMAGES_OR_SKIP(defaultHwInfo); cl_image_desc imageDesc = Image3dDefaults::imageDesc; @@ -38,7 +38,7 @@ struct OneMipLevelImageFixture { this->image.reset(createImage()); } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { } Image *createImage() { diff --git a/opencl/test/unit_test/fixtures/platform_fixture.cpp b/opencl/test/unit_test/fixtures/platform_fixture.cpp index 872158ad89..b51079dcef 100644 --- a/opencl/test/unit_test/fixtures/platform_fixture.cpp +++ b/opencl/test/unit_test/fixtures/platform_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ #include "gtest/gtest.h" namespace NEO { -void PlatformFixture::SetUp() { +void PlatformFixture::setUp() { pPlatform = constructPlatform(); ASSERT_EQ(0u, pPlatform->getNumDevices()); @@ -35,7 +35,7 @@ void PlatformFixture::SetUp() { } } -void PlatformFixture::TearDown() { +void PlatformFixture::tearDown() { platformsImpl->clear(); delete[] devices; } diff --git a/opencl/test/unit_test/fixtures/platform_fixture.h b/opencl/test/unit_test/fixtures/platform_fixture.h index 64563d4466..e4485a3cab 100644 --- a/opencl/test/unit_test/fixtures/platform_fixture.h +++ b/opencl/test/unit_test/fixtures/platform_fixture.h @@ -13,8 +13,8 @@ namespace NEO { class PlatformFixture { protected: - void SetUp(); // NOLINT(readability-identifier-naming) - void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); Platform *pPlatform = nullptr; diff --git a/opencl/test/unit_test/fixtures/program_fixture.cpp b/opencl/test/unit_test/fixtures/program_fixture.cpp index 16bc7fe000..3b3609e9b3 100644 --- a/opencl/test/unit_test/fixtures/program_fixture.cpp +++ b/opencl/test/unit_test/fixtures/program_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,9 +11,9 @@ #include "opencl/test/unit_test/mocks/mock_program.h" namespace NEO { -void ProgramFixture::CreateProgramWithSource(Context *pContext, +void ProgramFixture::createProgramWithSource(Context *pContext, const std::string &sourceFileName) { - Cleanup(); + cleanup(); cl_int retVal = CL_SUCCESS; std::string testFile; @@ -40,7 +40,7 @@ void ProgramFixture::CreateProgramWithSource(Context *pContext, ASSERT_EQ(CL_SUCCESS, retVal); } -void ProgramFixture::CreateProgramFromBinary(Context *pContext, +void ProgramFixture::createProgramFromBinary(Context *pContext, const ClDeviceVector &deviceVector, const std::string &binaryFileName, cl_int &retVal, @@ -66,13 +66,13 @@ void ProgramFixture::CreateProgramFromBinary(Context *pContext, retVal); } -void ProgramFixture::CreateProgramFromBinary(Context *pContext, +void ProgramFixture::createProgramFromBinary(Context *pContext, const ClDeviceVector &deviceVector, const std::string &binaryFileName, const std::string &options) { - Cleanup(); + cleanup(); cl_int retVal = CL_SUCCESS; - CreateProgramFromBinary( + createProgramFromBinary( pContext, deviceVector, binaryFileName, diff --git a/opencl/test/unit_test/fixtures/program_fixture.h b/opencl/test/unit_test/fixtures/program_fixture.h index 488e5e5302..19d3bdc5e4 100644 --- a/opencl/test/unit_test/fixtures/program_fixture.h +++ b/opencl/test/unit_test/fixtures/program_fixture.h @@ -18,29 +18,29 @@ namespace NEO { class ProgramFixture { public: - void CreateProgramFromBinary(Context *pContext, // NOLINT(readability-identifier-naming) + void createProgramFromBinary(Context *pContext, const ClDeviceVector &deviceVector, const std::string &binaryFileName, cl_int &retVal, const std::string &options = ""); - void CreateProgramFromBinary(Context *pContext, // NOLINT(readability-identifier-naming) + void createProgramFromBinary(Context *pContext, const ClDeviceVector &deviceVector, const std::string &binaryFileName, const std::string &options = ""); - void CreateProgramWithSource(Context *pContext, // NOLINT(readability-identifier-naming) + void createProgramWithSource(Context *pContext, const std::string &sourceFileName); protected: - virtual void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { } - virtual void TearDown() { // NOLINT(readability-identifier-naming) - Cleanup(); + void tearDown() { + cleanup(); } - void Cleanup() { // NOLINT(readability-identifier-naming) + void cleanup() { if (pProgram != nullptr) { pProgram->release(); } diff --git a/opencl/test/unit_test/fixtures/scenario_test_fixture.h b/opencl/test/unit_test/fixtures/scenario_test_fixture.h index e87c9344fc..29a3bf255e 100644 --- a/opencl/test/unit_test/fixtures/scenario_test_fixture.h +++ b/opencl/test/unit_test/fixtures/scenario_test_fixture.h @@ -17,12 +17,12 @@ using namespace NEO; class ScenarioTest : public ::testing::Test, public PlatformFixture { - using PlatformFixture::SetUp; + using PlatformFixture::setUp; protected: void SetUp() override { DebugManager.flags.EnableTimestampPacket.set(false); - PlatformFixture::SetUp(); + PlatformFixture::setUp(); auto pDevice = pPlatform->getClDevice(0); ASSERT_NE(nullptr, pDevice); @@ -43,7 +43,7 @@ class ScenarioTest : public ::testing::Test, context->release(); program->release(); - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } cl_int retVal; diff --git a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h index a440091f1a..7d4f9ab34d 100644 --- a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h @@ -72,11 +72,11 @@ inline const char *typeName(unsigned short &) { class SimpleArgKernelFixture : public ProgramFixture { public: - using ProgramFixture::SetUp; + using ProgramFixture::setUp; protected: - virtual void SetUp(ClDevice *pDevice) { - ProgramFixture::SetUp(); + void setUp(ClDevice *pDevice) { + ProgramFixture::setUp(); std::string testFile; int forTheName = 0; @@ -94,7 +94,7 @@ class SimpleArgKernelFixture : public ProgramFixture { ASSERT_EQ(CL_SUCCESS, retVal); ASSERT_NE(nullptr, pContext); - CreateProgramFromBinary( + createProgramFromBinary( pContext, deviceVector, testFile); @@ -117,7 +117,7 @@ class SimpleArgKernelFixture : public ProgramFixture { ASSERT_EQ(CL_SUCCESS, retVal); } - void TearDown() override { + void tearDown() { if (pKernel) { delete pKernel; pKernel = nullptr; @@ -125,7 +125,7 @@ class SimpleArgKernelFixture : public ProgramFixture { pContext->release(); - ProgramFixture::TearDown(); + ProgramFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -135,13 +135,13 @@ class SimpleArgKernelFixture : public ProgramFixture { class SimpleArgNonUniformKernelFixture : public ProgramFixture { public: - using ProgramFixture::SetUp; + using ProgramFixture::setUp; protected: - void SetUp(ClDevice *device, Context *context) { - ProgramFixture::SetUp(); + void setUp(ClDevice *device, Context *context) { + ProgramFixture::setUp(); - CreateProgramFromBinary( + createProgramFromBinary( context, context->getDevices(), "simple_nonuniform", @@ -163,13 +163,13 @@ class SimpleArgNonUniformKernelFixture : public ProgramFixture { ASSERT_EQ(CL_SUCCESS, retVal); } - void TearDown() override { + void tearDown() { if (kernel) { delete kernel; kernel = nullptr; } - ProgramFixture::TearDown(); + ProgramFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -178,14 +178,14 @@ class SimpleArgNonUniformKernelFixture : public ProgramFixture { class SimpleKernelFixture : public ProgramFixture { public: - using ProgramFixture::SetUp; + using ProgramFixture::setUp; protected: - void SetUp(ClDevice *device, Context *context) { - ProgramFixture::SetUp(); + void setUp(ClDevice *device, Context *context) { + ProgramFixture::setUp(); std::string programName("simple_kernels"); - CreateProgramFromBinary( + createProgramFromBinary( context, toClDeviceVector(*device), programName); @@ -212,14 +212,14 @@ class SimpleKernelFixture : public ProgramFixture { } } - void TearDown() override { + void tearDown() { for (size_t i = 0; i < maxKernelsCount; i++) { if (kernels[i]) { kernels[i].reset(nullptr); } } - ProgramFixture::TearDown(); + ProgramFixture::tearDown(); } uint32_t kernelIds = 0; @@ -231,15 +231,15 @@ class SimpleKernelFixture : public ProgramFixture { class SimpleKernelStatelessFixture : public ProgramFixture { public: DebugManagerStateRestore restorer; - using ProgramFixture::SetUp; + using ProgramFixture::setUp; protected: - void SetUp(ClDevice *device, Context *context) { - ProgramFixture::SetUp(); + void setUp(ClDevice *device, Context *context) { + ProgramFixture::setUp(); DebugManager.flags.DisableStatelessToStatefulOptimization.set(true); DebugManager.flags.EnableStatelessToStatefulBufferOffsetOpt.set(false); - CreateProgramFromBinary( + createProgramFromBinary( context, toClDeviceVector(*device), "stateless_kernel"); @@ -260,8 +260,8 @@ class SimpleKernelStatelessFixture : public ProgramFixture { ASSERT_EQ(CL_SUCCESS, retVal); } - void TearDown() override { - ProgramFixture::TearDown(); + void tearDown() { + ProgramFixture::tearDown(); } std::unique_ptr kernel = nullptr; @@ -271,15 +271,15 @@ class SimpleKernelStatelessFixture : public ProgramFixture { class StatelessCopyKernelFixture : public ProgramFixture { public: DebugManagerStateRestore restorer; - using ProgramFixture::SetUp; + using ProgramFixture::setUp; protected: - void SetUp(ClDevice *device, Context *context) { - ProgramFixture::SetUp(); + void setUp(ClDevice *device, Context *context) { + ProgramFixture::setUp(); DebugManager.flags.DisableStatelessToStatefulOptimization.set(true); DebugManager.flags.EnableStatelessToStatefulBufferOffsetOpt.set(false); - CreateProgramFromBinary( + createProgramFromBinary( context, toClDeviceVector(*device), "stateless_copy_buffer"); @@ -300,8 +300,8 @@ class StatelessCopyKernelFixture : public ProgramFixture { ASSERT_EQ(CL_SUCCESS, retVal); } - void TearDown() override { - ProgramFixture::TearDown(); + void tearDown() { + ProgramFixture::tearDown(); } std::unique_ptr multiDeviceKernel = nullptr; @@ -312,15 +312,15 @@ class StatelessCopyKernelFixture : public ProgramFixture { class StatelessKernelWithIndirectAccessFixture : public ProgramFixture { public: DebugManagerStateRestore restorer; - using ProgramFixture::SetUp; + using ProgramFixture::setUp; protected: - void SetUp(ClDevice *device, Context *context) { - ProgramFixture::SetUp(); + void setUp(ClDevice *device, Context *context) { + ProgramFixture::setUp(); DebugManager.flags.DisableStatelessToStatefulOptimization.set(true); DebugManager.flags.EnableStatelessToStatefulBufferOffsetOpt.set(false); - CreateProgramFromBinary( + createProgramFromBinary( context, toClDeviceVector(*device), "indirect_access_kernel"); @@ -342,8 +342,8 @@ class StatelessKernelWithIndirectAccessFixture : public ProgramFixture { EXPECT_TRUE(multiDeviceKernel->getKernel(device->getRootDeviceIndex())->getKernelInfo().hasIndirectStatelessAccess); } - void TearDown() override { - ProgramFixture::TearDown(); + void tearDown() { + ProgramFixture::tearDown(); } std::unique_ptr multiDeviceKernel = nullptr; @@ -352,20 +352,20 @@ class StatelessKernelWithIndirectAccessFixture : public ProgramFixture { class BindlessKernelFixture : public ProgramFixture { public: - using ProgramFixture::SetUp; - void SetUp(ClDevice *device, Context *context) { - ProgramFixture::SetUp(); + using ProgramFixture::setUp; + void setUp(ClDevice *device, Context *context) { + ProgramFixture::setUp(); this->deviceCl = device; this->contextCl = context; } - void TearDown() override { - ProgramFixture::TearDown(); + void tearDown() { + ProgramFixture::tearDown(); } void createKernel(const std::string &programName, const std::string &kernelName) { DebugManager.flags.UseBindlessMode.set(1); - CreateProgramFromBinary( + createProgramFromBinary( contextCl, contextCl->getDevices(), programName); diff --git a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h index f08100d40f..d065fa05bf 100644 --- a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h +++ b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h @@ -28,7 +28,7 @@ struct UltCommandStreamReceiverTest public ClHardwareParse, ::testing::Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); ClHardwareParse::setUp(); cmdBuffer = alignedMalloc(sizeStream, alignmentStream); @@ -83,7 +83,7 @@ struct UltCommandStreamReceiverTest alignedFree(dshBuffer); alignedFree(cmdBuffer); ClHardwareParse::tearDown(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } template diff --git a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp index ec17c9bad2..a298c40339 100644 --- a/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/test_device_caps_ehl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using EhlTest = TestLegacy; +using EhlTest = Test; EHLTEST_F(EhlTest, givenDeviceIdWhenAskingForSimulationThenReturnValidValue) { unsigned short ehlSimulationIds[2] = { diff --git a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp index b731fd558a..ca2a305f1c 100644 --- a/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_kernel_gen11.cpp @@ -19,7 +19,7 @@ namespace NEO { -using Gen11EnqueueTest = TestLegacy; +using Gen11EnqueueTest = Test; GEN11TEST_F(Gen11EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKernelIsSubmittedThenDefaultPolicyIsProgrammed) { MockContext mc; CommandQueueHw cmdQ{&mc, pClDevice, 0, false}; diff --git a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp index 61ddc4ee69..e6d1045534 100644 --- a/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_device_caps_icllp.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using IcllpTest = TestLegacy; +using IcllpTest = Test; ICLLPTEST_F(IcllpTest, givenIcllpWhenSlmSizeIsRequiredThenReturnCorrectValue) { EXPECT_EQ(64u, pDevice->getHardwareInfo().capabilityTable.slmSize); diff --git a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp index ee874fc07c..2dd8c07e9c 100644 --- a/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/kernel_tests_gen11.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using Gen11KernelTest = TestLegacy; +using Gen11KernelTest = Test; GEN11TEST_F(Gen11KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) { MockKernelWithInternals mockKernel(*pClDevice); auto retVal = mockKernel.mockKernel->Kernel::canTransformImages(); diff --git a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp index 8c28ab1eae..b44c042079 100644 --- a/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/test_device_caps_lkf.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using LkfTest = TestLegacy; +using LkfTest = Test; LKFTEST_F(LkfTest, givenLkfWhenSlmSizeIsRequiredThenReturnCorrectValue) { EXPECT_EQ(64u, pDevice->getHardwareInfo().capabilityTable.slmSize); diff --git a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp index cbf63f06a7..21f2779af7 100644 --- a/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/sampler_tests_gen11.cpp @@ -16,7 +16,7 @@ using namespace NEO; -typedef TestLegacy Gen11SamplerTest; +typedef Test Gen11SamplerTest; GEN11TEST_F(Gen11SamplerTest, WhenAppendingSamplerStateParamsThenStateIsNotChanged) { typedef typename FamilyType::SAMPLER_STATE SAMPLER_STATE; diff --git a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp index f3548b28f8..68612285b8 100644 --- a/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/tbx_command_stream_receiver_tests_gen11.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using Gen11TbxCommandStreamReceiverTests = TestLegacy; +using Gen11TbxCommandStreamReceiverTests = Test; GEN11TEST_F(Gen11TbxCommandStreamReceiverTests, whenAskedForPollForCompletionParametersThenReturnCorrectValues) { class MyMockTbxHw : public TbxCommandStreamReceiverHw { diff --git a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp index 0b4fce3369..c3bfe97aea 100644 --- a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp @@ -15,7 +15,7 @@ using namespace NEO; -typedef TestLegacy Gen11DeviceCaps; +typedef Test Gen11DeviceCaps; GEN11TEST_F(Gen11DeviceCaps, GivenDefaultWhenCheckingPreemptionModeThenMidThreadIsReturned) { EXPECT_TRUE(PreemptionMode::MidThread == pDevice->getHardwareInfo().capabilityTable.defaultPreemptionMode); diff --git a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp index 580a408054..6545b124a8 100644 --- a/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_platform_caps_gen11.cpp @@ -15,11 +15,11 @@ using namespace NEO; struct Gen11PlatformCaps : public PlatformFixture, public ::testing::Test { void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); } void TearDown() override { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/gen11/test_sample_gen11.cpp b/opencl/test/unit_test/gen11/test_sample_gen11.cpp index aa407aaf1f..567586321b 100644 --- a/opencl/test/unit_test/gen11/test_sample_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_sample_gen11.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy Gen11OnlyTeset; +typedef Test Gen11OnlyTeset; GEN11TEST_F(Gen11OnlyTeset, WhenGettingRenderCoreFamilyThenGen11CoreIsReturned) { EXPECT_EQ(IGFX_GEN11_CORE, pDevice->getRenderCoreFamily()); diff --git a/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp b/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp index 7efe8cf9ec..ed0376f0c0 100644 --- a/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp +++ b/opencl/test/unit_test/gen12lp/adlp/test_device_caps_adlp.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using AdlpUsDeviceIdTest = TestLegacy; +using AdlpUsDeviceIdTest = Test; ADLPTEST_F(AdlpUsDeviceIdTest, GivenNonZeroIdThenIsSimulationIsTrue) { unsigned short simulationIds[] = { diff --git a/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp b/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp index 7903edabe4..cacc28f56d 100644 --- a/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp +++ b/opencl/test/unit_test/gen12lp/adls/test_device_caps_adls.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using AdlsUsDeviceIdTest = TestLegacy; +using AdlsUsDeviceIdTest = Test; ADLSTEST_F(AdlsUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) { unsigned short adlsSimulationIds[1] = { diff --git a/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp index 891a49dcf7..3400a72366 100644 --- a/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/test_device_caps_dg1.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using Dg1DeviceCaps = TestLegacy; +using Dg1DeviceCaps = Test; DG1TEST_F(Dg1DeviceCaps, givenDg1WhenCheckSupportCacheFlushAfterWalkerThenFalse) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.supportCacheFlushAfterWalker); diff --git a/opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp index 73437025e1..5b0b7e59f7 100644 --- a/opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/gpgpu_walker_tests_gen12lp.cpp @@ -46,7 +46,7 @@ class MockKernelWithApplicableWa : public MockKernel { struct HardwareInterfaceTests : public ClDeviceFixture, public LinearStreamFixture, public ::testing::Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); LinearStreamFixture::setUp(); pContext = new NEO::MockContext(pClDevice); @@ -64,7 +64,7 @@ struct HardwareInterfaceTests : public ClDeviceFixture, public LinearStreamFixtu pContext->release(); LinearStreamFixture::tearDown(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } CommandQueue *pCommandQueue = nullptr; diff --git a/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl index f9634e697b..5d00262b53 100644 --- a/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/kernel_tests_gen12lp.inl @@ -14,7 +14,7 @@ using namespace NEO; -using Gen12LpKernelTest = TestLegacy; +using Gen12LpKernelTest = Test; GEN12LPTEST_F(Gen12LpKernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsFalse) { MockKernelWithInternals mockKernel(*pClDevice); auto retVal = mockKernel.mockKernel->Kernel::canTransformImages(); diff --git a/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl index 9fe851ed77..1d1468c280 100644 --- a/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/profiling_tests_gen12lp.inl @@ -18,13 +18,13 @@ using namespace NEO; struct ProfilingTestsGen12LP : public CommandEnqueueFixture, public ::testing::Test { void SetUp() override { - CommandEnqueueFixture::SetUp(CL_QUEUE_PROFILING_ENABLE); + CommandEnqueueFixture::setUp(CL_QUEUE_PROFILING_ENABLE); mockKernelWithInternals = std::make_unique(*pClDevice, nullptr); } void TearDown() override { mockKernelWithInternals.reset(); - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } std::unique_ptr mockKernelWithInternals; diff --git a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl index db79c9773e..d22b138e6d 100644 --- a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl @@ -16,7 +16,7 @@ using namespace NEO; -typedef TestLegacy Gen12LpSamplerTest; +typedef Test Gen12LpSamplerTest; HWTEST2_F(Gen12LpSamplerTest, givenTglLpSamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenDisableLowQualityFilter, IsTGLLP) { EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl index 088e2e40c1..7960015418 100644 --- a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl @@ -14,7 +14,7 @@ using namespace NEO; -using Gen12LPTbxCommandStreamReceiverTests = TestLegacy; +using Gen12LPTbxCommandStreamReceiverTests = Test; GEN12LPTEST_F(Gen12LPTbxCommandStreamReceiverTests, givenNullPtrGraphicsAlloctionWhenGetPPGTTAdditionalBitsIsCalledThenAppropriateValueIsReturned) { auto tbxCsr = std::make_unique>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); diff --git a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl index f4712bc34c..01830d4110 100644 --- a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy Gen12LpDeviceCaps; +typedef Test Gen12LpDeviceCaps; HWTEST2_F(Gen12LpDeviceCaps, WhenCheckingExtensionStringThenFp64IsNotSupported, IsTGLLP) { const auto &caps = pClDevice->getDeviceInfo(); @@ -113,7 +113,7 @@ GEN12LPTEST_F(Gen12LpDeviceCaps, givenGen12LpDeviceWhenCheckingPipesSupportThenF EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.supportsPipes); } -using TglLpUsDeviceIdTest = TestLegacy; +using TglLpUsDeviceIdTest = Test; HWTEST2_F(TglLpUsDeviceIdTest, WhenCheckingSimulationCapThenResultIsCorrect, IsTGLLP) { unsigned short tglLpSimulationIds[2] = { diff --git a/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl index 443517e537..cc42b63709 100644 --- a/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_platform_caps_gen12lp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2021 Intel Corporation + * Copyright (C) 2019-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,11 +13,11 @@ using namespace NEO; struct Gen12LpPlatformCaps : public PlatformFixture, public ::testing::Test { void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); } void TearDown() override { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl index 7a35358979..1f7849ca75 100644 --- a/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_sample_gen12lp.inl @@ -11,13 +11,13 @@ using namespace NEO; -typedef TestLegacy TigerlakeLpOnlyTest; +typedef Test TigerlakeLpOnlyTest; HWTEST2_F(TigerlakeLpOnlyTest, WhenGettingHardwareInfoThenProductFamilyIsTigerlakeLp, IsTGLLP) { EXPECT_EQ(IGFX_TIGERLAKE_LP, pDevice->getHardwareInfo().platform.eProductFamily); } -typedef TestLegacy Gen12LpOnlyTeset; +typedef Test Gen12LpOnlyTeset; GEN12LPTEST_F(Gen12LpOnlyTeset, WhenGettingRenderCoreFamilyThenGen12lpCoreIsReturned) { EXPECT_NE(IGFX_GEN9_CORE, pDevice->getRenderCoreFamily()); diff --git a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp index dd26a24ea9..180f0b2a00 100644 --- a/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/kernel_tests_gen8.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using Gen8KernelTest = TestLegacy; +using Gen8KernelTest = Test; GEN8TEST_F(Gen8KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsFalse) { MockKernelWithInternals mockKernel(*pClDevice); auto retVal = mockKernel.mockKernel->Kernel::canTransformImages(); diff --git a/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp index 80e46a1e87..d847610154 100644 --- a/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp @@ -14,7 +14,7 @@ using namespace NEO; -using Gen8ClDeviceCaps = TestLegacy; +using Gen8ClDeviceCaps = Test; GEN8TEST_F(Gen8ClDeviceCaps, WhenCheckingExtensionStringThenFp64IsSupported) { const auto &caps = pClDevice->getDeviceInfo(); diff --git a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp index 1f6708a80c..a4ddc62147 100644 --- a/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using Gen8PlatformCaps = TestLegacy; +using Gen8PlatformCaps = Test; GEN8TEST_F(Gen8PlatformCaps, WhenCheckingExtensionStringThenFp64IsSupported) { const auto &caps = pPlatform->getPlatformInfo(); diff --git a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp index a513bdc632..e0f55ac258 100644 --- a/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy DeviceTest; +typedef Test DeviceTest; BXTTEST_F(DeviceTest, givenBxtDeviceWhenAskedForProflingTimerResolutionThen52IsReturned) { auto resolution = pDevice->getProfilingTimerResolution(); diff --git a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp index 2050f251be..8181a1613e 100644 --- a/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy BxtDeviceCaps; +typedef Test BxtDeviceCaps; BXTTEST_F(BxtDeviceCaps, WhenCheckingProfilingTimerResolutionThenCorrectResolutionIsReturned) { const auto &caps = pDevice->getDeviceInfo(); @@ -45,7 +45,7 @@ BXTTEST_F(BxtDeviceCaps, WhenCheckFtrSupportsInteger64BitAtomicsThenReturnFalse) EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); } -typedef TestLegacy BxtUsDeviceIdTest; +typedef Test BxtUsDeviceIdTest; BXTTEST_F(BxtUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) { unsigned short bxtSimulationIds[3] = { diff --git a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp index 332c5af5f9..fffbcb512b 100644 --- a/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp +++ b/opencl/test/unit_test/gen9/bxt/windows/test_device_caps_bxt_windows.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy BxtDeviceCapsWindows; +typedef Test BxtDeviceCapsWindows; BXTTEST_F(BxtDeviceCapsWindows, GivenWhenGettingKmdNotifyPropertiesThenItIsDisabled) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp index b68184b9e9..1f85b77244 100644 --- a/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/test_device_caps_cfl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy CflDeviceCaps; +typedef Test CflDeviceCaps; CFLTEST_F(CflDeviceCaps, GivenCFLWhenCheckftr64KBpagesThenTrue) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftr64KBpages); diff --git a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp index a237b01b1d..8b5cd4ca54 100644 --- a/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp +++ b/opencl/test/unit_test/gen9/cfl/windows/test_device_caps_cfl_windows.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy CflDeviceCapsWindows; +typedef Test CflDeviceCapsWindows; CFLTEST_F(CflDeviceCapsWindows, GivenWhenGettingKmdNotifyPropertiesThenItIsDisabled) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp index bd5e868d22..859893939d 100644 --- a/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_kernel_gen9.cpp @@ -19,7 +19,7 @@ namespace NEO { -using Gen9EnqueueTest = TestLegacy; +using Gen9EnqueueTest = Test; GEN9TEST_F(Gen9EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKernelIsSubmittedThenRoundRobinPolicyIsProgrammed) { MockContext mc; CommandQueueHw cmdQ{&mc, pClDevice, 0, false}; diff --git a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp index dac322d493..5c78d25673 100644 --- a/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/test_device_caps_glk.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy Gen9DeviceCaps; +typedef Test Gen9DeviceCaps; GLKTEST_F(Gen9DeviceCaps, WhenCheckingProfilingTimerResolutionThenCorrectResolutionIsReturned) { const auto &caps = pDevice->getDeviceInfo(); @@ -36,7 +36,7 @@ GLKTEST_F(Gen9DeviceCaps, GlkIs32BitOsAllocatorAvailable) { } } -typedef TestLegacy GlkUsDeviceIdTest; +typedef Test GlkUsDeviceIdTest; GLKTEST_F(GlkUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) { unsigned short glkSimulationIds[3] = { diff --git a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp index 6a2947c513..a23eab67fd 100644 --- a/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp +++ b/opencl/test/unit_test/gen9/glk/windows/test_device_caps_glk_windows.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy GlkDeviceCapsWindows; +typedef Test GlkDeviceCapsWindows; GLKTEST_F(GlkDeviceCapsWindows, WhenCheckingKmdNotifyPropertiesThenKmdNotifyIsEnabledCorrectly) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp index d6d0171c32..3cbf1f2f0a 100644 --- a/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/test_device_caps_kbl.cpp @@ -11,7 +11,7 @@ using namespace NEO; -typedef TestLegacy KblDeviceCaps; +typedef Test KblDeviceCaps; KBLTEST_F(KblDeviceCaps, GivenKBLWhenCheckftr64KBpagesThenTrue) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftr64KBpages); diff --git a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp index 9dfdae19a3..1346a3129d 100644 --- a/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp +++ b/opencl/test/unit_test/gen9/kbl/windows/test_device_caps_kbl_windows.cpp @@ -11,7 +11,7 @@ using namespace NEO; -typedef TestLegacy KblDeviceCapsWindows; +typedef Test KblDeviceCapsWindows; KBLTEST_F(KblDeviceCapsWindows, GivenWhenGettingKmdNotifyPropertiesThenItIsDisabled) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp index 648642347c..a0c69efc06 100644 --- a/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/kernel_tests_gen9.cpp @@ -16,7 +16,7 @@ using namespace NEO; -using Gen9KernelTest = TestLegacy; +using Gen9KernelTest = Test; GEN9TEST_F(Gen9KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) { MockKernelWithInternals mockKernel(*pClDevice); auto retVal = mockKernel.mockKernel->Kernel::canTransformImages(); diff --git a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp index 0cb8e50c19..0d21787c3a 100644 --- a/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sampler_tests_gen9.cpp @@ -16,7 +16,7 @@ using namespace NEO; -typedef TestLegacy Gen9SamplerTest; +typedef Test Gen9SamplerTest; GEN9TEST_F(Gen9SamplerTest, WhenAppendingSamplerStateParamsThenStateIsNotChanged) { typedef typename FamilyType::SAMPLER_STATE SAMPLER_STATE; diff --git a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp index 83460330f2..17be7e7f9e 100644 --- a/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/device_tests_skl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy DeviceTest; +typedef Test DeviceTest; SKLTEST_F(DeviceTest, givenSklDeviceWhenAskedForProflingTimerResolutionThen83IsReturned) { auto resolution = pDevice->getProfilingTimerResolution(); diff --git a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp index ca79871753..630dc5fb8e 100644 --- a/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_device_caps_skl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy SklDeviceCaps; +typedef Test SklDeviceCaps; SKLTEST_F(SklDeviceCaps, WhenCheckingProfilingTimerResolutionThenCorrectResolutionIsReturned) { const auto &caps = pDevice->getDeviceInfo(); @@ -35,7 +35,7 @@ SKLTEST_F(SklDeviceCaps, WhenCheckingCapabilitiesThenSvmIsEnabled) { EXPECT_EQ(expectedCaps, caps.svmCapabilities); } -typedef TestLegacy SklUsDeviceIdTest; +typedef Test SklUsDeviceIdTest; SKLTEST_F(SklUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) { unsigned short sklSimulationIds[6] = { diff --git a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp index 72afa8017e..e237977c15 100644 --- a/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/test_sample_skl.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy SkylakeOnlyTest; +typedef Test SkylakeOnlyTest; SKLTEST_F(SkylakeOnlyTest, WhenGettingProductFamilyThenSkylakeIsReturned) { EXPECT_EQ(IGFX_SKYLAKE, pDevice->getHardwareInfo().platform.eProductFamily); diff --git a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp index 467c65300d..3713a3eca4 100644 --- a/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp +++ b/opencl/test/unit_test/gen9/skl/windows/test_device_caps_skl_windows.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy SklDeviceCapsWindows; +typedef Test SklDeviceCapsWindows; SKLTEST_F(SklDeviceCapsWindows, GivenWhenGettingKmdNotifyPropertiesThenItIsDisabled) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.kmdNotifyProperties.enableKmdNotify); diff --git a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp index c93082871a..c01f8d8e60 100644 --- a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp @@ -15,7 +15,7 @@ using namespace NEO; -typedef TestLegacy Gen9DeviceCaps; +typedef Test Gen9DeviceCaps; GEN9TEST_F(Gen9DeviceCaps, WhenCheckingExtensionStringThenFp64CorrectlyReported) { const auto &caps = pClDevice->getDeviceInfo(); diff --git a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp index 4f8bcc4991..0909f2351e 100644 --- a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp @@ -16,11 +16,11 @@ using namespace NEO; struct Gen9PlatformCaps : public PlatformFixture, public ::testing::Test { void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); } void TearDown() override { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/gen9/test_sample_gen9.cpp b/opencl/test/unit_test/gen9/test_sample_gen9.cpp index 04e866ab13..4e660e7c90 100644 --- a/opencl/test/unit_test/gen9/test_sample_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_sample_gen9.cpp @@ -13,7 +13,7 @@ using namespace NEO; -typedef TestLegacy Gen9OnlyTest; +typedef Test Gen9OnlyTest; GEN9TEST_F(Gen9OnlyTest, WhenGettingRenderCoreFamilyThenGen9CoreIsReturned) { EXPECT_EQ(IGFX_GEN9_CORE, pDevice->getRenderCoreFamily()); diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index 03cc51215d..0a0997fbec 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -158,7 +158,7 @@ struct MockResidentTestsPageFaultManager : public MockPageFaultManager { }; class GTPinFixture : public ContextFixture, public MemoryManagementFixture { - using ContextFixture::SetUp; + using ContextFixture::setUp; public: void setUp() { @@ -182,7 +182,7 @@ class GTPinFixture : public ContextFixture, public MemoryManagementFixture { pDevice = pPlatform->getClDevice(0); rootDeviceIndex = pDevice->getRootDeviceIndex(); cl_device_id device = pDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); driverServices.bufferAllocate = nullptr; driverServices.bufferDeallocate = nullptr; @@ -201,7 +201,7 @@ class GTPinFixture : public ContextFixture, public MemoryManagementFixture { } void tearDown() { - ContextFixture::TearDown(); + ContextFixture::tearDown(); platformsImpl->clear(); MemoryManagementFixture::tearDown(); NEO::isGTPinInitialized = false; diff --git a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp index 44921f206c..a255860182 100644 --- a/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/aub_helper_hw_tests_xehp_and_later.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using AubHelperHwTestXeHPAndLater = TestLegacy; +using AubHelperHwTestXeHPAndLater = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, AubHelperHwTestXeHPAndLater, givenAubHelperWhenGetDataHintForPml4EntryIsCalledThenTracePpgttLevel4IsReturned) { AubHelperHw aubHelper(true); diff --git a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp index d7fc3fa2d0..85cf4e60a1 100644 --- a/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp +++ b/opencl/test/unit_test/helpers/dispatch_info_builder_tests.cpp @@ -18,7 +18,7 @@ namespace NEO { using namespace SplitDispatch; class DispatchInfoBuilderFixture : public ContextFixture, public ClDeviceFixture { - using ContextFixture::SetUp; + using ContextFixture::setUp; public: DispatchInfoBuilderFixture() {} @@ -27,10 +27,10 @@ class DispatchInfoBuilderFixture : public ContextFixture, public ClDeviceFixture } protected: - void SetUp() { - ClDeviceFixture::SetUp(); + void setUp() { + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.bufferAddressingMode = KernelDescriptor::Stateless; @@ -55,12 +55,12 @@ class DispatchInfoBuilderFixture : public ContextFixture, public ClDeviceFixture pKernel->isBuiltIn = true; } - void TearDown() { + void tearDown() { delete pKernel; delete pProgram; - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } std::unique_ptr pKernelInfo; @@ -69,7 +69,7 @@ class DispatchInfoBuilderFixture : public ContextFixture, public ClDeviceFixture char pCrossThreadData[128]; }; -typedef TestLegacy DispatchInfoBuilderTest; +typedef Test DispatchInfoBuilderTest; template class DispatchInfoBuilderMock : DispatchInfoBuilder { diff --git a/opencl/test/unit_test/helpers/dispatch_info_tests.cpp b/opencl/test/unit_test/helpers/dispatch_info_tests.cpp index 65689e95ea..5c7a44643a 100644 --- a/opencl/test/unit_test/helpers/dispatch_info_tests.cpp +++ b/opencl/test/unit_test/helpers/dispatch_info_tests.cpp @@ -20,16 +20,16 @@ using namespace NEO; class DispatchInfoFixture : public ContextFixture, public ClDeviceFixture { - using ContextFixture::SetUp; + using ContextFixture::setUp; public: DispatchInfoFixture() {} protected: - void SetUp() { - ClDeviceFixture::SetUp(); + void setUp() { + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); pKernelInfo = std::make_unique(); pKernelInfo->setPerThreadScratchSize(1024, 0); @@ -40,12 +40,12 @@ class DispatchInfoFixture : public ContextFixture, public ClDeviceFixture { pKernel = new MockKernel(pProgram, *pKernelInfo, *pClDevice); pKernel->slmTotalSize = 128; } - void TearDown() { + void tearDown() { delete pKernel; delete pProgram; - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } std::unique_ptr pKernelInfo; @@ -53,7 +53,7 @@ class DispatchInfoFixture : public ContextFixture, public ClDeviceFixture { MockKernel *pKernel = nullptr; }; -typedef TestLegacy DispatchInfoTest; +typedef Test DispatchInfoTest; TEST_F(DispatchInfoTest, GivenNoGeometryWhenDispatchInfoIsCreatedThenValuesAreSetCorrectly) { std::unique_ptr dispatchInfo(new DispatchInfo); diff --git a/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp index dde13b1821..7f2d7095e8 100644 --- a/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/engine_node_helper_tests_xehp_and_later.cpp @@ -13,7 +13,7 @@ using namespace NEO; -using EngineNodeHelperTestsXeHPAndLater = ::TestLegacy; +using EngineNodeHelperTestsXeHPAndLater = ::Test; HWCMDTEST_F(IGFX_XE_HP_CORE, EngineNodeHelperTestsXeHPAndLater, WhenGetBcsEngineTypeIsCalledThenBcsEngineIsReturned) { const auto hwInfo = pDevice->getHardwareInfo(); diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp index bc474189cf..ca76d270ed 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp @@ -31,10 +31,10 @@ using namespace NEO; void HardwareCommandsTest::SetUp() { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); ASSERT_NE(nullptr, pClDevice); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); ASSERT_NE(nullptr, pContext); BuiltInFixture::SetUp(pDevice); ASSERT_NE(nullptr, pBuiltIns); @@ -45,8 +45,8 @@ void HardwareCommandsTest::SetUp() { void HardwareCommandsTest::TearDown() { mockKernelWithInternal.reset(nullptr); BuiltInFixture::TearDown(); - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } void HardwareCommandsTest::addSpaceForSingleKernelArg() { @@ -1196,7 +1196,7 @@ TEST_F(HardwareCommandsTest, givenCacheFlushAfterWalkerEnabledWhenPlatformNotSup EXPECT_EQ(0U, allocationsForCacheFlush.size()); } -using KernelCacheFlushTests = TestLegacy>; +using KernelCacheFlushTests = Test>; HWTEST_F(KernelCacheFlushTests, givenLocallyUncachedBufferWhenGettingAllocationsForFlushThenEmptyVectorIsReturned) { DebugManagerStateRestore dbgRestore; @@ -1225,10 +1225,10 @@ HWTEST_F(KernelCacheFlushTests, givenLocallyUncachedBufferWhenGettingAllocations clReleaseMemObject(bufferRegular); } -struct HardwareCommandsImplicitArgsTests : TestLegacy { +struct HardwareCommandsImplicitArgsTests : Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); indirectHeapAllocation = pDevice->getMemoryManager()->allocateGraphicsMemoryWithProperties(MockAllocationProperties{pDevice->getRootDeviceIndex(), MemoryConstants::pageSize}); expectedImplicitArgs.numWorkDim = 3; @@ -1246,7 +1246,7 @@ struct HardwareCommandsImplicitArgsTests : TestLegacy { void TearDown() override { pDevice->getMemoryManager()->freeGraphicsMemory(indirectHeapAllocation); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } template diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h index 296be623f9..733d13a24b 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h @@ -30,7 +30,7 @@ struct HardwareCommandsTest : ClDeviceFixture, ::testing::Test { using BuiltInFixture::SetUp; - using ContextFixture::SetUp; + using ContextFixture::setUp; void SetUp() override; void TearDown() override; diff --git a/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp b/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp index 914895931c..3194670ddb 100644 --- a/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp +++ b/opencl/test/unit_test/helpers/heap_assigner_ocl_tests.cpp @@ -13,7 +13,7 @@ namespace NEO { -using AlocationHelperTests = TestLegacy; +using AlocationHelperTests = Test; HWTEST_F(AlocationHelperTests, givenLinearStreamTypeWhenUseExternalAllocatorForSshAndDshDisabledThenUse32BitIsFalse) { DebugManagerStateRestore dbgRestorer; diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp index 24697418ef..d616a657f4 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_and_later.cpp @@ -17,7 +17,7 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" using PipeControlHelperTestsDg2AndLater = ::testing::Test; -using HwHelperTestsDg2AndLater = TestLegacy; +using HwHelperTestsDg2AndLater = Test; HWTEST2_F(PipeControlHelperTestsDg2AndLater, WhenAddingPipeControlWAThenCorrectCommandsAreProgrammed, IsAtLeastXeHpgCore) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp index 45c323918f..996807d365 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_dg2_or_below.cpp @@ -12,7 +12,7 @@ using namespace NEO; -using HwHelperDg2OrBelowTests = TestLegacy; +using HwHelperDg2OrBelowTests = Test; using isDG2OrBelow = IsAtMostProduct; HWTEST2_F(HwHelperDg2OrBelowTests, WhenGettingIsKmdMigrationSupportedThenFalseIsReturned, isDG2OrBelow) { diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp index 233c8f0f59..b3635aa843 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp @@ -25,7 +25,7 @@ #include "engine_node.h" -using HwHelperTestXeHPAndLater = TestLegacy; +using HwHelperTestXeHPAndLater = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, WhenGettingMaxBarriersPerSliceThen32IsReturned) { auto &helper = HwHelper::get(renderCoreFamily); diff --git a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp index cdd63d8b25..c489d04553 100644 --- a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp +++ b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp @@ -25,7 +25,7 @@ struct PerThreadDataTests : public ClDeviceFixture, ::testing::Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); kernelInfo.setLocalIds({localIdX, localIdY, localIdZ}); kernelInfo.kernelDescriptor.kernelAttributes.flags.usesFlattenedLocalIds = flattenedId; @@ -46,7 +46,7 @@ struct PerThreadDataTests : public ClDeviceFixture, void TearDown() override { alignedFree(indirectHeapMemory); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } const std::array workgroupWalkOrder = {{0, 1, 2}}; diff --git a/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp index e9a82c4309..a8333b6f57 100644 --- a/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp +++ b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.cpp @@ -11,7 +11,7 @@ namespace NEO { -void IndirectHeapFixture::SetUp(CommandQueue *pCmdQ) { +void IndirectHeapFixture::setUp(CommandQueue *pCmdQ) { pDSH = &pCmdQ->getIndirectHeap(IndirectHeap::Type::DYNAMIC_STATE, 8192); pSSH = &pCmdQ->getIndirectHeap(IndirectHeap::Type::SURFACE_STATE, 4096); pIOH = &pCmdQ->getIndirectHeap(IndirectHeap::Type::INDIRECT_OBJECT, 4096); diff --git a/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h index 1791af62f8..5dee793794 100644 --- a/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h +++ b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h @@ -14,8 +14,8 @@ namespace NEO { class CommandQueue; struct IndirectHeapFixture { - virtual void SetUp(CommandQueue *pCmdQ); // NOLINT(readability-identifier-naming) - virtual void TearDown() { // NOLINT(readability-identifier-naming) + void setUp(CommandQueue *pCmdQ); + void tearDown() { } IndirectHeap *pDSH = nullptr; diff --git a/opencl/test/unit_test/kernel/cache_flush_tests.inl b/opencl/test/unit_test/kernel/cache_flush_tests.inl index 9b6723f3df..e548ed18c8 100644 --- a/opencl/test/unit_test/kernel/cache_flush_tests.inl +++ b/opencl/test/unit_test/kernel/cache_flush_tests.inl @@ -203,7 +203,7 @@ class GivenCacheFlushAfterWalkerEnabledWhenProgramGlobalSurfacePresentAndPostSyn }; using EnqueueKernelFixture = HelloWorldFixture; -using EnqueueKernelTest = TestLegacy; +using EnqueueKernelTest = Test; template class GivenCacheFlushAfterWalkerEnabledAndProperSteppingIsSetWhenAllocationRequiresCacheFlushThenFlushCommandPresentAfterWalker : public EnqueueKernelTest { diff --git a/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl b/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl index a0061388ed..3456c3606b 100644 --- a/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl +++ b/opencl/test/unit_test/kernel/cache_flush_xehp_and_later_tests.inl @@ -235,7 +235,7 @@ class GivenCacheFlushAfterWalkerEnabledWhenProgramGlobalSurfacePresentAndPostSyn }; using EnqueueKernelFixture = HelloWorldFixture; -using EnqueueKernelTest = TestLegacy; +using EnqueueKernelTest = Test; template class GivenCacheFlushAfterWalkerEnabledWhenAllocationRequiresCacheFlushThenFlushCommandPresentAfterWalker : public EnqueueKernelTest { diff --git a/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp index d76c066ab4..740a4fd261 100644 --- a/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/gl/kernel_arg_buffer_tests.cpp @@ -28,7 +28,7 @@ using namespace NEO; -typedef TestLegacy KernelArgBufferTest; +typedef Test KernelArgBufferTest; TEST_F(KernelArgBufferTest, givenSharedBufferWhenSetArgIsCalledThenReportSharedObjUsage) { MockGlSharing glSharing; diff --git a/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp index 3ad844c7c9..c880a416a4 100644 --- a/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_accelerator_arg_tests.cpp @@ -27,23 +27,23 @@ using namespace NEO; class KernelArgAcceleratorFixture : public ContextFixture, public ClDeviceFixture { - using ContextFixture::SetUp; + using ContextFixture::setUp; public: KernelArgAcceleratorFixture() { } protected: - void SetUp() { + void setUp() { desc = { CL_ME_MB_TYPE_4x4_INTEL, CL_ME_SUBPIXEL_MODE_QPEL_INTEL, CL_ME_SAD_ADJUST_MODE_HAAR_INTEL, CL_ME_SEARCH_PATH_RADIUS_16_12_INTEL}; - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 1; @@ -64,12 +64,12 @@ class KernelArgAcceleratorFixture : public ContextFixture, public ClDeviceFixtur pKernel->setCrossThreadData(&pCrossThreadData[0], sizeof(pCrossThreadData)); } - void TearDown() { + void tearDown() { delete pKernel; delete pProgram; - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } cl_motion_estimation_desc_intel desc; @@ -79,7 +79,7 @@ class KernelArgAcceleratorFixture : public ContextFixture, public ClDeviceFixtur char pCrossThreadData[64]; }; -typedef TestLegacy KernelArgAcceleratorTest; +typedef Test KernelArgAcceleratorTest; TEST_F(KernelArgAcceleratorTest, WhenCreatingVmeAcceleratorThenCorrectKernelArgsAreSet) { cl_int status; diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp index f945e94f84..1cead6afbe 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -26,10 +26,10 @@ using namespace NEO; -void KernelArgBufferFixture::SetUp() { - ClDeviceFixture::SetUp(); +void KernelArgBufferFixture::setUp() { + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); // define kernel info pKernelInfo = std::make_unique(); @@ -51,10 +51,10 @@ void KernelArgBufferFixture::SetUp() { pKernel->setKernelArgHandler(0, &Kernel::setArgBuffer); } -void KernelArgBufferFixture::TearDown() { +void KernelArgBufferFixture::tearDown() { delete pKernel; delete pProgram; - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h index 9a47a88f95..bf5d1a3cfd 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_fixture.h @@ -24,11 +24,11 @@ using namespace NEO; class KernelArgBufferFixture : public ContextFixture, public ClDeviceFixture { - using ContextFixture::SetUp; + using ContextFixture::setUp; public: - void SetUp(); - void TearDown(); + void setUp(); + void tearDown(); cl_int retVal = CL_SUCCESS; MockProgram *pProgram = nullptr; diff --git a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp index c2ecc43847..a7ea5bc912 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_buffer_tests.cpp @@ -29,7 +29,7 @@ using namespace NEO; -struct KernelArgBufferTest : public TestLegacy { +struct KernelArgBufferTest : public Test { struct AllocationTypeHelper { AllocationType allocationType; bool compressed; @@ -750,9 +750,9 @@ TEST_F(KernelArgBufferTest, givenSVMAllocsManagerWithCompressedSVMAllocationsWhe class KernelArgBufferFixtureBindless : public KernelArgBufferFixture { public: - void SetUp() { + void setUp() { DebugManager.flags.UseBindlessMode.set(1); - KernelArgBufferFixture::SetUp(); + KernelArgBufferFixture::setUp(); pBuffer = new MockBuffer(); ASSERT_NE(nullptr, pBuffer); @@ -761,16 +761,16 @@ class KernelArgBufferFixtureBindless : public KernelArgBufferFixture { pKernelInfo->argAsPtr(0).stateless = undefined; pKernelInfo->argAsPtr(0).bindful = undefined; } - void TearDown() { + void tearDown() { delete pBuffer; - KernelArgBufferFixture::TearDown(); + KernelArgBufferFixture::tearDown(); } DebugManagerStateRestore restorer; MockBuffer *pBuffer; const CrossThreadDataOffset bindlessOffset = 0x10; }; -typedef TestLegacy KernelArgBufferTestBindless; +typedef Test KernelArgBufferTestBindless; HWTEST_F(KernelArgBufferTestBindless, givenUsedBindlessBuffersWhenPatchingSurfaceStateOffsetsThenCorrectOffsetIsPatchedInCrossThreadData) { using DataPortBindlessSurfaceExtendedMessageDescriptor = typename FamilyType::DataPortBindlessSurfaceExtendedMessageDescriptor; 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 8e0ac72e6d..0f748ad3c9 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_pipe_tests.cpp @@ -26,17 +26,17 @@ using namespace NEO; class KernelArgPipeFixture : public ContextFixture, public ClDeviceFixture { - using ContextFixture::SetUp; + using ContextFixture::setUp; public: KernelArgPipeFixture() { } protected: - void SetUp() { - ClDeviceFixture::SetUp(); + void setUp() { + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); // define kernel info pKernelInfo = std::make_unique(); @@ -56,12 +56,12 @@ class KernelArgPipeFixture : public ContextFixture, public ClDeviceFixture { pKernel->setKernelArgHandler(0, &Kernel::setArgPipe); } - void TearDown() { + void tearDown() { delete pKernel; delete pProgram; - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -73,7 +73,7 @@ class KernelArgPipeFixture : public ContextFixture, public ClDeviceFixture { char pCrossThreadData[64]; }; -typedef TestLegacy KernelArgPipeTest; +typedef Test KernelArgPipeTest; TEST_F(KernelArgPipeTest, GivenValidPipeWhenSettingKernelArgThenPipeAddressIsCorrect) { Pipe *pipe = new MockPipe(pContext); 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 b49da672e8..5050207650 100644 --- a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp @@ -26,17 +26,17 @@ using namespace NEO; class KernelArgSvmFixture : public ContextFixture, public ClDeviceFixture { - using ContextFixture::SetUp; + using ContextFixture::setUp; public: KernelArgSvmFixture() { } protected: - void SetUp() { - ClDeviceFixture::SetUp(); + void setUp() { + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); // define kernel info pKernelInfo = std::make_unique(); @@ -54,12 +54,12 @@ class KernelArgSvmFixture : public ContextFixture, public ClDeviceFixture { pKernel->setCrossThreadData(pCrossThreadData, sizeof(pCrossThreadData)); } - void TearDown() { + void tearDown() { delete pKernel; delete pProgram; - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -71,7 +71,7 @@ class KernelArgSvmFixture : public ContextFixture, public ClDeviceFixture { char pCrossThreadData[64]; }; -typedef TestLegacy KernelArgSvmTest; +typedef Test KernelArgSvmTest; TEST_F(KernelArgSvmTest, GivenValidSvmPtrWhenSettingKernelArgThenSvmPtrIsCorrect) { const ClDeviceInfo &devInfo = pClDevice->getDeviceInfo(); diff --git a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp index 2723b8ae0f..7f5bffca9e 100644 --- a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp @@ -27,10 +27,10 @@ class KernelWithCacheFlushTests : public PlatformFixture, public testing::TestWi void TearDown() override { } void initializePlatform() { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); } void clearPlatform() { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } }; TEST_F(KernelWithCacheFlushTests, givenDeviceWhichDoesntRequireCacheFlushWhenCheckIfKernelRequireFlushThenReturnedFalse) { diff --git a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp index 1e03092f40..dda361ae07 100644 --- a/opencl/test/unit_test/kernel/kernel_slm_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_slm_tests.cpp @@ -21,7 +21,7 @@ using namespace NEO; struct KernelSLMAndBarrierTest : public ClDeviceFixture, public ::testing::TestWithParam { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); program = std::make_unique(toClDeviceVector(*pClDevice)); kernelInfo.setCrossThreadDataSize(sizeof(crossThreadData)); @@ -34,7 +34,7 @@ struct KernelSLMAndBarrierTest : public ClDeviceFixture, kernelInfo.kernelDescriptor.kernelAttributes.simdSize = 32; } void TearDown() override { - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } uint32_t simd; diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 4c5314f156..56b2a9cb09 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -56,7 +56,7 @@ class KernelTests : public ProgramFromBinaryFixture { protected: void SetUp() override { - ProgramFromBinaryFixture::SetUp("CopyBuffer_simd32", "CopyBuffer"); + ProgramFromBinaryFixture::setUp("CopyBuffer_simd32", "CopyBuffer"); ASSERT_NE(nullptr, pProgram); ASSERT_EQ(CL_SUCCESS, retVal); @@ -394,17 +394,17 @@ TEST_F(KernelTests, WhenIsSingleSubdevicePreferredIsCalledThenCorrectValuesAreRe class KernelFromBinaryTest : public ProgramSimpleFixture { public: - void SetUp() override { - ProgramSimpleFixture::SetUp(); + void setUp() { + ProgramSimpleFixture::setUp(); } - void TearDown() override { - ProgramSimpleFixture::TearDown(); + void tearDown() { + ProgramSimpleFixture::tearDown(); } }; -typedef TestLegacy KernelFromBinaryTests; +typedef Test KernelFromBinaryTests; TEST_F(KernelFromBinaryTests, GivenKernelNumArgsWhenGettingInfoThenNumberOfKernelArgsIsReturned) { - CreateProgramFromBinary(pContext, pContext->getDevices(), "kernel_num_args"); + createProgramFromBinary(pContext, pContext->getDevices(), "kernel_num_args"); ASSERT_NE(nullptr, pProgram); retVal = pProgram->build( @@ -443,7 +443,7 @@ TEST_F(KernelFromBinaryTests, GivenKernelNumArgsWhenGettingInfoThenNumberOfKerne } TEST_F(KernelFromBinaryTests, WhenRegularKernelIsCreatedThenItIsNotBuiltIn) { - CreateProgramFromBinary(pContext, pContext->getDevices(), "simple_kernels"); + createProgramFromBinary(pContext, pContext->getDevices(), "simple_kernels"); ASSERT_NE(nullptr, pProgram); retVal = pProgram->build( @@ -474,7 +474,7 @@ TEST_F(KernelFromBinaryTests, WhenRegularKernelIsCreatedThenItIsNotBuiltIn) { } TEST_F(KernelFromBinaryTests, givenArgumentDeclaredAsConstantWhenKernelIsCreatedThenArgumentIsMarkedAsReadOnly) { - CreateProgramFromBinary(pContext, pContext->getDevices(), "simple_kernels"); + createProgramFromBinary(pContext, pContext->getDevices(), "simple_kernels"); ASSERT_NE(nullptr, pProgram); retVal = pProgram->build( @@ -490,9 +490,9 @@ TEST_F(KernelFromBinaryTests, givenArgumentDeclaredAsConstantWhenKernelIsCreated EXPECT_TRUE(pKernelInfo->getArgDescriptorAt(0).isReadOnly()); } -typedef TestLegacy KernelPrivateSurfaceTest; -typedef TestLegacy KernelGlobalSurfaceTest; -typedef TestLegacy KernelConstantSurfaceTest; +typedef Test KernelPrivateSurfaceTest; +typedef Test KernelGlobalSurfaceTest; +typedef Test KernelConstantSurfaceTest; class CommandStreamReceiverMock : public CommandStreamReceiver { typedef CommandStreamReceiver BaseClass; @@ -1052,7 +1052,7 @@ TEST_F(KernelConstantSurfaceTest, givenStatelessKernelWhenKernelIsCreatedThenCon delete kernel; } -typedef TestLegacy KernelResidencyTest; +typedef Test KernelResidencyTest; HWTEST_F(KernelResidencyTest, givenKernelWhenMakeResidentIsCalledThenKernelIsaIsMadeResident) { ASSERT_NE(nullptr, pDevice); @@ -2085,9 +2085,9 @@ HWTEST_F(KernelResidencyTest, WhenMakingArgsResidentThenImageFromImageCheckIsCor EXPECT_EQ(CommandStreamReceiver::SamplerCacheFlushState::samplerCacheFlushBefore, commandStreamReceiver.samplerCacheFlushRequired); } -struct KernelExecutionEnvironmentTest : public TestLegacy { +struct KernelExecutionEnvironmentTest : public Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); program = std::make_unique(toClDeviceVector(*pClDevice)); pKernelInfo = std::make_unique(); @@ -2100,7 +2100,7 @@ struct KernelExecutionEnvironmentTest : public TestLegacy { void TearDown() override { delete kernel; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } MockKernel *kernel; @@ -2160,12 +2160,12 @@ TEST_F(KernelExecutionEnvironmentTest, GivenCompiledWorkGroupSizeIsGreaterThanMa this->pKernelInfo->kernelDescriptor.kernelAttributes.requiredWorkgroupSize[2] = oldRequiredWorkGroupSizeZ; } -struct KernelCrossThreadTests : TestLegacy { +struct KernelCrossThreadTests : Test { KernelCrossThreadTests() { } void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); program = std::make_unique(toClDeviceVector(*pClDevice)); pKernelInfo = std::make_unique(); @@ -2175,7 +2175,7 @@ struct KernelCrossThreadTests : TestLegacy { void TearDown() override { - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } std::unique_ptr program; @@ -3043,16 +3043,16 @@ TEST_F(KernelTests, givenKernelWithSimdEqual1WhenKernelCreatedThenMaxWorgGroupSi EXPECT_EQ(kernel->getMaxKernelWorkGroupSize(), maxThreadsPerWG); } -struct KernelLargeGrfTests : TestLegacy { +struct KernelLargeGrfTests : Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); program = std::make_unique(toClDeviceVector(*pClDevice)); pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.crossThreadDataSize = 64; } void TearDown() override { - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } std::unique_ptr program; @@ -3130,7 +3130,7 @@ HWTEST2_F(KernelConstantSurfaceTest, givenKernelWithConstantSurfaceWhenKernelIsC program.setConstantSurface(nullptr); } -using KernelImplicitArgsTest = TestLegacy; +using KernelImplicitArgsTest = Test; TEST_F(KernelImplicitArgsTest, WhenKernelRequiresImplicitArgsThenImplicitArgsStructIsCreatedAndProperlyInitialized) { auto pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 32; diff --git a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp index 3dd4accf97..b99b2803c3 100644 --- a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp +++ b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp @@ -15,7 +15,7 @@ using namespace NEO; -typedef TestLegacy KernelSubstituteTest; +typedef Test KernelSubstituteTest; TEST_F(KernelSubstituteTest, givenKernelWhenSubstituteKernelHeapWithGreaterSizeThenAllocatesNewKernelAllocation) { MockKernelWithInternals kernel(*pClDevice); diff --git a/opencl/test/unit_test/linux/drm_null_device_tests.cpp b/opencl/test/unit_test/linux/drm_null_device_tests.cpp index c899541532..50601fe7c2 100644 --- a/opencl/test/unit_test/linux/drm_null_device_tests.cpp +++ b/opencl/test/unit_test/linux/drm_null_device_tests.cpp @@ -23,7 +23,7 @@ extern const DeviceDescriptor NEO::deviceDescriptorTable[]; class DrmNullDeviceTestsFixture { public: - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { if (deviceDescriptorTable[0].deviceId == 0) { GTEST_SKIP(); } @@ -36,7 +36,7 @@ class DrmNullDeviceTestsFixture { ASSERT_NE(drmNullDevice, nullptr); } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { } std::unique_ptr> drmNullDevice; @@ -46,7 +46,7 @@ class DrmNullDeviceTestsFixture { DebugManagerStateRestore dbgRestorer; }; -typedef TestLegacy DrmNullDeviceTests; +typedef Test DrmNullDeviceTests; TEST_F(DrmNullDeviceTests, GIVENdrmNullDeviceWHENcallGetDeviceIdTHENreturnProperDeviceId) { int ret = drmNullDevice->queryDeviceIdAndRevision(); diff --git a/opencl/test/unit_test/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp index 5632c7067c..fb5c3fab67 100644 --- a/opencl/test/unit_test/linux/main_linux_dll.cpp +++ b/opencl/test/unit_test/linux/main_linux_dll.cpp @@ -54,7 +54,7 @@ using namespace NEO; class DrmTestsFixture { public: - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { if (deviceDescriptorTable[0].deviceId == 0) { GTEST_SKIP(); } @@ -63,13 +63,13 @@ class DrmTestsFixture { rootDeviceEnvironment = executionEnvironment.rootDeviceEnvironments[0].get(); } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { } ExecutionEnvironment executionEnvironment; RootDeviceEnvironment *rootDeviceEnvironment = nullptr; }; -typedef TestLegacy DrmTests; +typedef Test DrmTests; void initializeTestedDevice() { for (uint32_t i = 0; deviceDescriptorTable[i].deviceId != 0; i++) { diff --git a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp index bf92d2f4b7..841d67cdd1 100644 --- a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp @@ -29,16 +29,16 @@ class BufferSetArgTest : public ContextFixture, public ClDeviceFixture, public testing::Test { - using ContextFixture::SetUp; + using ContextFixture::setUp; public: BufferSetArgTest() {} protected: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 1; @@ -73,8 +73,8 @@ class BufferSetArgTest : public ContextFixture, delete pMultiDeviceKernel; delete pProgram; - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index a35760f65f..b09e71f4d4 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -616,9 +616,9 @@ struct CompressedBuffersTests : public ::testing::Test { for (auto &rootDeviceEnvironment : executionEnvironment->rootDeviceEnvironments) { rootDeviceEnvironment->initGmm(); } - SetUp(executionEnvironment); + setUp(executionEnvironment); } - void SetUp(ExecutionEnvironment *executionEnvironment) { + void setUp(ExecutionEnvironment *executionEnvironment) { hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getMutableHardwareInfo(); device = std::make_unique(MockDevice::create(executionEnvironment, 0u)); context = std::make_unique(device.get(), true); @@ -764,7 +764,7 @@ struct CompressedBuffersSvmTests : public CompressedBuffersTests { executionEnvironment->prepareRootDeviceEnvironments(1u); hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getMutableHardwareInfo(); hwInfo->capabilityTable.gpuAddressSpace = MemoryConstants::max48BitAddress; - CompressedBuffersTests::SetUp(executionEnvironment); + CompressedBuffersTests::setUp(executionEnvironment); } }; @@ -860,13 +860,13 @@ class BufferTest : public ClDeviceFixture, protected: void SetUp() override { flags = GetParam(); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context.reset(new MockContext(pClDevice)); } void TearDown() override { context.reset(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -998,7 +998,7 @@ struct ValidHostPtr public MemoryManagementFixture { typedef BufferTest BaseClass; - using BufferTest::SetUp; + using BufferTest::setUp; using MemoryManagementFixture::setUp; ValidHostPtr() { @@ -1886,10 +1886,10 @@ INSTANTIATE_TEST_CASE_P( struct BufferUnmapTest : public ClDeviceFixture, public ::testing::Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); } void TearDown() override { - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp b/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp index 3549bc6785..7fa2214b35 100644 --- a/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp +++ b/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp @@ -24,20 +24,20 @@ using namespace NEO; class GetMemObjectInfo : public ::testing::Test, public PlatformFixture, public ClDeviceFixture { - using ClDeviceFixture::SetUp; - using PlatformFixture::SetUp; + using ClDeviceFixture::setUp; + using PlatformFixture::setUp; public: void SetUp() override { - PlatformFixture::SetUp(); - ClDeviceFixture::SetUp(); + PlatformFixture::setUp(); + ClDeviceFixture::setUp(); BufferDefaults::context = new MockContext; } void TearDown() override { delete BufferDefaults::context; - ClDeviceFixture::TearDown(); - PlatformFixture::TearDown(); + ClDeviceFixture::tearDown(); + PlatformFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/mem_obj/image1d_tests.cpp b/opencl/test/unit_test/mem_obj/image1d_tests.cpp index 19fcb96777..8262613395 100644 --- a/opencl/test/unit_test/mem_obj/image1d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image1d_tests.cpp @@ -25,7 +25,7 @@ class CreateImage1DTest : public ClDeviceFixture, protected: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); types = GetParam(); // clang-format off @@ -59,7 +59,7 @@ class CreateImage1DTest : public ClDeviceFixture, clReleaseMemObject(imageDesc.mem_object); } delete context; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/mem_obj/image2d_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_tests.cpp index 3e45fd1566..7b7d3d8ccb 100644 --- a/opencl/test/unit_test/mem_obj/image2d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_tests.cpp @@ -25,7 +25,7 @@ class CreateImage2DTest : public ClDeviceFixture, protected: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); types = GetParam(); // clang-format off @@ -52,7 +52,7 @@ class CreateImage2DTest : public ClDeviceFixture, void TearDown() override { delete context; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } Image *createImageWithFlags(cl_mem_flags flags) { auto surfaceFormat = Image::getSurfaceFormatFromTable( diff --git a/opencl/test/unit_test/mem_obj/image3d_tests.cpp b/opencl/test/unit_test/mem_obj/image3d_tests.cpp index 336fc5e719..8edbfd648d 100644 --- a/opencl/test/unit_test/mem_obj/image3d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image3d_tests.cpp @@ -26,7 +26,7 @@ class CreateImage3DTest : public ClDeviceFixture, protected: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = new MockContext(pClDevice); // clang-format off @@ -48,7 +48,7 @@ class CreateImage3DTest : public ClDeviceFixture, void TearDown() override { delete context; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp index 46a63c1e77..d50d12dc05 100644 --- a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp @@ -26,7 +26,7 @@ class ImageArraySizeTest : public ClDeviceFixture, protected: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); types = GetParam(); // clang-format off @@ -57,7 +57,7 @@ class ImageArraySizeTest : public ClDeviceFixture, clReleaseMemObject(imageDesc.mem_object); } delete context; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp index 305a201857..699b8db8bd 100644 --- a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp @@ -62,7 +62,7 @@ class ImageSetArgTest : public ClDeviceFixture, } void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 1; @@ -98,7 +98,7 @@ class ImageSetArgTest : public ClDeviceFixture, delete pMultiDeviceKernel; delete context; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; @@ -918,7 +918,7 @@ HWTEST_F(ImageSetArgTest, givenNonCompressedResourceWhenSettingImgArgThenDontSet class ImageMediaBlockSetArgTest : public ImageSetArgTest { protected: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 1; diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp index 90fb94cab7..1b179b384f 100644 --- a/opencl/test/unit_test/mem_obj/image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests.cpp @@ -58,9 +58,9 @@ class CreateImageTest : public ClDeviceFixture, protected: void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); - CommandQueueFixture::SetUp(pClDevice, 0); + CommandQueueFixture::setUp(pClDevice, 0); flags = GetParam(); // clang-format off @@ -81,8 +81,8 @@ class CreateImageTest : public ClDeviceFixture, } void TearDown() override { - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp b/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp index 47ddfe9423..d28f5fb8ac 100644 --- a/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests_tgllp_and_later.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ using namespace NEO; struct ImageTestsTgllAndLater : ClDeviceFixture, testing::Test { void SetUp() override { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context = std::make_unique(pClDevice); srcImage = std::unique_ptr(Image3dHelper<>::create(context.get())); } @@ -24,7 +24,7 @@ struct ImageTestsTgllAndLater : ClDeviceFixture, testing::Test { void TearDown() override { srcImage.reset(); context.reset(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } std::unique_ptr context{}; diff --git a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp index 8999e65a67..16b4dd28d8 100644 --- a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp @@ -35,8 +35,8 @@ class CreateTiledImageTest : public ClDeviceFixture, protected: void SetUp() override { - ClDeviceFixture::SetUp(); - CommandQueueFixture::SetUp(pClDevice, 0); + ClDeviceFixture::setUp(); + CommandQueueFixture::setUp(pClDevice, 0); type = GetParam(); // clang-format off @@ -57,8 +57,8 @@ class CreateTiledImageTest : public ClDeviceFixture, } void TearDown() override { - CommandQueueFixture::TearDown(); - ClDeviceFixture::TearDown(); + CommandQueueFixture::tearDown(); + ClDeviceFixture::tearDown(); } cl_image_format imageFormat; diff --git a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp index 65e1d9ccb8..a749542ce1 100644 --- a/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp +++ b/opencl/test/unit_test/mem_obj/linux/buffer_linux_tests.cpp @@ -58,13 +58,13 @@ class ExportBufferTests : public ClDeviceFixture, protected: void SetUp() override { flags = CL_MEM_READ_WRITE; - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context.reset(new MockContext(pClDevice)); } void TearDown() override { context.reset(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp index 5753b638ff..d67b543a31 100644 --- a/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp @@ -37,7 +37,7 @@ class SubBufferTest : public ClDeviceFixture, void TearDown() override { delete buffer; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp index b0af61cd8b..03c3965054 100644 --- a/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp +++ b/opencl/test/unit_test/mem_obj/windows/buffer_windows_tests.cpp @@ -49,13 +49,13 @@ class ExportBufferTests : public ClDeviceFixture, protected: void SetUp() override { flags = CL_MEM_READ_WRITE; - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); context.reset(new MockContext(pClDevice)); } void TearDown() override { context.reset(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp index 1f6d0c8160..d4cb3798b3 100644 --- a/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp +++ b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp @@ -32,11 +32,11 @@ class ZeroCopyBufferTest : public ClDeviceFixture, if (sizeToAlloc > 0) { host_ptr = (void *)alignedMalloc(sizeToAlloc, alignment); } - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); } void TearDown() override { - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); alignedFree(host_ptr); } diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp index c0818542c5..ce3bd7d84f 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -2557,16 +2557,16 @@ TEST(MemoryManagerTest, givenForcedLinearImages3DImageAndProperDescriptorValuesW alignedFree(hostPtr); } -class HeapSelectorTest : public TestLegacy { +class HeapSelectorTest : public Test { public: using BaseClass = ClDeviceFixture; void SetUp() override { executionEnvironment = std::unique_ptr(new MockExecutionEnvironment(defaultHwInfo.get())); memoryManager = std::unique_ptr(new MockMemoryManager(false, false, *executionEnvironment.get())); - BaseClass::SetUp(); + BaseClass::setUp(); } void TearDown() override { - BaseClass::TearDown(); + BaseClass::tearDown(); } std::unique_ptr executionEnvironment; std::unique_ptr memoryManager; diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index c635585404..e48b9dec51 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -36,7 +36,7 @@ template struct SVMMemoryAllocatorFixture { SVMMemoryAllocatorFixture() : executionEnvironment(defaultHwInfo.get()) {} - virtual void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { bool svmSupported = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo()->capabilityTable.ftrSvm; if (!svmSupported) { GTEST_SKIP(); @@ -48,7 +48,7 @@ struct SVMMemoryAllocatorFixture { memoryManager->pageFaultManager.reset(new MockPageFaultManager); } } - virtual void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { } MockExecutionEnvironment executionEnvironment; @@ -58,9 +58,9 @@ struct SVMMemoryAllocatorFixture { std::map deviceBitfields{{mockRootDeviceIndex, mockDeviceBitfield}}; }; -using SVMMemoryAllocatorTest = TestLegacy>; +using SVMMemoryAllocatorTest = Test>; -using SVMLocalMemoryAllocatorTest = TestLegacy>; +using SVMLocalMemoryAllocatorTest = Test>; TEST_F(SVMMemoryAllocatorTest, whenCreateZeroSizedSVMAllocationThenReturnNullptr) { auto ptr = svmManager->createSVMAlloc(0, {}, rootDeviceIndices, deviceBitfields); diff --git a/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl index abd68155b4..02c308b46e 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_get_device_info_tests_mt.inl @@ -14,7 +14,7 @@ using namespace NEO; namespace ULT { -using clGetDeviceInfoMtTests = TestLegacy; +using clGetDeviceInfoMtTests = Test; TEST_F(clGetDeviceInfoMtTests, GivenMultipleThreadsQueryingDeviceExtensionsWithVersionThenReturnedValuesAreValid) { UltClDeviceFactory deviceFactory{1, 0}; diff --git a/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl index 13842323f6..2539e2994d 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_get_platform_ids_tests_mt.inl @@ -11,7 +11,7 @@ using namespace NEO; -using clGetPlatformIDsMtTests = TestLegacy; +using clGetPlatformIDsMtTests = Test; namespace ULT { diff --git a/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl index d2b3747e4e..085e2e3f32 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_get_platform_info_tests_mt.inl @@ -14,7 +14,7 @@ using namespace NEO; namespace ULT { -using clGetPlatformInfoMtTests = TestLegacy; +using clGetPlatformInfoMtTests = Test; TEST_F(clGetPlatformInfoMtTests, GivenMultipleThreadsQueryingPlatformExtensionsWithVersionThenReturnedValuesAreValid) { UltClDeviceFactory deviceFactory{1, 0}; diff --git a/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl index bdab11ae07..499216fb91 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_intel_tracing_tests_mt.inl @@ -18,10 +18,10 @@ using namespace NEO; namespace ULT { -struct IntelTracingMtTest : public TestLegacy { +struct IntelTracingMtTest : public Test { void SetUp() override { DebugManager.flags.CreateMultipleRootDevices.set(maxRootDeviceCount); - TestLegacy::SetUp(); + Test::SetUp(); testedClDevice = pPlatform->getClDevice(rootDeviceIndex); } DebugManagerStateRestore restorer; diff --git a/opencl/test/unit_test/mt_tests/api/cl_set_mem_object_destructor_callback_tests_mt.inl b/opencl/test/unit_test/mt_tests/api/cl_set_mem_object_destructor_callback_tests_mt.inl index 692783cd6e..416a1978c0 100644 --- a/opencl/test/unit_test/mt_tests/api/cl_set_mem_object_destructor_callback_tests_mt.inl +++ b/opencl/test/unit_test/mt_tests/api/cl_set_mem_object_destructor_callback_tests_mt.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,12 +23,12 @@ struct clSetMemObjectDestructorCallbackMtTests : public ApiFixture<>, public ::testing::Test { void SetUp() override { - ApiFixture::SetUp(); + ApiFixture::setUp(); cbInvoked = 0; } void TearDown() override { - ApiFixture::TearDown(); + ApiFixture::tearDown(); } static void setMemCallbackThreadFunc(cl_mem buf) { diff --git a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp index 21f866b9ba..e65353cffb 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp @@ -60,7 +60,7 @@ class DrmGemCloseWorkerFixture { DrmMockForWorker *drmMock; uint32_t deadCnt = deadCntInit; - void SetUp() { // NOLINT(readability-identifier-naming) + void setUp() { this->drmMock = new DrmMockForWorker(*executionEnvironment.rootDeviceEnvironments[0]); auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo(); @@ -79,7 +79,7 @@ class DrmGemCloseWorkerFixture { this->drmMock->gem_close_expected = 0; } - void TearDown() { // NOLINT(readability-identifier-naming) + void tearDown() { if (this->drmMock->gem_close_expected >= 0) { EXPECT_EQ(this->drmMock->gem_close_expected, this->drmMock->gem_close_cnt); } @@ -97,7 +97,7 @@ class DrmGemCloseWorkerFixture { MockExecutionEnvironment executionEnvironment; }; -typedef TestLegacy DrmGemCloseWorkerTests; +typedef Test DrmGemCloseWorkerTests; TEST_F(DrmGemCloseWorkerTests, WhenClosingGemThenSucceeds) { this->drmMock->gem_close_expected = 1; diff --git a/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp b/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp index 88995fbda7..3e328f3862 100644 --- a/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp +++ b/opencl/test/unit_test/os_interface/linux/mock_performance_counters_linux.cpp @@ -36,9 +36,9 @@ std::unique_ptr MockPerformanceCounters::create() { } ////////////////////////////////////////////////////// -// PerformanceCountersFixture::SetUp +// PerformanceCountersFixture::setUp ////////////////////////////////////////////////////// -void PerformanceCountersFixture::SetUp() { +void PerformanceCountersFixture::setUp() { device = std::make_unique(new MockDevice()); context = std::make_unique(device.get()); queue = std::make_unique(context.get(), device.get(), &queueProperties, false); @@ -48,8 +48,8 @@ void PerformanceCountersFixture::SetUp() { } ////////////////////////////////////////////////////// -// PerformanceCountersFixture::TearDown +// PerformanceCountersFixture::tearDown ////////////////////////////////////////////////////// -void PerformanceCountersFixture::TearDown() { +void PerformanceCountersFixture::tearDown() { } } // namespace NEO diff --git a/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp index 429d9149eb..2867433a5e 100644 --- a/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/performance_counters_linux_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,11 +19,11 @@ struct PerformanceCountersLinuxTest : public PerformanceCountersFixture, public ::testing::Test { public: void SetUp() override { - PerformanceCountersFixture::SetUp(); + PerformanceCountersFixture::setUp(); } void TearDown() override { - PerformanceCountersFixture::TearDown(); + PerformanceCountersFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/os_interface/mock_performance_counters.cpp b/opencl/test/unit_test/os_interface/mock_performance_counters.cpp index dfd3f5f08f..d19aca0322 100644 --- a/opencl/test/unit_test/os_interface/mock_performance_counters.cpp +++ b/opencl/test/unit_test/os_interface/mock_performance_counters.cpp @@ -319,32 +319,32 @@ StatusCode MockMetricsLibraryValidInterface::GetData(GetReportData_1_0 *data) { } ////////////////////////////////////////////////////// -// PerformanceCountersDeviceFixture::SetUp +// PerformanceCountersDeviceFixture::setUp ////////////////////////////////////////////////////// -void PerformanceCountersDeviceFixture::SetUp() { +void PerformanceCountersDeviceFixture::setUp() { createFunc = Device::createPerformanceCountersFunc; Device::createPerformanceCountersFunc = [](Device *) { return MockPerformanceCounters::create(); }; } ////////////////////////////////////////////////////// -// PerformanceCountersDeviceFixture::TearDown +// PerformanceCountersDeviceFixture::tearDown ////////////////////////////////////////////////////// -void PerformanceCountersDeviceFixture::TearDown() { +void PerformanceCountersDeviceFixture::tearDown() { Device::createPerformanceCountersFunc = createFunc; } ////////////////////////////////////////////////////// // PerformanceCountersMetricsLibraryFixture::SetUp ////////////////////////////////////////////////////// -void PerformanceCountersMetricsLibraryFixture::SetUp() { - PerformanceCountersFixture::SetUp(); +void PerformanceCountersMetricsLibraryFixture::setUp() { + PerformanceCountersFixture::setUp(); } ////////////////////////////////////////////////////// // PerformanceCountersMetricsLibraryFixture::TearDown ////////////////////////////////////////////////////// -void PerformanceCountersMetricsLibraryFixture::TearDown() { - PerformanceCountersFixture::TearDown(); +void PerformanceCountersMetricsLibraryFixture::tearDown() { + PerformanceCountersFixture::tearDown(); } ////////////////////////////////////////////////////// diff --git a/opencl/test/unit_test/os_interface/mock_performance_counters.h b/opencl/test/unit_test/os_interface/mock_performance_counters.h index a21095e8e9..46f043ac15 100644 --- a/opencl/test/unit_test/os_interface/mock_performance_counters.h +++ b/opencl/test/unit_test/os_interface/mock_performance_counters.h @@ -209,8 +209,8 @@ class MockPerformanceCounters { // PerformanceCountersDeviceFixture ////////////////////////////////////////////////////// struct PerformanceCountersDeviceFixture { - virtual void SetUp(); // NOLINT(readability-identifier-naming) - virtual void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); decltype(&PerformanceCounters::create) createFunc; }; @@ -222,8 +222,8 @@ struct RootDeviceEnvironment; struct PerformanceCountersFixture { PerformanceCountersFixture(); ~PerformanceCountersFixture(); - virtual void SetUp(); // NOLINT(readability-identifier-naming) - virtual void TearDown(); // NOLINT(readability-identifier-naming) + void setUp(); + void tearDown(); cl_queue_properties queueProperties = {}; std::unique_ptr device; std::unique_ptr context; @@ -238,8 +238,8 @@ struct PerformanceCountersFixture { ////////////////////////////////////////////////////// struct PerformanceCountersMetricsLibraryFixture : PerformanceCountersFixture { - void SetUp() override; - void TearDown() override; + void setUp(); + void tearDown(); PerformanceCounters *initDeviceWithPerformanceCounters(const bool validMetricsLibraryApi, const bool mockMatricsLibrary); }; diff --git a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp index 5562831c1c..17c93a400f 100644 --- a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp +++ b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp @@ -25,20 +25,20 @@ struct PerformanceCountersDeviceTest : public PerformanceCountersDeviceFixture, public DeviceInstrumentationFixture, public ::testing::Test { void SetUp() override { - PerformanceCountersDeviceFixture::SetUp(); + PerformanceCountersDeviceFixture::setUp(); } void TearDown() override { - PerformanceCountersDeviceFixture::TearDown(); + PerformanceCountersDeviceFixture::tearDown(); } }; TEST_F(PerformanceCountersDeviceTest, GivenEnabledInstrumentationWhenGettingPerformanceCountersThenNonNullPtrIsReturned) { - DeviceInstrumentationFixture::SetUp(true); + DeviceInstrumentationFixture::setUp(true); EXPECT_NE(nullptr, device->getPerformanceCounters()); } TEST_F(PerformanceCountersDeviceTest, GivenDisabledInstrumentationWhenGettingPerformanceCountersThenNullPtrIsReturned) { - DeviceInstrumentationFixture::SetUp(false); + DeviceInstrumentationFixture::setUp(false); EXPECT_EQ(nullptr, device->getPerformanceCounters()); } @@ -46,11 +46,11 @@ struct PerformanceCountersTest : public PerformanceCountersFixture, public ::testing::Test { public: void SetUp() override { - PerformanceCountersFixture::SetUp(); + PerformanceCountersFixture::setUp(); } void TearDown() override { - PerformanceCountersFixture::TearDown(); + PerformanceCountersFixture::tearDown(); } }; @@ -212,7 +212,7 @@ struct PerformanceCountersMetricsLibraryTest : public PerformanceCountersMetrics public: void SetUp() override { - PerformanceCountersMetricsLibraryFixture::SetUp(); + PerformanceCountersMetricsLibraryFixture::setUp(); auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); osContext = std::make_unique(0, EngineDescriptorHelper::getDefaultDescriptor(HwHelper::get(hwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); @@ -220,7 +220,7 @@ struct PerformanceCountersMetricsLibraryTest : public PerformanceCountersMetrics } void TearDown() override { - PerformanceCountersMetricsLibraryFixture::TearDown(); + PerformanceCountersMetricsLibraryFixture::tearDown(); } std::unique_ptr osContext; }; diff --git a/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp index bfedc5fe76..bb83fd9997 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp +++ b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp @@ -37,9 +37,9 @@ std::unique_ptr MockPerformanceCounters::create() { } ////////////////////////////////////////////////////// -// PerformanceCountersFixture::SetUp +// PerformanceCountersFixture::setUp ////////////////////////////////////////////////////// -void PerformanceCountersFixture::SetUp() { +void PerformanceCountersFixture::setUp() { device = std::make_unique(new MockDevice()); context = std::make_unique(device.get()); queue = std::make_unique(context.get(), device.get(), &queueProperties, false); @@ -49,9 +49,9 @@ void PerformanceCountersFixture::SetUp() { } ////////////////////////////////////////////////////// -// PerformanceCountersFixture::TearDown +// PerformanceCountersFixture::tearDown ////////////////////////////////////////////////////// -void PerformanceCountersFixture::TearDown() { +void PerformanceCountersFixture::tearDown() { } } // namespace NEO diff --git a/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp index 48c5030ae1..ea6a1ca36c 100644 --- a/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/performance_counters_win_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,10 +17,10 @@ struct PerformanceCountersWinTest : public PerformanceCountersFixture, public ::testing::Test { public: void SetUp() override { - PerformanceCountersFixture::SetUp(); + PerformanceCountersFixture::setUp(); } void TearDown() override { - PerformanceCountersFixture::TearDown(); + PerformanceCountersFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h index 710fb8d1c0..4011b810ec 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h @@ -90,7 +90,7 @@ class MockWddmMemoryManagerFixture { MockGdi *gdi = nullptr; }; -typedef ::TestLegacy WddmMemoryManagerResidencyTest; +typedef ::Test WddmMemoryManagerResidencyTest; class ExecutionEnvironmentFixture : public ::testing::Test { public: diff --git a/opencl/test/unit_test/perf_tests/api/api_tests.cpp b/opencl/test/unit_test/perf_tests/api/api_tests.cpp index 74e20c68df..83df6c47ef 100644 --- a/opencl/test/unit_test/perf_tests/api/api_tests.cpp +++ b/opencl/test/unit_test/perf_tests/api/api_tests.cpp @@ -22,7 +22,7 @@ void api_fixture::SetUp() { setReferenceTime(); - PlatformFixture::SetUp(numPlatformDevices, platformDevices); + PlatformFixture::setUp(numPlatformDevices, platformDevices); DeviceFixture::setUp(); ASSERT_NE(nullptr, pDevice); @@ -32,15 +32,15 @@ void api_fixture::SetUp() { cl_device_id clDevice = pDevice; pContext = Context::create(nullptr, DeviceVector(&clDevice, 1), nullptr, nullptr, retVal); - CommandQueueHwFixture::SetUp(pDevice, pContext); + CommandQueueHwFixture::setUp(pDevice, pContext); } void api_fixture::TearDown() { delete pKernel; delete pContext; delete pProgram; - CommandQueueHwFixture::TearDown(); + CommandQueueHwFixture::tearDown(); DeviceFixture::tearDown(); - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } } // namespace NEO diff --git a/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp index 4bd2dc7d86..f09b157662 100644 --- a/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp +++ b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -34,18 +34,18 @@ CommandQueue *CommandQueueHwFixture::createCommandQueue( return funcCreate(context, pDevice, properties); } -void CommandQueueHwFixture::SetUp() { +void CommandQueueHwFixture::setUp() { ASSERT_NE(nullptr, pCmdQ); } -void CommandQueueHwFixture::SetUp( +void CommandQueueHwFixture::setUp( Device *pDevice, Context *context) { ASSERT_NE(nullptr, pDevice); pCmdQ = createCommandQueue(context, pDevice); - CommandQueueHwFixture::SetUp(); + CommandQueueHwFixture::setUp(); } -void CommandQueueHwFixture::TearDown() { +void CommandQueueHwFixture::tearDown() { delete pCmdQ; } @@ -63,7 +63,7 @@ CommandQueue *CommandQueueFixture::createCommandQueue( properties); } -void CommandQueueFixture::SetUp( +void CommandQueueFixture::setUp( Context *context, Device *device, cl_command_queue_properties properties) { @@ -73,7 +73,7 @@ void CommandQueueFixture::SetUp( properties); } -void CommandQueueFixture::TearDown() { +void CommandQueueFixture::tearDown() { delete pCmdQ; pCmdQ = nullptr; } diff --git a/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp index 37eddfb1d7..2836b35566 100644 --- a/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp +++ b/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,7 +19,7 @@ PlatformFixture::PlatformFixture() { } -void PlatformFixture::SetUp(size_t numDevices, const HardwareInfo **pDevices) { +void PlatformFixture::setUp(size_t numDevices, const HardwareInfo **pDevices) { pPlatform = platform(); ASSERT_EQ(0u, pPlatform->getNumDevices()); @@ -41,7 +41,7 @@ void PlatformFixture::SetUp(size_t numDevices, const HardwareInfo **pDevices) { } } -void PlatformFixture::TearDown() { +void PlatformFixture::tearDown() { pPlatform->shutdown(); delete[] devices; } diff --git a/opencl/test/unit_test/profiling/profiling_tests.cpp b/opencl/test/unit_test/profiling/profiling_tests.cpp index 731422e85c..893abf8fe8 100644 --- a/opencl/test/unit_test/profiling/profiling_tests.cpp +++ b/opencl/test/unit_test/profiling/profiling_tests.cpp @@ -32,7 +32,7 @@ namespace NEO { struct ProfilingTests : public CommandEnqueueFixture, public ::testing::Test { void SetUp() override { - CommandEnqueueFixture::SetUp(CL_QUEUE_PROFILING_ENABLE); + CommandEnqueueFixture::setUp(CL_QUEUE_PROFILING_ENABLE); program = ReleaseableObjectPtr(new MockProgram(toClDeviceVector(*pClDevice))); program->setContext(&ctx); @@ -47,7 +47,7 @@ struct ProfilingTests : public CommandEnqueueFixture, } void TearDown() override { - CommandEnqueueFixture::TearDown(); + CommandEnqueueFixture::tearDown(); } ReleaseableObjectPtr program; @@ -668,11 +668,11 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EventProfilingTest, givenRawTimestampsDebugModeWhenS struct ProfilingWithPerfCountersTests : public PerformanceCountersFixture, ::testing::Test { void SetUp() override { - SetUp(defaultHwInfo.get()); + setUp(defaultHwInfo.get()); } - void SetUp(const NEO::HardwareInfo *hardwareInfo) { - PerformanceCountersFixture::SetUp(); + void setUp(const NEO::HardwareInfo *hardwareInfo) { + PerformanceCountersFixture::setUp(); HardwareInfo hwInfo = *hardwareInfo; if (hwInfo.capabilityTable.defaultEngineType == aub_stream::EngineType::ENGINE_CCS) { @@ -694,7 +694,7 @@ struct ProfilingWithPerfCountersTests : public PerformanceCountersFixture, ::tes } void TearDown() override { - PerformanceCountersFixture::TearDown(); + PerformanceCountersFixture::tearDown(); } template @@ -721,7 +721,7 @@ struct ProfilingWithPerfCountersOnCCSTests : ProfilingWithPerfCountersTests { void SetUp() override { auto hwInfo = *defaultHwInfo; hwInfo.capabilityTable.defaultEngineType = aub_stream::ENGINE_CCS; - ProfilingWithPerfCountersTests::SetUp(&hwInfo); + ProfilingWithPerfCountersTests::setUp(&hwInfo); } void TearDown() override { diff --git a/opencl/test/unit_test/program/program_data_tests.cpp b/opencl/test/unit_test/program/program_data_tests.cpp index d9602e50b9..4340c5ecc5 100644 --- a/opencl/test/unit_test/program/program_data_tests.cpp +++ b/opencl/test/unit_test/program/program_data_tests.cpp @@ -37,8 +37,8 @@ class ProgramDataTestBase : public testing::Test, public PlatformFixture, public ProgramFixture { - using ContextFixture::SetUp; - using PlatformFixture::SetUp; + using ContextFixture::setUp; + using PlatformFixture::setUp; public: ProgramDataTestBase() { @@ -51,24 +51,24 @@ class ProgramDataTestBase : public testing::Test, void buildAndDecodeProgramPatchList(); void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); pClDevice = pPlatform->getClDevice(0); rootDeviceIndex = pClDevice->getRootDeviceIndex(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); - ProgramFixture::SetUp(); + ContextFixture::setUp(1, &device); + ProgramFixture::setUp(); - CreateProgramWithSource( + createProgramWithSource( pContext, "CopyBuffer_simd16.cl"); } void TearDown() override { knownSource.reset(); - ProgramFixture::TearDown(); - ContextFixture::TearDown(); - PlatformFixture::TearDown(); + ProgramFixture::tearDown(); + ContextFixture::tearDown(); + PlatformFixture::tearDown(); } size_t setupConstantAllocation() { @@ -456,7 +456,7 @@ TEST(ProgramScopeMetadataTest, WhenPatchingGlobalSurfaceThenPickProperSourceBuff } TEST_F(ProgramDataTest, GivenProgramWith32bitPointerOptWhenProgramScopeConstantBufferPatchTokensAreReadThenConstantPointerOffsetIsPatchedWith32bitPointer) { - CreateProgramWithSource(pContext, "CopyBuffer_simd16.cl"); + createProgramWithSource(pContext, "CopyBuffer_simd16.cl"); ASSERT_NE(nullptr, pProgram); MockProgram *prog = pProgram; @@ -502,7 +502,7 @@ TEST_F(ProgramDataTest, GivenProgramWith32bitPointerOptWhenProgramScopeConstantB } TEST_F(ProgramDataTest, GivenProgramWith32bitPointerOptWhenProgramScopeGlobalPointerPatchTokensAreReadThenGlobalPointerOffsetIsPatchedWith32bitPointer) { - CreateProgramWithSource(pContext, "CopyBuffer_simd16.cl"); + createProgramWithSource(pContext, "CopyBuffer_simd16.cl"); ASSERT_NE(nullptr, pProgram); MockProgram *prog = pProgram; diff --git a/opencl/test/unit_test/program/program_from_binary.h b/opencl/test/unit_test/program/program_from_binary.h index 6ca906eb1d..75f9aa5467 100644 --- a/opencl/test/unit_test/program/program_from_binary.h +++ b/opencl/test/unit_test/program/program_from_binary.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -26,31 +26,31 @@ struct ProgramFromBinaryFixture : public ClDeviceFixture, public ProgramFixture, public testing::Test { - using ContextFixture::SetUp; + using ContextFixture::setUp; void SetUp() override { - ProgramFromBinaryFixture::SetUp("CopyBuffer_simd32", "CopyBuffer"); + ProgramFromBinaryFixture::setUp("CopyBuffer_simd32", "CopyBuffer"); } - void SetUp(const char *binaryFileName, const char *kernelName) { + void setUp(const char *binaryFileName, const char *kernelName) { this->binaryFileName = binaryFileName; this->kernelName = kernelName; - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); - ProgramFixture::SetUp(); + ContextFixture::setUp(1, &device); + ProgramFixture::setUp(); if (options.size()) - CreateProgramFromBinary(pContext, pContext->getDevices(), binaryFileName, options); + createProgramFromBinary(pContext, pContext->getDevices(), binaryFileName, options); else - CreateProgramFromBinary(pContext, pContext->getDevices(), binaryFileName); + createProgramFromBinary(pContext, pContext->getDevices(), binaryFileName); } void TearDown() override { knownSource.reset(); - ProgramFixture::TearDown(); - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ProgramFixture::tearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } void setOptions(std::string &optionsIn) { @@ -70,22 +70,22 @@ struct ProgramFromBinaryFixture : public ClDeviceFixture, class ProgramSimpleFixture : public ClDeviceFixture, public ContextFixture, public ProgramFixture { - using ContextFixture::SetUp; + using ContextFixture::setUp; public: - void SetUp() override { - ClDeviceFixture::SetUp(); + void setUp() { + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); - ProgramFixture::SetUp(); + ContextFixture::setUp(1, &device); + ProgramFixture::setUp(); } - void TearDown() override { + void tearDown() { knownSource.reset(); - ProgramFixture::TearDown(); - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ProgramFixture::tearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } protected: diff --git a/opencl/test/unit_test/program/program_nonuniform.cpp b/opencl/test/unit_test/program/program_nonuniform.cpp index b65a9a8b36..09fcb7afab 100644 --- a/opencl/test/unit_test/program/program_nonuniform.cpp +++ b/opencl/test/unit_test/program/program_nonuniform.cpp @@ -154,27 +154,27 @@ class ProgramNonUniformTest : public ContextFixture, public CommandQueueHwFixture, public testing::Test { - using ContextFixture::SetUp; - using PlatformFixture::SetUp; + using ContextFixture::setUp; + using PlatformFixture::setUp; protected: ProgramNonUniformTest() { } void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); device = pPlatform->getClDevice(0); rootDeviceIndex = pPlatform->getClDevice(0)->getRootDeviceIndex(); - ContextFixture::SetUp(1, &device); - ProgramFixture::SetUp(); - CommandQueueHwFixture::SetUp(pPlatform->getClDevice(0), 0); + ContextFixture::setUp(1, &device); + ProgramFixture::setUp(); + CommandQueueHwFixture::setUp(pPlatform->getClDevice(0), 0); } void TearDown() override { - CommandQueueHwFixture::TearDown(); - ProgramFixture::TearDown(); - ContextFixture::TearDown(); - PlatformFixture::TearDown(); + CommandQueueHwFixture::tearDown(); + ProgramFixture::tearDown(); + ContextFixture::tearDown(); + PlatformFixture::tearDown(); } cl_device_id device; uint32_t rootDeviceIndex; @@ -184,7 +184,7 @@ class ProgramNonUniformTest : public ContextFixture, TEST_F(ProgramNonUniformTest, GivenCl21WhenExecutingKernelWithNonUniformThenEnqueueSucceeds) { REQUIRE_OCL_21_OR_SKIP(defaultHwInfo); - CreateProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); + createProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); auto mockProgram = pProgram; ASSERT_NE(nullptr, mockProgram); @@ -226,7 +226,7 @@ TEST_F(ProgramNonUniformTest, GivenCl21WhenExecutingKernelWithNonUniformThenEnqu TEST_F(ProgramNonUniformTest, GivenCl20WhenExecutingKernelWithNonUniformThenEnqueueSucceeds) { REQUIRE_OCL_21_OR_SKIP(defaultHwInfo); - CreateProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); + createProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); auto mockProgram = pProgram; ASSERT_NE(nullptr, mockProgram); @@ -266,7 +266,7 @@ TEST_F(ProgramNonUniformTest, GivenCl20WhenExecutingKernelWithNonUniformThenEnqu } TEST_F(ProgramNonUniformTest, GivenCl12WhenExecutingKernelWithNonUniformThenInvalidWorkGroupSizeIsReturned) { - CreateProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); + createProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); auto mockProgram = pProgram; ASSERT_NE(nullptr, mockProgram); diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index df3c4b3f6b..aa5bdf96c0 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -63,14 +63,14 @@ using namespace NEO; void ProgramTests::SetUp() { - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); cl_device_id device = pClDevice; - ContextFixture::SetUp(1, &device); + ContextFixture::setUp(1, &device); } void ProgramTests::TearDown() { - ContextFixture::TearDown(); - ClDeviceFixture::TearDown(); + ContextFixture::tearDown(); + ClDeviceFixture::tearDown(); } class NoCompilerInterfaceRootDeviceEnvironment : public RootDeviceEnvironment { @@ -235,7 +235,7 @@ TEST_F(ProgramFromBinaryTest, GivenProgramWithNoExecutableCodeWhenGettingNumKern size_t paramValueSize = sizeof(paramValue); size_t paramValueSizeRet = 0; - CreateProgramFromBinary(pContext, pContext->getDevices(), binaryFileName); + createProgramFromBinary(pContext, pContext->getDevices(), binaryFileName); MockProgram *p = pProgram; p->setBuildStatus(CL_BUILD_NONE); @@ -287,7 +287,7 @@ TEST_F(ProgramFromBinaryTest, GivenProgramWithNoExecutableCodeWhenGettingKernelN size_t paramValueSize = sizeof(size_t *); size_t paramValueSizeRet = 0; - CreateProgramFromBinary(pContext, pContext->getDevices(), binaryFileName); + createProgramFromBinary(pContext, pContext->getDevices(), binaryFileName); MockProgram *p = pProgram; p->setBuildStatus(CL_BUILD_NONE); @@ -555,7 +555,7 @@ TEST_F(ProgramFromBinaryTest, GivenGlobalVariableTotalSizeSetWhenGettingBuildGlo EXPECT_EQ(globalVarSize, 0u); // Set GlobalVariableTotalSize as 1024 - CreateProgramFromBinary(pContext, pContext->getDevices(), binaryFileName); + createProgramFromBinary(pContext, pContext->getDevices(), binaryFileName); MockProgram *p = pProgram; ProgramInfo programInfo; @@ -723,7 +723,7 @@ TEST_F(ProgramFromSourceTest, GivenSpecificParamatersWhenBuildingProgramThenSucc KernelBinaryHelper kbHelper(binaryFileName, true); auto device = pPlatform->getClDevice(0); - CreateProgramWithSource( + createProgramWithSource( pContext, sourceFileName); @@ -1006,7 +1006,7 @@ TEST_F(ProgramFromSourceTest, GivenDifferentCommpilerOptionsWhenBuildingProgramT auto rootDeviceIndex = pContext->getDevice(0)->getRootDeviceIndex(); - CreateProgramWithSource( + createProgramWithSource( pContext, sourceFileName); @@ -1068,7 +1068,7 @@ TEST_F(ProgramFromSourceTest, GivenEmptyProgramWhenCreatingProgramThenInvalidVal } TEST_F(ProgramFromSourceTest, GivenSpecificParamatersWhenCompilingProgramThenSuccessOrCorrectErrorCodeIsReturned) { - CreateProgramWithSource( + createProgramWithSource( pContext, sourceFileName); @@ -1271,7 +1271,7 @@ TEST_F(ProgramFromSourceTest, GivenAdvancedOptionsWhenCreatingProgramThenSuccess } TEST_F(ProgramFromSourceTest, GivenSpecificParamatersWhenLinkingProgramThenSuccessOrCorrectErrorCodeIsReturned) { - CreateProgramWithSource( + createProgramWithSource( pContext, sourceFileName); @@ -1370,14 +1370,14 @@ TEST_F(ProgramFromSourceTest, GivenInvalidOptionsWhenCreatingLibraryThenCorrectE class PatchTokenFromBinaryTest : public ProgramSimpleFixture { public: - void SetUp() override { - ProgramSimpleFixture::SetUp(); + void setUp() { + ProgramSimpleFixture::setUp(); } - void TearDown() override { - ProgramSimpleFixture::TearDown(); + void tearDown() { + ProgramSimpleFixture::tearDown(); } }; -using PatchTokenTests = TestLegacy; +using PatchTokenTests = Test; template class CommandStreamReceiverMock : public UltCommandStreamReceiver { @@ -1399,7 +1399,7 @@ class CommandStreamReceiverMock : public UltCommandStreamReceiver { }; HWTEST_F(PatchTokenTests, givenKernelRequiringConstantAllocationWhenMakeResidentIsCalledThenConstantAllocationIsMadeResident) { - CreateProgramFromBinary(pContext, pContext->getDevices(), "test_constant_memory"); + createProgramFromBinary(pContext, pContext->getDevices(), "test_constant_memory"); ASSERT_NE(nullptr, pProgram); retVal = pProgram->build( @@ -1462,7 +1462,7 @@ HWTEST_F(PatchTokenTests, givenKernelRequiringConstantAllocationWhenMakeResident } TEST_F(PatchTokenTests, WhenBuildingProgramThenGwsIsSet) { - CreateProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); + createProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); ASSERT_NE(nullptr, pProgram); retVal = pProgram->build( @@ -1482,7 +1482,7 @@ TEST_F(PatchTokenTests, WhenBuildingProgramThenGwsIsSet) { TEST_F(PatchTokenTests, WhenBuildingProgramThenConstantKernelArgsAreAvailable) { // PATCH_TOKEN_STATELESS_CONSTANT_MEMORY_OBJECT_KERNEL_ARGUMENT - CreateProgramFromBinary(pContext, pContext->getDevices(), "test_basic_constant"); + createProgramFromBinary(pContext, pContext->getDevices(), "test_basic_constant"); ASSERT_NE(nullptr, pProgram); retVal = pProgram->build( @@ -1522,7 +1522,7 @@ TEST_F(PatchTokenTests, GivenVmeKernelWhenBuildingKernelThenArgAvailable) { } // PATCH_TOKEN_INLINE_VME_SAMPLER_INFO token indicates a VME kernel. - CreateProgramFromBinary(pContext, pContext->getDevices(), "vme_kernels"); + createProgramFromBinary(pContext, pContext->getDevices(), "vme_kernels"); ASSERT_NE(nullptr, pProgram); retVal = pProgram->build( @@ -1549,14 +1549,14 @@ TEST_F(PatchTokenTests, GivenVmeKernelWhenBuildingKernelThenArgAvailable) { class ProgramPatchTokenFromBinaryTest : public ProgramSimpleFixture { public: - void SetUp() override { - ProgramSimpleFixture::SetUp(); + void setUp() { + ProgramSimpleFixture::setUp(); } - void TearDown() override { - ProgramSimpleFixture::TearDown(); + void tearDown() { + ProgramSimpleFixture::tearDown(); } }; -typedef TestLegacy ProgramPatchTokenTests; +typedef Test ProgramPatchTokenTests; TEST(ProgramFromBinaryTests, givenBinaryWithInvalidICBEThenErrorIsReturned) { cl_int retVal = CL_INVALID_BINARY; @@ -1644,10 +1644,10 @@ TEST(ProgramFromBinaryTests, givenEmptyProgramThenErrorIsReturned) { EXPECT_EQ(CL_INVALID_BINARY, retVal); } -using ProgramWithDebugSymbolsTests = TestLegacy; +using ProgramWithDebugSymbolsTests = Test; TEST_F(ProgramWithDebugSymbolsTests, GivenProgramCreatedWithDashGOptionWhenGettingProgramBinariesThenDebugDataIsIncluded) { - CreateProgramFromBinary(pContext, pContext->getDevices(), "CopyBuffer_simd16", "-g"); + createProgramFromBinary(pContext, pContext->getDevices(), "CopyBuffer_simd16", "-g"); ASSERT_NE(nullptr, pProgram); @@ -2969,14 +2969,14 @@ TEST(setProgramSpecializationConstantTest, givenUninitializedCompilerinterfaceWh EXPECT_EQ(CL_OUT_OF_HOST_MEMORY, retVal); } -using ProgramBinTest = TestLegacy; +using ProgramBinTest = Test; TEST_F(ProgramBinTest, givenPrintProgramBinaryProcessingTimeSetWhenBuildProgramThenProcessingTimeIsPrinted) { DebugManagerStateRestore restorer; DebugManager.flags.PrintProgramBinaryProcessingTime.set(true); testing::internal::CaptureStdout(); - CreateProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); + createProgramFromBinary(pContext, pContext->getDevices(), "kernel_data_param"); auto retVal = pProgram->build( pProgram->getDevices(), diff --git a/opencl/test/unit_test/program/program_tests.h b/opencl/test/unit_test/program/program_tests.h index b5a8a1a93c..16ec7d7fbc 100644 --- a/opencl/test/unit_test/program/program_tests.h +++ b/opencl/test/unit_test/program/program_tests.h @@ -15,7 +15,7 @@ class ProgramTests : public NEO::ClDeviceFixture, public ::testing::Test, public NEO::ContextFixture { - using NEO::ContextFixture::SetUp; + using NEO::ContextFixture::setUp; public: void SetUp() override; diff --git a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp index 9181cf9252..4d65a83bf9 100644 --- a/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp +++ b/opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp @@ -77,14 +77,14 @@ class ProgramWithKernelDebuggingTest : public ProgramFixture, KernelFilenameHelper::getKernelFilenameFromInternalOption(kernelOption, filename); kbHelper = std::make_unique(filename, false); - CreateProgramWithSource( + createProgramWithSource( &mockContext, "copybuffer.cl"); pProgram->enableKernelDebug(); } void TearDown() override { - ProgramFixture::TearDown(); + ProgramFixture::tearDown(); } std::unique_ptr kbHelper; MockUnrestrictiveContext mockContext; diff --git a/opencl/test/unit_test/program/program_with_source.h b/opencl/test/unit_test/program/program_with_source.h index b6b3bb4c54..f4a7c1c77b 100644 --- a/opencl/test/unit_test/program/program_with_source.h +++ b/opencl/test/unit_test/program/program_with_source.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -26,8 +26,8 @@ class ProgramFromSourceTest : public ContextFixture, public ProgramFixture, public testing::TestWithParam> { - using ContextFixture::SetUp; - using PlatformFixture::SetUp; + using ContextFixture::setUp; + using PlatformFixture::setUp; protected: void SetUp() override { @@ -36,22 +36,22 @@ class ProgramFromSourceTest : public ContextFixture, kernelName = "CopyBuffer"; kbHelper = new KernelBinaryHelper(binaryFileName); - PlatformFixture::SetUp(); + PlatformFixture::setUp(); cl_device_id device = pPlatform->getClDevice(0); rootDeviceIndex = pPlatform->getClDevice(0)->getRootDeviceIndex(); - ContextFixture::SetUp(1, &device); - ProgramFixture::SetUp(); + ContextFixture::setUp(1, &device); + ProgramFixture::setUp(); - CreateProgramWithSource( + createProgramWithSource( pContext, sourceFileName); } void TearDown() override { knownSource.reset(); - ProgramFixture::TearDown(); - ContextFixture::TearDown(); - PlatformFixture::TearDown(); + ProgramFixture::tearDown(); + ContextFixture::tearDown(); + PlatformFixture::tearDown(); delete kbHelper; } diff --git a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp index 38ef26d814..57170a70d5 100644 --- a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp +++ b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp @@ -33,8 +33,8 @@ class SamplerSetArgFixture : public ClDeviceFixture { } protected: - void SetUp() { - ClDeviceFixture::SetUp(); + void setUp() { + ClDeviceFixture::setUp(); pKernelInfo = std::make_unique(); pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 1; @@ -62,12 +62,12 @@ class SamplerSetArgFixture : public ClDeviceFixture { retVal = CL_INVALID_VALUE; } - void TearDown() { + void tearDown() { delete pMultiDeviceKernel; delete sampler; delete context; - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } bool crossThreadDataUnchanged() { @@ -102,7 +102,7 @@ class SamplerSetArgFixture : public ClDeviceFixture { Sampler *sampler = nullptr; }; -typedef TestLegacy SamplerSetArgTest; +typedef Test SamplerSetArgTest; HWTEST_F(SamplerSetArgTest, WhenSettingKernelArgSamplerThenSamplerStatesAreCorrect) { typedef typename FamilyType::SAMPLER_STATE SAMPLER_STATE; createSampler(); @@ -390,10 +390,10 @@ struct NormalizedTest : public SamplerSetArgFixture, public ::testing::TestWithParam { void SetUp() override { - SamplerSetArgFixture::SetUp(); + SamplerSetArgFixture::setUp(); } void TearDown() override { - SamplerSetArgFixture::TearDown(); + SamplerSetArgFixture::tearDown(); } }; @@ -441,10 +441,10 @@ struct AddressingModeTest : public SamplerSetArgFixture, public ::testing::TestWithParam { void SetUp() override { - SamplerSetArgFixture::SetUp(); + SamplerSetArgFixture::setUp(); } void TearDown() override { - SamplerSetArgFixture::TearDown(); + SamplerSetArgFixture::tearDown(); } }; @@ -560,10 +560,10 @@ struct FilterModeTest : public SamplerSetArgFixture, public ::testing::TestWithParam { void SetUp() override { - SamplerSetArgFixture::SetUp(); + SamplerSetArgFixture::setUp(); } void TearDown() override { - SamplerSetArgFixture::TearDown(); + SamplerSetArgFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp index 8a3ce33be2..77c181d646 100644 --- a/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/sampler/sampler_tests_xehp_and_later.cpp @@ -15,7 +15,7 @@ using namespace NEO; -using XeHPAndLaterSamplerTest = TestLegacy; +using XeHPAndLaterSamplerTest = Test; HWCMDTEST_F(IGFX_XE_HP_CORE, XeHPAndLaterSamplerTest, GivenDefaultThenLowQualityFilterIsDisabled) { using SAMPLER_STATE = typename FamilyType::SAMPLER_STATE; diff --git a/opencl/test/unit_test/sharings/va/context_va_tests.cpp b/opencl/test/unit_test/sharings/va/context_va_tests.cpp index b5c97024a5..13e65dcc3d 100644 --- a/opencl/test/unit_test/sharings/va/context_va_tests.cpp +++ b/opencl/test/unit_test/sharings/va/context_va_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -19,13 +19,13 @@ using namespace NEO; struct VAContextTest : public PlatformFixture, public ::testing::Test { - using PlatformFixture::SetUp; + using PlatformFixture::setUp; VAContextTest() { } void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); cl_platform_id platform = pPlatform; properties = new cl_context_properties[3]; @@ -40,7 +40,7 @@ struct VAContextTest : public PlatformFixture, void TearDown() override { delete[] properties; delete context; - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } cl_int retVal = CL_SUCCESS; diff --git a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp index 9b5044ef1e..d724870234 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp @@ -42,7 +42,7 @@ class VaSharingTests : public ::testing::Test, public PlatformFixture { public: void SetUp() override { rootDeviceIndex = context.getDevice(0)->getRootDeviceIndex(); - PlatformFixture::SetUp(); + PlatformFixture::setUp(); vaSharing = new MockVaSharing; context.setSharingFunctions(&vaSharing->sharingFunctions); vaSharing->sharingFunctions.querySupportedVaImageFormats(VADisplay(1)); @@ -57,7 +57,7 @@ class VaSharingTests : public ::testing::Test, public PlatformFixture { } context.releaseSharingFunctions(SharingType::VA_SHARING); delete vaSharing; - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } void updateAcquiredHandle(unsigned int handle) { @@ -1238,7 +1238,7 @@ TEST_F(VaSharingTests, givenPlaneArgumentEquals2WithoutNoProperFormatsThenReturn EXPECT_EQ(result, CL_SUCCESS); } -class VaDeviceTests : public TestLegacy { +class VaDeviceTests : public Test { public: VaDeviceTests() { ultHwConfig.useMockedPrepareDeviceEnvironmentsFunc = false; diff --git a/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp index f79bf6aef3..e6e2a436f2 100644 --- a/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_device_caps_xe_hp_core.cpp @@ -15,7 +15,7 @@ using namespace NEO; -typedef TestLegacy XE_HP_COREDeviceCaps; +typedef Test XE_HP_COREDeviceCaps; HWCMDTEST_F(IGFX_XE_HP_CORE, XE_HP_COREDeviceCaps, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) { MockKernelWithInternals mockKernel(*pClDevice); diff --git a/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp index 77a51e1b92..f3ef3085c8 100644 --- a/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_platform_caps_xe_hp_core.cpp @@ -13,11 +13,11 @@ using namespace NEO; struct XE_HP_COREPlatformCaps : public PlatformFixture, public ::testing::Test { void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); } void TearDown() override { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp index 22866e0b54..446a5f0786 100644 --- a/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/test_sample_xe_hp_core.cpp @@ -11,7 +11,7 @@ using namespace NEO; -typedef TestLegacy XE_HP_COREOnlyTest; +typedef Test XE_HP_COREOnlyTest; XE_HP_CORE_TEST_F(XE_HP_COREOnlyTest, WhenGettingRenderCoreFamilyThenOnlyXeHpCoreIsReturned) { EXPECT_EQ(IGFX_XE_HP_CORE, pDevice->getRenderCoreFamily()); diff --git a/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl index f586170850..f083cfa99b 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/sampler_tests_xehp.inl @@ -16,7 +16,7 @@ using namespace NEO; -typedef TestLegacy XeHPSamplerTest; +typedef Test XeHPSamplerTest; XEHPTEST_F(XeHPSamplerTest, givenXeHPSamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenDisableLowQualityFilter) { EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_command_stream_receiver_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_command_stream_receiver_xehp.inl index a966b79cc1..aa40bb2b0b 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_command_stream_receiver_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_command_stream_receiver_xehp.inl @@ -23,12 +23,12 @@ class CommandStreamReceiverHwTestWithLocalMemory : public ClDeviceFixture, void SetUp() override { dbgRestore = std::make_unique(); DebugManager.flags.EnableLocalMemory.set(1); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); HardwareParse::setUp(); } void TearDown() override { HardwareParse::tearDown(); - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } private: diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl index 2b954ae845..547cb64141 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_device_caps_xehp.inl @@ -14,7 +14,7 @@ using namespace NEO; -typedef TestLegacy XeHPUsDeviceIdTest; +typedef Test XeHPUsDeviceIdTest; XEHPTEST_F(XeHPUsDeviceIdTest, WhenGettingHardwareInfoThenProductFamilyIsXeHpSdv) { EXPECT_EQ(IGFX_XE_HP_SDV, pDevice->getHardwareInfo().platform.eProductFamily); diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl index da844d4471..900a6f3a34 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_local_work_size_xehp.inl @@ -15,7 +15,7 @@ using namespace NEO; -using XeHPComputeWorkgroupSizeTest = TestLegacy; +using XeHPComputeWorkgroupSizeTest = Test; XEHPTEST_F(XeHPComputeWorkgroupSizeTest, giveXeHpA0WhenKernelIsaIsBelowThresholdAndThereAreNoImageBarriersAndSlmThenSmallWorkgorupSizeIsSelected) { auto program = std::make_unique(toClDeviceVector(*pClDevice)); diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_platform_caps_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_platform_caps_xehp.inl index 2667416d3a..731cf10726 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_platform_caps_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_platform_caps_xehp.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,11 +13,11 @@ using namespace NEO; struct XE_HP_COREPlatformCaps : public PlatformFixture, public ::testing::Test { void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); } void TearDown() override { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl index d89e8eb2d0..6621b6c4e9 100644 --- a/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl +++ b/opencl/test/unit_test/xe_hp_core/xehp/test_sub_devices_xehp.inl @@ -15,7 +15,7 @@ using namespace NEO; -using XeHPUsDeviceIdTest = TestLegacy; +using XeHPUsDeviceIdTest = Test; HWTEST_EXCLUDE_PRODUCT(SubDeviceTests, givenCCSEngineWhenCallingGetDefaultEngineWithWaThenTheSameEngineIsReturned, IGFX_XE_HP_SDV); diff --git a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp index dfad0faa39..9f0ff61dc6 100644 --- a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp @@ -23,7 +23,7 @@ #include "hw_cmds_xe_hpc_core_base.h" -using HwHelperTestsXeHpcCore = TestLegacy; +using HwHelperTestsXeHpcCore = Test; XE_HPC_CORETEST_F(HwHelperTestsXeHpcCore, givenXeHpcThenAuxTranslationIsNotRequired) { auto &clHwHelper = ClHwHelper::get(renderCoreFamily); diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp index bcd61ccf63..fc7d39be91 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp @@ -16,7 +16,7 @@ #include "opencl/test/unit_test/mocks/mock_context.h" using namespace NEO; -using EngineNodeHelperPvcTests = ::TestLegacy; +using EngineNodeHelperPvcTests = ::Test; PVCTEST_F(EngineNodeHelperPvcTests, WhenGetBcsEngineTypeIsCalledForPVCThenCorrectBcsEngineIsReturned) { using namespace aub_stream; diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp index a655402131..5e5bec729e 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/hw_helper_tests_pvc.cpp @@ -16,7 +16,7 @@ namespace NEO { -using HwHelperTestsPvcXt = TestLegacy; +using HwHelperTestsPvcXt = Test; PVCTEST_F(HwHelperTestsPvcXt, givenSingleTileCsrOnPvcXtWhenAllocatingCsrSpecificAllocationsAndIsNotBaseDieA0ThenStoredInProperMemoryPool) { auto hwInfo = *defaultHwInfo; @@ -34,7 +34,7 @@ PVCTEST_F(HwHelperTestsPvcXt, givenMultiTileCsrOnPvcWhenAllocatingCsrSpecificAll checkIfMultiTileCsrWhenAllocatingCsrSpecificAllocationsThenStoredInLocalMemoryPool(&hwInfo); } -using HwHelperTestsPvc = TestLegacy; +using HwHelperTestsPvc = Test; PVCTEST_F(HwHelperTestsPvc, givenRevisionEnumAndPlatformFamilyTypeThenProperValueForIsWorkaroundRequiredIsReturned) { uint32_t steppings[] = { REVISION_A0, diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp index 528000491d..150029e6f2 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/sampler_tests_pvc.cpp @@ -18,7 +18,7 @@ using namespace NEO; -typedef TestLegacy PvcSamplerTest; +typedef Test PvcSamplerTest; PVCTEST_F(PvcSamplerTest, givenPvcSamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenDisableLowQualityFilter) { EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp index a2d76fa12f..bc636ddddf 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp +++ b/opencl/test/unit_test/xe_hpc_core/pvc/test_device_caps_pvc.cpp @@ -17,7 +17,7 @@ using namespace NEO; -using PvcDeviceCapsTests = TestLegacy; +using PvcDeviceCapsTests = Test; PVCTEST_F(PvcDeviceCapsTests, givenPvcProductWhenCheckBlitterOperationsSupportThenReturnFalse) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.blitterOperationsSupported); diff --git a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp index 0c85c25720..8deb48d600 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_device_caps_xe_hpc_core.cpp @@ -19,7 +19,7 @@ using namespace NEO; -typedef TestLegacy XeHpcCoreDeviceCaps; +typedef Test XeHpcCoreDeviceCaps; XE_HPC_CORETEST_F(XeHpcCoreDeviceCaps, givenXeHpcCoreWhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); diff --git a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp index ff4de42a40..38c0379acb 100644 --- a/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/test_platform_caps_xe_hpc_core.cpp @@ -16,11 +16,11 @@ using namespace NEO; struct XeHpcCorePlatformCaps : public PlatformFixture, public ::testing::Test { void SetUp() override { - PlatformFixture::SetUp(); + PlatformFixture::setUp(); } void TearDown() override { - PlatformFixture::TearDown(); + PlatformFixture::tearDown(); } }; diff --git a/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp index a494be70b8..5ff55093ef 100644 --- a/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/command_stream_receiver_hw_tests_xe_hpg_core.cpp @@ -20,10 +20,10 @@ class CommandStreamReceiverHwTestXeHpgCore : public ClDeviceFixture, public: void SetUp() override { DebugManager.flags.EnableLocalMemory.set(1); - ClDeviceFixture::SetUp(); + ClDeviceFixture::setUp(); } void TearDown() override { - ClDeviceFixture::TearDown(); + ClDeviceFixture::tearDown(); } private: diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp index d00bb7e119..4c48c1c00d 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/sampler_tests_dg2.cpp @@ -19,7 +19,7 @@ using namespace NEO; -using SamplerTest = TestLegacy; +using SamplerTest = Test; HWTEST2_F(SamplerTest, givenDg2SamplerWhenUsingDefaultFilteringAndAppendSamplerStateParamsThenNotEnableLowQualityFilter, IsDG2) { EXPECT_FALSE(DebugManager.flags.ForceSamplerLowFilteringPrecision.get()); diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp index b4c5d4f817..689f6d474f 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/test_device_caps_dg2.cpp @@ -20,7 +20,7 @@ using namespace NEO; -using Dg2UsDeviceIdTest = TestLegacy; +using Dg2UsDeviceIdTest = Test; DG2TEST_F(Dg2UsDeviceIdTest, givenDg2ProductWhenCheckBlitterOperationsSupportThenReturnFalse) { EXPECT_FALSE(pDevice->getHardwareInfo().capabilityTable.blitterOperationsSupported); diff --git a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp index 2e6f0d5a31..f7eeb28bd0 100644 --- a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp @@ -16,7 +16,7 @@ using namespace NEO; -typedef TestLegacy XeHpgCoreDeviceCaps; +typedef Test XeHpgCoreDeviceCaps; XE_HPG_CORETEST_F(XeHpgCoreDeviceCaps, givenXeHpgCoreWhenCheckFtrSupportsInteger64BitAtomicsThenReturnTrue) { EXPECT_TRUE(pDevice->getHardwareInfo().capabilityTable.ftrSupportsInteger64BitAtomics); diff --git a/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp index 980355b69e..4b97083181 100644 --- a/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/test_sample_xe_hpg_core.cpp @@ -11,7 +11,7 @@ using namespace NEO; -typedef TestLegacy XeHpgCoreOnlyTeset; +typedef Test XeHpgCoreOnlyTeset; XE_HPG_CORETEST_F(XeHpgCoreOnlyTeset, WhenGettingRenderCoreFamilyThenXeHpgCoreIsReturned) { EXPECT_EQ(IGFX_XE_HPG_CORE, pDevice->getRenderCoreFamily()); diff --git a/shared/test/common/test_macros/test.h b/shared/test/common/test_macros/test.h index 9b58cde743..afde5abbff 100644 --- a/shared/test/common/test_macros/test.h +++ b/shared/test/common/test_macros/test.h @@ -24,20 +24,6 @@ struct Test } }; -template -struct TestLegacy - : public Fixture, - public ::testing::Test { - - void SetUp() override { - Fixture::SetUp(); - } - - void TearDown() override { - Fixture::TearDown(); - } -}; - #define TO_STR2(x) #x #define TO_STR(x) TO_STR2(x)