intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-11 16:45:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: call writeMemory after shared ISA transfer

Browse Source 
Related-To: NEO-11408

If downloadAllocation happens before makeResident,
such transfer might become outdated (zeroed out).
This commit fixes that by writing memory immediately
to tbx.

Signed-off-by: Szymon Morek <szymon.morek@intel.com>
This commit is contained in:
Szymon Morek
2024-05-14 11:51:05 +00:00
committed by Compute-Runtime-Automation
parent 4b39b11403
commit 9989829487
3 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
level_zero/core/source/module/module_imp.cpp
View File

@@ -612,6 +612,9 @@ void ModuleImp::transferIsaSegmentsToAllocation(NEO::Device *neoDevice, const NE
moduleOffset,
isaBuffer.data(),
isaBuffer.size());
for (auto &engine : neoDevice->getAllEngines()) {
engine.commandStreamReceiver->writeMemory(*moduleAllocation);
}
for (auto &kernelImmData : kernelImmDatas) {
kernelImmData->setIsaCopiedToAllocation();
}

36
level_zero/core/test/unit_tests/sources/module/test_module.cpp
View File

@@ -24,6 +24,7 @@
#include "shared/test/common/device_binary_format/patchtokens_tests.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/helpers/mock_file_io.h"
#include "shared/test/common/libult/ult_command_stream_receiver.h"
#include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/mocks/mock_elf.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h"
@@ -694,6 +695,41 @@ HWTEST_F(ModuleTest, GivenIncorrectNameWhenCreatingKernelThenResultErrorInvalidA
EXPECT_EQ(ZE_RESULT_ERROR_INVALID_KERNEL_NAME, res);
}
HWTEST_F(ModuleTest, whenMultipleModulesCreatedThenModulesShareIsaAllocation) {
DebugManagerStateRestore restorer;
debugManager.flags.EnableLocalMemory.set(1);
uint8_t binary[10];
ze_module_desc_t moduleDesc = {};
moduleDesc.format = ZE_MODULE_FORMAT_IL_SPIRV;
moduleDesc.pInputModule = binary;
moduleDesc.inputSize = 10;
ModuleBuildLog *moduleBuildLog = nullptr;
NEO::GraphicsAllocation *allocation;
std::vector<std::unique_ptr<L0::ModuleImp>> modules;
constexpr size_t numModules = 10;
auto &ultCsr = neoDevice->getUltCommandStreamReceiver<FamilyType>();
auto initialWriteMemoryCount = ultCsr.writeMemoryParams.callCount;
for (auto i = 0u; i < numModules; i++) {
modules.emplace_back(new L0::ModuleImp(device, moduleBuildLog, ModuleType::user));
modules[i]->initialize(&moduleDesc, device->getNEODevice());
EXPECT_EQ(initialWriteMemoryCount + (i + 1), ultCsr.writeMemoryParams.callCount);
if (i == 0) {
allocation = modules[i]->getKernelsIsaParentAllocation();
}
auto &vec = modules[i]->getKernelImmutableDataVector();
auto offsetForImmData = vec[0]->getIsaOffsetInParentAllocation();
for (auto &immData : vec) {
EXPECT_EQ(offsetForImmData, immData->getIsaOffsetInParentAllocation());
offsetForImmData += immData->getIsaSubAllocationSize();
}
// Verify that all imm datas share same parent allocation
if (i != 0) {
EXPECT_EQ(allocation, modules[i]->getKernelsIsaParentAllocation());
}
}
};
template <typename T1, typename T2>
struct ModuleSpecConstantsFixture : public DeviceFixture {
void setUp() {

31
level_zero/core/test/unit_tests/sources/module/test_module_2.cpp
View File

@@ -451,36 +451,5 @@ TEST_F(ModuleTests, givenFP64EmulationEnabledWhenCreatingModuleThenEnableFP64Gen
EXPECT_TRUE(CompilerOptions::contains(cip->buildInternalOptions, BuildOptions::enableFP64GenEmu));
};
TEST_F(ModuleTests, whenMultipleModulesCreatedThenModulesShareIsaAllocation) {
DebugManagerStateRestore restorer;
debugManager.flags.EnableLocalMemory.set(1);
uint8_t binary[10];
ze_module_desc_t moduleDesc = {};
moduleDesc.format = ZE_MODULE_FORMAT_IL_SPIRV;
moduleDesc.pInputModule = binary;
moduleDesc.inputSize = 10;
ModuleBuildLog *moduleBuildLog = nullptr;
NEO::GraphicsAllocation *allocation;
std::vector<std::unique_ptr<L0::ModuleImp>> modules;
constexpr size_t numModules = 10;
for (auto i = 0u; i < numModules; i++) {
modules.emplace_back(new L0::ModuleImp(device, moduleBuildLog, ModuleType::user));
modules[i]->initialize(&moduleDesc, device->getNEODevice());
if (i == 0) {
allocation = modules[i]->getKernelsIsaParentAllocation();
}
auto &vec = modules[i]->getKernelImmutableDataVector();
auto offsetForImmData = vec[0]->getIsaOffsetInParentAllocation();
for (auto &immData : vec) {
EXPECT_EQ(offsetForImmData, immData->getIsaOffsetInParentAllocation());
offsetForImmData += immData->getIsaSubAllocationSize();
}
// Verify that all imm datas share same parent allocation
if (i != 0) {
EXPECT_EQ(allocation, modules[i]->getKernelsIsaParentAllocation());
}
}
};
} // namespace ult
} // namespace L0