Skip to content

Commit 0e8487f

Browse files
nrspruitnrspruit
authored
Fix Null Driver version check for n-1 testing and support (#408)
Signed-off-by: Neil R. Spruit <[email protected]>
1 parent 02b7655 commit 0e8487f

File tree

5 files changed

+75
-75
lines changed

5 files changed

+75
-75
lines changed

‎scripts/templates/nullddi.cpp.mako‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ ${tbl['export']['name']}(
156156
if( nullptr == pDdiTable )
157157
return ${X}_RESULT_ERROR_INVALID_NULL_POINTER;
158158

159-
if( driver::context.version < version )
159+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
160160
return ${X}_RESULT_ERROR_UNSUPPORTED_VERSION;
161161

162162
${x}_result_t result = ${X}_RESULT_SUCCESS;

‎source/drivers/null/ze_nullddi.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6344,7 +6344,7 @@ zeGetGlobalProcAddrTable(
63446344
if( nullptr == pDdiTable )
63456345
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
63466346

6347-
if( driver::context.version < version )
6347+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
63486348
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
63496349

63506350
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6381,7 +6381,7 @@ zeGetRTASBuilderProcAddrTable(
63816381
if( nullptr == pDdiTable )
63826382
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
63836383

6384-
if( driver::context.version < version )
6384+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
63856385
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
63866386

63876387
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6416,7 +6416,7 @@ zeGetRTASBuilderExpProcAddrTable(
64166416
if( nullptr == pDdiTable )
64176417
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
64186418

6419-
if( driver::context.version < version )
6419+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
64206420
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
64216421

64226422
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6449,7 +6449,7 @@ zeGetRTASParallelOperationProcAddrTable(
64496449
if( nullptr == pDdiTable )
64506450
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
64516451

6452-
if( driver::context.version < version )
6452+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
64536453
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
64546454

64556455
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6482,7 +6482,7 @@ zeGetRTASParallelOperationExpProcAddrTable(
64826482
if( nullptr == pDdiTable )
64836483
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
64846484

6485-
if( driver::context.version < version )
6485+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
64866486
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
64876487

64886488
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6515,7 +6515,7 @@ zeGetDriverProcAddrTable(
65156515
if( nullptr == pDdiTable )
65166516
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
65176517

6518-
if( driver::context.version < version )
6518+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
65196519
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
65206520

65216521
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6558,7 +6558,7 @@ zeGetDriverExpProcAddrTable(
65586558
if( nullptr == pDdiTable )
65596559
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
65606560

6561-
if( driver::context.version < version )
6561+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
65626562
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
65636563

65646564
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6585,7 +6585,7 @@ zeGetDeviceProcAddrTable(
65856585
if( nullptr == pDdiTable )
65866586
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
65876587

6588-
if( driver::context.version < version )
6588+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
65896589
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
65906590

65916591
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6656,7 +6656,7 @@ zeGetDeviceExpProcAddrTable(
66566656
if( nullptr == pDdiTable )
66576657
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
66586658

6659-
if( driver::context.version < version )
6659+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
66606660
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
66616661

66626662
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6683,7 +6683,7 @@ zeGetContextProcAddrTable(
66836683
if( nullptr == pDdiTable )
66846684
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
66856685

6686-
if( driver::context.version < version )
6686+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
66876687
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
66886688

66896689
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6726,7 +6726,7 @@ zeGetCommandQueueProcAddrTable(
67266726
if( nullptr == pDdiTable )
67276727
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
67286728

6729-
if( driver::context.version < version )
6729+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
67306730
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
67316731

67326732
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6763,7 +6763,7 @@ zeGetCommandListProcAddrTable(
67636763
if( nullptr == pDdiTable )
67646764
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
67656765

6766-
if( driver::context.version < version )
6766+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
67676767
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
67686768

67696769
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6864,7 +6864,7 @@ zeGetCommandListExpProcAddrTable(
68646864
if( nullptr == pDdiTable )
68656865
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
68666866

6867-
if( driver::context.version < version )
6867+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
68686868
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
68696869

68706870
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6905,7 +6905,7 @@ zeGetEventProcAddrTable(
69056905
if( nullptr == pDdiTable )
69066906
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
69076907

6908-
if( driver::context.version < version )
6908+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
69096909
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
69106910

69116911
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6952,7 +6952,7 @@ zeGetEventExpProcAddrTable(
69526952
if( nullptr == pDdiTable )
69536953
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
69546954

6955-
if( driver::context.version < version )
6955+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
69566956
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
69576957

69586958
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6979,7 +6979,7 @@ zeGetEventPoolProcAddrTable(
69796979
if( nullptr == pDdiTable )
69806980
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
69816981

6982-
if( driver::context.version < version )
6982+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
69836983
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
69846984

69856985
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7020,7 +7020,7 @@ zeGetFenceProcAddrTable(
70207020
if( nullptr == pDdiTable )
70217021
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
70227022

7023-
if( driver::context.version < version )
7023+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
70247024
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
70257025

70267026
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7055,7 +7055,7 @@ zeGetImageProcAddrTable(
70557055
if( nullptr == pDdiTable )
70567056
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
70577057

7058-
if( driver::context.version < version )
7058+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
70597059
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
70607060

70617061
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7090,7 +7090,7 @@ zeGetImageExpProcAddrTable(
70907090
if( nullptr == pDdiTable )
70917091
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
70927092

7093-
if( driver::context.version < version )
7093+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
70947094
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
70957095

70967096
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7121,7 +7121,7 @@ zeGetKernelProcAddrTable(
71217121
if( nullptr == pDdiTable )
71227122
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
71237123

7124-
if( driver::context.version < version )
7124+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
71257125
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
71267126

71277127
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7170,7 +7170,7 @@ zeGetKernelExpProcAddrTable(
71707170
if( nullptr == pDdiTable )
71717171
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
71727172

7173-
if( driver::context.version < version )
7173+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
71747174
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
71757175

71767176
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7203,7 +7203,7 @@ zeGetMemProcAddrTable(
72037203
if( nullptr == pDdiTable )
72047204
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
72057205

7206-
if( driver::context.version < version )
7206+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
72077207
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
72087208

72097209
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7252,7 +7252,7 @@ zeGetMemExpProcAddrTable(
72527252
if( nullptr == pDdiTable )
72537253
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
72547254

7255-
if( driver::context.version < version )
7255+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
72567256
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
72577257

72587258
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7285,7 +7285,7 @@ zeGetModuleProcAddrTable(
72857285
if( nullptr == pDdiTable )
72867286
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
72877287

7288-
if( driver::context.version < version )
7288+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
72897289
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
72907290

72917291
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7328,7 +7328,7 @@ zeGetModuleBuildLogProcAddrTable(
73287328
if( nullptr == pDdiTable )
73297329
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
73307330

7331-
if( driver::context.version < version )
7331+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
73327332
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
73337333

73347334
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7357,7 +7357,7 @@ zeGetPhysicalMemProcAddrTable(
73577357
if( nullptr == pDdiTable )
73587358
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
73597359

7360-
if( driver::context.version < version )
7360+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
73617361
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
73627362

73637363
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7386,7 +7386,7 @@ zeGetSamplerProcAddrTable(
73867386
if( nullptr == pDdiTable )
73877387
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
73887388

7389-
if( driver::context.version < version )
7389+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
73907390
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
73917391

73927392
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7415,7 +7415,7 @@ zeGetVirtualMemProcAddrTable(
74157415
if( nullptr == pDdiTable )
74167416
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
74177417

7418-
if( driver::context.version < version )
7418+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
74197419
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
74207420

74217421
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7454,7 +7454,7 @@ zeGetFabricEdgeExpProcAddrTable(
74547454
if( nullptr == pDdiTable )
74557455
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
74567456

7457-
if( driver::context.version < version )
7457+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
74587458
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
74597459

74607460
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7485,7 +7485,7 @@ zeGetFabricVertexExpProcAddrTable(
74857485
if( nullptr == pDdiTable )
74867486
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
74877487

7488-
if( driver::context.version < version )
7488+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
74897489
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
74907490

74917491
ze_result_t result = ZE_RESULT_SUCCESS;

‎source/drivers/null/zer_nullddi.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ zerGetGlobalProcAddrTable(
149149
if( nullptr == pDdiTable )
150150
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
151151

152-
if( driver::context.version < version )
152+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
153153
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
154154

155155
ze_result_t result = ZE_RESULT_SUCCESS;

0 commit comments

Comments
 (0)