Skip to content

Commit 9cfb598

Browse files
committed
trace: remove superfluous objects
Trace context isn't used when building LLEXT, move it to monolithic build part. In many cases this eliminates the entire module's .data section. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 411e131 commit 9cfb598

File tree

38 files changed

+51
-88
lines changed

38 files changed

+51
-88
lines changed

src/audio/aria/aria.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ LOG_MODULE_REGISTER(aria, CONFIG_SOF_LOG_LEVEL);
3232
/* these ids aligns windows driver requirement to support windows driver */
3333
SOF_DEFINE_REG_UUID(aria);
3434

35-
DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
36-
3735
/**
3836
* \brief Aria gain index mapping table
3937
*/
@@ -326,6 +324,7 @@ SOF_LLEXT_BUILDINFO;
326324

327325
#else
328326

327+
DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
329328
DECLARE_MODULE_ADAPTER(aria_interface, aria_uuid, aria_comp_tr);
330329
SOF_MODULE_INIT(aria, sys_comp_module_aria_interface_init);
331330

src/audio/codec/dts/dts.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
#include <sof/audio/module_adapter/module/generic.h>
99
#include "DtsSofInterface.h"
1010

11-
1211
LOG_MODULE_REGISTER(dts, CONFIG_SOF_LOG_LEVEL);
1312

1413
SOF_DEFINE_REG_UUID(dts);
15-
DECLARE_TR_CTX(dts_tr, SOF_UUID(dts_uuid), LOG_LEVEL_INFO);
1614

1715
#define MAX_EXPECTED_DTS_CONFIG_DATA_SIZE 8192
1816

@@ -480,6 +478,7 @@ SOF_LLEXT_BUILDINFO;
480478

481479
#else
482480

481+
DECLARE_TR_CTX(dts_tr, SOF_UUID(dts_uuid), LOG_LEVEL_INFO);
483482
DECLARE_MODULE_ADAPTER(dts_interface, dts_uuid, dts_tr);
484483
SOF_MODULE_INIT(dts, sys_comp_module_dts_interface_init);
485484

src/audio/copier/copier.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ LOG_MODULE_REGISTER(copier, CONFIG_SOF_LOG_LEVEL);
5252
/* this id aligns windows driver requirement to support windows driver */
5353
SOF_DEFINE_REG_UUID(copier);
5454

