Skip to content

ll_schedule: refining the scheduling policy to on demand#3768

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 7 commits into from
Feb 26, 2021
Merged

ll_schedule: refining the scheduling policy to on demand #3768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5565c99
Revert "timer_domain: set last_tick to ticks_req in order to avoid dr…
keyonjie Feb 24, 2021
06afce2
ll_schedule: rename last_tick to next_tick
keyonjie Feb 4, 2021
3452a81
timer_domain: refine the timer_domain_set() logic
keyonjie Feb 4, 2021
ab9a89c
ll_schedule: refine the _domain_set/clear() logic
keyonjie Feb 4, 2021
159a49f
ll_schedule: _tasks_run() refining
keyonjie Feb 4, 2021
b8409b4
ll_schedule: reschedule logic refining
keyonjie Feb 4, 2021
f535d45
Kconfig: update the description of SYSTICK_PERIOD
keyonjie Feb 25, 2021
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
14 changes: 11 additions & 3 deletions src/include/sof/schedule/ll_schedule_domain.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,7 +42,7 @@ struct ll_schedule_domain_ops {
};

Comment thread
dbaluta marked this conversation as resolved.
Outdated
struct ll_schedule_domain {
uint64_t last_tick; /**< timestamp of last run */
uint64_t next_tick; /**< ticks just set for next run */
spinlock_t lock; /**< standard lock */
atomic_t total_num_tasks; /**< total number of registered tasks */
atomic_t num_clients; /**< number of registered cores */
Expand DownExpand Up@@ -84,6 +84,8 @@ static inline struct ll_schedule_domain *domain_init
domain->full_sync = false;
domain->ticks_per_ms = clock_ms_to_ticks(clk, 1);
domain->ops = ops;
/* maximum value means no tick has been set to timer */
domain->next_tick = UINT64_MAX;

spinlock_init(&domain->lock);
atomic_init(&domain->total_num_tasks, 0);
Expand DownExpand Up@@ -135,19 +137,26 @@ static inline void domain_disable(struct ll_schedule_domain *domain, int core)
platform_shared_commit(domain, sizeof(*domain));
}

/* configure the next interrupt for domain */
static inline void domain_set(struct ll_schedule_domain *domain, uint64_t start)
{
if (domain->ops->domain_set)
domain->ops->domain_set(domain, start);
else
domain->next_tick = start;

platform_shared_commit(domain, sizeof(*domain));
}

/* clear the interrupt for domain */
static inline void domain_clear(struct ll_schedule_domain *domain)
{
if (domain->ops->domain_clear)
domain->ops->domain_clear(domain);

/* reset to denote no tick/interrupt is set */
domain->next_tick = UINT64_MAX;

platform_shared_commit(domain, sizeof(*domain));
}

Expand All@@ -165,8 +174,7 @@ static inline bool domain_is_pending(struct ll_schedule_domain *domain,
return ret;
}

struct ll_schedule_domain *timer_domain_init(struct timer *timer, int clk,
uint64_t timeout);
struct ll_schedule_domain *timer_domain_init(struct timer *timer, int clk);

struct ll_schedule_domain *dma_multi_chan_domain_init(struct dma *dma_array,
uint32_t num_dma, int clk,
Expand Down
3 changes: 1 addition & 2 deletions src/platform/Kconfig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,8 +375,7 @@ config SYSTICK_PERIOD
int "System tick period in microseconds"
default 1000
help
Defines platform system tick period. It is used to
drive timer based low latency scheduler and also
Defines platform system tick period. It is used
as a timeout check value for system agent.
Value should be provided in microseconds.

Expand Down
3 changes: 1 addition & 2 deletions src/platform/baytrail/platform.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,8 +219,7 @@ int platform_init(struct sof *sof)

/* init low latency timer domain and scheduler */
sof->platform_timer_domain =
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK,
CONFIG_SYSTICK_PERIOD);
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK);

@lyakhlyakhFeb 24, 2021

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Is CONFIG_SYSTICK_PERIOD still needed after this change? The only other place it's also used in is to configure the system agent. You could either remove it and make the SA use the same constant, or at least adjust the description of CONFIG_SYSTICK_PERIOD in src/platform/Kconfig. Would be a separate patch or even an additional PR, not very important.

@keyonjiekeyonjieFeb 25, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Is CONFIG_SYSTICK_PERIOD still needed after this change? The only other place it's also used in is to configure the system agent. You could either remove it and make the SA use the same constant, or at least adjust the description of CONFIG_SYSTICK_PERIOD in src/platform/Kconfig. Would be a separate patch or even an additional PR, not very important.

I thought about this but didn't check the Kconfig description, agree, at least let me remove the scheduler part form it.
The naming 'SYSTICK_PERIOD' sounds vague to me, but let me keep it with this PR.

scheduler_init_ll(sof->platform_timer_domain);

/* init the system agent */
Expand Down
3 changes: 1 addition & 2 deletions src/platform/haswell/platform.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,8 +192,7 @@ int platform_init(struct sof *sof)

/* init low latency timer domain and scheduler */
sof->platform_timer_domain =
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK,
CONFIG_SYSTICK_PERIOD);
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK);
scheduler_init_ll(sof->platform_timer_domain);

/* init the system agent */
Expand Down
3 changes: 1 addition & 2 deletions src/platform/imx8/platform.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,8 +158,7 @@ int platform_init(struct sof *sof)

/* init low latency domains and schedulers */
sof->platform_timer_domain =
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK,
CONFIG_SYSTICK_PERIOD);
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK);
scheduler_init_ll(sof->platform_timer_domain);

platform_timer_start(sof->platform_timer);
Expand Down
3 changes: 1 addition & 2 deletions src/platform/imx8m/platform.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -157,8 +157,7 @@ int platform_init(struct sof *sof)

/* init low latency domains and schedulers */
sof->platform_timer_domain =
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK,
CONFIG_SYSTICK_PERIOD);
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK);
scheduler_init_ll(sof->platform_timer_domain);

platform_timer_start(sof->platform_timer);
Expand Down
3 changes: 1 addition & 2 deletions src/platform/intel/cavs/platform.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -386,8 +386,7 @@ int platform_init(struct sof *sof)

/* init low latency timer domain and scheduler */
sof->platform_timer_domain =
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK,
CONFIG_SYSTICK_PERIOD);
timer_domain_init(sof->platform_timer, PLATFORM_DEFAULT_CLOCK);
scheduler_init_ll(sof->platform_timer_domain);

/* init the system agent */
Expand Down
7 changes: 4 additions & 3 deletions src/schedule/dma_single_chan_domain.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,7 @@ static void dma_single_chan_domain_disable(struct ll_schedule_domain *domain,
}

/**
* \brief Calculates domain's last tick.
* \brief Calculates domain's next tick.
* \param[in,out] domain Pointer to schedule domain.
* \param[in] start Offset of last calculated tick.
*/
Expand All@@ -475,14 +475,15 @@ static void dma_single_chan_domain_set(struct ll_schedule_domain *domain,
goto out;

if (dma_domain->channel_changed) {
domain->last_tick = platform_timer_get_atomic(timer_get());
domain->next_tick = platform_timer_get_atomic(timer_get());

dma_domain->channel_changed = false;
} else {
ticks = domain->ticks_per_ms * data->channel->period / 1000 +
start;

domain->last_tick = domain->last_tick ? ticks : start;
domain->next_tick = domain->next_tick != UINT64_MAX ?
ticks : start;
}

out:
Expand Down
Loading