Skip to content

tests: sched: Add busy threads for SMP #81051

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
nashif merged 2 commits into from
Nov 16, 2024
Merged

tests: sched: Add busy threads for SMP #81051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3195702
tests: sched: Add busy threads for SMP
ycsin Nov 7, 2024
b928d26
tests: benchmarks/sched: limit CPU to 1 for Intel ADSP ACE
ycsin Nov 8, 2024
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
6 changes: 6 additions & 0 deletions tests/benchmarks/sched/boards/intel_adsp_ace15_mtpm_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Due to addition of busy threads running on other cores,
# and the simulator runs in single thread bouncing through
# all cores, we are wasting quite a bit of time just busy
# waiting. This makes each simulator run too long for CI.
# So limit CPU number to 1.
CONFIG_MP_MAX_NUM_CPUS=1
6 changes: 6 additions & 0 deletions tests/benchmarks/sched/boards/intel_adsp_ace20_lnl_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Due to addition of busy threads running on other cores,
# and the simulator runs in single thread bouncing through
# all cores, we are wasting quite a bit of time just busy
# waiting. This makes each simulator run too long for CI.
# So limit CPU number to 1.
CONFIG_MP_MAX_NUM_CPUS=1
6 changes: 6 additions & 0 deletions tests/benchmarks/sched/boards/intel_adsp_ace30_ptl_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Due to addition of busy threads running on other cores,
# and the simulator runs in single thread bouncing through
# all cores, we are wasting quite a bit of time just busy
# waiting. This makes each simulator run too long for CI.
# So limit CPU number to 1.
CONFIG_MP_MAX_NUM_CPUS=1
27 changes: 27 additions & 0 deletions tests/benchmarks/sched/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
static K_THREAD_STACK_DEFINE(partner_stack, 1024);
static struct k_thread partner_thread;

#if (CONFIG_MP_MAX_NUM_CPUS > 1)
static struct k_thread busy_thread[CONFIG_MP_MAX_NUM_CPUS - 1];

#define BUSY_THREAD_STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)

Check notice on line 43 in tests/benchmarks/sched/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

tests/benchmarks/sched/src/main.c:43 
-#define BUSY_THREAD_STACK_SIZE  (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
+#define BUSY_THREAD_STACK_SIZE (1024 + CONFIG_TEST_EXTRA_STACK_SIZE)
static K_THREAD_STACK_ARRAY_DEFINE(busy_thread_stack, CONFIG_MP_MAX_NUM_CPUS - 1,
BUSY_THREAD_STACK_SIZE);
#endif /* (CONFIG_MP_MAX_NUM_CPUS > 1) */

_wait_q_t waitq;

enum {
Expand Down Expand Up @@ -88,8 +97,26 @@
}
}

#if (CONFIG_MP_MAX_NUM_CPUS > 1)
static void busy_thread_entry(void *arg1, void *arg2, void *arg3)
{
while (true) {
}
}
#endif /* (CONFIG_MP_MAX_NUM_CPUS > 1) */

int main(void)
{
#if (CONFIG_MP_MAX_NUM_CPUS > 1)
/* Spawn busy threads that will execute on the other cores */
for (uint32_t i = 0; i < CONFIG_MP_MAX_NUM_CPUS - 1; i++) {
k_thread_create(&busy_thread[i], busy_thread_stack[i],
BUSY_THREAD_STACK_SIZE, busy_thread_entry,
NULL, NULL, NULL,
K_HIGHEST_THREAD_PRIO, 0, K_NO_WAIT);
}

Check notice on line 117 in tests/benchmarks/sched/src/main.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

tests/benchmarks/sched/src/main.c:117 
-		k_thread_create(&busy_thread[i], busy_thread_stack[i],
-				BUSY_THREAD_STACK_SIZE, busy_thread_entry,
-				NULL, NULL, NULL,
-				K_HIGHEST_THREAD_PRIO, 0, K_NO_WAIT);
+		k_thread_create(&busy_thread[i], busy_thread_stack[i], BUSY_THREAD_STACK_SIZE,
+				busy_thread_entry, NULL, NULL, NULL, K_HIGHEST_THREAD_PRIO, 0,
+				K_NO_WAIT);
#endif /* (CONFIG_MP_MAX_NUM_CPUS > 1) */

z_waitq_init(&waitq);

int main_prio = k_thread_priority_get(k_current_get());
Expand Down
Loading