intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-07 12:42:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

feature: add assertBufferPtr to ImplicitArgs

Browse Source 
Related-To: NEO-5753, NEO-8078

Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2023-06-20 16:14:44 +00:00
committed by Compute-Runtime-Automation
parent c98c9302cc
commit 111b112729
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
level_zero/core/source/kernel/kernel_imp.cpp
View File

@@ -1172,6 +1172,10 @@ void KernelImp::setAssertBuffer() {
this->getImmutableData()->getDescriptor().payloadMappings.implicitArgs.assertBufferAddress,
static_cast<uintptr_t>(assertHandler->getAssertBuffer()->getGpuAddressToPatch()));
this->residencyContainer.push_back(assertHandler->getAssertBuffer());
if (pImplicitArgs) {
pImplicitArgs->assertBufferPtr = static_cast<uintptr_t>(assertHandler->getAssertBuffer()->getGpuAddressToPatch());
}
}
void KernelImp::patchBindlessOffsetsInCrossThreadData(uint64_t bindlessSurfaceStateBaseOffset) const {

36
level_zero/core/test/unit_tests/sources/assert/test_assert.cpp
View File

@@ -6,6 +6,7 @@
*/
#include "shared/source/helpers/hw_info.h"
#include "shared/source/kernel/implicit_args.h"
#include "shared/test/common/helpers/default_hw_info.h"
#include "shared/test/common/libult/ult_command_stream_receiver.h"
#include "shared/test/common/mocks/mock_assert_handler.h"
@@ -89,6 +90,41 @@ TEST(KernelAssert, GivenKernelWithAssertWhenSettingAssertBufferThenAssertBufferI
EXPECT_TRUE(std::find(kernel.getResidencyContainer().begin(), kernel.getResidencyContainer().end(), assertHandler->getAssertBuffer()) != kernel.getResidencyContainer().end());
}
TEST(KernelAssert, GivenKernelWithAssertAndImplicitArgsWhenInitializingKernelThenImplicitArgsAssertBufferPtrIsSet) {
NEO::Device *neoDevice(NEO::MockDevice::createWithNewExecutionEnvironment<NEO::MockDevice>(NEO::defaultHwInfo.get(), 0));
Mock<L0::DeviceImp> l0Device(neoDevice, neoDevice->getExecutionEnvironment());
auto assertHandler = new MockAssertHandler(neoDevice);
neoDevice->getRootDeviceEnvironmentRef().assertHandler.reset(assertHandler);
MockModule module(&l0Device, nullptr, ModuleType::User);
Mock<Kernel> kernel;
kernel.module = &module;
kernel.descriptor.kernelMetadata.kernelName = "test";
kernel.descriptor.kernelAttributes.flags.usesAssert = true;
kernel.descriptor.kernelAttributes.flags.requiresImplicitArgs = true;
kernel.descriptor.payloadMappings.implicitArgs.assertBufferAddress.stateless = 0;
kernel.descriptor.payloadMappings.implicitArgs.assertBufferAddress.pointerSize = sizeof(uintptr_t);
kernel.crossThreadData = std::make_unique<uint8_t[]>(16);
kernel.crossThreadDataSize = sizeof(uint8_t[16]);
module.kernelImmData = &kernel.immutableData;
char heap[8];
kernel.info.heapInfo.pKernelHeap = heap;
ze_kernel_desc_t kernelDesc = {};
kernelDesc.pKernelName = "test";
auto result = kernel.initialize(&kernelDesc);
EXPECT_EQ(ZE_RESULT_SUCCESS, result);
auto assertBufferAddress = assertHandler->getAssertBuffer()->getGpuAddressToPatch();
auto implicitArgs = kernel.getImplicitArgs();
ASSERT_NE(nullptr, implicitArgs);
EXPECT_EQ(assertBufferAddress, implicitArgs->assertBufferPtr);
}
TEST(KernelAssert, GivenNoAssertHandlerWhenKernelWithAssertSetsAssertBufferThenAssertHandlerIsCreated) {
NEO::Device *neoDevice(NEO::MockDevice::createWithNewExecutionEnvironment<NEO::MockDevice>(NEO::defaultHwInfo.get(), 0));
Mock<L0::DeviceImp> l0Device(neoDevice, neoDevice->getExecutionEnvironment());