Skip to content

Commit 46afcfa

Browse files
authored
[ET-VK] Add storage_type parameter to define_required_extensions (pytorch#16855)
Update the `define_required_extensions` function in gen_vulkan_spv.py to accept a `storage_type` argument as the first parameter. This allows the function to generate appropriate GLSL extensions based on both the storage type and data type, enabling more precise extension requirements for different shader configurations. Also add a new `define_explicit_type_extensions` helper function for cases where only explicit arithmetic type extensions are needed without the storage-related image format extensions. Updated all 72 GLSL shader files across: - runtime/graph/ops/glsl/ (67 files) - test/glsl/ (2 files) - test/custom_ops/glsl/ (2 files) Fixed shaders that need extensions for multiple storage types: - linear_q4gsw_coop.glsl, linear_q4gsw_tiled.glsl, linear_q8csw_tiled.glsl: Added buffer extensions for shaders using both texture and buffer storage - image_to_nchw.glsl, permute_texture.glsl: Added explicit type extensions - scalar_tensor.glsl: Use explicit type extensions for SCALAR_VALUE_TYPE Differential Revision: [D91281385](https://our.internmc.facebook.com/intern/diff/D91281385/)
1 parent 27f1891 commit 46afcfa

73 files changed

Lines changed: 203 additions & 151 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎backends/vulkan/runtime/gen_vulkan_spv.py‎

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,32 @@ def define_active_storage_type(storage_type: str):
422422
raise AssertionError(f"Invalid storage type: {storage_type}")
423423

424424

425-
def define_required_extensions(dtypes: Union[str, List[str]]):
425+
def define_explicit_type_extensions(dtypes: Union[str, List[str]]):
426+
out_str = "\n"
427+
dtype_list = dtypes if isinstance(dtypes, list) else [dtypes]
428+
429+
for dtype in dtype_list:
430+
glsl_type = None
431+
if dtype == "half":
432+
glsl_type = "float16"
433+
elif dtype == "double":
434+
# We only need to allow float64_t type usage
435+
glsl_type = "float64"
436+
elif dtype in ["int8", "uint8", "bool"]:
437+
glsl_type = "int8"
438+
elif dtype in ["int16", "uint16"]:
439+
glsl_type = "int16"
440+
elif dtype in ["int64", "uint64"]:
441+
# We only need to allow int64_t and uint64_t type usage
442+
glsl_type = "int64"
443+
444+
if glsl_type is not None:
445+
out_str += f"#extension GL_EXT_shader_explicit_arithmetic_types_{glsl_type} : require\n"
446+
447+
return out_str
448+
449+
450+
def define_required_extensions(storage_type: str, dtypes: Union[str, List[str]]):
426451
out_str = "\n"
427452
dtype_list = dtypes if isinstance(dtypes, list) else [dtypes]
428453

@@ -445,10 +470,11 @@ def define_required_extensions(dtypes: Union[str, List[str]]):
445470
# We only need to allow int64_t and uint64_t type usage
446471
glsl_type = "int64"
447472

448-
if nbit is not None:
449-
out_str += f"#extension GL_EXT_shader_{nbit}_storage : require\n"
450-
if glsl_type is not None:
451-
out_str += f"#extension GL_EXT_shader_explicit_arithmetic_types_{glsl_type} : require\n"
473+
if storage_type.lower() == "buffer":
474+
if nbit is not None:
475+
out_str += f"#extension GL_EXT_shader_{nbit}_storage : require\n"
476+
if glsl_type is not None:
477+
out_str += f"#extension GL_EXT_shader_explicit_arithmetic_types_{glsl_type} : require\n"
452478

453479
return out_str
454480

@@ -476,6 +502,7 @@ def define_required_extensions(dtypes: Union[str, List[str]]):
476502
"layout_declare_spec_const": layout_declare_spec_const,
477503
"define_active_storage_type": define_active_storage_type,
478504
"define_required_extensions": define_required_extensions,
505+
"define_explicit_type_extensions": define_explicit_type_extensions,
479506
}
480507

481508

@@ -996,6 +1023,7 @@ def generate_src_file(shader_paths_pair) -> Tuple[bool, List[str]]:
9961023
with codecs.open(template_file_path, "r", encoding="utf-8") as input_file:
9971024
input_text = input_file.read()
9981025
input_text = self.maybe_replace_u16vecn(input_text)
1026+
print(f"template_file_path: {template_file_path}")
9991027
output_text = preprocess(input_text, codegen_params)
10001028

10011029
included_files = get_glsl_includes(output_text)

‎backends/vulkan/runtime/graph/ops/glsl/addmm_naive_buffer.glsl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
#version 450 core
1010

11+
${define_required_extensions("buffer", DTYPE)}
12+
1113
#define PRECISION ${PRECISION}
1214

1315
$if HAS_BIAS:
1416
#define HAS_BIAS
1517

1618
#define T ${buffer_scalar_type(DTYPE)}
1719

18-
${define_required_extensions(DTYPE)}
19-
2020
layout(std430) buffer;
2121

2222
${layout_declare_tensor(B, "w", "t_out", DTYPE, "buffer")}

‎backends/vulkan/runtime/graph/ops/glsl/binary_op.glsl‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@
66
* LICENSE file in the root directory of this source tree.
77
*/
88

9+
// Binary comparison ops require that the output is boolean and not the same as input.
10+
$IS_COMPARISON_OP = (any([name in VARIANT_NAME for name in ["binary_eq", "binary_lt", "binary_le", "binary_gt", "binary_ge"]]))
11+
912
#version 450 core
1013

11-
#define PRECISION ${PRECISION}
14+
${define_required_extensions(STORAGE, DTYPE)}
15+
$if IS_COMPARISON_OP:
16+
${define_required_extensions(STORAGE, "uint8")}
1217

13-
// Binary comparison ops require that the output is boolean and not the same as input.
14-
$IS_COMPARISON_OP = (any([name in VARIANT_NAME for name in ["binary_eq", "binary_lt", "binary_le", "binary_gt", "binary_ge"]]))
18+
#define PRECISION ${PRECISION}
1519

1620
#define NAME ${VARIANT_NAME}
1721

@@ -26,11 +30,6 @@ $else:
2630
#define op(X, Y, A) ${OPERATOR}
2731

2832
${define_active_storage_type(STORAGE)}
29-
${define_required_extensions(DTYPE)}
30-
31-
32-
$if IS_COMPARISON_OP:
33-
${define_required_extensions("uint8")}
3433

3534
layout(std430) buffer;
3635

‎backends/vulkan/runtime/graph/ops/glsl/binary_q8ta_q8ta_q8to.glsl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#version 450 core
1010

11+
${define_required_extensions("buffer", DTYPE)}
12+
1113
#define PRECISION ${PRECISION}
1214

1315
#define NAME ${VARIANT_NAME}
@@ -21,8 +23,6 @@ $if IO_STORAGE == "buffer":
2123

2224
#define op(X, Y) ${OPERATOR}
2325

24-
${define_required_extensions(DTYPE)}
25-
2626
layout(std430) buffer;
2727

2828
#include "indexing.glslh"

‎backends/vulkan/runtime/graph/ops/glsl/binary_scalar_buffer.glsl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#version 450 core
1010

11+
${define_required_extensions(STORAGE, DTYPE)}
12+
1113
#define PRECISION ${PRECISION}
1214

1315
#define NAME ${VARIANT_NAME}
@@ -17,7 +19,6 @@
1719
#define op(X, Y) ${OPERATOR}
1820

1921
${define_active_storage_type(STORAGE)}
20-
${define_required_extensions(DTYPE)}
2122

2223
layout(std430) buffer;
2324

‎backends/vulkan/runtime/graph/ops/glsl/binary_scalar_texture.glsl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#version 450 core
1010

11+
${define_required_extensions(STORAGE, DTYPE)}
12+
1113
#define PRECISION ${PRECISION}
1214

1315
#define NAME ${VARIANT_NAME}
@@ -18,7 +20,6 @@
1820
#define op(X, Y) ${OPERATOR}
1921

2022
${define_active_storage_type(STORAGE)}
21-
${define_required_extensions(DTYPE)}
2223

2324
layout(std430) buffer;
2425

‎backends/vulkan/runtime/graph/ops/glsl/buffer_to_buffer.glsl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#version 450 core
22

3+
${define_required_extensions(STORAGE, DTYPE)}
4+
35
#define PRECISION ${PRECISION}
46

57
#define T ${buffer_scalar_type(DTYPE)}
68

7-
${define_required_extensions(DTYPE)}
8-
99
layout(std430) buffer;
1010

1111
${layout_declare_tensor(0, "w", "out_buf", DTYPE, STORAGE)}

‎backends/vulkan/runtime/graph/ops/glsl/buffer_to_nchw.glsl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#version 450 core
22

3+
${define_required_extensions(STORAGE, DTYPE)}
4+
${define_required_extensions("buffer", BUF_DTYPE)}
5+
36
#define PRECISION ${PRECISION}
47

58
#define T ${buffer_scalar_type(DTYPE)}
69
#define DST_T ${buffer_scalar_type(BUF_DTYPE)}
710

8-
${define_required_extensions(DTYPE)}
9-
${define_required_extensions(BUF_DTYPE)}
10-
1111
layout(std430) buffer;
1212

1313
#include "indexing.glslh"

‎backends/vulkan/runtime/graph/ops/glsl/choose_qparams_per_row.glsl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88

99
#version 450 core
1010

11+
${define_required_extensions(STORAGE, DTYPE)}
12+
${define_required_extensions("texture3d", "int8")}
13+
14+
#extension GL_EXT_control_flow_attributes : require
15+
1116
#define PRECISION ${PRECISION}
1217
#define VEC4_T ${texel_load_type(DTYPE, STORAGE)}
1318
#define T ${texel_load_component_type(DTYPE, STORAGE)}
@@ -20,11 +25,6 @@
2025

2126
${define_active_storage_type(STORAGE)}
2227

23-
${define_required_extensions(DTYPE)}
24-
${define_required_extensions("int8")}
25-
26-
#extension GL_EXT_control_flow_attributes : require
27-
2828
layout(std430) buffer;
2929

3030
#include "common.glslh"

‎backends/vulkan/runtime/graph/ops/glsl/col2im.glsl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
#version 450 core
1010

11+
${define_required_extensions(OUTPUT_STORAGE, DTYPE)}
12+
${define_required_extensions(INPUT_STORAGE, DTYPE)}
13+
1114
#define PRECISION ${PRECISION}
1215
#define VEC4_T ${texel_load_type(DTYPE, OUTPUT_STORAGE)}
1316
#define T ${texel_load_component_type(DTYPE, OUTPUT_STORAGE)}
@@ -25,8 +28,6 @@ $if INPUT_STORAGE == "buffer":
2528
#define TILE_N 4
2629
#define TILE_K 4
2730

28-
${define_required_extensions(DTYPE)}
29-
3031
layout(std430) buffer;
3132

3233
#include "conv2d_common.glslh"

0 commit comments

Comments
 (0)