Skip to content

tools: Support multi-output component playback testing on testbench#3210

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

Merged
lgirdwood merged 3 commits into from
Aug 6, 2020
Merged

tools: Support multi-output component playback testing on testbench #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e902859
tools: topology: Support multi-output playback topology
johnylin76 Jul 24, 2020
8484e15
tools: testbench: Support multiple output files
johnylin76 Jul 24, 2020
9d1581b
tools: testbench: Support channels specification
johnylin76 Jul 24, 2020
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
186 changes: 180 additions & 6 deletions tools/test/topology/test-playback.m4
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,9 @@ include(`platform/intel/bxt.m4')

DEBUG_START

dnl Produce uppercase for input string
define(`upcase', `translit(`$*', `a-z', `A-Z')')

#
# Machine Specific Config - !! MUST BE SET TO MATCH TEST MACHINE DRIVER !!
#
Expand All@@ -32,17 +35,50 @@ DEBUG_START
# TEST_SSP_PHY_BITS - SSP physical slot size
# TEST_SSP_DATA_BITS - SSP data slot size
# TEST_SSP_MODE - SSP mode e.g. I2S, LEFT_J, DSP_A and DSP_B
# TEST_PIPE_AMOUNT - Total amount of pipelines e.g. 1, 2, 3, 4
#

