-
Notifications
You must be signed in to change notification settings - Fork 321
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
Audio: Mixin_mixout: Add HiFi5 implementation. #8793
Merged
+326
−15
Merged
Changes from all commits
Commits
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 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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| add_local_sources(sof mixin_mixout.c mixin_mixout_generic.c mixin_mixout_hifi3.c) | ||
| add_local_sources(sof mixin_mixout.c mixin_mixout_generic.c mixin_mixout_hifi3.c mixin_mixout_hifi5.c) |
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,285 @@ | ||
| // SPDX-License-Identifier: BSD-3-Clause | ||
| // | ||
| // Copyright(c) 2024 Intel Corporation. All rights reserved. | ||
| // | ||
| // Author: Andrula Song <[email protected]> | ||
|
|
||
| #include <sof/common.h> | ||
|
|
||
| #include "mixin_mixout.h" | ||
|
|
||
| #if SOF_USE_HIFI(5, MIXIN_MIXOUT) | ||
|
|
||
| #if CONFIG_FORMAT_S16LE | ||
| static void mix_s16(struct cir_buf_ptr *sink, int32_t start_sample, int32_t mixed_samples, | ||
| const struct cir_buf_ptr *source, | ||
| int32_t sample_count, uint16_t gain) | ||
| { | ||
| int samples_to_mix, samples_to_copy, left_samples; | ||
| int n, nmax, i, m, left; | ||
| ae_int16x4 in_sample, in_sample1; | ||
| ae_int16x4 out_sample, out_sample1; | ||
| ae_int16x8 *in; | ||
| ae_int16x8 *out; | ||
| ae_valignx2 inu = AE_ZALIGN128(); | ||
| ae_valignx2 outu1 = AE_ZALIGN128(); | ||
| ae_valignx2 outu2 = AE_ZALIGN128(); | ||
| /* cir_buf_wrap() is required and is done below in a loop */ | ||
| ae_int16 *dst = (ae_int16 *)sink->ptr + start_sample; | ||
| ae_int16 *src = source->ptr; | ||
|
|
||
| assert(mixed_samples >= start_sample); | ||
| samples_to_mix = AE_MIN32(mixed_samples - start_sample, sample_count); | ||
| samples_to_copy = sample_count - samples_to_mix; | ||
| n = 0; | ||
|
|
||
| for (left_samples = samples_to_mix; left_samples > 0; left_samples -= n) { | ||
| src = cir_buf_wrap(src + n, source->buf_start, source->buf_end); | ||
| dst = cir_buf_wrap(dst + n, sink->buf_start, sink->buf_end); | ||
| /* calculate the remaining samples*/ | ||
| nmax = (ae_int16 *)source->buf_end - src; | ||
| n = AE_MIN32(left_samples, nmax); | ||
| nmax = (ae_int16 *)sink->buf_end - dst; | ||
| n = AE_MIN32(n, nmax); | ||
| in = (ae_int16x8 *)src; | ||
| out = (ae_int16x8 *)dst; | ||
| inu = AE_LA128_PP(in); | ||
| outu1 = AE_LA128_PP(out); | ||
| m = n >> 3; | ||
| left = n & 0x07; | ||
| /* process 8 samples per loop */ | ||
| for (i = 0; i < m; i++) { | ||
| AE_LA16X4X2_IP(in_sample, in_sample1, inu, in); | ||
| AE_LA16X4X2_IP(out_sample, out_sample1, outu1, out); | ||
| out--; | ||
| out_sample = AE_ADD16S(in_sample, out_sample); | ||
| out_sample1 = AE_ADD16S(in_sample1, out_sample1); | ||
| AE_SA16X4X2_IP(out_sample, out_sample1, outu2, out); | ||
| } | ||
| AE_SA128POS_FP(outu2, out); | ||
|
|
||
| /* process the left samples that less than 8 | ||
| * one by one to avoid memory access overrun | ||
| */ | ||
| for (i = 0; i < left ; i++) { | ||
| AE_L16_IP(in_sample, (ae_int16 *)in, sizeof(ae_int16)); | ||
| AE_L16_IP(out_sample, (ae_int16 *)out, 0); | ||
| out_sample = AE_ADD16S(in_sample, out_sample); | ||
| AE_S16_0_IP(out_sample, (ae_int16 *)out, sizeof(ae_int16)); | ||
| } | ||
| } | ||
|
|
||
| for (left_samples = samples_to_copy; left_samples > 0; left_samples -= n) { | ||
| src = cir_buf_wrap(src + n, source->buf_start, source->buf_end); | ||
| dst = cir_buf_wrap(dst + n, sink->buf_start, sink->buf_end); | ||
| /* calculate the remaining samples*/ | ||
| nmax = (ae_int16 *)source->buf_end - src; | ||
| n = AE_MIN32(left_samples, nmax); | ||
| nmax = (ae_int16 *)sink->buf_end - dst; | ||
| n = AE_MIN32(n, nmax); | ||
| in = (ae_int16x8 *)src; | ||
| out = (ae_int16x8 *)dst; | ||
| inu = AE_LA128_PP(in); | ||
| m = n >> 3; | ||
| left = n & 0x07; | ||
| /* process 8 frames per loop */ | ||
| for (i = 0; i < m; i++) { | ||
| AE_LA16X4X2_IP(in_sample, in_sample1, inu, in); | ||
| AE_SA16X4X2_IP(in_sample, in_sample1, outu2, out); | ||
| } | ||
| AE_SA128POS_FP(outu2, out); | ||
|
|
||
| /* process the left samples that less than 8 | ||
| * one by one to avoid memory access overrun | ||
| */ | ||
| for (i = 0; i < left ; i++) { | ||
| AE_L16_IP(in_sample, (ae_int16 *)in, sizeof(ae_int16)); | ||
| AE_S16_0_IP(in_sample, (ae_int16 *)out, sizeof(ae_int16)); | ||
| } | ||
| } | ||
| } | ||
| #endif /* CONFIG_FORMAT_S16LE */ | ||
|
|
||
| #if CONFIG_FORMAT_S24LE | ||
| static void mix_s24(struct cir_buf_ptr *sink, int32_t start_sample, int32_t mixed_samples, | ||
| const struct cir_buf_ptr *source, | ||
| int32_t sample_count, uint16_t gain) | ||
| { | ||
| int samples_to_mix, samples_to_copy, left_samples; | ||
| int n, nmax, i, m, left; | ||
| ae_int32x2 in_sample, in_sample1; | ||
| ae_int32x2 out_sample, out_sample1; | ||
| ae_int32x4 *in; | ||
| ae_int32x4 *out; | ||
| ae_valignx2 inu = AE_ZALIGN128(); | ||
| ae_valignx2 outu1 = AE_ZALIGN128(); | ||
| ae_valignx2 outu2 = AE_ZALIGN128(); | ||
| /* cir_buf_wrap() is required and is done below in a loop */ | ||
| int32_t *dst = (int32_t *)sink->ptr + start_sample; | ||
| int32_t *src = source->ptr; | ||
|
|
||
| assert(mixed_samples >= start_sample); | ||
| samples_to_mix = AE_MIN32(mixed_samples - start_sample, sample_count); | ||
| samples_to_copy = sample_count - samples_to_mix; | ||
| n = 0; | ||
|
|
||
| for (left_samples = samples_to_mix; left_samples > 0; left_samples -= n) { | ||
| src = cir_buf_wrap(src + n, source->buf_start, source->buf_end); | ||
| dst = cir_buf_wrap(dst + n, sink->buf_start, sink->buf_end); | ||
| /* calculate the remaining samples*/ | ||
| nmax = (int32_t *)source->buf_end - src; | ||
| n = AE_MIN32(left_samples, nmax); | ||
| nmax = (int32_t *)sink->buf_end - dst; | ||
| n = AE_MIN32(n, nmax); | ||
| in = (ae_int32x4 *)src; | ||
| out = (ae_int32x4 *)dst; | ||
| inu = AE_LA128_PP(in); | ||
| outu1 = AE_LA128_PP(out); | ||
| m = n >> 2; | ||
| left = n & 3; | ||
| /* process 2 samples per time */ | ||
| for (i = 0; i < m; i++) { | ||
| AE_LA32X2X2_IP(in_sample, in_sample1, inu, in); | ||
| AE_LA32X2X2_IP(out_sample, out_sample1, outu1, out); | ||
| out--; | ||
| out_sample = AE_ADD24S(in_sample, out_sample); | ||
| out_sample1 = AE_ADD24S(in_sample1, out_sample1); | ||
| AE_SA32X2X2_IP(out_sample, out_sample1, outu2, out); | ||
| } | ||
| AE_SA128POS_FP(outu2, out); | ||
|
|
||
| /* process the left sample to avoid memory access overrun */ | ||
| if (left) { | ||
| AE_L32_IP(in_sample, (ae_int32 *)in, sizeof(ae_int32)); | ||
| AE_L32_IP(out_sample, (ae_int32 *)out, 0); | ||
| out_sample = AE_ADD24S(in_sample, out_sample); | ||
| AE_S32_L_IP(out_sample, (ae_int32 *)out, sizeof(ae_int32)); | ||
| } | ||
| } | ||
|
|
||
| for (left_samples = samples_to_copy; left_samples > 0; left_samples -= n) { | ||
| src = cir_buf_wrap(src + n, source->buf_start, source->buf_end); | ||
| dst = cir_buf_wrap(dst + n, sink->buf_start, sink->buf_end); | ||
| nmax = (int32_t *)source->buf_end - src; | ||
| n = AE_MIN32(left_samples, nmax); | ||
| nmax = (int32_t *)sink->buf_end - dst; | ||
| n = AE_MIN32(n, nmax); | ||
| in = (ae_int32x4 *)src; | ||
| out = (ae_int32x4 *)dst; | ||
| inu = AE_LA128_PP(in); | ||
| m = n >> 2; | ||
| left = n & 3; | ||
| for (i = 0; i < m; i++) { | ||
| AE_LA32X2X2_IP(in_sample, in_sample1, inu, in); | ||
| AE_SA32X2X2_IP(in_sample, in_sample1, outu2, out); | ||
| } | ||
| AE_SA128POS_FP(outu2, out); | ||
| /* process the left sample to avoid memory access overrun */ | ||
| if (left) { | ||
| AE_L32_IP(in_sample, (ae_int32 *)in, sizeof(ae_int32)); | ||
| AE_S32_L_IP(in_sample, (ae_int32 *)out, sizeof(ae_int32)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #endif /* CONFIG_FORMAT_S24LE */ | ||
|
|
||
| #if CONFIG_FORMAT_S32LE | ||
| static void mix_s32(struct cir_buf_ptr *sink, int32_t start_sample, int32_t mixed_samples, | ||
| const struct cir_buf_ptr *source, | ||
| int32_t sample_count, uint16_t gain) | ||
| { | ||
| int samples_to_mix, samples_to_copy, left_samples; | ||
| int n, nmax, i, m, left; | ||
| ae_int32x2 in_sample, in_sample1; | ||
| ae_int32x2 out_sample, out_sample1; | ||
| ae_int32x4 *in; | ||
| ae_int32x4 *out; | ||
| ae_valignx2 inu = AE_ZALIGN128(); | ||
| ae_valignx2 outu1 = AE_ZALIGN128(); | ||
| ae_valignx2 outu2 = AE_ZALIGN128(); | ||
| /* cir_buf_wrap() is required and is done below in a loop */ | ||
| int32_t *dst = (int32_t *)sink->ptr + start_sample; | ||
| int32_t *src = source->ptr; | ||
|
|
||
| assert(mixed_samples >= start_sample); | ||
| samples_to_mix = AE_MIN32(mixed_samples - start_sample, sample_count); | ||
| samples_to_copy = sample_count - samples_to_mix; | ||
| n = 0; | ||
|
|
||
| for (left_samples = samples_to_mix; left_samples > 0; left_samples -= n) { | ||
| src = cir_buf_wrap(src + n, source->buf_start, source->buf_end); | ||
| dst = cir_buf_wrap(dst + n, sink->buf_start, sink->buf_end); | ||
| /* calculate the remaining samples*/ | ||
| nmax = (int32_t *)source->buf_end - src; | ||
| n = AE_MIN32(left_samples, nmax); | ||
| nmax = (int32_t *)sink->buf_end - dst; | ||
| n = AE_MIN32(n, nmax); | ||
| in = (ae_int32x4 *)src; | ||
| out = (ae_int32x4 *)dst; | ||
| inu = AE_LA128_PP(in); | ||
| outu1 = AE_LA128_PP(out); | ||
| m = n >> 2; | ||
| left = n & 3; | ||
| for (i = 0; i < m; i++) { | ||
| AE_LA32X2X2_IP(in_sample, in_sample1, inu, in); | ||
| AE_LA32X2X2_IP(out_sample, out_sample1, outu1, out); | ||
| out--; | ||
| out_sample = AE_ADD32S(in_sample, out_sample); | ||
| out_sample1 = AE_ADD32S(in_sample1, out_sample1); | ||
| AE_SA32X2X2_IP(out_sample, out_sample1, outu2, out); | ||
| } | ||
| AE_SA128POS_FP(outu2, out); | ||
|
|
||
| /* process the left sample to avoid memory access overrun */ | ||
| if (left) { | ||
| AE_L32_IP(in_sample, (ae_int32 *)in, sizeof(ae_int32)); | ||
| AE_L32_IP(out_sample, (ae_int32 *)out, 0); | ||
| out_sample = AE_ADD32S(in_sample, out_sample); | ||
| AE_S32_L_IP(out_sample, (ae_int32 *)out, sizeof(ae_int32)); | ||
| } | ||
| } | ||
|
|
||
| for (left_samples = samples_to_copy; left_samples > 0; left_samples -= n) { | ||
| src = cir_buf_wrap(src + n, source->buf_start, source->buf_end); | ||
| dst = cir_buf_wrap(dst + n, sink->buf_start, sink->buf_end); | ||
| /* calculate the remaining samples*/ | ||
| nmax = (int32_t *)source->buf_end - src; | ||
| n = AE_MIN32(left_samples, nmax); | ||
| nmax = (int32_t *)sink->buf_end - dst; | ||
| n = AE_MIN32(n, nmax); | ||
| in = (ae_int32x4 *)src; | ||
| out = (ae_int32x4 *)dst; | ||
| inu = AE_LA128_PP(in); | ||
| m = n >> 2; | ||
| left = n & 3; | ||
| for (i = 0; i < m; i++) { | ||
| AE_LA32X2X2_IP(in_sample, in_sample1, inu, in); | ||
| AE_SA32X2X2_IP(in_sample, in_sample1, outu2, out); | ||
| } | ||
| AE_SA128POS_FP(outu2, out); | ||
| /* process the left sample to avoid memory access overrun */ | ||
| if (left) { | ||
| AE_L32_IP(in_sample, (ae_int32 *)in, sizeof(ae_int32)); | ||
| AE_S32_L_IP(in_sample, (ae_int32 *)out, sizeof(ae_int32)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #endif /* CONFIG_FORMAT_S32LE */ | ||
|
|
||
| const struct mix_func_map mix_func_map[] = { | ||
| #if CONFIG_FORMAT_S16LE | ||
| { SOF_IPC_FRAME_S16_LE, mix_s16 }, | ||
| #endif | ||
| #if CONFIG_FORMAT_S24LE | ||
| { SOF_IPC_FRAME_S24_4LE, mix_s24 }, | ||
| #endif | ||
| #if CONFIG_FORMAT_S32LE | ||
| { SOF_IPC_FRAME_S32_LE, mix_s32 } | ||
| #endif | ||
| }; | ||
|
|
||
| const size_t mix_count = ARRAY_SIZE(mix_func_map); | ||
|
|
||
| #endif | ||
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
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.
Has this mix code been been verified? The ALSA S24_LE is aligned to least significant bits while ae_f24 in Xtensa is most significant bits aligned. In the past at least SOF was using the ALSA S24_LE. We used to have a mess with this and I'm no more sure if we have discarded the 24 bit ALSA format to be compatible with Windows OS's 24 bit format. Is the previous generic or HiFi3 mixing like this, if yes this would be OK. Changing 24 bit assumptions is another discussion and apparently we may support both in parts of code (cc @kv2019i ). But we should reject in prepare() unsupported 24 bit flavor.
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.
ok - having a reject message would be fine here until support for both 24bit formats is upstream. This message and 24 bit support can be added incrementally though since this is good for testing now and passing CI.
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.
I hope CI is testing the 24 bit case. Proposing to make another test patch that breaks mix_s24() function and see if it fails the CI run.