Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: indirect access in external functions 

Read indirect_stateless_count in module external functions.

If greater than 0, mark all kernels that have the has_stack_calls flag
set from this module as having indirect accesses.

Related-To: NEO-7712

Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
This commit is contained in:
Dominik Dabek 2024-01-18 13:23:34 +00:00 committed by Compute-Runtime-Automation
parent af5977766d
commit e0ccf22557
12 changed files with 123 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1109,6 +1109,7 @@ ze_result_t KernelImp::initialize(const ze_kernel_desc_t *desc) {
kernelDescriptor.kernelAttributes.hasNonKernelArgStore ||
kernelDescriptor.kernelAttributes.hasNonKernelArgAtomic ||
kernelDescriptor.kernelAttributes.hasIndirectStatelessAccess ||
(moduleImp->getTranslationUnit()->programInfo.functionPointerWithIndirectAccessExists && kernelDescriptor.kernelAttributes.flags.useStackCalls) ||
NEO::KernelHelper::isAnyArgumentPtrByValue(kernelDescriptor);
} else {
kernelHasIndirectAccess = true;

42
level_zero/core/test/unit_tests/sources/kernel/test_kernel.cpp
View File

@ -1387,6 +1387,7 @@ TEST_F(KernelIndirectPropertiesFromIGCTests, givenDetectIndirectAccessInKernelEn
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgStore = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgAtomic = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasIndirectStatelessAccess = false;
module->getTranslationUnit()->programInfo.functionPointerWithIndirectAccessExists = false;
kernel->initialize(&desc);
@ -1404,6 +1405,7 @@ TEST_F(KernelIndirectPropertiesFromIGCTests, givenDetectIndirectAccessInKernelEn
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgStore = true;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgAtomic = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasIndirectStatelessAccess = false;
module->getTranslationUnit()->programInfo.functionPointerWithIndirectAccessExists = false;
kernel->initialize(&desc);
@ -1421,6 +1423,7 @@ TEST_F(KernelIndirectPropertiesFromIGCTests, givenDetectIndirectAccessInKernelEn
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgStore = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgAtomic = true;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasIndirectStatelessAccess = false;
module->getTranslationUnit()->programInfo.functionPointerWithIndirectAccessExists = false;
kernel->initialize(&desc);
@ -1438,6 +1441,45 @@ TEST_F(KernelIndirectPropertiesFromIGCTests, givenDetectIndirectAccessInKernelEn
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgStore = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgAtomic = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasIndirectStatelessAccess = true;
module->getTranslationUnit()->programInfo.functionPointerWithIndirectAccessExists = false;
kernel->initialize(&desc);
EXPECT_TRUE(kernel->hasIndirectAccess());
}
{
std::unique_ptr<ModuleImmutableDataFixture::MockKernel> kernel;
kernel = std::make_unique<ModuleImmutableDataFixture::MockKernel>(module.get());
ze_kernel_desc_t desc = {};
desc.pKernelName = kernelName.c_str();
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgLoad = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgStore = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgAtomic = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasIndirectStatelessAccess = false;
module->getTranslationUnit()->programInfo.functionPointerWithIndirectAccessExists = true;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.flags.useStackCalls = false;
kernel->initialize(&desc);
EXPECT_FALSE(kernel->hasIndirectAccess());
}
{
std::unique_ptr<ModuleImmutableDataFixture::MockKernel> kernel;
kernel = std::make_unique<ModuleImmutableDataFixture::MockKernel>(module.get());
ze_kernel_desc_t desc = {};
desc.pKernelName = kernelName.c_str();
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgLoad = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgStore = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasNonKernelArgAtomic = false;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.hasIndirectStatelessAccess = false;
module->getTranslationUnit()->programInfo.functionPointerWithIndirectAccessExists = true;
module->mockKernelImmData->mockKernelDescriptor->kernelAttributes.flags.useStackCalls = true;
kernel->initialize(&desc);

1
opencl/source/kernel/kernel.cpp
View File

@ -296,6 +296,7 @@ cl_int Kernel::initialize() {
kernelDescriptor.kernelAttributes.hasNonKernelArgStore ||
kernelDescriptor.kernelAttributes.hasNonKernelArgAtomic ||
kernelDescriptor.kernelAttributes.hasIndirectStatelessAccess ||
(program->getFunctionPointerWithIndirectAccessExists() && kernelDescriptor.kernelAttributes.flags.useStackCalls) ||
NEO::KernelHelper::isAnyArgumentPtrByValue(kernelDescriptor);
} else {
this->kernelHasIndirectAccess = true;

1
opencl/source/program/process_device_binary.cpp
View File

@ -289,6 +289,7 @@ cl_int Program::processProgramInfo(ProgramInfo &src, const ClDevice &clDevice) {
}
indirectDetectionVersion = src.indirectDetectionVersion;
functionPointerWithIndirectAccessExists = src.functionPointerWithIndirectAccessExists;
return linkBinary(&clDevice.getDevice(), src.globalConstants.initData, src.globalConstants.size, src.globalVariables.initData,
src.globalVariables.size, src.globalStrings, src.externalFunctions);

2
opencl/source/program/program.h
View File

@ -247,6 +247,7 @@ class Program : public BaseObject<_cl_program> {
MOCKABLE_VIRTUAL std::string getInternalOptions() const;
uint32_t getMaxRootDeviceIndex() const { return maxRootDeviceIndex; }
uint32_t getIndirectDetectionVersion() const { return indirectDetectionVersion; }
bool getFunctionPointerWithIndirectAccessExists() const { return functionPointerWithIndirectAccessExists; }
void retainForKernel() {
std::unique_lock<std::mutex> lock{lockMutex};
exposedKernels++;
@ -372,6 +373,7 @@ class Program : public BaseObject<_cl_program> {
ClDeviceVector clDevicesInProgram;
uint32_t indirectDetectionVersion = 0u;
bool functionPointerWithIndirectAccessExists = false;
bool isBuiltIn = false;
bool isGeneratedByIgc = true;

62
opencl/test/unit_test/kernel/kernel_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2023 Intel Corporation
* Copyright (C) 2018-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -1776,6 +1776,66 @@ HWTEST_F(KernelResidencyTest, givenKernelWithNoKernelArgLoadNorKernelArgStoreNor
memoryManager->freeGraphicsMemory(pKernelInfo->kernelAllocation);
}
HWTEST_F(KernelResidencyTest, givenKernelWithExternalFunctionWithIndirectAccessAndDetectIndirectAccessInKernelEnabledThenKernelHasIndirectAccessIsSetToTrue) {
DebugManagerStateRestore restorer;
debugManager.flags.DetectIndirectAccessInKernel.set(1);
auto pKernelInfo = std::make_unique<KernelInfo>();
pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 1;
pKernelInfo->kernelDescriptor.kernelAttributes.hasNonKernelArgLoad = false;
pKernelInfo->kernelDescriptor.kernelAttributes.hasNonKernelArgStore = false;
pKernelInfo->kernelDescriptor.kernelAttributes.hasNonKernelArgAtomic = false;
pKernelInfo->kernelDescriptor.kernelAttributes.hasIndirectStatelessAccess = false;
pKernelInfo->kernelDescriptor.kernelAttributes.flags.useStackCalls = true;
auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver<FamilyType>();
commandStreamReceiver.storeMakeResidentAllocations = true;
auto memoryManager = commandStreamReceiver.getMemoryManager();
pKernelInfo->kernelAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{pDevice->getRootDeviceIndex(), MemoryConstants::pageSize});
MockProgram program(toClDeviceVector(*pClDevice));
MockContext ctx;
program.setContext(&ctx);
program.buildInfos[pDevice->getRootDeviceIndex()].globalSurface = new MockGraphicsAllocation();
program.functionPointerWithIndirectAccessExists = true;
std::unique_ptr<MockKernel> kernel(new MockKernel(&program, *pKernelInfo, *pClDevice));
ASSERT_EQ(CL_SUCCESS, kernel->initialize());
EXPECT_TRUE(kernel->getHasIndirectAccess());
memoryManager->freeGraphicsMemory(pKernelInfo->kernelAllocation);
}
HWTEST_F(KernelResidencyTest, givenKernelWithExternalFunctionWithIndirectAccessButNoUseStackCallsAndDetectIndirectAccessInKernelEnabledThenKernelHasIndirectAccessIsSetToFalse) {
DebugManagerStateRestore restorer;
debugManager.flags.DetectIndirectAccessInKernel.set(1);
auto pKernelInfo = std::make_unique<KernelInfo>();
pKernelInfo->kernelDescriptor.kernelAttributes.simdSize = 1;
pKernelInfo->kernelDescriptor.kernelAttributes.hasNonKernelArgLoad = false;
pKernelInfo->kernelDescriptor.kernelAttributes.hasNonKernelArgStore = false;
pKernelInfo->kernelDescriptor.kernelAttributes.hasNonKernelArgAtomic = false;
pKernelInfo->kernelDescriptor.kernelAttributes.hasIndirectStatelessAccess = false;
pKernelInfo->kernelDescriptor.kernelAttributes.flags.useStackCalls = false;
auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver<FamilyType>();
commandStreamReceiver.storeMakeResidentAllocations = true;
auto memoryManager = commandStreamReceiver.getMemoryManager();
pKernelInfo->kernelAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{pDevice->getRootDeviceIndex(), MemoryConstants::pageSize});
MockProgram program(toClDeviceVector(*pClDevice));
MockContext ctx;
program.setContext(&ctx);
program.buildInfos[pDevice->getRootDeviceIndex()].globalSurface = new MockGraphicsAllocation();
program.functionPointerWithIndirectAccessExists = true;
std::unique_ptr<MockKernel> kernel(new MockKernel(&program, *pKernelInfo, *pClDevice));
ASSERT_EQ(CL_SUCCESS, kernel->initialize());
EXPECT_FALSE(kernel->getHasIndirectAccess());
memoryManager->freeGraphicsMemory(pKernelInfo->kernelAllocation);
}
HWTEST_F(KernelResidencyTest, givenKernelWithPtrByValueArgumentAndDetectIndirectAccessInKernelEnabledThenKernelHasIndirectAccessIsSetToTrue) {
DebugManagerStateRestore restorer;
debugManager.flags.DetectIndirectAccessInKernel.set(1);

3
opencl/test/unit_test/mocks/mock_program.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2023 Intel Corporation
* Copyright (C) 2018-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -55,6 +55,7 @@ class MockProgram : public Program {
using Program::deviceBuildInfos;
using Program::disableZebinIfVmeEnabled;
using Program::extractInternalOptions;
using Program::functionPointerWithIndirectAccessExists;
using Program::getKernelInfo;
using Program::getModuleAllocations;
using Program::internalOptionsToExtract;

4
shared/source/device_binary_format/zebin/zeinfo_decoder.cpp
View File

@ -9,6 +9,7 @@
#include "shared/source/compiler_interface/external_functions.h"
#include "shared/source/debug_settings/debug_settings_manager.h"
#include "shared/source/device_binary_format/zebin/zebin_elf.h"
#include "shared/source/device_binary_format/zebin/zeinfo_enum_lookup.h"
#include "shared/source/helpers/aligned_memory.h"
#include "shared/source/helpers/basic_math.h"
@ -494,6 +495,9 @@ DecodeError decodeZeInfoKernels(ProgramInfo &dst, Yaml::YamlParser &parser, cons
if (DecodeError::success != zeInfoErr) {
return zeInfoErr;
}
if (kernelInfo->kernelDescriptor.kernelMetadata.kernelName == Zebin::Elf::SectionNames::externalFunctions) {
dst.functionPointerWithIndirectAccessExists |= kernelInfo->kernelDescriptor.kernelAttributes.hasIndirectStatelessAccess;
}
dst.kernelInfos.push_back(kernelInfo.release());
}

1
shared/source/program/program_info.h
View File

@ -48,6 +48,7 @@ struct ProgramInfo {
uint32_t minScratchSpaceSize = 0U;
uint32_t indirectDetectionVersion = 0U;
size_t kernelMiscInfoPos = std::string::npos;
bool functionPointerWithIndirectAccessExists = false;
};
size_t getMaxInlineSlmNeeded(const ProgramInfo &programInfo);

3
shared/test/common/mocks/mock_modules_zebin.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2023 Intel Corporation
* Copyright (C) 2020-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -69,6 +69,7 @@ kernels:
- name: Intel_Symbol_Table_Void_Program
execution_env:
simd_size: 8
indirect_stateless_count: 1
functions:
- name: fun0
execution_env:

3
shared/test/unit_test/device_binary_format/device_binary_formats_tests.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2020-2023 Intel Corporation
* Copyright (C) 2020-2024 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@ -343,6 +343,7 @@ TEST(DecodeSingleDeviceBinary, GivenZebinWithExternalFunctionsThenDecodingSuccee
EXPECT_TRUE(decodeErrors.empty()) << decodeErrors;
EXPECT_NE(nullptr, programInfo.linkerInput.get());
EXPECT_EQ(1, programInfo.linkerInput->getExportedFunctionsSegmentId());
EXPECT_TRUE(programInfo.functionPointerWithIndirectAccessExists);
}
TEST(DecodeSingleDeviceBinary, GivenOclElfFormatThenDecodingFails) {

4
shared/test/unit_test/device_binary_format/zebin_decoder_tests.cpp
View File

@ -6532,6 +6532,8 @@ functions:
EXPECT_EQ(128U, fun1Info.numGrfRequired);
EXPECT_EQ(8U, fun1Info.simdSize);
EXPECT_EQ(0U, fun1Info.barrierCount);
EXPECT_FALSE(programInfo.functionPointerWithIndirectAccessExists);
}
}
@ -6572,6 +6574,8 @@ functions:
EXPECT_EQ(128U, fun0Info.numGrfRequired);
EXPECT_EQ(8U, fun0Info.simdSize);
EXPECT_EQ(1U, fun0Info.barrierCount);
EXPECT_FALSE(programInfo.functionPointerWithIndirectAccessExists);
}
TEST(PopulateZeInfoExternalFunctionsMetadata, GivenInvalidExternalFunctionsMetadataThenFail) {