# Apply a non-trivial filter blob IIR and FIR tests. TODO: Note that the
# PIPELINE_FILTERx notation will be updated in future for better flexibility.
define(PIPELINE_FILTER1, ifelse(TEST_PIPE_NAME, `eq-iir', `eq_iir_coef_loudness.m4'))
define(PIPELINE_FILTER2, ifelse(TEST_PIPE_NAME, `eq-fir', `eq_fir_coef_loudness.m4'))

# Define TEST_HAS_PIPEn flags according to TEST_PIPE_AMOUNT. Those flags will be
# used to determine whether PIPELINE_n should be added.
ifelse(TEST_PIPE_AMOUNT, `2',
`
define(TEST_HAS_PIPE2)
')

ifelse(TEST_PIPE_AMOUNT, `3',
`
define(TEST_HAS_PIPE2)
define(TEST_HAS_PIPE3)
')

ifelse(TEST_PIPE_AMOUNT, `4',
`
define(TEST_HAS_PIPE2)
define(TEST_HAS_PIPE3)
define(TEST_HAS_PIPE4)
')

#
# Define the pipeline
# Define the pipeline(s)
#
# PCM0P --> TEST_PIPE_NAME --> SSP(TEST_DAI_PORT)
# PCM0P --> BUF1.0 --> TEST_PIPE_NAME --> BUF1.1 --> SSP(TEST_DAI_PORT)
ifdef(`TEST_HAS_PIPE2',
`
# +---> BUF2.0 --> SSP(0 or 1)
')
ifdef(`TEST_HAS_PIPE3',
`
# +---> BUF3.0 --> SSP(2 or 3)
')
ifdef(`TEST_HAS_PIPE4',
`
# +---> BUF4.0 --> SSP(4 or 5)
')
#

# Playback pipeline 1 on PCM 0 using max 2 channels of s32le.
Expand All@@ -52,10 +88,71 @@ PIPELINE_PCM_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4,
1000, 0, 0,
8000, 192000, 48000)

# Generalize the pipeline junction name as PIPELINE_JUNCTION.
# e.g. TEST_PIPE_NAME=`crossover' --> PIPELINE_JUNCTION=`PIPELINE_CROSSOVER_1'
define(PIPELINE_JUNCTION, concat(concat(`PIPELINE_', upcase(TEST_PIPE_NAME)), `_1'))

ifdef(`TEST_HAS_PIPE2',
`
# Playback pipeline 2 on PCM 1 using max 2 channels of s32le.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-dai-endpoint.m4,
2, 1, 2, s32le,
1000, 0, 0,
8000, 192000, 48000)

# connect pipelines together
SectionGraph."pipe-sof-second-pipe" {
index "2"

lines [
# connect the second sink buffer
dapm(PIPELINE_SOURCE_2, PIPELINE_JUNCTION)
]
}
')

ifdef(`TEST_HAS_PIPE3',
`
# Playback pipeline 3 on PCM 2 using max 2 channels of s32le.
# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-dai-endpoint.m4,
3, 2, 2, s32le,
1000, 0, 0,
8000, 192000, 48000)

# connect pipelines together
SectionGraph."pipe-sof-third-pipe" {
index "3"

lines [
# connect the third sink buffer
dapm(PIPELINE_SOURCE_3, PIPELINE_JUNCTION)
]
}
')

ifdef(`TEST_HAS_PIPE4',
`
# Playback pipeline 4 on PCM 3 using max 2 channels of s32le.

@cujomalaineycujomalaineyJul 24, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this section could be extracted out to a macro call and the index is just subbed in, thoughts?

# Set 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-dai-endpoint.m4,
4, 3, 2, s32le,
1000, 0, 0,
8000, 192000, 48000)

# connect pipelines together
SectionGraph."pipe-sof-fourth-pipe" {
index "4"

lines [
# connect the fourth sink buffer
dapm(PIPELINE_SOURCE_4, PIPELINE_JUNCTION)
]
}
')

# DAI configuration
#
# SSP port TEST_DAI_PORT is our only pipeline DAI
#

# playback DAI is SSP TEST_DAI_PORT using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
Expand All@@ -64,6 +161,48 @@ DAI_ADD(sof/pipe-dai-playback.m4,
PIPELINE_SOURCE_1, 2, TEST_DAI_FORMAT,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)

ifdef(`TEST_HAS_PIPE2',
`
define(TEST_DAI2_PORT, ifelse(TEST_DAI_PORT, `0', `1', `0'))
define(TEST_DAI2_LINK_NAME, ifelse(TEST_DAI_PORT, `0', `SSP1-Codec', `SSP0-Codec'))

# playback DAI is SSP TEST_DAI2_PORT using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD_SCHED(sof/pipe-dai-sched-playback.m4,

@cujomalaineycujomalaineyJul 24, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same goes for this section

2, TEST_DAI_TYPE, TEST_DAI2_PORT, TEST_DAI2_LINK_NAME,
PIPELINE_SOURCE_2, 2, TEST_DAI_FORMAT,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER,
PIPELINE_PLAYBACK_SCHED_COMP_1)
')

ifdef(`TEST_HAS_PIPE3',
`
define(TEST_DAI3_PORT, ifelse(TEST_DAI_PORT, `2', `3', `2'))
define(TEST_DAI3_LINK_NAME, ifelse(TEST_DAI_PORT, `2', `SSP3-Codec', `SSP2-Codec'))

# playback DAI is SSP TEST_DAI3_PORT using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD_SCHED(sof/pipe-dai-sched-playback.m4,
3, TEST_DAI_TYPE, TEST_DAI3_PORT, TEST_DAI3_LINK_NAME,
PIPELINE_SOURCE_3, 2, TEST_DAI_FORMAT,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER,
PIPELINE_PLAYBACK_SCHED_COMP_1)
')

ifdef(`TEST_HAS_PIPE4',
`
define(TEST_DAI4_PORT, ifelse(TEST_DAI_PORT, `4', `5', `4'))
define(TEST_DAI4_LINK_NAME, ifelse(TEST_DAI_PORT, `4', `SSP5-Codec', `SSP4-Codec'))

# playback DAI is SSP TEST_DAI4_PORT using 2 periods
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
DAI_ADD_SCHED(sof/pipe-dai-sched-playback.m4,
4, TEST_DAI_TYPE, TEST_DAI4_PORT, TEST_DAI4_LINK_NAME,
PIPELINE_SOURCE_4, 2, TEST_DAI_FORMAT,
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER,
PIPELINE_PLAYBACK_SCHED_COMP_1)
')

# PCM Passthrough
PCM_PLAYBACK_ADD(Passthrough, 0, PIPELINE_PCM_1)

Expand All@@ -73,7 +212,7 @@ PCM_PLAYBACK_ADD(Passthrough, 0, PIPELINE_PCM_1)
# Clocks masters wrt codec
#
# TEST_SSP_DATA_BITS bit I2S
# using TEST_SSP_PHY_BITS bit sample container on SSP TEST_DAI_PORT
# using TEST_SSP_PHY_BITS bit sample container on SSP port(s)
#
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
Expand All@@ -84,5 +223,40 @@ DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI_PORT, 0, TEST_DAI_LINK_NAME,
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))

ifdef(`TEST_HAS_PIPE2',
`
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI2_PORT, 1, TEST_DAI2_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI2_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
')

ifdef(`TEST_HAS_PIPE3',
`
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI3_PORT, 2, TEST_DAI3_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI3_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
')

ifdef(`TEST_HAS_PIPE4',
`
DAI_CONFIG(TEST_DAI_TYPE, TEST_DAI4_PORT, 3, TEST_DAI4_LINK_NAME,
SSP_CONFIG(TEST_SSP_MODE,
SSP_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in),
SSP_CLOCK(bclk, TEST_SSP_BCLK, codec_slave),
SSP_CLOCK(fsync, 48000, codec_slave),
SSP_TDM(2, TEST_SSP_PHY_BITS, 3, 3),
SSP_CONFIG_DATA(TEST_DAI_TYPE, TEST_DAI4_PORT,
TEST_SSP_DATA_BITS, TEST_SSP_MCLK_ID)))
')

DEBUG_END
Loading