Skip to content

testing/ostest: build the perf test only where it can link #3676

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
acassis merged 1 commit into from
Jul 31, 2026
+12 −3
Merged

testing/ostest: build the perf test only where it can link #3676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion testing/ostest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@ if(CONFIG_TESTING_OSTEST)
list(APPEND SRCS nxevent.c)
endif()

if(CONFIG_ARCH_HAVE_PERF_EVENTS)
# perf_gettime() and perf_getfreq() live in the kernel and are not system
# calls, so only a flat build can reach them from here.

if(CONFIG_ARCH_HAVE_PERF_EVENTS AND CONFIG_BUILD_FLAT)
list(APPEND SRCS perf_gettime.c)
endif()

Expand Down
5 changes: 5 additions & 0 deletions testing/ostest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,14 @@ CSRCS += nxevent.c
endif
endif

# perf_gettime() and perf_getfreq() live in the kernel and are not system
# calls, so only a flat build can reach them from here.

ifeq ($(CONFIG_ARCH_HAVE_PERF_EVENTS),y)
ifeq ($(CONFIG_BUILD_FLAT),y)
CSRCS += perf_gettime.c
endif
endif

ifeq ($(CONFIG_BUILD_FLAT),y)
CSRCS += wdog.c spinlock.c
Expand Down
2 changes: 1 addition & 1 deletion testing/ostest/ostest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ void spinlock_test(void);

/* perf_gettime.c ***********************************************************/

#ifdef CONFIG_ARCH_HAVE_PERF_EVENTS
#if defined(CONFIG_ARCH_HAVE_PERF_EVENTS) && defined(CONFIG_BUILD_FLAT)
void perf_gettime_test(void);
#endif

Expand Down
3 changes: 2 additions & 1 deletion testing/ostest/ostest_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,8 @@ static int user_main(int argc, char *argv[])
check_test_memory_usage();
#endif

#if defined(CONFIG_ARCH_PERF_EVENTS) && !defined(CONFIG_ARCH_PERF_EVENTS_USER_ACCESS)
#if defined(CONFIG_ARCH_PERF_EVENTS) && \
!defined(CONFIG_ARCH_PERF_EVENTS_USER_ACCESS) && defined(CONFIG_BUILD_FLAT)
/* Verify performance event time counter */

printf("\nuser_main: performance event time counter test\n");
Expand Down
Loading