Don't store MockProgram as member of fixture

This is to prepare for adding argument to MockProgram constructor. It'll have
to be constructed after ExecutionEnvironment creation, for example after
DeviceFixture::SetUp.

Change-Id: I37b08f814679271820a07fb29cf1fb6b517c8376
Signed-off-by: Maciej Dziuban <maciej.dziuban@intel.com>
This commit is contained in:
Maciej Dziuban
2018-08-09 11:34:50 +02:00
committed by sys_ocldev
parent 20aa362a7d
commit 6f26ced3b5
15 changed files with 92 additions and 79 deletions

View File

@@ -36,6 +36,7 @@ struct KernelSLMAndBarrierTest : public DeviceFixture,
public ::testing::TestWithParam<uint32_t> {
void SetUp() override {
DeviceFixture::SetUp();
program = std::make_unique<MockProgram>();
memset(&kernelHeader, 0, sizeof(kernelHeader));
kernelHeader.KernelHeapSize = sizeof(kernelIsa);
@@ -66,7 +67,7 @@ struct KernelSLMAndBarrierTest : public DeviceFixture,
uint32_t simd;
uint32_t numChannels;
MockProgram program;
std::unique_ptr<MockProgram> program;
SKernelBinaryHeaderCommon kernelHeader;
SPatchDataParameterStream dataParameterStream;
@@ -90,7 +91,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, KernelSLMAndBarrierTest, test_SLMProgramming) {
executionEnvironment.HasBarriers = 1;
kernelInfo.workloadInfo.slmStaticSize = GetParam() * KB;
MockKernel kernel(&program, kernelInfo, *pDevice);
MockKernel kernel(program.get(), kernelInfo, *pDevice);
ASSERT_EQ(CL_SUCCESS, kernel.initialize());
// After creating Mock Kernel now create Indirect Heap