Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Audio: Component: HiFi5 implementation of functions. #8695

Merged
merged 3 commits into from
Mar 8, 2024
Merged

Audio: Component: HiFi5 implementation of functions. #8695

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
568a4c7
Audio: Component: Add HiFi5 implementation of audio_stream_copy
andrula-song Jan 4, 2024
cb20c2f
Audio: Component: Fix the potential risks of HiFi3 audio_stream_copy
andrula-song Mar 8, 2024
124eb29
Audio: Component: Add HiFi5 implementation of cir_buf_copy.
andrula-song Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 148 additions & 8 deletions src/audio/component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@

#if defined(__XCC__)
#include <xtensa/config/core-isa.h>
#if XCHAL_HAVE_HIFI3 || XCHAL_HAVE_HIFI4
#define STREAMCOPY_HIFI3
# if XCHAL_HAVE_HIFI5
# define STREAMCOPY_HIFI5
# elif XCHAL_HAVE_HIFI3 || XCHAL_HAVE_HIFI4
# define STREAMCOPY_HIFI3
#endif
#endif

Expand Down Expand Up @@ -182,7 +184,101 @@ void comp_get_copy_limits_frame_aligned(const struct comp_buffer *source,
cl->sink_bytes = cl->frames * cl->sink_frame_bytes;
}

#ifdef STREAMCOPY_HIFI3
#if defined(STREAMCOPY_HIFI5)

#include <xtensa/tie/xt_hifi5.h>

int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
struct audio_stream *sink, uint32_t ooffset, uint32_t samples)
{
int ssize = audio_stream_sample_bytes(source); /* src fmt == sink fmt */
ae_int16x8 *src = (ae_int16x8 *)((int8_t *)audio_stream_get_rptr(source) + ioffset * ssize);
ae_int16x8 *dst = (ae_int16x8 *)((int8_t *)audio_stream_get_wptr(sink) + ooffset * ssize);
int shorts = samples * ssize >> 1;
int shorts_src;
int shorts_dst;
int shorts_copied;
int left, m, i;
ae_int16x4 in_sample1;
ae_int16x4 in_sample2;
ae_valignx2 inu;
ae_valignx2 outu = AE_ZALIGN128();

/* copy with 16bit as the minimum unit since the minimum sample size is 16 bit*/
while (shorts > 0) {
src = audio_stream_wrap(source, src);
dst = audio_stream_wrap(sink, dst);
shorts_src = audio_stream_samples_without_wrap_s16(source, src);
shorts_dst = audio_stream_samples_without_wrap_s16(sink, dst);
shorts_copied = AE_MIN32(shorts_src, shorts_dst);
shorts_copied = AE_MIN32(shorts, shorts_copied);
m = shorts_copied >> 3;
left = shorts_copied & 0x07;
inu = AE_LA128_PP(src);
/* copy 4 * 16bit(8 bytes)per loop */
for (i = 0; i < m; i++) {
AE_LA16X4X2_IP(in_sample1, in_sample2, inu, src);
AE_SA16X4X2_IP(in_sample1, in_sample2, outu, dst);
}
AE_SA128POS_FP(outu, dst);

/* process the left bits that less than 4 * 16 */
for (i = 0; i < left ; i++) {
AE_L16_IP(in_sample1, (ae_int16 *)src, sizeof(ae_int16));
AE_S16_0_IP(in_sample1, (ae_int16 *)dst, sizeof(ae_int16));
}
shorts -= shorts_copied;
}
return samples;
}

