mirror of
https://github.com/intel/compute-runtime.git
synced 2026-01-08 14:02:58 +08:00
Enahnce kernel debug ULTs
Mock ProgramWithKernelDebugging ULTs. This change is neccessary to ensure independence from binary format after incoming switching to zebinary format. Signed-off-by: Kacper Nowak <kacper.nowak@intel.com> Related-To: NEO-6646
This commit is contained in:
committed by
Compute-Runtime-Automation
parent
0420df780d
commit
83b84b3491
@@ -15,12 +15,12 @@
|
||||
#include "shared/test/common/helpers/test_files.h"
|
||||
#include "shared/test/common/mocks/mock_device.h"
|
||||
#include "shared/test/common/mocks/mock_elf.h"
|
||||
#include "shared/test/unit_test/device_binary_format/elf/elf_tests_data.h"
|
||||
#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h"
|
||||
#include "shared/test/unit_test/helpers/gtest_helpers.h"
|
||||
|
||||
#include "opencl/test/unit_test/mocks/mock_cl_device.h"
|
||||
#include "opencl/test/unit_test/mocks/mock_program.h"
|
||||
#include "opencl/test/unit_test/test_files/patch_list.h"
|
||||
|
||||
#include "compiler_options.h"
|
||||
#include "gtest/gtest.h"
|
||||
@@ -29,52 +29,6 @@
|
||||
|
||||
using namespace NEO;
|
||||
|
||||
enum class enabledIrFormat {
|
||||
NONE,
|
||||
ENABLE_SPIRV,
|
||||
ENABLE_LLVM
|
||||
};
|
||||
|
||||
template <enabledIrFormat irFormat = enabledIrFormat::NONE>
|
||||
struct MockElfBinaryPatchtokens {
|
||||
MockElfBinaryPatchtokens(const HardwareInfo &hwInfo) : MockElfBinaryPatchtokens(std::string{}, hwInfo){};
|
||||
MockElfBinaryPatchtokens(const std::string &buildOptions, const HardwareInfo &hwInfo) {
|
||||
mockDevBinaryHeader.Device = hwInfo.platform.eRenderCoreFamily;
|
||||
mockDevBinaryHeader.GPUPointerSizeInBytes = sizeof(void *);
|
||||
mockDevBinaryHeader.Version = iOpenCL::CURRENT_ICBE_VERSION;
|
||||
constexpr size_t mockDevBinaryDataSize = sizeof(mockDevBinaryHeader) + mockDataSize;
|
||||
constexpr size_t mockSpirvBinaryDataSize = sizeof(spirvMagic) + mockDataSize;
|
||||
constexpr size_t mockLlvmBinaryDataSize = sizeof(llvmBcMagic) + mockDataSize;
|
||||
|
||||
char mockDevBinaryData[mockDevBinaryDataSize];
|
||||
memcpy_s(mockDevBinaryData, mockDevBinaryDataSize, &mockDevBinaryHeader, sizeof(mockDevBinaryHeader));
|
||||
memset(mockDevBinaryData + sizeof(mockDevBinaryHeader), '\x01', mockDataSize);
|
||||
|
||||
char mockSpirvBinaryData[mockSpirvBinaryDataSize];
|
||||
memcpy_s(mockSpirvBinaryData, mockSpirvBinaryDataSize, spirvMagic.data(), spirvMagic.size());
|
||||
memset(mockSpirvBinaryData + spirvMagic.size(), '\x02', mockDataSize);
|
||||
|
||||
char mockLlvmBinaryData[mockLlvmBinaryDataSize];
|
||||
memcpy_s(mockLlvmBinaryData, mockLlvmBinaryDataSize, llvmBcMagic.data(), llvmBcMagic.size());
|
||||
memset(mockLlvmBinaryData + llvmBcMagic.size(), '\x03', mockDataSize);
|
||||
|
||||
Elf::ElfEncoder<Elf::EI_CLASS_64> enc;
|
||||
enc.getElfFileHeader().identity = Elf::ElfFileHeaderIdentity(Elf::EI_CLASS_64);
|
||||
enc.getElfFileHeader().type = NEO::Elf::ET_OPENCL_EXECUTABLE;
|
||||
enc.appendSection(Elf::SHT_OPENCL_DEV_BINARY, Elf::SectionNamesOpenCl::deviceBinary, ArrayRef<const uint8_t>::fromAny(mockDevBinaryData, mockDevBinaryDataSize));
|
||||
if (irFormat == enabledIrFormat::ENABLE_SPIRV)
|
||||
enc.appendSection(Elf::SHT_OPENCL_SPIRV, Elf::SectionNamesOpenCl::spirvObject, ArrayRef<const uint8_t>::fromAny(mockSpirvBinaryData, mockSpirvBinaryDataSize));
|
||||
else if (irFormat == enabledIrFormat::ENABLE_LLVM)
|
||||
enc.appendSection(Elf::SHT_OPENCL_LLVM_BINARY, Elf::SectionNamesOpenCl::llvmObject, ArrayRef<const uint8_t>::fromAny(mockLlvmBinaryData, mockLlvmBinaryDataSize));
|
||||
if (false == buildOptions.empty())
|
||||
enc.appendSection(Elf::SHT_OPENCL_OPTIONS, Elf::SectionNamesOpenCl::buildOptions, ArrayRef<const uint8_t>::fromAny(buildOptions.data(), buildOptions.size()));
|
||||
storage = enc.encode();
|
||||
}
|
||||
static constexpr size_t mockDataSize = 0x10;
|
||||
SProgramBinaryHeader mockDevBinaryHeader = SProgramBinaryHeader{MAGIC_CL, 0, 0, 0, 0, 0, 0};
|
||||
std::vector<uint8_t> storage;
|
||||
};
|
||||
|
||||
class ProcessElfBinaryTests : public ::testing::Test {
|
||||
public:
|
||||
void SetUp() override {
|
||||
|
||||
@@ -5,12 +5,14 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "shared/source/device_binary_format/patchtokens_decoder.h"
|
||||
#include "shared/test/common/helpers/debug_manager_state_restore.h"
|
||||
#include "shared/test/common/helpers/kernel_binary_helper.h"
|
||||
#include "shared/test/common/helpers/kernel_filename_helper.h"
|
||||
#include "shared/test/common/libult/global_environment.h"
|
||||
#include "shared/test/common/mocks/mock_source_level_debugger.h"
|
||||
#include "shared/test/common/test_macros/test.h"
|
||||
#include "shared/test/unit_test/device_binary_format/elf/elf_tests_data.h"
|
||||
#include "shared/test/unit_test/helpers/gtest_helpers.h"
|
||||
|
||||
#include "opencl/test/unit_test/fixtures/program_fixture.h"
|
||||
@@ -20,6 +22,7 @@
|
||||
|
||||
#include "compiler_options.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include "program_debug_data.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <memory>
|
||||
@@ -300,6 +303,11 @@ TEST_F(ProgramWithKernelDebuggingTest, givenEnabledKernelDebugWhenProgramIsLinke
|
||||
}
|
||||
|
||||
TEST_F(ProgramWithKernelDebuggingTest, givenProgramWithKernelDebugEnabledWhenBuiltThenPatchTokenAllocateSipSurfaceHasSizeGreaterThanZero) {
|
||||
auto &refBin = pProgram->buildInfos[pDevice->getRootDeviceIndex()].unpackedDeviceBinary;
|
||||
auto refBinSize = pProgram->buildInfos[pDevice->getRootDeviceIndex()].unpackedDeviceBinarySize;
|
||||
if (NEO::isDeviceBinaryFormat<NEO::DeviceBinaryFormat::Zebin>(ArrayRef<const uint8_t>::fromAny(refBin.get(), refBinSize))) {
|
||||
GTEST_SKIP();
|
||||
}
|
||||
auto retVal = pProgram->build(pProgram->getDevices(), CompilerOptions::debugKernelEnable.data(), false);
|
||||
EXPECT_EQ(CL_SUCCESS, retVal);
|
||||
|
||||
@@ -313,9 +321,7 @@ TEST_F(ProgramWithKernelDebuggingTest, givenGtpinInitializedWhenCreatingProgramF
|
||||
auto retVal = pProgram->build(pProgram->getDevices(), CompilerOptions::debugKernelEnable.data(), false);
|
||||
EXPECT_EQ(CL_SUCCESS, retVal);
|
||||
|
||||
auto kernelInfo = pProgram->getKernelInfo("CopyBuffer", pDevice->getRootDeviceIndex());
|
||||
EXPECT_NE(kernelInfo->debugData.vIsa, nullptr);
|
||||
EXPECT_NE(0u, kernelInfo->debugData.vIsaSize);
|
||||
EXPECT_TRUE(pProgram->wasDebuggerNotified);
|
||||
|
||||
NEO::isGTPinInitialized = gtpinInitializedBackup;
|
||||
}
|
||||
@@ -327,9 +333,7 @@ TEST_F(ProgramWithKernelDebuggingTest, givenGtpinNotInitializedWhenCreatingProgr
|
||||
auto retVal = pProgram->build(pProgram->getDevices(), CompilerOptions::debugKernelEnable.data(), false);
|
||||
EXPECT_EQ(CL_SUCCESS, retVal);
|
||||
|
||||
auto kernelInfo = pProgram->getKernelInfo("CopyBuffer", pDevice->getRootDeviceIndex());
|
||||
EXPECT_EQ(kernelInfo->debugData.vIsa, nullptr);
|
||||
EXPECT_EQ(0u, kernelInfo->debugData.vIsaSize);
|
||||
EXPECT_FALSE(pProgram->wasDebuggerNotified);
|
||||
|
||||
NEO::isGTPinInitialized = gtpinInitializedBackup;
|
||||
}
|
||||
@@ -344,15 +348,41 @@ TEST_F(ProgramWithKernelDebuggingTest, givenKernelDebugEnabledWhenProgramIsBuilt
|
||||
}
|
||||
|
||||
TEST_F(ProgramWithKernelDebuggingTest, givenProgramWithKernelDebugEnabledWhenProcessDebugDataIsCalledThenKernelInfosAreFilledWithDebugData) {
|
||||
auto retVal = pProgram->build(pProgram->getDevices(), nullptr, false);
|
||||
EXPECT_EQ(CL_SUCCESS, retVal);
|
||||
iOpenCL::SProgramDebugDataHeaderIGC debugDataHeader{};
|
||||
debugDataHeader.NumberOfKernels = 1u;
|
||||
|
||||
char mockKernelName[] = "CopyBuffer";
|
||||
constexpr size_t mockKernelDebugDataSize = 0x10;
|
||||
PatchTokenBinary::SKernelDebugDataHeaderIGC mockKernelDebugHeader{};
|
||||
mockKernelDebugHeader.KernelNameSize = sizeof(mockKernelName);
|
||||
mockKernelDebugHeader.SizeVisaDbgInBytes = mockKernelDebugDataSize;
|
||||
|
||||
char mockKerneDebugData[mockKernelDebugDataSize];
|
||||
memset(mockKerneDebugData, '\x01', mockKernelDebugDataSize);
|
||||
|
||||
KernelInfo *mockKernelInfo = new KernelInfo{};
|
||||
mockKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "CopyBuffer";
|
||||
pProgram->addKernelInfo(mockKernelInfo, pDevice->getRootDeviceIndex());
|
||||
|
||||
constexpr size_t mockDebugDataSize = sizeof(iOpenCL::SProgramDebugDataHeaderIGC) + sizeof(PatchTokenBinary::KernelFromPatchtokens) + sizeof(mockKernelName) + mockKernelDebugDataSize;
|
||||
|
||||
char *mockDebugData = new char[mockDebugDataSize];
|
||||
auto dataPtr = mockDebugData;
|
||||
|
||||
memcpy_s(dataPtr, mockDebugDataSize, &debugDataHeader, sizeof(iOpenCL::SProgramDebugDataHeaderIGC));
|
||||
dataPtr = ptrOffset(dataPtr, sizeof(iOpenCL::SProgramDebugDataHeaderIGC));
|
||||
memcpy_s(dataPtr, mockDebugDataSize, &mockKernelDebugHeader, sizeof(PatchTokenBinary::SKernelDebugDataHeaderIGC));
|
||||
dataPtr = ptrOffset(dataPtr, sizeof(PatchTokenBinary::SKernelDebugDataHeaderIGC));
|
||||
memcpy_s(dataPtr, mockDebugDataSize, &mockKernelName, sizeof(mockKernelName));
|
||||
dataPtr = ptrOffset(dataPtr, sizeof(mockKernelName));
|
||||
memcpy_s(dataPtr, mockDebugDataSize, mockKerneDebugData, mockKernelDebugDataSize);
|
||||
pProgram->buildInfos[pDevice->getRootDeviceIndex()].debugData.reset(mockDebugData);
|
||||
|
||||
pProgram->processDebugData(pDevice->getRootDeviceIndex());
|
||||
auto receivedKernelInfo = pProgram->getKernelInfo("CopyBuffer", pDevice->getRootDeviceIndex());
|
||||
|
||||
auto kernelInfo = pProgram->getKernelInfo("CopyBuffer", pDevice->getRootDeviceIndex());
|
||||
|
||||
EXPECT_NE(0u, kernelInfo->debugData.vIsaSize);
|
||||
EXPECT_NE(nullptr, kernelInfo->debugData.vIsa);
|
||||
EXPECT_NE(0u, receivedKernelInfo->debugData.vIsaSize);
|
||||
EXPECT_NE(nullptr, receivedKernelInfo->debugData.vIsa);
|
||||
}
|
||||
|
||||
TEST_F(ProgramWithKernelDebuggingTest, givenProgramWithNonZebinaryFormatAndKernelDebugEnabledWhenProgramIsBuiltThenProcessDebugDataIsCalledAndDebuggerNotified) {
|
||||
@@ -360,9 +390,25 @@ TEST_F(ProgramWithKernelDebuggingTest, givenProgramWithNonZebinaryFormatAndKerne
|
||||
pDevice->executionEnvironment->rootDeviceEnvironments[pDevice->getRootDeviceIndex()]->debugger.reset(sourceLevelDebugger);
|
||||
pProgram->enableKernelDebug();
|
||||
|
||||
cl_int retVal = pProgram->build(pProgram->getDevices(), nullptr, false);
|
||||
EXPECT_EQ(CL_SUCCESS, retVal);
|
||||
EXPECT_FALSE(pProgram->wasCreateDebugZebinCalled);
|
||||
EXPECT_TRUE(pProgram->wasProcessDebugDataCalled);
|
||||
EXPECT_EQ(1u, sourceLevelDebugger->notifyKernelDebugDataCalled);
|
||||
auto mockElf = std::make_unique<MockElfBinaryPatchtokens<>>(pDevice->getHardwareInfo());
|
||||
auto mockElfSize = mockElf->storage.size();
|
||||
auto mockElfData = mockElf->storage.data();
|
||||
|
||||
pProgram->buildInfos[pDevice->getRootDeviceIndex()].unpackedDeviceBinarySize = mockElfSize;
|
||||
pProgram->buildInfos[pDevice->getRootDeviceIndex()].unpackedDeviceBinary.reset(new char[mockElfSize]);
|
||||
memcpy_s(pProgram->buildInfos[pDevice->getRootDeviceIndex()].unpackedDeviceBinary.get(), pProgram->buildInfos[pDevice->getRootDeviceIndex()].unpackedDeviceBinarySize,
|
||||
mockElfData, mockElfSize);
|
||||
|
||||
KernelInfo *mockKernelInfo = new KernelInfo{};
|
||||
mockKernelInfo->kernelDescriptor.kernelMetadata.kernelName = "CopyBuffer";
|
||||
pProgram->addKernelInfo(mockKernelInfo, pDevice->getRootDeviceIndex());
|
||||
|
||||
auto counter = 0u;
|
||||
for (const auto &device : pProgram->getDevices()) {
|
||||
pProgram->notifyDebuggerWithDebugData(device);
|
||||
|
||||
EXPECT_FALSE(pProgram->wasCreateDebugZebinCalled);
|
||||
EXPECT_TRUE(pProgram->wasProcessDebugDataCalled);
|
||||
EXPECT_EQ(++counter, sourceLevelDebugger->notifyKernelDebugDataCalled);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user