Skip to content

Commit ec23571

Browse files
IgWod-IMGsivan-shani
IgWod-IMG
authored and
sivan-shani
committed
[mlir][spirv] Drop support for the SPV_NV_mesh_shader extension (llvm#127200)
The support is dropped in favour of newer `SPV_EXT_mesh_shader` extension. The EXT patch already replaced conflicting enum values, and the NV extensions is now fully removed to reduce a maintenance burden.
1 parent 214d069 commit ec23571

File tree

1 file changed

+26
-106
lines changed

1 file changed

+26
-106
lines changed

‎mlir/include/mlir/Dialect/SPIRV/IR/SPIRVBase.td‎

Lines changed: 26 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,6 @@ def SPV_NV_compute_shader_derivatives : I32EnumAttrCase<"SPV_NV_compute_shade
408408
def SPV_NV_cooperative_matrix : I32EnumAttrCase<"SPV_NV_cooperative_matrix", 5001>;
409409
def SPV_NV_fragment_shader_barycentric : I32EnumAttrCase<"SPV_NV_fragment_shader_barycentric", 5002>;
410410
def SPV_NV_geometry_shader_passthrough : I32EnumAttrCase<"SPV_NV_geometry_shader_passthrough", 5003>;
411-
def SPV_NV_mesh_shader : I32EnumAttrCase<"SPV_NV_mesh_shader", 5004>;
412411
def SPV_NV_ray_tracing : I32EnumAttrCase<"SPV_NV_ray_tracing", 5005>;
413412
def SPV_NV_sample_mask_override_coverage : I32EnumAttrCase<"SPV_NV_sample_mask_override_coverage", 5006>;
414413
def SPV_NV_shader_image_footprint : I32EnumAttrCase<"SPV_NV_shader_image_footprint", 5007>;
@@ -466,7 +465,7 @@ def SPIRV_ExtensionAttr :
466465
SPV_INTEL_bfloat16_conversion, SPV_INTEL_cache_controls,
467466
SPV_NV_compute_shader_derivatives, SPV_NV_cooperative_matrix,
468467
SPV_NV_fragment_shader_barycentric, SPV_NV_geometry_shader_passthrough,
469-
SPV_NV_mesh_shader, SPV_NV_ray_tracing, SPV_NV_sample_mask_override_coverage,
468+
SPV_NV_ray_tracing, SPV_NV_sample_mask_override_coverage,
470469
SPV_NV_shader_image_footprint, SPV_NV_shader_sm_builtins,
471470
SPV_NV_shader_subgroup_partitioned, SPV_NV_shading_rate,
472471
SPV_NV_stereo_view_rendering, SPV_NV_viewport_array2, SPV_NV_bindless_texture,
@@ -1203,12 +1202,6 @@ def SPIRV_C_FragmentFullyCoveredEXT : I32EnumAttrCase<"Fragm
12031202
Extension<[SPV_EXT_fragment_fully_covered]>
12041203
];
12051204
}
1206-
def SPIRV_C_MeshShadingNV : I32EnumAttrCase<"MeshShadingNV", 5266> {
1207-
list<I32EnumAttrCase> implies = [SPIRV_C_Shader];
1208-
list<Availability> availability = [
1209-
Extension<[SPV_NV_mesh_shader]>
1210-
];
1211-
}
12121205
def SPIRV_C_MeshShadingEXT : I32EnumAttrCase<"MeshShadingEXT", 5283> {
12131206
list<I32EnumAttrCase> implies = [SPIRV_C_Shader];
12141207
list<Availability> availability = [
@@ -1501,7 +1494,7 @@ def SPIRV_CapabilityAttr :
15011494
SPIRV_C_RayQueryKHR, SPIRV_C_RayTracingKHR, SPIRV_C_Float16ImageAMD,
15021495
SPIRV_C_ImageGatherBiasLodAMD, SPIRV_C_FragmentMaskAMD, SPIRV_C_StencilExportEXT,
15031496
SPIRV_C_ImageReadWriteLodAMD, SPIRV_C_Int64ImageEXT, SPIRV_C_ShaderClockKHR,
1504-
SPIRV_C_FragmentFullyCoveredEXT, SPIRV_C_MeshShadingNV, SPIRV_C_FragmentDensityEXT,
1497+
SPIRV_C_FragmentFullyCoveredEXT, SPIRV_C_FragmentDensityEXT,
15051498
SPIRV_C_ShaderNonUniform, SPIRV_C_RuntimeDescriptorArray,
15061499
SPIRV_C_StorageTexelBufferArrayDynamicIndexing, SPIRV_C_RayTracingNV,
15071500
SPIRV_C_RayTracingMotionBlurNV, SPIRV_C_PhysicalStorageBufferAddresses,
@@ -1584,7 +1577,7 @@ def SPIRV_BI_InstanceId : I32EnumAttrCase<"InstanceId", 6> {
15841577
}
15851578
def SPIRV_BI_PrimitiveId : I32EnumAttrCase<"PrimitiveId", 7> {
15861579
list<Availability> availability = [
1587-
Capability<[SPIRV_C_Geometry, SPIRV_C_MeshShadingNV, SPIRV_C_RayTracingKHR, SPIRV_C_RayTracingNV, SPIRV_C_MeshShadingEXT, SPIRV_C_Tessellation]>
1580+
Capability<[SPIRV_C_Geometry, SPIRV_C_RayTracingKHR, SPIRV_C_RayTracingNV, SPIRV_C_MeshShadingEXT, SPIRV_C_Tessellation]>
15881581
];
15891582
}
15901583
def SPIRV_BI_InvocationId : I32EnumAttrCase<"InvocationId", 8> {
@@ -1594,12 +1587,12 @@ def SPIRV_BI_InvocationId : I32EnumAttrCase<"InvocationId", 8> {
15941587
}
15951588
def SPIRV_BI_Layer : I32EnumAttrCase<"Layer", 9> {
15961589
list<Availability> availability = [
1597-
Capability<[SPIRV_C_Geometry, SPIRV_C_MeshShadingNV, SPIRV_C_MeshShadingEXT, SPIRV_C_ShaderLayer, SPIRV_C_ShaderViewportIndexLayerEXT]>
1590+
Capability<[SPIRV_C_Geometry, SPIRV_C_MeshShadingEXT, SPIRV_C_ShaderLayer, SPIRV_C_ShaderViewportIndexLayerEXT]>
15981591
];
15991592
}
16001593
def SPIRV_BI_ViewportIndex : I32EnumAttrCase<"ViewportIndex", 10> {
16011594
list<Availability> availability = [
1602-
Capability<[SPIRV_C_MeshShadingNV, SPIRV_C_MeshShadingEXT, SPIRV_C_MultiViewport, SPIRV_C_ShaderViewportIndex, SPIRV_C_ShaderViewportIndexLayerEXT]>
1595+
Capability<[SPIRV_C_MeshShadingEXT, SPIRV_C_MultiViewport, SPIRV_C_ShaderViewportIndex, SPIRV_C_ShaderViewportIndexLayerEXT]>
16031596
];
16041597
}
16051598
def SPIRV_BI_TessLevelOuter : I32EnumAttrCase<"TessLevelOuter", 11> {
@@ -1777,8 +1770,8 @@ def SPIRV_BI_BaseInstance : I32EnumAttrCase<"BaseInstance", 4425>
17771770
}
17781771
def SPIRV_BI_DrawIndex : I32EnumAttrCase<"DrawIndex", 4426> {
17791772
list<Availability> availability = [
1780-
Extension<[SPV_KHR_shader_draw_parameters, SPV_NV_mesh_shader, SPV_EXT_mesh_shader]>,
1781-
Capability<[SPIRV_C_DrawParameters, SPIRV_C_MeshShadingNV, SPIRV_C_MeshShadingEXT]>
1773+
Extension<[SPV_KHR_shader_draw_parameters, SPV_EXT_mesh_shader]>,
1774+
Capability<[SPIRV_C_DrawParameters, SPIRV_C_MeshShadingEXT]>
17821775
];
17831776
}
17841777
def SPIRV_BI_PrimitiveShadingRateKHR : I32EnumAttrCase<"PrimitiveShadingRateKHR", 4432> {
@@ -1848,8 +1841,8 @@ def SPIRV_BI_FragStencilRefEXT : I32EnumAttrCase<"FragStencilRefEXT",
18481841
}
18491842
def SPIRV_BI_ViewportMaskNV : I32EnumAttrCase<"ViewportMaskNV", 5253> {
18501843
list<Availability> availability = [
1851-
Extension<[SPV_NV_mesh_shader, SPV_NV_viewport_array2]>,
1852-
Capability<[SPIRV_C_MeshShadingNV, SPIRV_C_ShaderViewportMaskNV]>
1844+
Extension<[SPV_NV_viewport_array2]>,
1845+
Capability<[SPIRV_C_ShaderViewportMaskNV]>
18531846
];
18541847
}
18551848
def SPIRV_BI_SecondaryPositionNV : I32EnumAttrCase<"SecondaryPositionNV", 5257> {
@@ -1866,14 +1859,14 @@ def SPIRV_BI_SecondaryViewportMaskNV : I32EnumAttrCase<"SecondaryViewportMas
18661859
}
18671860
def SPIRV_BI_PositionPerViewNV : I32EnumAttrCase<"PositionPerViewNV", 5261> {
18681861
list<Availability> availability = [
1869-
Extension<[SPV_NVX_multiview_per_view_attributes, SPV_NV_mesh_shader]>,
1870-
Capability<[SPIRV_C_MeshShadingNV, SPIRV_C_PerViewAttributesNV]>
1862+
Extension<[SPV_NVX_multiview_per_view_attributes]>,
1863+
Capability<[SPIRV_C_PerViewAttributesNV]>
18711864
];
18721865
}
18731866
def SPIRV_BI_ViewportMaskPerViewNV : I32EnumAttrCase<"ViewportMaskPerViewNV", 5262> {
18741867
list<Availability> availability = [
1875-
Extension<[SPV_NVX_multiview_per_view_attributes, SPV_NV_mesh_shader]>,
1876-
Capability<[SPIRV_C_MeshShadingNV, SPIRV_C_PerViewAttributesNV]>
1868+
Extension<[SPV_NVX_multiview_per_view_attributes]>,
1869+
Capability<[SPIRV_C_PerViewAttributesNV]>
18771870
];
18781871
}
18791872
def SPIRV_BI_FullyCoveredEXT : I32EnumAttrCase<"FullyCoveredEXT", 5264> {
@@ -1882,54 +1875,6 @@ def SPIRV_BI_FullyCoveredEXT : I32EnumAttrCase<"FullyCoveredEXT", 52
18821875
Capability<[SPIRV_C_FragmentFullyCoveredEXT]>
18831876
];
18841877
}
1885-
def SPIRV_BI_TaskCountNV : I32EnumAttrCase<"TaskCountNV", 5274> {
1886-
list<Availability> availability = [
1887-
Extension<[SPV_NV_mesh_shader]>,
1888-
Capability<[SPIRV_C_MeshShadingNV]>
1889-
];
1890-
}
1891-
def SPIRV_BI_PrimitiveCountNV : I32EnumAttrCase<"PrimitiveCountNV", 5275> {
1892-
list<Availability> availability = [
1893-
Extension<[SPV_NV_mesh_shader]>,
1894-
Capability<[SPIRV_C_MeshShadingNV]>
1895-
];
1896-
}
1897-
def SPIRV_BI_PrimitiveIndicesNV : I32EnumAttrCase<"PrimitiveIndicesNV", 5276> {
1898-
list<Availability> availability = [
1899-
Extension<[SPV_NV_mesh_shader]>,
1900-
Capability<[SPIRV_C_MeshShadingNV]>
1901-
];
1902-
}
1903-
def SPIRV_BI_ClipDistancePerViewNV : I32EnumAttrCase<"ClipDistancePerViewNV", 5277> {
1904-
list<Availability> availability = [
1905-
Extension<[SPV_NV_mesh_shader]>,
1906-
Capability<[SPIRV_C_MeshShadingNV]>
1907-
];
1908-
}
1909-
def SPIRV_BI_CullDistancePerViewNV : I32EnumAttrCase<"CullDistancePerViewNV", 5278> {
1910-
list<Availability> availability = [
1911-
Extension<[SPV_NV_mesh_shader]>,
1912-
Capability<[SPIRV_C_MeshShadingNV]>
1913-
];
1914-
}
1915-
def SPIRV_BI_LayerPerViewNV : I32EnumAttrCase<"LayerPerViewNV", 5279> {
1916-
list<Availability> availability = [
1917-
Extension<[SPV_NV_mesh_shader]>,
1918-
Capability<[SPIRV_C_MeshShadingNV]>
1919-
];
1920-
}
1921-
def SPIRV_BI_MeshViewCountNV : I32EnumAttrCase<"MeshViewCountNV", 5280> {
1922-
list<Availability> availability = [
1923-
Extension<[SPV_NV_mesh_shader]>,
1924-
Capability<[SPIRV_C_MeshShadingNV]>
1925-
];
1926-
}
1927-
def SPIRV_BI_MeshViewIndicesNV : I32EnumAttrCase<"MeshViewIndicesNV", 5281> {
1928-
list<Availability> availability = [
1929-
Extension<[SPV_NV_mesh_shader]>,
1930-
Capability<[SPIRV_C_MeshShadingNV]>
1931-
];
1932-
}
19331878
def SPIRV_BI_BaryCoordKHR : I32EnumAttrCase<"BaryCoordKHR", 5286> {
19341879
list<Availability> availability = [
19351880
Extension<[SPV_KHR_fragment_shader_barycentric, SPV_NV_fragment_shader_barycentric]>,
@@ -2130,9 +2075,6 @@ def SPIRV_BuiltInAttr :
21302075
SPIRV_BI_BaryCoordPullModelAMD, SPIRV_BI_FragStencilRefEXT, SPIRV_BI_ViewportMaskNV,
21312076
SPIRV_BI_SecondaryPositionNV, SPIRV_BI_SecondaryViewportMaskNV,
21322077
SPIRV_BI_PositionPerViewNV, SPIRV_BI_ViewportMaskPerViewNV, SPIRV_BI_FullyCoveredEXT,
2133-
SPIRV_BI_TaskCountNV, SPIRV_BI_PrimitiveCountNV, SPIRV_BI_PrimitiveIndicesNV,
2134-
SPIRV_BI_ClipDistancePerViewNV, SPIRV_BI_CullDistancePerViewNV,
2135-
SPIRV_BI_LayerPerViewNV, SPIRV_BI_MeshViewCountNV, SPIRV_BI_MeshViewIndicesNV,
21362078
SPIRV_BI_BaryCoordKHR, SPIRV_BI_BaryCoordNoPerspKHR, SPIRV_BI_FragSizeEXT,
21372079
SPIRV_BI_FragInvocationCountEXT, SPIRV_BI_PrimitivePointIndicesEXT,
21382080
SPIRV_BI_PrimitiveLineIndicesEXT, SPIRV_BI_PrimitiveTriangleIndicesEXT,
@@ -2394,20 +2336,8 @@ def SPIRV_D_SecondaryViewportRelativeNV : I32EnumAttrCase<"SecondaryViewp
23942336
}
23952337
def SPIRV_D_PerPrimitiveEXT : I32EnumAttrCase<"PerPrimitiveEXT", 5271> {
23962338
list<Availability> availability = [
2397-
Extension<[SPV_NV_mesh_shader, SPV_EXT_mesh_shader]>,
2398-
Capability<[SPIRV_C_MeshShadingNV, SPIRV_C_MeshShadingEXT]>
2399-
];
2400-
}
2401-
def SPIRV_D_PerViewNV : I32EnumAttrCase<"PerViewNV", 5272> {
2402-
list<Availability> availability = [
2403-
Extension<[SPV_NV_mesh_shader]>,
2404-
Capability<[SPIRV_C_MeshShadingNV]>
2405-
];
2406-
}
2407-
def SPIRV_D_PerTaskNV : I32EnumAttrCase<"PerTaskNV", 5273> {
2408-
list<Availability> availability = [
2409-
Extension<[SPV_NV_mesh_shader]>,
2410-
Capability<[SPIRV_C_MeshShadingNV]>
2339+
Extension<[SPV_EXT_mesh_shader]>,
2340+
Capability<[SPIRV_C_MeshShadingEXT]>
24112341
];
24122342
}
24132343
def SPIRV_D_PerVertexKHR : I32EnumAttrCase<"PerVertexKHR", 5285> {
@@ -2694,8 +2624,8 @@ def SPIRV_DecorationAttr :
26942624
SPIRV_D_AlignmentId, SPIRV_D_MaxByteOffsetId, SPIRV_D_NoSignedWrap,
26952625
SPIRV_D_NoUnsignedWrap, SPIRV_D_ExplicitInterpAMD, SPIRV_D_OverrideCoverageNV,
26962626
SPIRV_D_PassthroughNV, SPIRV_D_ViewportRelativeNV,
2697-
SPIRV_D_SecondaryViewportRelativeNV, SPIRV_D_PerPrimitiveEXT, SPIRV_D_PerViewNV,
2698-
SPIRV_D_PerTaskNV, SPIRV_D_PerVertexKHR, SPIRV_D_NonUniform, SPIRV_D_RestrictPointer,
2627+
SPIRV_D_SecondaryViewportRelativeNV, SPIRV_D_PerPrimitiveEXT,
2628+
SPIRV_D_PerVertexKHR, SPIRV_D_NonUniform, SPIRV_D_RestrictPointer,
26992629
SPIRV_D_AliasedPointer, SPIRV_D_BindlessSamplerNV, SPIRV_D_BindlessImageNV,
27002630
SPIRV_D_BoundSamplerNV, SPIRV_D_BoundImageNV, SPIRV_D_SIMTCallINTEL,
27012631
SPIRV_D_ReferencedIndirectlyINTEL, SPIRV_D_ClobberINTEL, SPIRV_D_SideEffectsINTEL,
@@ -2877,12 +2807,12 @@ def SPIRV_EM_Isolines : I32EnumAttrCase<"Isolines", 25>
28772807
}
28782808
def SPIRV_EM_OutputVertices : I32EnumAttrCase<"OutputVertices", 26> {
28792809
list<Availability> availability = [
2880-
Capability<[SPIRV_C_Geometry, SPIRV_C_MeshShadingNV, SPIRV_C_MeshShadingEXT, SPIRV_C_Tessellation]>
2810+
Capability<[SPIRV_C_Geometry, SPIRV_C_MeshShadingEXT, SPIRV_C_Tessellation]>
28812811
];
28822812
}
28832813
def SPIRV_EM_OutputPoints : I32EnumAttrCase<"OutputPoints", 27> {
28842814
list<Availability> availability = [
2885-
Capability<[SPIRV_C_Geometry, SPIRV_C_MeshShadingNV, SPIRV_C_MeshShadingEXT]>
2815+
Capability<[SPIRV_C_Geometry, SPIRV_C_MeshShadingEXT]>
28862816
];
28872817
}
28882818
def SPIRV_EM_OutputLineStrip : I32EnumAttrCase<"OutputLineStrip", 28> {
@@ -3038,14 +2968,14 @@ def SPIRV_EM_StencilRefLessBackAMD : I32EnumAttrCase<"StencilRefLessB
30382968
}
30392969
def SPIRV_EM_OutputLinesEXT : I32EnumAttrCase<"OutputLinesEXT", 5269> {
30402970
list<Availability> availability = [
3041-
Extension<[SPV_NV_mesh_shader, SPV_EXT_mesh_shader]>,
3042-
Capability<[SPIRV_C_MeshShadingNV, SPIRV_C_MeshShadingEXT]>
2971+
Extension<[SPV_EXT_mesh_shader]>,
2972+
Capability<[SPIRV_C_MeshShadingEXT]>
30432973
];
30442974
}
30452975
def SPIRV_EM_OutputPrimitivesEXT : I32EnumAttrCase<"OutputPrimitivesEXT", 5270> {
30462976
list<Availability> availability = [
3047-
Extension<[SPV_NV_mesh_shader, SPV_EXT_mesh_shader]>,
3048-
Capability<[SPIRV_C_MeshShadingNV, SPIRV_C_MeshShadingEXT]>
2977+
Extension<[SPV_EXT_mesh_shader]>,
2978+
Capability<[SPIRV_C_MeshShadingEXT]>
30492979
];
30502980
}
30512981
def SPIRV_EM_DerivativeGroupQuadsNV : I32EnumAttrCase<"DerivativeGroupQuadsNV", 5289> {
@@ -3062,8 +2992,8 @@ def SPIRV_EM_DerivativeGroupLinearNV : I32EnumAttrCase<"DerivativeGroup
30622992
}
30632993
def SPIRV_EM_OutputTrianglesEXT : I32EnumAttrCase<"OutputTrianglesEXT", 5298> {
30642994
list<Availability> availability = [
3065-
Extension<[SPV_NV_mesh_shader, SPV_EXT_mesh_shader]>,
3066-
Capability<[SPIRV_C_MeshShadingNV, SPIRV_C_MeshShadingEXT]>
2995+
Extension<[SPV_EXT_mesh_shader]>,
2996+
Capability<[SPIRV_C_MeshShadingEXT]>
30672997
];
30682998
}
30692999
def SPIRV_EM_PixelInterlockOrderedEXT : I32EnumAttrCase<"PixelInterlockOrderedEXT", 5366> {
@@ -3237,16 +3167,6 @@ def SPIRV_EM_Kernel : I32EnumAttrCase<"Kernel", 6> {
32373167
Capability<[SPIRV_C_Kernel]>
32383168
];
32393169
}
3240-
def SPIRV_EM_TaskNV : I32EnumAttrCase<"TaskNV", 5267> {
3241-
list<Availability> availability = [
3242-
Capability<[SPIRV_C_MeshShadingNV]>
3243-
];
3244-
}
3245-
def SPIRV_EM_MeshNV : I32EnumAttrCase<"MeshNV", 5268> {
3246-
list<Availability> availability = [
3247-
Capability<[SPIRV_C_MeshShadingNV]>
3248-
];
3249-
}
32503170
def SPIRV_EM_RayGenerationKHR : I32EnumAttrCase<"RayGenerationKHR", 5313> {
32513171
list<Availability> availability = [
32523172
Capability<[SPIRV_C_RayTracingKHR, SPIRV_C_RayTracingNV]>
@@ -3292,7 +3212,7 @@ def SPIRV_ExecutionModelAttr :
32923212
SPIRV_I32EnumAttr<"ExecutionModel", "valid SPIR-V ExecutionModel", "execution_model", [
32933213
SPIRV_EM_Vertex, SPIRV_EM_TessellationControl, SPIRV_EM_TessellationEvaluation,
32943214
SPIRV_EM_Geometry, SPIRV_EM_Fragment, SPIRV_EM_GLCompute, SPIRV_EM_Kernel,
3295-
SPIRV_EM_TaskNV, SPIRV_EM_MeshNV, SPIRV_EM_RayGenerationKHR, SPIRV_EM_IntersectionKHR,
3215+
SPIRV_EM_RayGenerationKHR, SPIRV_EM_IntersectionKHR,
32963216
SPIRV_EM_AnyHitKHR, SPIRV_EM_ClosestHitKHR, SPIRV_EM_MissKHR, SPIRV_EM_CallableKHR,
32973217
SPIRV_EM_TaskEXT, SPIRV_EM_MeshEXT
32983218
]>;

0 commit comments

Comments
 (0)