Skip to content

Commit 742fde3

Browse files
rwmcguirrwmcguir
committed
Update CONTRIBUTING.md file
Signed-off-by: Russell McGuire <russell.w.mcguire@intel.com>
1 parent 1f7d3a1 commit 742fde3

5 files changed

Lines changed: 75 additions & 8 deletions

File tree

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ To generate the code from the scripts, run the following commands:
3939
* `git checkout v1.12.15`
4040
* Generate the specification JSON file and Headers:
4141
* `cd level-zero-spec/scripts`
42-
* `python3 ./run.py --debug '--!html' '--!rst' '--!build' --ver 1.12`
42+
* `python3 ./run.py --debug '--!html' '--!rst' '--!build' --ver 1.16`
4343
* Copy the Headers From Spec to Loader repo
4444
* `cp level-zero-spec/include/* level-zero/include/`
45-
* Execute the json2src script in the level-zero repo with the input.json in the specification repo with the corresponding spec version, for example:
46-
* `./level-zero/scripts/json2src.py --ver 1.12 --api-json level-zero-spec/scripts/input.json .`
45+
* Execute the json2src script in the level-zero repo with the input.json in the specification repo with the corresponding spec version, for example (be sure you're inside the level-zero repository folder)
46+
* `./scripts/json2src.py --ver 1.16 --api-json ../level-zero-spec/scripts/input.json .`
4747

4848
These scripts update the code with what would be generated in the next specification update.
4949

@@ -56,7 +56,7 @@ When releasing a new version of the Level Zero Loader, the following steps must
5656
The loader version is defined in the root [CMakeLists.txt](CMakeLists.txt) file using semantic versioning (https://semver.org/):
5757

5858
```cmake
59-
project(level-zero VERSION 1.28.3)
59+
project(level-zero VERSION 1.29.0)
6060
```
6161

6262
Update the version number according to the type of changes:

‎source/drivers/null/ze_nullddi.cpp‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7154,6 +7154,17 @@ zeGetDeviceProcAddrTable(
71547154
pDdiTable->pfnGetAggregatedCopyOffloadIncrementValue = driver::zeDeviceGetAggregatedCopyOffloadIncrementValue;
71557155
}
71567156

7157+
if (version >= ZE_API_VERSION_1_16) {
7158+
pDdiTable->pfnGetRuntimeRequirements = driver::zeDeviceGetRuntimeRequirements;
7159+
}
7160+
7161+
if (version >= ZE_API_VERSION_1_16) {
7162+
pDdiTable->pfnGetRuntimeRequirementsKey = driver::zeDeviceGetRuntimeRequirementsKey;
7163+
}
7164+
7165+
if (version >= ZE_API_VERSION_1_16) {
7166+
pDdiTable->pfnValidateRuntimeRequirements = driver::zeDeviceValidateRuntimeRequirements;
7167+
}
71577168

71587169
if (version >= ZE_API_VERSION_1_2) {
71597170
pDdiTable->pfnReserveCacheExt = driver::zeDeviceReserveCacheExt;
@@ -7455,16 +7466,19 @@ zeGetCommandListProcAddrTable(
74557466
pDdiTable->pfnAppendLaunchKernelWithArguments = driver::zeCommandListAppendLaunchKernelWithArguments;
74567467
}
74577468

7458-
<<<<<<< HEAD
7459-
if (version >= ZE_API_VERSION_1_3) {
7460-
=======
7469+
if (version >= ZE_API_VERSION_1_16) {
74617470
pDdiTable->pfnAppendMemoryCopyWithParameters = driver::zeCommandListAppendMemoryCopyWithParameters;
7471+
}
74627472

7473+
if (version >= ZE_API_VERSION_1_16) {
74637474
pDdiTable->pfnAppendMemoryFillWithParameters = driver::zeCommandListAppendMemoryFillWithParameters;
7475+
}
74647476

7477+
if (version >= ZE_API_VERSION_1_16) {
74657478
pDdiTable->pfnImmediateAppendCommandListsWithParameters = driver::zeCommandListImmediateAppendCommandListsWithParameters;
7479+
}
74667480

7467-
>>>>>>> e75544f (Release v1.29.0)
7481+
if (version >= ZE_API_VERSION_1_3) {
74687482
pDdiTable->pfnAppendImageCopyToMemoryExt = driver::zeCommandListAppendImageCopyToMemoryExt;
74697483
}
74707484

‎source/drivers/null/zes_nullddi.cpp‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5690,11 +5690,17 @@ zesGetPowerProcAddrTable(
56905690
pDdiTable->pfnSetLimitsExt = driver::zesPowerSetLimitsExt;
56915691
}
56925692

5693+
if (version >= ZE_API_VERSION_1_16) {
56935694
pDdiTable->pfnGetUsage = driver::zesPowerGetUsage;
5695+
}
56945696

5697+
if (version >= ZE_API_VERSION_1_16) {
56955698
pDdiTable->pfnGetLimitsExt2 = driver::zesPowerGetLimitsExt2;
5699+
}
56965700

5701+
if (version >= ZE_API_VERSION_1_16) {
56975702
pDdiTable->pfnSetLimitsExt2 = driver::zesPowerSetLimitsExt2;
5703+
}
56985704

56995705
return result;
57005706
}
@@ -5803,13 +5809,21 @@ zesGetRasExpProcAddrTable(
58035809
pDdiTable->pfnClearStateExp = driver::zesRasClearStateExp;
58045810
}
58055811

5812+
if (version >= ZE_API_VERSION_1_16) {
58065813
pDdiTable->pfnGetSupportedCategoriesExp = driver::zesRasGetSupportedCategoriesExp;
5814+
}
58075815

5816+
if (version >= ZE_API_VERSION_1_16) {
58085817
pDdiTable->pfnGetStateExp2 = driver::zesRasGetStateExp2;
5818+
}
58095819

5820+
if (version >= ZE_API_VERSION_1_16) {
58105821
pDdiTable->pfnGetConfigExp = driver::zesRasGetConfigExp;
5822+
}
58115823

5824+
if (version >= ZE_API_VERSION_1_16) {
58125825
pDdiTable->pfnSetConfigExp = driver::zesRasSetConfigExp;
5826+
}
58135827

58145828
return result;
58155829
}

‎source/loader/ze_ldrddi.cpp‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10123,6 +10123,15 @@ zeGetDeviceProcAddrTable(
1012310123
if (version >= ZE_API_VERSION_1_15) {
1012410124
pDdiTable->pfnGetAggregatedCopyOffloadIncrementValue = firstDriver->dditable.ze.Device.pfnGetAggregatedCopyOffloadIncrementValue;
1012510125
}
10126+
if (version >= ZE_API_VERSION_1_16) {
10127+
pDdiTable->pfnGetRuntimeRequirements = firstDriver->dditable.ze.Device.pfnGetRuntimeRequirements;
10128+
}
10129+
if (version >= ZE_API_VERSION_1_16) {
10130+
pDdiTable->pfnGetRuntimeRequirementsKey = firstDriver->dditable.ze.Device.pfnGetRuntimeRequirementsKey;
10131+
}
10132+
if (version >= ZE_API_VERSION_1_16) {
10133+
pDdiTable->pfnValidateRuntimeRequirements = firstDriver->dditable.ze.Device.pfnValidateRuntimeRequirements;
10134+
}
1012610135
if (version >= ZE_API_VERSION_1_2) {
1012710136
pDdiTable->pfnReserveCacheExt = firstDriver->dditable.ze.Device.pfnReserveCacheExt;
1012810137
}
@@ -10984,6 +10993,15 @@ zeGetCommandListProcAddrTable(
1098410993
if (version >= ZE_API_VERSION_1_14) {
1098510994
pDdiTable->pfnAppendLaunchKernelWithArguments = firstDriver->dditable.ze.CommandList.pfnAppendLaunchKernelWithArguments;
1098610995
}
10996+
if (version >= ZE_API_VERSION_1_16) {
10997+
pDdiTable->pfnAppendMemoryCopyWithParameters = firstDriver->dditable.ze.CommandList.pfnAppendMemoryCopyWithParameters;
10998+
}
10999+
if (version >= ZE_API_VERSION_1_16) {
11000+
pDdiTable->pfnAppendMemoryFillWithParameters = firstDriver->dditable.ze.CommandList.pfnAppendMemoryFillWithParameters;
11001+
}
11002+
if (version >= ZE_API_VERSION_1_16) {
11003+
pDdiTable->pfnImmediateAppendCommandListsWithParameters = firstDriver->dditable.ze.CommandList.pfnImmediateAppendCommandListsWithParameters;
11004+
}
1098711005
if (version >= ZE_API_VERSION_1_3) {
1098811006
pDdiTable->pfnAppendImageCopyToMemoryExt = firstDriver->dditable.ze.CommandList.pfnAppendImageCopyToMemoryExt;
1098911007
}

‎source/loader/zes_ldrddi.cpp‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8108,6 +8108,15 @@ zesGetPowerProcAddrTable(
81088108
if (version >= ZE_API_VERSION_1_0) {
81098109
pDdiTable->pfnSetLimitsExt = firstDriver->dditable.zes.Power.pfnSetLimitsExt;
81108110
}
8111+
if (version >= ZE_API_VERSION_1_16) {
8112+
pDdiTable->pfnGetUsage = firstDriver->dditable.zes.Power.pfnGetUsage;
8113+
}
8114+
if (version >= ZE_API_VERSION_1_16) {
8115+
pDdiTable->pfnGetLimitsExt2 = firstDriver->dditable.zes.Power.pfnGetLimitsExt2;
8116+
}
8117+
if (version >= ZE_API_VERSION_1_16) {
8118+
pDdiTable->pfnSetLimitsExt2 = firstDriver->dditable.zes.Power.pfnSetLimitsExt2;
8119+
}
81118120
}
81128121
}
81138122

@@ -8402,6 +8411,18 @@ zesGetRasExpProcAddrTable(
84028411
if (version >= ZE_API_VERSION_1_0) {
84038412
pDdiTable->pfnClearStateExp = firstDriver->dditable.zes.RasExp.pfnClearStateExp;
84048413
}
8414+
if (version >= ZE_API_VERSION_1_16) {
8415+
pDdiTable->pfnGetSupportedCategoriesExp = firstDriver->dditable.zes.RasExp.pfnGetSupportedCategoriesExp;
8416+
}
8417+
if (version >= ZE_API_VERSION_1_16) {
8418+
pDdiTable->pfnGetStateExp2 = firstDriver->dditable.zes.RasExp.pfnGetStateExp2;
8419+
}
8420+
if (version >= ZE_API_VERSION_1_16) {
8421+
pDdiTable->pfnGetConfigExp = firstDriver->dditable.zes.RasExp.pfnGetConfigExp;
8422+
}
8423+
if (version >= ZE_API_VERSION_1_16) {
8424+
pDdiTable->pfnSetConfigExp = firstDriver->dditable.zes.RasExp.pfnSetConfigExp;
8425+
}
84058426
}
84068427
}
84078428

0 commit comments

Comments
 (0)