mirror of
https://github.com/intel/compute-runtime.git
synced 2025-09-10 12:53:42 +08:00
Remove usage of TestLegacy from opencl tests
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:

committed by
Compute-Runtime-Automation

parent
44d218e52e
commit
bca852617c
@ -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;
|
||||
|
@ -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<cl_context_properties>(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();
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -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<MockKernel>(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;
|
||||
|
@ -24,20 +24,20 @@ struct GetSupportedImageFormatsTest : public PlatformFixture,
|
||||
public ContextFixture,
|
||||
public ::testing::TestWithParam<std::tuple<uint64_t, uint32_t>> {
|
||||
|
||||
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;
|
||||
|
@ -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<cl_context_properties>(static_cast<cl_platform_id>(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) {
|
||||
|
Reference in New Issue
Block a user