Fix for broken single sku build

Change-Id: I658bb0943d5ddc5229b8b25c4ae7fba2c867d25f
Signed-off-by: Pawel Wilma <pawel.wilma@intel.com>
This commit is contained in:
Pawel Wilma 2020-10-13 14:56:46 +02:00 committed by sys_ocldev
parent 53a99f6772
commit 675f7b380f
3 changed files with 6 additions and 14 deletions

View File

@ -82,7 +82,7 @@ void HardwareInterface<TGLLPFamily>::dispatchWorkarounds(
template <> template <>
size_t GpgpuWalkerHelper<TGLLPFamily>::getSizeForWaDisableRccRhwoOptimization(const Kernel *pKernel) { size_t GpgpuWalkerHelper<TGLLPFamily>::getSizeForWaDisableRccRhwoOptimization(const Kernel *pKernel) {
if (pKernel->requiresWaDisableRccRhwoOptimization()) { if (pKernel->requiresWaDisableRccRhwoOptimization()) {
return (2 * (sizeof(TGLLP::PIPE_CONTROL) + sizeof(TGLLPFamily::MI_LOAD_REGISTER_IMM))); return (2 * (sizeof(TGLLPFamily::PIPE_CONTROL) + sizeof(TGLLPFamily::MI_LOAD_REGISTER_IMM)));
} }
return 0u; return 0u;
} }

View File

@ -18,3 +18,8 @@ GEN11TEST_F(Gen11KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturn
auto retVal = mockKernel.mockKernel->Kernel::canTransformImages(); auto retVal = mockKernel.mockKernel->Kernel::canTransformImages();
EXPECT_TRUE(retVal); EXPECT_TRUE(retVal);
} }
GEN11TEST_F(Gen11KernelTest, GivenKernelWhenNotRunningOnGen12lpThenWaDisableRccRhwoOptimizationIsNotRequired) {
MockKernelWithInternals kernel(*pClDevice);
EXPECT_FALSE(kernel.mockKernel->requiresWaDisableRccRhwoOptimization());
}

View File

@ -20,19 +20,6 @@ GEN12LPTEST_F(Gen12LpKernelTest, givenKernelWhenCanTransformImagesIsCalledThenRe
EXPECT_FALSE(retVal); EXPECT_FALSE(retVal);
} }
GEN12LPTEST_F(Gen12LpKernelTest, GivenKernelWhenNotRunningOnGen12lpThenWaDisableRccRhwoOptimizationIsNotRequired) {
HardwareInfo hwInfoToModify = hardwareInfo;
hwInfoToModify.platform.eRenderCoreFamily = IGFX_GEN11_CORE;
delete pClDevice;
pDevice = MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfoToModify, rootDeviceIndex);
ASSERT_NE(nullptr, pDevice);
pClDevice = new MockClDevice{pDevice};
ASSERT_NE(nullptr, pClDevice);
MockKernelWithInternals kernel(*pClDevice);
EXPECT_FALSE(kernel.mockKernel->requiresWaDisableRccRhwoOptimization());
}
GEN12LPTEST_F(Gen12LpKernelTest, GivenKernelWhenNotUsingSharedObjArgsThenWaDisableRccRhwoOptimizationIsNotRequired) { GEN12LPTEST_F(Gen12LpKernelTest, GivenKernelWhenNotUsingSharedObjArgsThenWaDisableRccRhwoOptimizationIsNotRequired) {
MockKernelWithInternals kernel(*pClDevice); MockKernelWithInternals kernel(*pClDevice);
EXPECT_FALSE(kernel.mockKernel->requiresWaDisableRccRhwoOptimization()); EXPECT_FALSE(kernel.mockKernel->requiresWaDisableRccRhwoOptimization());