x64: brdgmm conv: enable zps per group (closes MFDNN-12556) #2274
+130
−46
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
tczeszun
added
the
platform:cpu-x64
tczeszun
force-pushed
the
tczeszun/brdgmm_conv_zps
branch
2 times, most recently
from
c215542 to
0741e51
Compare
dzarukin
reviewed
Dec 16, 2024
src/common/primitive_attr_quant.hpp
Outdated
| @@ -244,6 +244,7 @@ struct zero_points_t : public c_compatible { | |||
|
|
|||
| // arg-specific checks | |||
| bool common(int arg) const { return get_mask(arg) == 0; } | |||
| bool per_oc(int arg) const { return get_mask(arg) == 2; } | |||
There was a problem hiding this comment.
Suggest not to introduce this as primitives may interpret mask == 2 not necessarily as per_oc and rely on get_mask() directly.
There was a problem hiding this comment.
@dzarukin get_mask() is private, do you suggest to change it to public?
I could also change per_oc to per_dim_1 alternatively.
There was a problem hiding this comment.
I see, wouldn't think it's in private... Let's use per_dim_1 then, I'll replace it as a part of future refactor later. Thanks for checking.
src/cpu/x64/brgemm/brgemm.cpp
Outdated
| @@ -207,6 +207,7 @@ void brgemm_kernel_execute_postops(const brgemm_kernel_t *brg_kernel, int bs, | |||
| brgemm_p.b_zp_compensations = post_ops_data.b_zp_compensations; | |||
| brgemm_p.c_zp_values = post_ops_data.c_zp_values; | |||
| brgemm_p.ptr_dst_scales = post_ops_data.dst_scales; | |||
| brgemm_p.a_zp_values = post_ops_data.a_zp_values; | |||
There was a problem hiding this comment.
Nit: put above c_zp_values to group identical values?
src/cpu/x64/brgemm/brgemm.cpp
Outdated
Comment on lines
468
to
471
| zp_type = zero_points.has_default_values(mem_arg) || skip_zero_point | ||
| ? brgemm_broadcast_t::none | ||
| : brgemm_broadcast_t::per_tensor; | ||
| : is_per_oc_bcast ? brgemm_broadcast_t::per_n | ||
| : brgemm_broadcast_t::per_tensor; |
There was a problem hiding this comment.
Nit: for better readability and control of the value.
zp_type = brgemm_broadcast_t::none;
if (XXX) {
zp_type = brgemm_broadcast_t::per_tensor;
} else if (YYY) {
zp_type = brgemm_broadcast_t::per_n;
}
tczeszun
force-pushed
the
tczeszun/brdgmm_conv_zps
branch
from
0741e51 to
2bcc3f3
Compare
dzarukin
approved these changes
Dec 17, 2024
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.
Adding src zero points per-group (mask=2) support to brdgmm conv.
Related jira: MFDNN-12556
CI
Nightly