xe: ocl: sdpa: pull grouped scales out of gemm where possible #2409
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
platform:gpu-intel
umar456
reviewed
Jan 15, 2025
Comment on lines
+113
to
+124
| #if VAL_SCALES == QUANTIZE_1D | ||
| DECLARE_2D_TILE(v_scales_tile_type, KEY_ATTR_SCALES_DATA_T, SUBGROUP_SIZE, | ||
| ugemm_kq_sg_tile_m, 1, 1, 1) | ||
| DECLARE_2D_TILE(v_scales_tile_type_float, float, SUBGROUP_SIZE, | ||
| ugemm_kq_sg_tile_m, 1, 1, 1) | ||
| DECLARE_2D_TILE_BLOCK_OPS(v_scales_tile_type, KEY_ATTR_SCALES_DATA_T, | ||
| SUBGROUP_SIZE, ugemm_kq_sg_tile_m, 1, 1, 1) | ||
|
|
||
| DECLARE_2D_TILE_HREDUCE(s_tile_type, SUBGROUP_SIZE, ugemm_kq_c_type_block0, | ||
| ugemm_kq_c_type_block1, ugemm_kq_c_type_nblock0, | ||
| ugemm_kq_c_type_nblock1, v_scales_tile_type_float, SUBGROUP_SIZE, | ||
| ugemm_kq_sg_tile_m, 1, 1, 1) |
There was a problem hiding this comment.
Suggested change
| #if VAL_SCALES == QUANTIZE_1D | |
| DECLARE_2D_TILE(v_scales_tile_type, KEY_ATTR_SCALES_DATA_T, SUBGROUP_SIZE, | |
| ugemm_kq_sg_tile_m, 1, 1, 1) | |
| DECLARE_2D_TILE(v_scales_tile_type_float, float, SUBGROUP_SIZE, | |
| ugemm_kq_sg_tile_m, 1, 1, 1) | |
| DECLARE_2D_TILE_BLOCK_OPS(v_scales_tile_type, KEY_ATTR_SCALES_DATA_T, | |
| SUBGROUP_SIZE, ugemm_kq_sg_tile_m, 1, 1, 1) | |
| DECLARE_2D_TILE_HREDUCE(s_tile_type, SUBGROUP_SIZE, ugemm_kq_c_type_block0, | |
| ugemm_kq_c_type_block1, ugemm_kq_c_type_nblock0, | |
| ugemm_kq_c_type_nblock1, v_scales_tile_type_float, SUBGROUP_SIZE, | |
| ugemm_kq_sg_tile_m, 1, 1, 1) | |
| #if VAL_SCALES == QUANTIZE_1D | |
| DECLARE_2D_TILE(v_scales_tile_type, VAL_ATTR_SCALES_DATA_T, SUBGROUP_SIZE, | |
| ugemm_kq_sg_tile_m, 1, 1, 1) | |
| DECLARE_2D_TILE(v_scales_tile_type_float, float, SUBGROUP_SIZE, | |
| ugemm_kq_sg_tile_m, 1, 1, 1) | |
| DECLARE_2D_TILE_BLOCK_OPS(v_scales_tile_type, VAL_ATTR_SCALES_DATA_T, | |
| SUBGROUP_SIZE, ugemm_kq_sg_tile_m, 1, 1, 1) | |
| DECLARE_2D_TILE_HREDUCE(s_tile_type, SUBGROUP_SIZE, ugemm_kq_c_type_block0, | |
| ugemm_kq_c_type_block1, ugemm_kq_c_type_nblock0, | |
| ugemm_kq_c_type_nblock1, v_scales_tile_type_float, SUBGROUP_SIZE, | |
| ugemm_kq_sg_tile_m, 1, 1, 1) |
There was a problem hiding this comment.
Good catch, thanks.
umar456
approved these changes
Jan 15, 2025
dzarukin
reviewed
Jan 16, 2025
| @@ -21,11 +21,14 @@ | |||
| #include "gemm_kq.h" | |||
| #include "gemm_vs.h" | |||
|
|
|||
| /* The quantization parameter may be unique for each token/element */ | |||
There was a problem hiding this comment.
Random spot: do we have test cases covering new per-token scaling optimized path and the old path?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hoists the K scaling out of the GEMM microkernel where possible. Here, "where possible" means no zp and group size >= head size (so effectively per-token scaling).