Revert "feature: enable illegal opcode exception"

This reverts commit 02b6b3bbaa.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2023-11-08 01:04:40 +01:00
committed by Compute-Runtime-Automation
parent f36e86f121
commit cdf2cd5699
3 changed files with 2 additions and 35 deletions

View File

@@ -82,8 +82,7 @@ void EncodeDispatchKernel<Family>::encode(CommandContainer &container, EncodeDis
idd.setKernelStartPointerHigh(0u); idd.setKernelStartPointerHigh(0u);
} }
bool debugEnabled = args.device->getL0Debugger() != nullptr; if (args.dispatchInterface->getKernelDescriptor().kernelAttributes.flags.usesAssert && args.device->getL0Debugger() != nullptr) {
if (args.dispatchInterface->getKernelDescriptor().kernelAttributes.flags.usesAssert && debugEnabled) {
idd.setSoftwareExceptionEnable(1); idd.setSoftwareExceptionEnable(1);
} }

View File

@@ -93,12 +93,7 @@ void EncodeDispatchKernel<Family>::encode(CommandContainer &container, EncodeDis
} }
idd.setKernelStartPointer(offset); idd.setKernelStartPointer(offset);
} }
if (args.dispatchInterface->getKernelDescriptor().kernelAttributes.flags.usesAssert && args.device->getL0Debugger() != nullptr) {
bool debugEnabled = args.device->getL0Debugger() != nullptr;
if (debugEnabled) {
idd.setIllegalOpcodeExceptionEnable(1);
}
if (args.dispatchInterface->getKernelDescriptor().kernelAttributes.flags.usesAssert && debugEnabled) {
idd.setSoftwareExceptionEnable(1); idd.setSoftwareExceptionEnable(1);
} }

View File

@@ -116,33 +116,6 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenXeHpDebuggingEnabledA
EXPECT_TRUE(idd.getSoftwareExceptionEnable()); EXPECT_TRUE(idd.getSoftwareExceptionEnable());
} }
HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenXeHpDebuggingEnabledWhenDispatchingKernelThenIllegalOpcodeExceptionIsEnabled) {
using WALKER_TYPE = typename FamilyType::WALKER_TYPE;
using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA;
auto debugger = new MockDebuggerL0(pDevice);
pDevice->getRootDeviceEnvironmentRef().debugger.reset(debugger);
uint32_t dims[] = {2, 1, 1};
std::unique_ptr<MockDispatchKernelEncoder> dispatchInterface(new MockDispatchKernelEncoder());
dispatchInterface->kernelDescriptor.kernelAttributes.flags.usesAssert = true;
EncodeDispatchKernelArgs dispatchArgs = createDefaultDispatchKernelArgs(pDevice, dispatchInterface.get(), dims, false);
EncodeDispatchKernel<FamilyType>::encode(*cmdContainer.get(), dispatchArgs);
GenCmdList commands;
CmdParse<FamilyType>::parseCommandBuffer(commands, ptrOffset(cmdContainer->getCommandStream()->getCpuBase(), 0), cmdContainer->getCommandStream()->getUsed());
auto itor = find<WALKER_TYPE *>(commands.begin(), commands.end());
ASSERT_NE(itor, commands.end());
auto cmd = genCmdCast<WALKER_TYPE *>(*itor);
auto &idd = cmd->getInterfaceDescriptor();
EXPECT_TRUE(idd.getIllegalOpcodeExceptionEnable());
}
HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenSimdSizeWhenDispatchingKernelThenSimdMessageIsSet) { HWCMDTEST_F(IGFX_XE_HP_CORE, CommandEncodeStatesTest, givenSimdSizeWhenDispatchingKernelThenSimdMessageIsSet) {
using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA; using INTERFACE_DESCRIPTOR_DATA = typename FamilyType::INTERFACE_DESCRIPTOR_DATA;
using WALKER_TYPE = typename FamilyType::WALKER_TYPE; using WALKER_TYPE = typename FamilyType::WALKER_TYPE;