From 299dcb8bd26397c5f02d670026a23f5106a5d59d Mon Sep 17 00:00:00 2001
From: Neil R Spruit <neil.r.spruit@intel.com>
Date: Tue, 26 Jul 2022 03:31:38 +0000
Subject: [PATCH] Remove Support for reading a function pointer of a kernel

Signed-off-by: Neil R Spruit <neil.r.spruit@intel.com>
---
 level_zero/core/source/module/module_imp.cpp  | 24 ++-----------
 .../unit_tests/sources/module/test_module.cpp | 35 -------------------
 2 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/level_zero/core/source/module/module_imp.cpp b/level_zero/core/source/module/module_imp.cpp
index 8d7b0b5b69..67513559bb 100644
--- a/level_zero/core/source/module/module_imp.cpp
+++ b/level_zero/core/source/module/module_imp.cpp
@@ -899,30 +899,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<void *>(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<void *>(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<void *>(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 e784803598..50b966d510 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
@@ -1801,41 +1801,6 @@ TEST_F(ModuleFunctionPointerTests, givenInvalidFunctionNameAndModuleWithExported
     EXPECT_EQ(ZE_RESULT_ERROR_INVALID_FUNCTION_NAME, res);
 }
 
-TEST_F(ModuleFunctionPointerTests, givenModuleWithExportedSymbolThenGetFunctionPointerReturnsGpuAddressToKernelFunction) {
-
-    uint64_t gpuAddress = 0x12345;
-
-    NEO::SymbolInfo symbolInfo{};
-    symbolInfo.segment = NEO::SegmentType::Instructions;
-    NEO::Linker::RelocatedSymbol relocatedSymbol{symbolInfo, gpuAddress};
-
-    char kernelHeap[MemoryConstants::pageSize] = {};
-
-    auto kernelInfo = std::make_unique<NEO::KernelInfo>();
-    kernelInfo->heapInfo.pKernelHeap = kernelHeap;
-    kernelInfo->heapInfo.KernelHeapSize = MemoryConstants::pageSize;
-    kernelInfo->kernelDescriptor.kernelMetadata.kernelName = "kernelFunction";
-    module0->getTranslationUnit()->programInfo.kernelInfos.push_back(kernelInfo.release());
-    NEO::KernelDescriptor kernelDescriptor;
-    kernelDescriptor.kernelMetadata.kernelName = "kernelFunction";
-
-    auto kernelImmData = std::make_unique<WhiteBox<::L0::KernelImmutableData>>(device);
-    kernelImmData->isaGraphicsAllocation.reset(neoDevice->getMemoryManager()->allocateGraphicsMemoryWithProperties(
-        {device->getRootDeviceIndex(), MemoryConstants::pageSize, NEO::AllocationType::KERNEL_ISA, neoDevice->getDeviceBitfield()}));
-
-    kernelImmData->kernelDescriptor = &kernelDescriptor;
-
-    module0->kernelImmDatas.push_back(std::move(kernelImmData));
-
-    module0->symbols["externalFunction"] = relocatedSymbol;
-
-    void *functionPointer = nullptr;
-    ze_result_t res = module0->getFunctionPointer("kernelFunction", &functionPointer);
-    EXPECT_EQ(ZE_RESULT_SUCCESS, res);
-
-    EXPECT_EQ(reinterpret_cast<uint64_t>(functionPointer), module0->kernelImmDatas[0]->getIsaGraphicsAllocation()->getGpuAddress());
-}
-
 class DeviceModuleSetArgBufferTest : public ModuleFixture, public ::testing::Test {
   public:
     void SetUp() override {