Revert "build: improve L0 driver versioning to allow HotFix number"

This reverts commit 56847274fa.

Reverting due to bug in unified runtime:
https://github.com/oneapi-src/unified-runtime/issues/1777

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk
2024-06-21 10:31:08 +00:00
committed by Compute-Runtime-Automation
parent 8698e7fb43
commit a9795349b4
11 changed files with 13 additions and 27 deletions

View File

@@ -208,8 +208,8 @@ TEST_F(DriverVersionTest, WhenGettingDriverVersionThenExpectedDriverVersionIsRet
ze_result_t res = driverHandle->getProperties(&properties);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
auto expectedDriverVersion = static_cast<uint32_t>(NEO_VERSION_BUILD << 12);
expectedDriverVersion += static_cast<uint32_t>(NEO_VERSION_HOTFIX);
auto expectedDriverVersion = static_cast<uint32_t>(DriverHandleImp::initialDriverVersionValue);
expectedDriverVersion += static_cast<uint32_t>(NEO_VERSION_BUILD);
EXPECT_EQ(expectedDriverVersion, properties.driverVersion);
}
@@ -232,12 +232,12 @@ TEST_F(DriverVersionTest, GivenDebugOverrideWhenGettingDriverVersionThenExpected
expectedDriverVersion = 10;
EXPECT_EQ(expectedDriverVersion, properties.driverVersion);
NEO::debugManager.flags.OverrideDriverVersion.set((29383 << 12) + 71);
NEO::debugManager.flags.OverrideDriverVersion.set(DriverHandleImp::initialDriverVersionValue + 20);
res = driverHandle->getProperties(&properties);
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
expectedDriverVersion = (0x72c7000 + 0x47);
expectedDriverVersion = DriverHandleImp::initialDriverVersionValue + 20;
EXPECT_EQ(expectedDriverVersion, properties.driverVersion);
}
@@ -254,8 +254,8 @@ TEST_F(DriverVersionTest, givenCallToGetDriverPropertiesThenUuidIsSet) {
EXPECT_NE(0u, uniqueId);
auto driverVersion = static_cast<uint32_t>(uuid & 0xFFFFFFFF);
auto expectedDriverVersion = static_cast<uint32_t>(NEO_VERSION_BUILD << 12);
expectedDriverVersion += static_cast<uint32_t>(NEO_VERSION_HOTFIX);
auto expectedDriverVersion = static_cast<uint32_t>(DriverHandleImp::initialDriverVersionValue);
expectedDriverVersion += static_cast<uint32_t>(NEO_VERSION_BUILD);
EXPECT_EQ(expectedDriverVersion, driverVersion);
}