Skip to content

Commit 9e89986

Browse files
committed
audio: use xtensa/core-isa headers for HiFi builds
Use <xtensa/config/core-isa.h> consistently in HiFi FIR/SRC/ARIA and format headers instead of <xtensa/config/defs.h>. This avoids compiler-specific include probing and keeps build behavior identical across Cadence and upstream LLVM toolchains, since Zephyr SDK provides core-isa headers consistently for Xtensa targets.
1 parent e0c2702 commit 9e89986

14 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/audio/aria/aria_hifi3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "aria.h"
66

77
#if SOF_USE_HIFI(3, ARIA) || SOF_USE_HIFI(4, ARIA)
8-
#include <xtensa/config/defs.h>
8+
#include <xtensa/config/core-isa.h>
99
#include <xtensa/tie/xt_hifi3.h>
1010

1111
extern const int32_t sof_aria_index_tab[];

src/audio/aria/aria_hifi5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "aria.h"
66

77
#if SOF_USE_HIFI(5, ARIA)
8-
#include <xtensa/config/defs.h>
8+
#include <xtensa/config/core-isa.h>
99
#include <xtensa/tie/xt_hifi5.h>
1010

1111
extern const int32_t sof_aria_index_tab[];

src/audio/eq_fir/eq_fir_hifi2ep.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <sof/audio/buffer.h>
1414
#include <sof/audio/format.h>
1515
#include <sof/math/fir_hifi2ep.h>
16-
#include <xtensa/config/defs.h>
16+
#include <xtensa/config/core-isa.h>
1717
#include <xtensa/tie/xt_hifi2.h>
1818
#include <errno.h>
1919
#include <stddef.h>

src/audio/eq_fir/eq_fir_hifi3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <sof/audio/module_adapter/module/generic.h>
1313
#include <sof/math/fir_hifi3.h>
1414
#include <user/fir.h>
15-
#include <xtensa/config/defs.h>
15+
#include <xtensa/config/core-isa.h>
1616
#include <xtensa/tie/xt_hifi3.h>
1717
#include <errno.h>
1818
#include <stddef.h>

src/audio/src/src_hifi2ep.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "src_common.h"
1414

15-
#include <xtensa/config/defs.h>
15+
#include <xtensa/config/core-isa.h>
1616
#include <xtensa/tie/xt_hifi2.h>
1717
#include <stddef.h>
1818
#include <stdint.h>

src/audio/src/src_hifi3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "src_common.h"
1414

15-
#include <xtensa/config/defs.h>
15+
#include <xtensa/config/core-isa.h>
1616
#include <xtensa/tie/xt_hifi3.h>
1717
#include <stddef.h>
1818
#include <stdint.h>

src/audio/src/src_hifi4.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "src_common.h"
1515

1616
#include <sof/math/numbers.h>
17-
#include <xtensa/config/defs.h>
17+
#include <xtensa/config/core-isa.h>
1818
#include <xtensa/tie/xt_hifi4.h>
1919
#include <stddef.h>
2020
#include <stdint.h>

src/audio/src/src_hifi5.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "src_common.h"
1515

1616
#include <sof/math/numbers.h>
17-
#include <xtensa/config/defs.h>
17+
#include <xtensa/config/core-isa.h>
1818
#include <xtensa/tie/xt_hifi5.h>
1919
#include <stddef.h>
2020
#include <stdint.h>

src/include/sof/audio/format_hifi3.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define __SOF_AUDIO_FORMAT_HIFI3_H__
1010

1111
#include <stdint.h>
12-
#include <xtensa/config/defs.h>
12+
#include <xtensa/config/core-isa.h>
1313
#include <xtensa/tie/xt_hifi3.h>
1414

1515
/* Saturation inline functions */

src/include/sof/math/fir_hifi2ep.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <sof/audio/audio_stream.h>
1717
#include <sof/audio/buffer.h>
1818
#include <user/fir.h>
19-
#include <xtensa/config/defs.h>
19+
#include <xtensa/config/core-isa.h>
2020
#include <xtensa/tie/xt_hifi2.h>
2121
#include <stdint.h>
2222

0 commit comments

Comments
 (0)