intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: improve L0 driver versioning to allow HotFix number

Browse Source 
new format is: BBBBB.HHH, where:
* BBBBB is build number
* HHH is hotfix number

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk
2024-04-24 12:43:17 +00:00
committed by Compute-Runtime-Automation
parent a70aaa72ed
commit 56847274fa
11 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
level_zero/core/source/driver/driver_handle_imp.cpp
View File

@@ -113,9 +113,10 @@ ze_result_t DriverHandleImp::getApiVersion(ze_api_version_t *version) {
}
ze_result_t DriverHandleImp::getProperties(ze_driver_properties_t *properties) {
uint32_t versionBuild = static_cast<uint32_t>(NEO_VERSION_BUILD);
uint32_t versionBuild = static_cast<uint32_t>(NEO_VERSION_BUILD) << 12;
uint32_t versionHotfix = static_cast<uint32_t>(NEO_VERSION_HOTFIX);
properties->driverVersion = DriverHandleImp::initialDriverVersionValue + versionBuild;
properties->driverVersion = versionBuild + versionHotfix;
if (NEO::debugManager.flags.OverrideDriverVersion.get() > -1) {
properties->driverVersion = static_cast<uint32_t>(NEO::debugManager.flags.OverrideDriverVersion.get());
}

2
level_zero/core/source/driver/driver_handle_imp.h
View File

@@ -51,8 +51,6 @@ struct DriverHandleImp : public DriverHandle {
~DriverHandleImp() override;
DriverHandleImp();
static constexpr uint32_t initialDriverVersionValue = 0x01030000;
ze_result_t createContext(const ze_context_desc_t *desc,
uint32_t numDevices,
ze_device_handle_t *phDevices,

12
level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
View File

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