55-
DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
56-
5755
#if CONFIG_INTEL_ADSP_MIC_PRIVACY
5856
static void mic_privacy_event(void *arg, enum notify_id type, void *data)
5957
{
@@ -1213,5 +1211,7 @@ static const struct module_interface copier_interface = {
12131211
.endpoint_ops = &copier_endpoint_ops,
12141212
};
12151213

1214+
DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
1215+
12161216
DECLARE_MODULE_ADAPTER(copier_interface, copier_uuid, copier_comp_tr);
12171217
SOF_MODULE_INIT(copier, sys_comp_module_copier_interface_init);

src/audio/copier/copier_ipcgtw.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ LOG_MODULE_REGISTER(ipcgtw, CONFIG_SOF_LOG_LEVEL);
1616

1717
SOF_DEFINE_REG_UUID(ipcgw);
1818

19-
DECLARE_TR_CTX(ipcgtw_comp_tr, SOF_UUID(ipcgw_uuid), LOG_LEVEL_INFO);
20-
2119
/* List of existing IPC gateways */
2220
static struct list_item ipcgtw_list_head = LIST_INIT(ipcgtw_list_head);
2321

src/audio/crossover/crossover.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ LOG_MODULE_REGISTER(crossover, CONFIG_SOF_LOG_LEVEL);
4040

4141
SOF_DEFINE_REG_UUID(crossover);
4242

43-
DECLARE_TR_CTX(crossover_tr, SOF_UUID(crossover_uuid), LOG_LEVEL_INFO);
44-
4543
/**
4644
* \brief Reset the state (coefficients and delay) of the crossover filter
4745
* across all channels
@@ -648,6 +646,7 @@ SOF_LLEXT_BUILDINFO;
648646

649647
#else
650648

649+
DECLARE_TR_CTX(crossover_tr, SOF_UUID(crossover_uuid), LOG_LEVEL_INFO);
651650
DECLARE_MODULE_ADAPTER(crossover_interface, crossover_uuid, crossover_tr);
652651
SOF_MODULE_INIT(crossover, sys_comp_module_crossover_interface_init);
653652

src/audio/dai-legacy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
4141

4242
SOF_DEFINE_REG_UUID(dai);
4343

44-
DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
45-
4644
#if CONFIG_COMP_DAI_GROUP
4745

4846
static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev, int cmd);
@@ -1105,6 +1103,8 @@ static uint64_t dai_get_processed_data(struct comp_dev *dev, uint32_t stream_no,
11051103
return ret;
11061104
}
11071105

1106+
DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
1107+
11081108
static const struct comp_driver comp_dai = {
11091109
.type = SOF_COMP_DAI,
11101110
.uid = SOF_RT_UUID(dai_uuid),

src/audio/dai-zephyr.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
6464

6565
SOF_DEFINE_REG_UUID(dai);
6666

67-
DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
68-
6967
#if CONFIG_COMP_DAI_GROUP
7068

7169
static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev, int cmd);
@@ -1995,6 +1993,8 @@ int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, struct bind_inf
19951993
}
19961994
#endif /* CONFIG_IPC_MAJOR_4 */
19971995

1996+
DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
1997+
19981998
static const struct comp_driver comp_dai = {
19991999
.type = SOF_COMP_DAI,
20002000
.uid = SOF_RT_UUID(dai_uuid),

src/audio/dcblock/dcblock.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ LOG_MODULE_REGISTER(dcblock, CONFIG_SOF_LOG_LEVEL);
3636

3737
SOF_DEFINE_REG_UUID(dcblock);
3838

39-
DECLARE_TR_CTX(dcblock_tr, SOF_UUID(dcblock_uuid), LOG_LEVEL_INFO);
40-
4139
/**
4240
* \brief Sets the DC Blocking filter in pass through mode.
4341
* The frequency response of a DCB filter is:
@@ -272,6 +270,7 @@ SOF_LLEXT_BUILDINFO;
272270

273271
#else
274272

273+
DECLARE_TR_CTX(dcblock_tr, SOF_UUID(dcblock_uuid), LOG_LEVEL_INFO);
275274
DECLARE_MODULE_ADAPTER(dcblock_interface, dcblock_uuid, dcblock_tr);
276275
SOF_MODULE_INIT(dcblock, sys_comp_module_dcblock_interface_init);
277276

src/audio/eq_fir/eq_fir.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ LOG_MODULE_REGISTER(eq_fir, CONFIG_SOF_LOG_LEVEL);
4040

4141
SOF_DEFINE_REG_UUID(eq_fir);
4242

43-
DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
44-
4543
/* Pass-through functions to replace FIR core while not configured for
4644
* response.
4745
*/
@@ -499,6 +497,7 @@ SOF_LLEXT_BUILDINFO;
499497

500498
#else
501499

500+
DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
502501
DECLARE_MODULE_ADAPTER(eq_fir_interface, eq_fir_uuid, eq_fir_tr);
503502
SOF_MODULE_INIT(eq_fir, sys_comp_module_eq_fir_interface_init);
504503

src/audio/eq_iir/eq_iir.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ LOG_MODULE_REGISTER(eq_iir, CONFIG_SOF_LOG_LEVEL);
3737

3838
SOF_DEFINE_REG_UUID(eq_iir);
3939

40-
DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
41-
4240
/*
4341
* End of EQ setup code. Next the standard component methods.
4442
*/
@@ -267,6 +265,7 @@ SOF_LLEXT_BUILDINFO;
267265

268266
#else
269267

268+
DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
270269
DECLARE_MODULE_ADAPTER(eq_iir_interface, eq_iir_uuid, eq_iir_tr);
271270
SOF_MODULE_INIT(eq_iir, sys_comp_module_eq_iir_interface_init);
272271

0 commit comments

Comments
 (0)