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.

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: Aria: Fix compilation for HiFi5 #9605

Merged
merged 1 commit into from
Oct 25, 2024

Conversation

singalsu
Copy link
Collaborator

In aria_hifi5.c

  • The needed type for "in" in AE_LA32X2X2_IP() needs to be ae_int32x4. The HiFi5 code was likely developed with an earlier toolchain that used different type.
  • Removed unused declared variables, warnings are errors in testbench build.
  • Changed index_tab to common sof_aria_index_tab[]

In aria_generic.c, hifi3 changed INDEX_TAB[] to a common sof_aria_index_tab[]. It avoids link error in HiFi5 build where aria.c is missing the INDEX_TAB[].

The sof_aria_index_tab[] is changed from uint8_t to int32_t type to use the same table in every build.

In aria_hifi5.c

- The needed type for "in" in AE_LA32X2X2_IP() needs to be
  ae_int32x4. The HiFi5 code was likely developed with an
  earlier toolchain that used different type.
- Removed unused declared variables, warnings are errors
  in testbench build.
- Changed index_tab to common sof_aria_index_tab[]

In aria_generic.c, hifi3 changed INDEX_TAB[] to a common
sof_aria_index_tab[]. It avoids link error in HiFi5 build
where aria.c is missing the INDEX_TAB[].

The sof_aria_index_tab[] is changed from uint8_t to int32_t
type to use the same table in every build.

Signed-off-by: Seppo Ingalsuo <[email protected]>
@singalsu singalsu marked this pull request as ready for review October 23, 2024 09:54
@singalsu
Copy link
Collaborator Author

Changed to non-draft. I don't have good tests for Aria, but I was able to verify that before this change testbench MTL build output with topology sof-hda-benchmark-generic.tplg (copier - gain - mixin - mixout - aria - gain - mixin - mixout - copier) is bit exact with after change MTL build. With after changes build for TGL, MTL, PTL, and no-name HiFi5 platform they are all bit exact.

@lgirdwood
Copy link
Member

SOFCI TEST

@lgirdwood lgirdwood merged commit 4c69f83 into thesofproject:main Oct 25, 2024
43 of 47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants