intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 06:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: correct loading L0 loader functions"

Browse Source 
This reverts commit 9c7b3c5e19.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2024-10-17 02:39:48 +02:00
committed by Compute-Runtime-Automation
parent e11ceb4a20
commit f117b5fb68
37 changed files with 84 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
level_zero/sysman/source/shared/firmware_util/sysman_firmware_util_imp.cpp
View File

@@ -208,9 +208,8 @@ FirmwareUtilImp::~FirmwareUtilImp() {
FirmwareUtil *FirmwareUtil::create(uint16_t domain, uint8_t bus, uint8_t device, uint8_t function) {
FirmwareUtilImp *pFwUtilImp = new FirmwareUtilImp(domain, bus, device, function);
UNRECOVERABLE_IF(nullptr == pFwUtilImp);
NEO::OsLibraryCreateProperties properties(FirmwareUtilImp::fwUtilLibraryName);
properties.customLoadFlags = &FirmwareUtilImp::fwUtilLoadFlags;
pFwUtilImp->libraryHandle = NEO::OsLibrary::loadFunc(properties);
NEO::OsLibrary::loadFlagsOverwrite = &FirmwareUtilImp::fwUtilLoadFlags;
pFwUtilImp->libraryHandle = NEO::OsLibrary::loadFunc(FirmwareUtilImp::fwUtilLibraryName);
if (pFwUtilImp->libraryHandle == nullptr || pFwUtilImp->loadEntryPoints() == false || pFwUtilImp->fwDeviceInit() != ZE_RESULT_SUCCESS) {
if (nullptr != pFwUtilImp->libraryHandle) {
delete pFwUtilImp->libraryHandle;

2
level_zero/sysman/test/unit_tests/sources/firmware_util/linux/test_fw_util_linux.cpp
View File

@@ -34,6 +34,8 @@ TEST(FwUtilTest, GivenLibraryWasSetWhenCreatingFirmwareUtilInterfaceThenLibraryI
VariableBackup<bool> dlOpenCalledBackup{&dlOpenCalled, false};
VariableBackup<int> dlOpenFlagsBackup{&dlOpenFlags, 0};
auto flags = RTLD_LAZY;
NEO::OsLibrary::loadFlagsOverwrite = &flags;
L0::Sysman::FirmwareUtil *pFwUtil = L0::Sysman::FirmwareUtil::create(0, 0, 0, 0);
EXPECT_EQ(dlOpenCalled, true);
EXPECT_EQ(dlOpenFlags, RTLD_LAZY);

4
level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
View File

@@ -43,6 +43,8 @@ struct MockFwUtilInterface : public L0::Sysman::FirmwareUtil {
struct MockFwUtilOsLibrary : public OsLibrary {
public:
static bool mockLoad;
MockFwUtilOsLibrary(const std::string &name, std::string *errorValue) {
}
MockFwUtilOsLibrary() {}
~MockFwUtilOsLibrary() override = default;
void *getProcAddress(const std::string &procName) override {
@@ -59,7 +61,7 @@ struct MockFwUtilOsLibrary : public OsLibrary {
std::string getFullPath() override {
return std::string();
}
static OsLibrary *load(const OsLibraryCreateProperties &properties) {
static OsLibrary *load(const std::string &name) {
if (mockLoad == true) {
auto ptr = new (std::nothrow) MockFwUtilOsLibrary();
return ptr;