-
Notifications
You must be signed in to change notification settings - Fork 3.1k
[CPU][ARM] Constrain MHA single-token dot_product templates #34616
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
alvoron
wants to merge
5
commits into
openvinotoolkit:master
Choose a base branch
from
alvoron:alvoron_arm_dot_product
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+108
−98
Open
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -668,7 +668,15 @@ void sum_q_head(T* a, size_t n, size_t group_size, float* out) { | |
| } | ||
| } | ||
|
|
||
| #if defined(OPENVINO_ARCH_ARM64) | ||
| template <typename TA, | ||
| typename TB, | ||
| typename std::enable_if<(std::is_same_v<TA, float> || std::is_same_v<TA, ov::float16>) && | ||
| (std::is_same_v<TB, float> || std::is_same_v<TB, ov::float16>), | ||
| bool>::type = true> | ||
| #else | ||
| template <typename TA, typename TB> | ||
| #endif | ||
| static float | ||
| dot_product(TA* a, TB* b, size_t n, float* scale, float* zp, float* head_sum, [[maybe_unused]] size_t group_size) { | ||
| size_t i = 0; | ||
|
|
@@ -761,110 +769,113 @@ dot_product(TA* a, TB* b, size_t n, float* scale, float* zp, float* head_sum, [[ | |
|
|
||
| #elif defined(OPENVINO_ARCH_ARM64) | ||
| # if defined(HAVE_SVE) | ||
| svbool_t pg = svptrue_b32(); | ||
| svfloat32_t sum0 = svdup_n_f32(0.0f); | ||
| svfloat32_t sum1 = svdup_n_f32(0.0f); | ||
| svfloat32_t sum2 = svdup_n_f32(0.0f); | ||
| svfloat32_t sum3 = svdup_n_f32(0.0f); | ||
| auto vec_len = vec_len_f32_sve(); | ||
|
|
||
| auto _a = reinterpret_cast<float32_t*>(a); | ||
| auto _b = reinterpret_cast<float32_t*>(b); | ||
|
|
||
| for (; i + 4 * vec_len <= n; i += 4 * vec_len) { | ||
| svfloat32_t a0 = svld1_f32(pg, _a + i); | ||
| svfloat32_t a1 = svld1_f32(pg, _a + i + vec_len); | ||
| svfloat32_t a2 = svld1_f32(pg, _a + i + vec_len * 2); | ||
| svfloat32_t a3 = svld1_f32(pg, _a + i + vec_len * 3); | ||
|
|
||
| svfloat32_t b0 = svld1_f32(pg, _b + i); | ||
| svfloat32_t b1 = svld1_f32(pg, _b + i + vec_len); | ||
| svfloat32_t b2 = svld1_f32(pg, _b + i + vec_len * 2); | ||
| svfloat32_t b3 = svld1_f32(pg, _b + i + vec_len * 3); | ||
|
|
||
| sum0 = svmla_f32_z(pg, sum0, a0, b0); | ||
| sum1 = svmla_f32_z(pg, sum1, a1, b1); | ||
| sum2 = svmla_f32_z(pg, sum2, a2, b2); | ||
| sum3 = svmla_f32_z(pg, sum3, a3, b3); | ||
| } | ||
| if (i + 2 * vec_len <= n) { | ||
| svfloat32_t a0 = svld1_f32(pg, _a + i); | ||
| svfloat32_t a1 = svld1_f32(pg, _a + i + vec_len); | ||
| if constexpr (std::is_same_v<TA, float> && std::is_same_v<TB, float>) { | ||
| svbool_t pg = svptrue_b32(); | ||
| svfloat32_t sum0 = svdup_n_f32(0.0f); | ||
| svfloat32_t sum1 = svdup_n_f32(0.0f); | ||
| svfloat32_t sum2 = svdup_n_f32(0.0f); | ||
| svfloat32_t sum3 = svdup_n_f32(0.0f); | ||
| auto vec_len = vec_len_f32_sve(); | ||
|
|
||
| svfloat32_t b0 = svld1_f32(pg, _b + i); | ||
| svfloat32_t b1 = svld1_f32(pg, _b + i + vec_len); | ||
| auto _a = reinterpret_cast<float32_t*>(a); | ||
| auto _b = reinterpret_cast<float32_t*>(b); | ||
|
|
||
| sum0 = svmla_f32_z(pg, sum0, a0, b0); | ||
| sum1 = svmla_f32_z(pg, sum1, a1, b1); | ||
| i += 2 * vec_len; | ||
| } | ||
| if (i + vec_len <= n) { | ||
| svfloat32_t a0 = svld1_f32(pg, _a + i); | ||
| svfloat32_t b0 = svld1_f32(pg, _b + i); | ||
| sum0 = svmla_f32_z(pg, sum0, a0, b0); | ||
| i += vec_len; | ||
| } | ||
| // Process the tail elements parallely as well (if any) | ||
| if (i != n) { | ||
| svbool_t pg_rem = svwhilelt_b32(0, static_cast<int>(n - i)); | ||
| svfloat32_t a0 = svld1_f32(pg_rem, _a + i); | ||
| svfloat32_t b0 = svld1_f32(pg_rem, _b + i); | ||
| sum0 = svmla_f32_m(pg_rem, sum0, a0, b0); | ||
| i = n; | ||
| } | ||
| float32_t sum_0 = svaddv_f32(pg, sum0); | ||
| float32_t sum_1 = svaddv_f32(pg, sum1); | ||
| float32_t sum_2 = svaddv_f32(pg, sum2); | ||
| float32_t sum_3 = svaddv_f32(pg, sum3); | ||
| sum = static_cast<float>(sum_0 + sum_1 + sum_2 + sum_3); | ||
| # else | ||
| float32x4_t vsum0 = vdupq_n_f32(0.0f); | ||
| float32x4_t vsum1 = vdupq_n_f32(0.0f); | ||
| float32x4_t vsum2 = vdupq_n_f32(0.0f); | ||
| float32x4_t vsum3 = vdupq_n_f32(0.0f); | ||
|
|
||
| for (; i + 4 * vec_len_f32_neon <= n; i += vec_len_f32_neon * 4) { | ||
| float32x4_t va0 = __vld1q_f32(a + i); | ||
| float32x4_t va1 = __vld1q_f32(a + i + vec_len_f32_neon); | ||
| float32x4_t va2 = __vld1q_f32(a + i + vec_len_f32_neon * 2); | ||
| float32x4_t va3 = __vld1q_f32(a + i + vec_len_f32_neon * 3); | ||
|
|
||
| float32x4_t vb0 = __vld1q_f32(b + i); | ||
| float32x4_t vb1 = __vld1q_f32(b + i + vec_len_f32_neon); | ||
| float32x4_t vb2 = __vld1q_f32(b + i + vec_len_f32_neon * 2); | ||
| float32x4_t vb3 = __vld1q_f32(b + i + vec_len_f32_neon * 3); | ||
|
|
||
| vsum0 = vmlaq_f32(vsum0, va0, vb0); | ||
| vsum1 = vmlaq_f32(vsum1, va1, vb1); | ||
| vsum2 = vmlaq_f32(vsum2, va2, vb2); | ||
| vsum3 = vmlaq_f32(vsum3, va3, vb3); | ||
| } | ||
| if (i + 2 * vec_len_f32_neon <= n) { | ||
| float32x4_t va0 = __vld1q_f32(a + i); | ||
| float32x4_t va1 = __vld1q_f32(a + i + vec_len_f32_neon); | ||
| for (; i + 4 * vec_len <= n; i += 4 * vec_len) { | ||
| svfloat32_t a0 = svld1_f32(pg, _a + i); | ||
| svfloat32_t a1 = svld1_f32(pg, _a + i + vec_len); | ||
| svfloat32_t a2 = svld1_f32(pg, _a + i + vec_len * 2); | ||
| svfloat32_t a3 = svld1_f32(pg, _a + i + vec_len * 3); | ||
|
|
||
| float32x4_t vb0 = __vld1q_f32(b + i); | ||
| float32x4_t vb1 = __vld1q_f32(b + i + vec_len_f32_neon); | ||
| svfloat32_t b0 = svld1_f32(pg, _b + i); | ||
| svfloat32_t b1 = svld1_f32(pg, _b + i + vec_len); | ||
| svfloat32_t b2 = svld1_f32(pg, _b + i + vec_len * 2); | ||
| svfloat32_t b3 = svld1_f32(pg, _b + i + vec_len * 3); | ||
|
|
||
| vsum0 = vmlaq_f32(vsum0, va0, vb0); | ||
| vsum1 = vmlaq_f32(vsum1, va1, vb1); | ||
| i += 2 * vec_len_f32_neon; | ||
| } | ||
| if (i + vec_len_f32_neon <= n) { | ||
| float32x4_t va0 = __vld1q_f32(a + i); | ||
| float32x4_t vb0 = __vld1q_f32(b + i); | ||
| vsum0 = vmlaq_f32(vsum0, va0, vb0); | ||
| i += vec_len_f32_neon; | ||
| } | ||
| sum0 = svmla_f32_z(pg, sum0, a0, b0); | ||
| sum1 = svmla_f32_z(pg, sum1, a1, b1); | ||
| sum2 = svmla_f32_z(pg, sum2, a2, b2); | ||
| sum3 = svmla_f32_z(pg, sum3, a3, b3); | ||
| } | ||
| if (i + 2 * vec_len <= n) { | ||
| svfloat32_t a0 = svld1_f32(pg, _a + i); | ||
| svfloat32_t a1 = svld1_f32(pg, _a + i + vec_len); | ||
|
|
||
| vsum0 = vaddq_f32(vsum0, vsum1); | ||
| vsum2 = vaddq_f32(vsum2, vsum3); | ||
| vsum0 = vaddq_f32(vsum0, vsum2); | ||
| svfloat32_t b0 = svld1_f32(pg, _b + i); | ||
| svfloat32_t b1 = svld1_f32(pg, _b + i + vec_len); | ||
|
|
||
| float32x2_t temp_sum = vadd_f32(vget_low_f32(vsum0), vget_high_f32(vsum0)); | ||
| temp_sum = vpadd_f32(temp_sum, temp_sum); | ||
| sum = vget_lane_f32(temp_sum, 0); | ||
| sum0 = svmla_f32_z(pg, sum0, a0, b0); | ||
| sum1 = svmla_f32_z(pg, sum1, a1, b1); | ||
| i += 2 * vec_len; | ||
| } | ||
| if (i + vec_len <= n) { | ||
| svfloat32_t a0 = svld1_f32(pg, _a + i); | ||
| svfloat32_t b0 = svld1_f32(pg, _b + i); | ||
| sum0 = svmla_f32_z(pg, sum0, a0, b0); | ||
| i += vec_len; | ||
| } | ||
| // Process the tail elements parallely as well (if any) | ||
| if (i != n) { | ||
| svbool_t pg_rem = svwhilelt_b32(0, static_cast<int>(n - i)); | ||
| svfloat32_t a0 = svld1_f32(pg_rem, _a + i); | ||
| svfloat32_t b0 = svld1_f32(pg_rem, _b + i); | ||
| sum0 = svmla_f32_m(pg_rem, sum0, a0, b0); | ||
| i = n; | ||
| } | ||
| float32_t sum_0 = svaddv_f32(pg, sum0); | ||
| float32_t sum_1 = svaddv_f32(pg, sum1); | ||
| float32_t sum_2 = svaddv_f32(pg, sum2); | ||
| float32_t sum_3 = svaddv_f32(pg, sum3); | ||
| sum = static_cast<float>(sum_0 + sum_1 + sum_2 + sum_3); | ||
| } else | ||
| # endif | ||
| { | ||
| float32x4_t vsum0 = vdupq_n_f32(0.0f); | ||
| float32x4_t vsum1 = vdupq_n_f32(0.0f); | ||
| float32x4_t vsum2 = vdupq_n_f32(0.0f); | ||
| float32x4_t vsum3 = vdupq_n_f32(0.0f); | ||
|
|
||
| for (; i + 4 * vec_len_f32_neon <= n; i += vec_len_f32_neon * 4) { | ||
| float32x4_t va0 = __vld1q_f32(a + i); | ||
| float32x4_t va1 = __vld1q_f32(a + i + vec_len_f32_neon); | ||
| float32x4_t va2 = __vld1q_f32(a + i + vec_len_f32_neon * 2); | ||
| float32x4_t va3 = __vld1q_f32(a + i + vec_len_f32_neon * 3); | ||
|
|
||
| float32x4_t vb0 = __vld1q_f32(b + i); | ||
| float32x4_t vb1 = __vld1q_f32(b + i + vec_len_f32_neon); | ||
| float32x4_t vb2 = __vld1q_f32(b + i + vec_len_f32_neon * 2); | ||
| float32x4_t vb3 = __vld1q_f32(b + i + vec_len_f32_neon * 3); | ||
|
|
||
| vsum0 = vmlaq_f32(vsum0, va0, vb0); | ||
| vsum1 = vmlaq_f32(vsum1, va1, vb1); | ||
| vsum2 = vmlaq_f32(vsum2, va2, vb2); | ||
| vsum3 = vmlaq_f32(vsum3, va3, vb3); | ||
| } | ||
| if (i + 2 * vec_len_f32_neon <= n) { | ||
| float32x4_t va0 = __vld1q_f32(a + i); | ||
| float32x4_t va1 = __vld1q_f32(a + i + vec_len_f32_neon); | ||
|
|
||
| float32x4_t vb0 = __vld1q_f32(b + i); | ||
| float32x4_t vb1 = __vld1q_f32(b + i + vec_len_f32_neon); | ||
|
|
||
| vsum0 = vmlaq_f32(vsum0, va0, vb0); | ||
| vsum1 = vmlaq_f32(vsum1, va1, vb1); | ||
| i += 2 * vec_len_f32_neon; | ||
| } | ||
| if (i + vec_len_f32_neon <= n) { | ||
| float32x4_t va0 = __vld1q_f32(a + i); | ||
| float32x4_t vb0 = __vld1q_f32(b + i); | ||
| vsum0 = vmlaq_f32(vsum0, va0, vb0); | ||
| i += vec_len_f32_neon; | ||
| } | ||
|
|
||
| vsum0 = vaddq_f32(vsum0, vsum1); | ||
| vsum2 = vaddq_f32(vsum2, vsum3); | ||
| vsum0 = vaddq_f32(vsum0, vsum2); | ||
|
|
||
| float32x2_t temp_sum = vadd_f32(vget_low_f32(vsum0), vget_high_f32(vsum0)); | ||
| temp_sum = vpadd_f32(temp_sum, temp_sum); | ||
| sum = vget_lane_f32(temp_sum, 0); | ||
| } | ||
| #endif | ||
| for (; i < n; i++) { | ||
| sum += a[i] * b[i]; | ||
|
|
@@ -1315,7 +1326,12 @@ static float dot_product_by_channel(TA* a, | |
| return sum; | ||
| } | ||
|
|
||
| #if defined(OPENVINO_ARCH_ARM64) | ||
| template <typename TA, | ||
| typename std::enable_if<std::is_same_v<TA, float> || std::is_same_v<TA, ov::float16>, bool>::type = true> | ||
| #else | ||
| template <typename TA> | ||
| #endif | ||
|
||
| static float dot_product(TA* a, uint8_t* b, size_t n, float* scale, float* zp, float* head_sum, size_t group_size) { | ||
| float sum = 0.0f; | ||
| size_t group_id = 0; | ||
|
|
@@ -2063,6 +2079,7 @@ void mha_single_token(const ov::intel_cpu::PlainTensor& query, | |
| bool quant_key_by_channel, | ||
| const ov::intel_cpu::PlainTensor& sink_input, | ||
| const ov::intel_cpu::CpuParallelPtr& cpu_parallel) { | ||
| #if !defined(OPENVINO_ARCH_ARM64) | ||
| if (query.get_precision() == ov::element::bf16) { | ||
| if (present_key.get_precision() == ov::element::u8) { | ||
| mha_single_token_kernel<ov::bfloat16, uint8_t, float>(query, | ||
|
|
@@ -2107,7 +2124,9 @@ void mha_single_token(const ov::intel_cpu::PlainTensor& query, | |
| sink_input, | ||
| cpu_parallel); | ||
| } | ||
| } else if (query.get_precision() == ov::element::f16) { | ||
| } | ||
| #endif | ||
| if (query.get_precision() == ov::element::f16) { | ||
| #if defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) | ||
| if (present_key.get_precision() == ov::element::f16) { | ||
| mha_single_token_kernel<ov::float16, ov::float16, ov::float16>(query, | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Such a construct looks cumbersome and difficult to read.
Better use
static_accertunder corresponding macro.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed