Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1301afd authored by Michael Ellerman's avatar Michael Ellerman
Browse files

selftests/powerpc: Move pick_online_cpu() up into utils.c 



We want to use this in another test, so make it available at the top of
the powerpc selftests tree.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 00b912b0

tools/testing/selftests/powerpc/pmu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ noarg: 
	$(MAKE) -C ../



TEST_PROGS := count_instructions l3_bank_test per_event_excludes

EXTRA_SOURCES := ../harness.c event.c lib.c

EXTRA_SOURCES := ../harness.c event.c lib.c ../utils.c



all: $(TEST_PROGS) ebb

tools/testing/selftests/powerpc/pmu/lib.c

+0 −26
Original line number Diff line number Diff line
@@ -15,32 +15,6 @@ 
#include "lib.h"





int pick_online_cpu(void)

{

	cpu_set_t mask;

	int cpu;



	CPU_ZERO(&mask);



	if (sched_getaffinity(0, sizeof(mask), &mask)) {

		perror("sched_getaffinity");

		return -1;

	}



	/* We prefer a primary thread, but skip 0 */

	for (cpu = 8; cpu < CPU_SETSIZE; cpu += 8)

		if (CPU_ISSET(cpu, &mask))

			return cpu;



	/* Search for anything, but in reverse */

	for (cpu = CPU_SETSIZE - 1; cpu >= 0; cpu--)

		if (CPU_ISSET(cpu, &mask))

			return cpu;



	printf("No cpus in affinity mask?!\n");

	return -1;

}



int bind_to_cpu(int cpu)

{

	cpu_set_t mask;

tools/testing/selftests/powerpc/pmu/lib.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ union pipe { 
	int fds[2];

};



extern int pick_online_cpu(void);

extern int bind_to_cpu(int cpu);

extern int kill_child_and_wait(pid_t child_pid);

extern int wait_for_child(pid_t child_pid);

tools/testing/selftests/powerpc/utils.c

+29 −0
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ 
 * Licensed under GPLv2.

 */



#define _GNU_SOURCE	/* For CPU_ZERO etc. */



#include <elf.h>

#include <errno.h>

#include <fcntl.h>

#include <link.h>

#include <sched.h>

#include <stdio.h>

#include <sys/stat.h>

#include <sys/types.h>
@@ -56,3 +59,29 @@ void *get_auxv_entry(int type) 
	close(fd);

	return result;

}



int pick_online_cpu(void)

{

	cpu_set_t mask;

	int cpu;



	CPU_ZERO(&mask);



	if (sched_getaffinity(0, sizeof(mask), &mask)) {

		perror("sched_getaffinity");

		return -1;

	}



	/* We prefer a primary thread, but skip 0 */

	for (cpu = 8; cpu < CPU_SETSIZE; cpu += 8)

		if (CPU_ISSET(cpu, &mask))

			return cpu;



	/* Search for anything, but in reverse */

	for (cpu = CPU_SETSIZE - 1; cpu >= 0; cpu--)

		if (CPU_ISSET(cpu, &mask))

			return cpu;



	printf("No cpus in affinity mask?!\n");

	return -1;

}

tools/testing/selftests/powerpc/utils.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ typedef uint8_t u8; 


int test_harness(int (test_function)(void), char *name);

extern void *get_auxv_entry(int type);

int pick_online_cpu(void);



static inline bool have_hwcap2(unsigned long ftr2)

{