intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-06 02:18:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove not needed ifdef

Browse Source 
Resolves: NEO-3891

Change-Id: I37e66cc2229969409c6eb52e12267ae5531c3abf
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski
2019-10-25 10:39:41 +02:00
committed by sys_ocldev
parent b855852500
commit f8a9eb642e
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/helpers/hardware_commands_helper_base.inl
View File

@@ -103,13 +103,11 @@ void HardwareCommandsHelper<GfxFamily>::setKernelStartOffset(
} }
kernelStartOffset += kernel.getStartOffset(); kernelStartOffset += kernel.getStartOffset();
#ifdef WIN32
if ((kernel.getDevice().getHardwareInfo().platform.eProductFamily == IGFX_TIGERLAKE_LP) && if ((kernel.getDevice().getHardwareInfo().platform.eProductFamily == IGFX_TIGERLAKE_LP) &&
(kernel.getDevice().getHardwareInfo().platform.usRevId == REVISION_A0) && (kernel.getDevice().getHardwareInfo().platform.usRevId == REVISION_A0) &&
isCssUsed) { isCssUsed) {
kernelStartOffset += kernelInfo.patchInfo.threadPayload->OffsetToSkipSetFFIDGP; kernelStartOffset += kernelInfo.patchInfo.threadPayload->OffsetToSkipSetFFIDGP;
} }
#endif
} }
template <typename GfxFamily> template <typename GfxFamily>

31
unit_tests/helpers/hardware_commands_helper_tests.cpp
View File

@@ -1076,6 +1076,37 @@ HWCMDTEST_F(IGFX_GEN8_CORE, HardwareCommandsTest, GivenKernelWithSamplersWhenInd
delete[] mockDsh; delete[] mockDsh;
} }
using HardwareCommandsWaTest = ::testing::Test;
HWCMDTEST_F(IGFX_GEN8_CORE, HardwareCommandsWaTest, GivenTgllpA0WhenSettingKernelStartOffsetThenAdditionalOffsetIsSet) {
const uint64_t defaultKernelStartOffset = 0;
const uint64_t additionalOffsetDueToFfid = 0x1234;
SPatchThreadPayload threadPayload{};
threadPayload.OffsetToSkipSetFFIDGP = additionalOffsetDueToFfid;
auto hwInfo = *platformDevices[0];
hwInfo.platform.eProductFamily = IGFX_TIGERLAKE_LP;
__REVID revIds[] = {REVISION_A0, REVISION_A1};
for (auto revId : revIds) {
hwInfo.platform.usRevId = revId;
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo));
MockKernelWithInternals mockKernelWithInternals{*device};
mockKernelWithInternals.kernelInfo.patchInfo.threadPayload = &threadPayload;
for (auto isCcsUsed : ::testing::Bool()) {
uint64_t kernelStartOffset = defaultKernelStartOffset;
HardwareCommandsHelper<FamilyType>::setKernelStartOffset(kernelStartOffset, false, mockKernelWithInternals.kernelInfo, false,
false, *mockKernelWithInternals.mockKernel, isCcsUsed);
if ((revId == REVISION_A0) && isCcsUsed) {
EXPECT_EQ(defaultKernelStartOffset + additionalOffsetDueToFfid, kernelStartOffset);
} else {
EXPECT_EQ(defaultKernelStartOffset, kernelStartOffset);
}
}
}
}
using HardwareCommandsHelperTests = ::testing::Test; using HardwareCommandsHelperTests = ::testing::Test;
HWTEST_F(HardwareCommandsHelperTests, givenCompareAddressAndDataWhenProgrammingSemaphoreWaitThenSetupAllFields) { HWTEST_F(HardwareCommandsHelperTests, givenCompareAddressAndDataWhenProgrammingSemaphoreWaitThenSetupAllFields) {