diff --git a/level_zero/core/source/module/module_imp.cpp b/level_zero/core/source/module/module_imp.cpp index fbd08b1f39..cde3d14a7d 100644 --- a/level_zero/core/source/module/module_imp.cpp +++ b/level_zero/core/source/module/module_imp.cpp @@ -906,30 +906,12 @@ bool ModuleImp::linkBinary() { } ze_result_t ModuleImp::getFunctionPointer(const char *pFunctionName, void **pfnFunction) { - // Check if the function is in the exported symbol table + // Check if the function is in the exported symbol table, if the symbol cannot be found then this function name is invalid. auto symbolIt = symbols.find(pFunctionName); - if ((symbolIt != symbols.end()) && (symbolIt->second.symbol.segment == NEO::SegmentType::Instructions)) { - *pfnFunction = reinterpret_cast(symbolIt->second.gpuAddress); - } - // If the Function Pointer is not in the exported symbol table, then this function might be a kernel. - // Check if the function name matches a kernel and return the gpu address to that function - if (*pfnFunction == nullptr) { - auto kernelImmData = this->getKernelImmutableData(pFunctionName); - if (kernelImmData != nullptr) { - auto isaAllocation = kernelImmData->getIsaGraphicsAllocation(); - *pfnFunction = reinterpret_cast(isaAllocation->getGpuAddress()); - // Ensure that any kernel in this module which uses this kernel module function pointer has access to the memory. - for (auto &data : this->getKernelImmutableDataVector()) { - if (data.get() != kernelImmData) { - data.get()->getResidencyContainer().insert(data.get()->getResidencyContainer().end(), isaAllocation); - } - } - } - } - - if (*pfnFunction == nullptr) { + if ((symbolIt == symbols.end()) || (symbolIt->second.symbol.segment != NEO::SegmentType::Instructions)) { return ZE_RESULT_ERROR_INVALID_FUNCTION_NAME; } + *pfnFunction = reinterpret_cast(symbolIt->second.gpuAddress); return ZE_RESULT_SUCCESS; } diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp index 0e8e9dc606..b7fed1d69e 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp @@ -1789,7 +1789,7 @@ TEST_F(ModuleFunctionPointerTests, givenInvalidFunctionNameAndModuleWithExported EXPECT_EQ(ZE_RESULT_ERROR_INVALID_FUNCTION_NAME, res); } -TEST_F(ModuleFunctionPointerTests, givenModuleWithExportedSymbolThenGetFunctionPointerReturnsGpuAddressToKernelFunction) { +TEST_F(ModuleFunctionPointerTests, givenModuleWithExportedKernelThenGetFunctionPointerOfKernelFunctionReturnsInvalidFunctionName) { uint64_t gpuAddress = 0x12345; @@ -1819,9 +1819,7 @@ TEST_F(ModuleFunctionPointerTests, givenModuleWithExportedSymbolThenGetFunctionP void *functionPointer = nullptr; ze_result_t res = module0->getFunctionPointer("kernelFunction", &functionPointer); - EXPECT_EQ(ZE_RESULT_SUCCESS, res); - - EXPECT_EQ(reinterpret_cast(functionPointer), module0->kernelImmDatas[0]->getIsaGraphicsAllocation()->getGpuAddress()); + EXPECT_EQ(ZE_RESULT_ERROR_INVALID_FUNCTION_NAME, res); } class DeviceModuleSetArgBufferTest : public ModuleFixture, public ::testing::Test {