Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove usage of TestLegacy from opencl tests

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2022-08-16 14:51:17 +00:00
committed by Compute-Runtime-Automation
parent 44d218e52e
commit bca852617c
350 changed files with 1295 additions and 1315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opencl/test/unit_test/program/program_data_tests.cpp
View File

@ -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;

42
opencl/test/unit_test/program/program_from_binary.h
View File

@ -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:

26
opencl/test/unit_test/program/program_nonuniform.cpp
View File

@ -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);

58
opencl/test/unit_test/program/program_tests.cpp
View File

@ -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<PatchTokenFromBinaryTest>;
using PatchTokenTests = Test<PatchTokenFromBinaryTest>;
template <typename FamilyType>
class CommandStreamReceiverMock : public UltCommandStreamReceiver<FamilyType> {
@ -1399,7 +1399,7 @@ class CommandStreamReceiverMock : public UltCommandStreamReceiver<FamilyType> {
};
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<ProgramPatchTokenFromBinaryTest> ProgramPatchTokenTests;
typedef Test<ProgramPatchTokenFromBinaryTest> 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<ProgramSimpleFixture>;
using ProgramWithDebugSymbolsTests = Test<ProgramSimpleFixture>;
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<ProgramSimpleFixture>;
using ProgramBinTest = Test<ProgramSimpleFixture>;
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(),

2
opencl/test/unit_test/program/program_tests.h
View File

@ -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;

4
opencl/test/unit_test/program/program_with_kernel_debug_tests.cpp
View File

@ -77,14 +77,14 @@ class ProgramWithKernelDebuggingTest : public ProgramFixture,
KernelFilenameHelper::getKernelFilenameFromInternalOption(kernelOption, filename);
kbHelper = std::make_unique<KernelBinaryHelper>(filename, false);
CreateProgramWithSource(
createProgramWithSource(
&mockContext,
"copybuffer.cl");
pProgram->enableKernelDebug();
}
void TearDown() override {
ProgramFixture::TearDown();
ProgramFixture::tearDown();
}
std::unique_ptr<KernelBinaryHelper> kbHelper;
MockUnrestrictiveContext mockContext;

20
opencl/test/unit_test/program/program_with_source.h
View File

@ -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<std::tuple<const char *, const char *, const char *>> {
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;
}