Revert "fix(ocl zebin): do not expose functions as kernel"

This reverts commit 359b9278b8.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>

opencl/source/program/process_device_binary.cpp

@@ -38,10 +38,6 @@ const KernelInfo *Program::getKernelInfo(
         return nullptr;
     }
 
-    if (kernelName == NEO::Elf::SectionsNamesZebin::externalFunctions) {
-        return nullptr;
-    }
-
     auto &kernelInfoArray = buildInfos[rootDeviceIndex].kernelInfoArray;
 
     auto it = std::find_if(kernelInfoArray.begin(), kernelInfoArray.end(),
@@ -51,19 +47,11 @@ const KernelInfo *Program::getKernelInfo(
 }
 
 size_t Program::getNumKernels() const {
-    auto numKernels = buildInfos[clDevices[0]->getRootDeviceIndex()].kernelInfoArray.size();
+    return buildInfos[clDevices[0]->getRootDeviceIndex()].kernelInfoArray.size();
-    auto usesExportedFunctions = (exportedFunctionsKernelId != std::numeric_limits<size_t>::max());
-    if (usesExportedFunctions) {
-        numKernels--;
-    }
-    return numKernels;
 }
 
 const KernelInfo *Program::getKernelInfo(size_t ordinal, uint32_t rootDeviceIndex) const {
     auto &kernelInfoArray = buildInfos[rootDeviceIndex].kernelInfoArray;
-    if (exportedFunctionsKernelId == ordinal) {
-        ordinal++;
-    }
     DEBUG_BREAK_IF(ordinal >= kernelInfoArray.size());
     return kernelInfoArray[ordinal];
 }
@@ -97,7 +85,6 @@ cl_int Program::linkBinary(Device *pDevice, const void *constantsInitData, size_
         strings.segmentSize = stringsInfo.size;
     }
     if (linkerInput->getExportedFunctionsSegmentId() >= 0) {
-        exportedFunctionsKernelId = static_cast<size_t>(linkerInput->getExportedFunctionsSegmentId());
         // Exported functions reside in instruction heap of one of kernels
         auto exportedFunctionHeapId = linkerInput->getExportedFunctionsSegmentId();
         buildInfos[rootDeviceIndex].exportedFunctionsSurface = kernelInfoArray[exportedFunctionHeapId]->getGraphicsAllocation();

opencl/source/program/program.h

@@ -370,8 +370,6 @@ class Program : public BaseObject<_cl_program> {
     std::mutex lockMutex;
     uint32_t exposedKernels = 0;
 
-    size_t exportedFunctionsKernelId = std::numeric_limits<size_t>::max();
-
     std::once_flag extractAndDecodeMetadataOnce;
 };
 

opencl/test/unit_test/fixtures/program_fixture.cpp

@@ -8,7 +8,6 @@
 #include "opencl/test/unit_test/fixtures/program_fixture.h"
 
 #include "opencl/source/program/create.inl"
-#include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 
 namespace NEO {
@@ -41,13 +40,6 @@ void ProgramFixture::createProgramWithSource(Context *pContext,
     ASSERT_EQ(CL_SUCCESS, retVal);
 }
 
-void ProgramFixture::cleanup() {
-    if (pProgram != nullptr) {
-        pProgram->release();
-    }
-    knownSource.reset();
-}
-
 void ProgramFixture::createProgramFromBinary(Context *pContext,
                                              const ClDeviceVector &deviceVector,
                                              const std::string &binaryFileName,
@@ -91,14 +83,4 @@ void ProgramFixture::createProgramFromBinary(Context *pContext,
     ASSERT_EQ(CL_SUCCESS, retVal);
 }
 
-NEOProgramFixture::NEOProgramFixture() = default;
-NEOProgramFixture::~NEOProgramFixture() = default;
-
-void NEOProgramFixture::setUp() {
-    context = std::make_unique<MockContext>();
-    program = std::make_unique<MockNeoProgram>(context.get(), false, context->getDevices());
-}
-
-void NEOProgramFixture::tearDown() {}
-
 } // namespace NEO

opencl/test/unit_test/fixtures/program_fixture.h

@@ -9,31 +9,12 @@
 #include "shared/source/helpers/file_io.h"
 #include "shared/test/common/helpers/test_files.h"
 
+#include "opencl/source/program/program.h"
+#include "opencl/test/unit_test/mocks/mock_program.h"
+
 #include "gtest/gtest.h"
 
-#include <memory>
-#include <string>
-
 namespace NEO {
-class Context;
-class ClDeviceVector;
-class MockContext;
-class MockProgram;
-class ClDevice;
-class MockNeoProgram;
-using cl_int = int;
-
-class NEOProgramFixture {
-  public:
-    NEOProgramFixture();
-    ~NEOProgramFixture();
-
-  protected:
-    void setUp();
-    void tearDown();
-    std::unique_ptr<MockContext> context;
-    std::unique_ptr<MockNeoProgram> program;
-};
 
 class ProgramFixture {
   public:
@@ -59,7 +40,12 @@ class ProgramFixture {
         cleanup();
     }
 
-    void cleanup();
+    void cleanup() {
+        if (pProgram != nullptr) {
+            pProgram->release();
+        }
+        knownSource.reset();
+    }
 
     MockProgram *pProgram = nullptr;
     std::unique_ptr<char[]> knownSource;

opencl/test/unit_test/mocks/mock_program.h

@@ -25,23 +25,6 @@ ClDeviceVector toClDeviceVector(ClDevice &clDevice);
 ////////////////////////////////////////////////////////////////////////////////
 // Program - Core implementation
 ////////////////////////////////////////////////////////////////////////////////
-class MockNeoProgram : public NEO::Program {
-  public:
-    using Base = NEO::Program;
-    using Base::buildInfos;
-    using Base::exportedFunctionsKernelId;
-
-    MockNeoProgram(NEO::Context *context, bool isBuiltIn, const NEO::ClDeviceVector &devices)
-        : NEO::Program(context, isBuiltIn, devices) {}
-
-    void resizeAndPopulateKernelInfoArray(size_t size) {
-        buildInfos[0].kernelInfoArray.resize(size);
-        for (auto &entry : buildInfos[0].kernelInfoArray) {
-            entry = new KernelInfo();
-        }
-    }
-};
-
 class MockProgram : public Program {
   public:
     using Program::allowNonUniform;

opencl/test/unit_test/program/program_tests.cpp

@@ -565,25 +565,6 @@ TEST_F(ProgramFromBinaryTest, givenReuseKernelBinariesWhenCleanCurrentKernelInfo
     EXPECT_EQ(0u, kernelAllocMap.size());
 }
 
-using ProgramGetNumKernelsTest = Test<NEOProgramFixture>;
-TEST_F(ProgramGetNumKernelsTest, givenProgramWithFunctionsWhenGettingNumKernelsFunctionsAreNotExposed) {
-    program->resizeAndPopulateKernelInfoArray(2);
-    program->exportedFunctionsKernelId = 0;
-    EXPECT_EQ(1U, program->getNumKernels());
-}
-
-using ProgramGetKernelInfoTest = Test<NEOProgramFixture>;
-TEST_F(ProgramGetKernelInfoTest, givenProgramWithFunctionsWhenGettingKernelInfoByIndexThenFunctionsAreNotExposed) {
-    program->resizeAndPopulateKernelInfoArray(2);
-    program->exportedFunctionsKernelId = 0;
-    auto kernelInfo = program->getKernelInfo(size_t(0), uint32_t(0));
-    EXPECT_EQ(program->buildInfos[0].kernelInfoArray[1], kernelInfo);
-}
-
-TEST_F(ProgramGetKernelInfoTest, givenProgramFunctionsWhenGettingKernelInfoByNameThenFunctionsAreNotExposed) {
-    EXPECT_EQ(nullptr, program->getKernelInfo(NEO::Elf::SectionsNamesZebin::externalFunctions.data(), uint32_t(0)));
-}
-
 HWTEST_F(ProgramFromBinaryTest, givenProgramWhenCleanCurrentKernelInfoIsCalledButGpuIsNotYetDoneThenKernelAllocationIsPutOnDeferredFreeListAndCsrRegistersCacheFlush) {
     auto &csr = pDevice->getGpgpuCommandStreamReceiver();
     EXPECT_TRUE(csr.getTemporaryAllocations().peekIsEmpty());