Skip to content

Commit 2e743e9

Browse files
mprettner-huaweimprettner-huawei
authored
Improve automatic formatting of SPV extensions allowlists (KhronosGroup#6167)
1 parent 9de1dbb commit 2e743e9

File tree

4 files changed

+206
-173
lines changed

4 files changed

+206
-173
lines changed

‎source/opt/aggressive_dead_code_elim_pass.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,6 @@ Pass::Status AggressiveDCEPass::Process() {
971971
void AggressiveDCEPass::InitExtensions() {
972972
extensions_allowlist_.clear();
973973

974-
// clang-format off
975974
extensions_allowlist_.insert({
976975
"SPV_AMD_shader_explicit_vertex_parameter",
977976
"SPV_AMD_shader_trinary_minmax",
@@ -1040,9 +1039,8 @@ void AggressiveDCEPass::InitExtensions() {
10401039
"SPV_KHR_fragment_shading_rate",
10411040
"SPV_KHR_quad_control",
10421041
"SPV_NV_shader_invocation_reorder",
1043-
"SPV_NV_cluster_acceleration_structure"
1042+
"SPV_NV_cluster_acceleration_structure",
10441043
});
1045-
// clang-format on
10461044
}
10471045

10481046
Instruction* AggressiveDCEPass::GetHeaderBranch(BasicBlock* blk) {

‎source/opt/local_access_chain_convert_pass.cpp

Lines changed: 68 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -399,43 +399,74 @@ Pass::Status LocalAccessChainConvertPass::Process() {
399399

400400
void LocalAccessChainConvertPass::InitExtensions() {
401401
extensions_allowlist_.clear();
402-
extensions_allowlist_.insert(
403-
{"SPV_AMD_shader_explicit_vertex_parameter",
404-
"SPV_AMD_shader_trinary_minmax", "SPV_AMD_gcn_shader",
405-
"SPV_KHR_shader_ballot", "SPV_AMD_shader_ballot",
406-
"SPV_AMD_gpu_shader_half_float", "SPV_KHR_shader_draw_parameters",
407-
"SPV_KHR_subgroup_vote", "SPV_KHR_8bit_storage", "SPV_KHR_16bit_storage",
408-
"SPV_KHR_device_group", "SPV_KHR_multiview",
409-
"SPV_NVX_multiview_per_view_attributes", "SPV_NV_viewport_array2",
410-
"SPV_NV_stereo_view_rendering", "SPV_NV_sample_mask_override_coverage",
411-
"SPV_NV_geometry_shader_passthrough", "SPV_AMD_texture_gather_bias_lod",
412-
"SPV_KHR_storage_buffer_storage_class",
413-
// SPV_KHR_variable_pointers
414-
// Currently do not support extended pointer expressions
415-
"SPV_AMD_gpu_shader_int16", "SPV_KHR_post_depth_coverage",
416-
"SPV_KHR_shader_atomic_counter_ops", "SPV_EXT_shader_stencil_export",
417-
"SPV_EXT_shader_viewport_index_layer",
418-
"SPV_AMD_shader_image_load_store_lod", "SPV_AMD_shader_fragment_mask",
419-
"SPV_EXT_fragment_fully_covered", "SPV_AMD_gpu_shader_half_float_fetch",
420-
"SPV_GOOGLE_decorate_string", "SPV_GOOGLE_hlsl_functionality1",
421-
"SPV_GOOGLE_user_type", "SPV_NV_shader_subgroup_partitioned",
422-
"SPV_EXT_demote_to_helper_invocation", "SPV_EXT_descriptor_indexing",
423-
"SPV_NV_fragment_shader_barycentric",
424-
"SPV_NV_compute_shader_derivatives", "SPV_NV_shader_image_footprint",
425-
"SPV_NV_shading_rate", "SPV_NV_mesh_shader", "SPV_EXT_mesh_shader",
426-
"SPV_NV_ray_tracing", "SPV_KHR_ray_tracing", "SPV_KHR_ray_query",
427-
"SPV_EXT_fragment_invocation_density", "SPV_KHR_terminate_invocation",
428-
"SPV_KHR_subgroup_uniform_control_flow", "SPV_KHR_integer_dot_product",
429-
"SPV_EXT_shader_image_int64", "SPV_KHR_non_semantic_info",
430-
"SPV_KHR_uniform_group_instructions",
431-
"SPV_KHR_fragment_shader_barycentric", "SPV_KHR_vulkan_memory_model",
432-
"SPV_NV_bindless_texture", "SPV_EXT_shader_atomic_float_add",
433-
"SPV_EXT_fragment_shader_interlock",
434-
"SPV_KHR_compute_shader_derivatives", "SPV_NV_cooperative_matrix",
435-
"SPV_KHR_cooperative_matrix", "SPV_KHR_ray_tracing_position_fetch",
436-
"SPV_AMDX_shader_enqueue", "SPV_KHR_fragment_shading_rate",
437-
"SPV_KHR_quad_control", "SPV_NV_shader_invocation_reorder",
438-
"SPV_NV_cluster_acceleration_structure"});
402+
extensions_allowlist_.insert({
403+
"SPV_AMD_shader_explicit_vertex_parameter",
404+
"SPV_AMD_shader_trinary_minmax",
405+
"SPV_AMD_gcn_shader",
406+
"SPV_KHR_shader_ballot",
407+
"SPV_AMD_shader_ballot",
408+
"SPV_AMD_gpu_shader_half_float",
409+
"SPV_KHR_shader_draw_parameters",
410+
"SPV_KHR_subgroup_vote",
411+
"SPV_KHR_8bit_storage",
412+
"SPV_KHR_16bit_storage",
413+
"SPV_KHR_device_group",
414+
"SPV_KHR_multiview",
415+
"SPV_NVX_multiview_per_view_attributes",
416+
"SPV_NV_viewport_array2",
417+
"SPV_NV_stereo_view_rendering",
418+
"SPV_NV_sample_mask_override_coverage",
419+
"SPV_NV_geometry_shader_passthrough",
420+
"SPV_AMD_texture_gather_bias_lod",
421+
"SPV_KHR_storage_buffer_storage_class",
422+
// SPV_KHR_variable_pointers
423+
// Currently do not support extended pointer expressions
424+
"SPV_AMD_gpu_shader_int16",
425+
"SPV_KHR_post_depth_coverage",
426+
"SPV_KHR_shader_atomic_counter_ops",
427+
"SPV_EXT_shader_stencil_export",
428+
"SPV_EXT_shader_viewport_index_layer",
429+
"SPV_AMD_shader_image_load_store_lod",
430+
"SPV_AMD_shader_fragment_mask",
431+
"SPV_EXT_fragment_fully_covered",
432+
"SPV_AMD_gpu_shader_half_float_fetch",
433+
"SPV_GOOGLE_decorate_string",
434+
"SPV_GOOGLE_hlsl_functionality1",
435+
"SPV_GOOGLE_user_type",
436+
"SPV_NV_shader_subgroup_partitioned",
437+
"SPV_EXT_demote_to_helper_invocation",
438+
"SPV_EXT_descriptor_indexing",
439+
"SPV_NV_fragment_shader_barycentric",
440+
"SPV_NV_compute_shader_derivatives",
441+
"SPV_NV_shader_image_footprint",
442+
"SPV_NV_shading_rate",
443+
"SPV_NV_mesh_shader",
444+
"SPV_EXT_mesh_shader",
445+
"SPV_NV_ray_tracing",
446+
"SPV_KHR_ray_tracing",
447+
"SPV_KHR_ray_query",
448+
"SPV_EXT_fragment_invocation_density",
449+
"SPV_KHR_terminate_invocation",
450+
"SPV_KHR_subgroup_uniform_control_flow",
451+
"SPV_KHR_integer_dot_product",
452+
"SPV_EXT_shader_image_int64",
453+
"SPV_KHR_non_semantic_info",
454+
"SPV_KHR_uniform_group_instructions",
455+
"SPV_KHR_fragment_shader_barycentric",
456+
"SPV_KHR_vulkan_memory_model",
457+
"SPV_NV_bindless_texture",
458+
"SPV_EXT_shader_atomic_float_add",
459+
"SPV_EXT_fragment_shader_interlock",
460+
"SPV_KHR_compute_shader_derivatives",
461+
"SPV_NV_cooperative_matrix",
462+
"SPV_KHR_cooperative_matrix",
463+
"SPV_KHR_ray_tracing_position_fetch",
464+
"SPV_AMDX_shader_enqueue",
465+
"SPV_KHR_fragment_shading_rate",
466+
"SPV_KHR_quad_control",
467+
"SPV_NV_shader_invocation_reorder",
468+
"SPV_NV_cluster_acceleration_structure",
469+
});
439470
}
440471

441472
bool LocalAccessChainConvertPass::AnyIndexIsOutOfBounds(

‎source/opt/local_single_block_elim_pass.cpp

Lines changed: 69 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -235,73 +235,75 @@ Pass::Status LocalSingleBlockLoadStoreElimPass::Process() {
235235

236236
void LocalSingleBlockLoadStoreElimPass::InitExtensions() {
237237
extensions_allowlist_.clear();
238-
extensions_allowlist_.insert({"SPV_AMD_shader_explicit_vertex_parameter",
239-
"SPV_AMD_shader_trinary_minmax",
240-
"SPV_AMD_gcn_shader",
241-
"SPV_KHR_shader_ballot",
242-
"SPV_AMD_shader_ballot",
243-
"SPV_AMDX_shader_enqueue",
244-
"SPV_AMD_gpu_shader_half_float",
245-
"SPV_KHR_shader_draw_parameters",
246-
"SPV_KHR_subgroup_vote",
247-
"SPV_KHR_8bit_storage",
248-
"SPV_KHR_16bit_storage",
249-
"SPV_KHR_device_group",
250-
"SPV_KHR_multiview",
251-
"SPV_NVX_multiview_per_view_attributes",
252-
"SPV_NV_viewport_array2",
253-
"SPV_NV_stereo_view_rendering",
254-
"SPV_NV_sample_mask_override_coverage",
255-
"SPV_NV_geometry_shader_passthrough",
256-
"SPV_AMD_texture_gather_bias_lod",
257-
"SPV_KHR_storage_buffer_storage_class",
258-
"SPV_KHR_variable_pointers",
259-
"SPV_AMD_gpu_shader_int16",
260-
"SPV_KHR_post_depth_coverage",
261-
"SPV_KHR_shader_atomic_counter_ops",
262-
"SPV_EXT_shader_stencil_export",
263-
"SPV_EXT_shader_viewport_index_layer",
264-
"SPV_AMD_shader_image_load_store_lod",
265-
"SPV_AMD_shader_fragment_mask",
266-
"SPV_EXT_fragment_fully_covered",
267-
"SPV_AMD_gpu_shader_half_float_fetch",
268-
"SPV_GOOGLE_decorate_string",
269-
"SPV_GOOGLE_hlsl_functionality1",
270-
"SPV_GOOGLE_user_type",
271-
"SPV_NV_shader_subgroup_partitioned",
272-
"SPV_EXT_demote_to_helper_invocation",
273-
"SPV_EXT_descriptor_indexing",
274-
"SPV_NV_fragment_shader_barycentric",
275-
"SPV_NV_compute_shader_derivatives",
276-
"SPV_NV_shader_image_footprint",
277-
"SPV_NV_shading_rate",
278-
"SPV_NV_mesh_shader",
279-
"SPV_EXT_mesh_shader",
280-
"SPV_NV_ray_tracing",
281-
"SPV_KHR_ray_tracing",
282-
"SPV_KHR_ray_query",
283-
"SPV_EXT_fragment_invocation_density",
284-
"SPV_EXT_physical_storage_buffer",
285-
"SPV_KHR_physical_storage_buffer",
286-
"SPV_KHR_terminate_invocation",
287-
"SPV_KHR_subgroup_uniform_control_flow",
288-
"SPV_KHR_integer_dot_product",
289-
"SPV_EXT_shader_image_int64",
290-
"SPV_KHR_non_semantic_info",
291-
"SPV_KHR_uniform_group_instructions",
292-
"SPV_KHR_fragment_shader_barycentric",
293-
"SPV_KHR_vulkan_memory_model",
294-
"SPV_NV_bindless_texture",
295-
"SPV_EXT_shader_atomic_float_add",
296-
"SPV_EXT_fragment_shader_interlock",
297-
"SPV_KHR_compute_shader_derivatives",
298-
"SPV_NV_cooperative_matrix",
299-
"SPV_KHR_cooperative_matrix",
300-
"SPV_KHR_ray_tracing_position_fetch",
301-
"SPV_KHR_fragment_shading_rate",
302-
"SPV_KHR_quad_control",
303-
"SPV_NV_shader_invocation_reorder",
304-
"SPV_NV_cluster_acceleration_structure"});
238+
extensions_allowlist_.insert({
239+
"SPV_AMD_shader_explicit_vertex_parameter",
240+
"SPV_AMD_shader_trinary_minmax",
241+
"SPV_AMD_gcn_shader",
242+
"SPV_KHR_shader_ballot",
243+
"SPV_AMD_shader_ballot",
244+
"SPV_AMDX_shader_enqueue",
245+
"SPV_AMD_gpu_shader_half_float",
246+
"SPV_KHR_shader_draw_parameters",
247+
"SPV_KHR_subgroup_vote",
248+
"SPV_KHR_8bit_storage",
249+
"SPV_KHR_16bit_storage",
250+
"SPV_KHR_device_group",
251+
"SPV_KHR_multiview",
252+
"SPV_NVX_multiview_per_view_attributes",
253+
"SPV_NV_viewport_array2",
254+
"SPV_NV_stereo_view_rendering",
255+
"SPV_NV_sample_mask_override_coverage",
256+
"SPV_NV_geometry_shader_passthrough",
257+
"SPV_AMD_texture_gather_bias_lod",
258+
"SPV_KHR_storage_buffer_storage_class",
259+
"SPV_KHR_variable_pointers",
260+
"SPV_AMD_gpu_shader_int16",
261+
"SPV_KHR_post_depth_coverage",
262+
"SPV_KHR_shader_atomic_counter_ops",
263+
"SPV_EXT_shader_stencil_export",
264+
"SPV_EXT_shader_viewport_index_layer",
265+
"SPV_AMD_shader_image_load_store_lod",
266+
"SPV_AMD_shader_fragment_mask",
267+
"SPV_EXT_fragment_fully_covered",
268+
"SPV_AMD_gpu_shader_half_float_fetch",
269+
"SPV_GOOGLE_decorate_string",
270+
"SPV_GOOGLE_hlsl_functionality1",
271+
"SPV_GOOGLE_user_type",
272+
"SPV_NV_shader_subgroup_partitioned",
273+
"SPV_EXT_demote_to_helper_invocation",
274+
"SPV_EXT_descriptor_indexing",
275+
"SPV_NV_fragment_shader_barycentric",
276+
"SPV_NV_compute_shader_derivatives",
277+
"SPV_NV_shader_image_footprint",
278+
"SPV_NV_shading_rate",
279+
"SPV_NV_mesh_shader",
280+
"SPV_EXT_mesh_shader",
281+
"SPV_NV_ray_tracing",
282+
"SPV_KHR_ray_tracing",
283+
"SPV_KHR_ray_query",
284+
"SPV_EXT_fragment_invocation_density",
285+
"SPV_EXT_physical_storage_buffer",
286+
"SPV_KHR_physical_storage_buffer",
287+
"SPV_KHR_terminate_invocation",
288+
"SPV_KHR_subgroup_uniform_control_flow",
289+
"SPV_KHR_integer_dot_product",
290+
"SPV_EXT_shader_image_int64",
291+
"SPV_KHR_non_semantic_info",
292+
"SPV_KHR_uniform_group_instructions",
293+
"SPV_KHR_fragment_shader_barycentric",
294+
"SPV_KHR_vulkan_memory_model",
295+
"SPV_NV_bindless_texture",
296+
"SPV_EXT_shader_atomic_float_add",
297+
"SPV_EXT_fragment_shader_interlock",
298+
"SPV_KHR_compute_shader_derivatives",
299+
"SPV_NV_cooperative_matrix",
300+
"SPV_KHR_cooperative_matrix",
301+
"SPV_KHR_ray_tracing_position_fetch",
302+
"SPV_KHR_fragment_shading_rate",
303+
"SPV_KHR_quad_control",
304+
"SPV_NV_shader_invocation_reorder",
305+
"SPV_NV_cluster_acceleration_structure",
306+
});
305307
}
306308

307309
} // namespace opt

0 commit comments

Comments
 (0)