void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
void *dst_addr, void *dst_end, size_t byte_size)
{
size_t bytes = byte_size;
size_t bytes_src;
size_t bytes_dst;
size_t bytes_copied;
size_t short_copied;
int left, m, i;
ae_int16x4 in_sample1, in_sample2;
ae_valignx2 inu;
ae_valignx2 outu = AE_ZALIGN128();
ae_int16x8 *in = (ae_int16x8 *)src;
ae_int16x8 *out = (ae_int16x8 *)dst;

while (bytes) {
bytes_src = cir_buf_bytes_without_wrap(in, src_end);
bytes_dst = cir_buf_bytes_without_wrap(out, dst_end);
bytes_copied = MIN(bytes_src, bytes_dst);
bytes_copied = MIN(bytes, bytes_copied);
short_copied = bytes_copied >> 1;

m = short_copied >> 3;
left = short_copied & 0x07;
inu = AE_LA128_PP(in);
/* copy 2 * 4 * 16bit(16 bytes)per loop */
for (i = 0; i < m; i++) {
AE_LA16X4X2_IP(in_sample1, in_sample2, inu, in);
AE_SA16X4X2_IP(in_sample1, in_sample2, outu, out);
}
AE_SA128POS_FP(outu, out);

/* process the left bits that less than 2 * 4 * 16 */
for (i = 0; i < left ; i++) {
AE_L16_IP(in_sample1, (ae_int16 *)in, sizeof(ae_int16));
AE_S16_0_IP(in_sample1, (ae_int16 *)out, sizeof(ae_int16));
}

bytes -= bytes_copied;
in = cir_buf_wrap(in, src_addr, src_end);
out = cir_buf_wrap(out, dst_addr, dst_end);
}
}

#elif defined(STREAMCOPY_HIFI3)

#include <xtensa/tie/xt_hifi3.h>

int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
struct audio_stream *sink, uint32_t ooffset, uint32_t samples)
Expand All @@ -200,13 +296,13 @@ int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
ae_valign outu = AE_ZALIGN64();

/* copy with 16bit as the minimum unit since the minimum sample size is 16 bit*/
while (shorts) {
while (shorts > 0) {
src = audio_stream_wrap(source, src);
dst = audio_stream_wrap(sink, dst);
shorts_src = audio_stream_samples_without_wrap_s16(source, src);
shorts_dst = audio_stream_samples_without_wrap_s16(sink, dst);
shorts_copied = AE_MIN_32_signed(shorts_src, shorts_dst);
shorts_copied = AE_MIN_32_signed(shorts, shorts_copied);
shorts_copied = AE_MIN32(shorts_src, shorts_dst);
shorts_copied = AE_MIN32(shorts, shorts_copied);
m = shorts_copied >> 2;
left = shorts_copied & 0x03;
inu = AE_LA64_PP(src);
Expand All @@ -227,6 +323,50 @@ int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
return samples;
}

void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
void *dst_addr, void *dst_end, size_t byte_size)
{
size_t bytes = byte_size;
size_t bytes_src;
size_t bytes_dst;
size_t bytes_copied;
size_t short_copied;

int left, m, i;
ae_int16x4 in_sample = AE_ZERO16();
ae_valign inu = AE_ZALIGN64();
ae_valign outu = AE_ZALIGN64();
ae_int16x4 *in = (ae_int16x4 *)src;
ae_int16x4 *out = (ae_int16x4 *)dst;

while (bytes) {
bytes_src = cir_buf_bytes_without_wrap(in, src_end);
bytes_dst = cir_buf_bytes_without_wrap(out, dst_end);
bytes_copied = MIN(bytes_src, bytes_dst);
bytes_copied = MIN(bytes, bytes_copied);
short_copied = bytes_copied >> 1;
m = short_copied >> 2;
left = short_copied & 0x03;
inu = AE_LA64_PP(in);
/* copy 4 * 16bit(8 bytes)per loop */
for (i = 0; i < m; i++) {
AE_LA16X4_IP(in_sample, inu, in);
AE_SA16X4_IP(in_sample, outu, out);
}
AE_SA64POS_FP(outu, out);

/* process the left bits that less than 4 * 16 */
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));
}

bytes -= bytes_copied;
in = cir_buf_wrap(in, src_addr, src_end);
out = cir_buf_wrap(out, dst_addr, dst_end);
}
}

#else

int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
Expand Down Expand Up @@ -256,8 +396,6 @@ int audio_stream_copy(const struct audio_stream *source, uint32_t ioffset,
return samples;
}

#endif

void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
void *dst_addr, void *dst_end, size_t byte_size)
{
Expand All @@ -280,6 +418,8 @@ void cir_buf_copy(void *src, void *src_addr, void *src_end, void *dst,
}
}

#endif

void audio_stream_copy_from_linear(const void *linear_source, int ioffset,
struct audio_stream *sink, int ooffset,
unsigned int samples)
Expand Down
Loading