apache · W-M-R · Nov 7, 2024 · Nov 7, 2024
diff --git a/arch/arm/src/cmake/armclang.cmake b/arch/arm/src/cmake/armclang.cmake
@@ -120,7 +120,7 @@ if(CONFIG_SCHED_GCOV)
   add_compile_options(-fprofile-generate -ftest-coverage)
 endif()
 
-if(CONFIG_SCHED_GPROF_ALL)
+if(CONFIG_LIB_GPROF_ALL)
   add_compile_options(-pg)
 endif()
 

diff --git a/arch/arm/src/cmake/clang.cmake b/arch/arm/src/cmake/clang.cmake
@@ -121,7 +121,7 @@ if(CONFIG_SCHED_GCOV_ALL)
   add_compile_options(-fprofile-generate -ftest-coverage)
 endif()
 
-if(CONFIG_SCHED_GPROF_ALL)
+if(CONFIG_LIB_GPROF_ALL)
   add_compile_options(-pg)
 endif()
 

diff --git a/arch/arm/src/cmake/gcc.cmake b/arch/arm/src/cmake/gcc.cmake
@@ -131,7 +131,7 @@ if(CONFIG_SCHED_GCOV_ALL)
   add_compile_options(-fprofile-generate -ftest-coverage)
 endif()
 
-if(CONFIG_SCHED_GPROF_ALL)
+if(CONFIG_LIB_GPROF_ALL)
   add_compile_options(-pg)
 endif()
 
@@ -165,7 +165,7 @@ if(CONFIG_ARCH_INSTRUMENT_ALL)
   add_compile_options(-finstrument-functions)
 endif()
 
-if(CONFIG_SCHED_GPROF_ALL)
+if(CONFIG_LIB_GPROF_ALL)
   add_compile_options(-pg)
 endif()
 

diff --git a/arch/arm/src/cmake/ghs.cmake b/arch/arm/src/cmake/ghs.cmake
@@ -92,7 +92,7 @@ if(CONFIG_SCHED_GCOV_ALL)
   add_compile_options(-fprofile-generate -ftest-coverage)
 endif()
 
-if(CONFIG_SCHED_GPROF_ALL)
+if(CONFIG_LIB_GPROF_ALL)
   add_compile_options(-pg)
 endif()
 

diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs
@@ -72,7 +72,7 @@ ifneq ($(CONFIG_STACK_USAGE_WARNING),0)
   ARCHOPTIMIZATION += -Wstack-usage=$(CONFIG_STACK_USAGE_WARNING)
 endif
 
-ifeq ($(CONFIG_SCHED_GPROF_ALL),y)
+ifeq ($(CONFIG_LIB_GPROF_ALL),y)
   ARCHOPTIMIZATION += -pg
 endif
 

diff --git a/arch/arm64/src/Toolchain.defs b/arch/arm64/src/Toolchain.defs
@@ -96,7 +96,7 @@ ifeq ($(CONFIG_ARCH_INSTRUMENT_ALL),y)
   ARCHOPTIMIZATION += -finstrument-functions
 endif
 
-ifeq ($(CONFIG_SCHED_GPROF_ALL),y)
+ifeq ($(CONFIG_LIB_GPROF_ALL),y)
   ARCHOPTIMIZATION += -pg
 endif
 

diff --git a/arch/arm64/src/cmake/Toolchain.cmake b/arch/arm64/src/cmake/Toolchain.cmake
@@ -135,7 +135,7 @@ if(CONFIG_ARCH_INSTRUMENT_ALL)
   add_compile_options(-finstrument-functions)
 endif()
 
-if(CONFIG_SCHED_GPROF_ALL)
+if(CONFIG_LIB_GPROF_ALL)
   add_compile_options(-pg)
 endif()
 

diff --git a/arch/sim/Kconfig b/arch/sim/Kconfig
@@ -92,7 +92,7 @@ config SIM_UBSAN_DUMMY
 
 config SIM_GPROF
 	bool "Enable gprof"
-	depends on !SCHED_GPROF
+	depends on !LIB_GPROF
 	default n
 	---help---
 		Enable support gprof profiling tool.

diff --git a/arch/sim/src/cmake/Toolchain.cmake b/arch/sim/src/cmake/Toolchain.cmake
@@ -90,7 +90,7 @@ if(CONFIG_SCHED_GCOV_ALL)
   add_compile_options(-fprofile-generate -ftest-coverage)
 endif()
 
-if(CONFIG_SCHED_GPROF_ALL OR CONFIG_SIM_GPROF)
+if(CONFIG_LIB_GPROF_ALL OR CONFIG_SIM_GPROF)
   add_compile_options(-pg)
 endif()
 

diff --git a/boards/sim/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs
@@ -76,7 +76,7 @@ ifeq ($(CONFIG_SCHED_GCOV_ALL),y)
   ARCHOPTIMIZATION += -fprofile-generate -ftest-coverage
 endif
 
-ifneq ($(CONFIG_SCHED_GPROF_ALL)$(CONFIG_SIM_GPROF),)
+ifneq ($(CONFIG_LIB_GPROF_ALL)$(CONFIG_SIM_GPROF),)
   ARCHOPTIMIZATION += -pg
 endif
 

diff --git a/libs/libc/Kconfig b/libs/libc/Kconfig
@@ -15,6 +15,7 @@ source "libs/libc/pthread/Kconfig"
 source "libs/libc/dlfcn/Kconfig"
 source "libs/libc/modlib/Kconfig"
 source "libs/libc/gdbstub/Kconfig"
+source "libs/libc/gprof/Kconfig"
 source "libs/libc/grp/Kconfig"
 source "libs/libc/pwd/Kconfig"
 source "libs/libc/locale/Kconfig"

diff --git a/libs/libc/Makefile b/libs/libc/Makefile
@@ -35,6 +35,7 @@ include fixedmath/Make.defs
 include gdbstub/Make.defs
 include grp/Make.defs
 include gnssutils/Make.defs
+include gprof/Make.defs
 include hex2bin/Make.defs
 include inttypes/Make.defs
 include libgen/Make.defs

diff --git a/libs/libc/gprof/CMakeLists.txt b/libs/libc/gprof/CMakeLists.txt
@@ -0,0 +1,25 @@
+# ##############################################################################
+# libs/libc/gprof/CMakeLists.txt
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
+# ##############################################################################
+
+if(CONFIG_LIB_GPROF)
+  target_sources(c PRIVATE profile_monitor.c)
+endif()
diff --git a/libs/libc/gprof/Kconfig b/libs/libc/gprof/Kconfig
@@ -0,0 +1,29 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config LIB_GPROF
+	bool "Enable gprof profiling"
+	default n
+	---help---
+		Enable gprof profiling support.  This will cause the compiler to
+		generate additional code to support profiling.  This will also
+		cause the linker to include the gmon.out file in the final
+		executable.
+		Add the "-pg" parameter to the Makefile when compiling to obtain
+		the function call graph of the specified module.
+
+if LIB_GPROF
+
+config LIB_GPROF_ALL
+	bool "Enable gprof call graph for all modules"
+	depends on FRAME_POINTER
+	default n
+	---help---
+		Enable gprof profiling for all code, it will instrument
+		all code, which will cause a large performance penalty for the code.
+		You can add the '-pg' parameter to the specified module in the
+		makefile to only analyze the content of the module.
+
+endif # LIB_GPROF
diff --git a/libs/libc/gprof/Make.defs b/libs/libc/gprof/Make.defs
@@ -0,0 +1,34 @@
+############################################################################
+# libs/libc/gprof/Make.defs
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifeq ($(CONFIG_LIB_GPROF),y)
+
+# Add the internal C files to the build
+
+CSRCS += profile_monitor.c
+
+# Add the userfs directory to the build
+
+DEPPATH += --dep-path gprof
+VPATH += :gprof
+
+endif
diff --git a/sched/instrument/profile_monitor.c → libs/libc/gprof/profile_monitor.c b/sched/instrument/profile_monitor.c → libs/libc/gprof/profile_monitor.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * sched/instrument/profile_monitor.c
+ * libs/libc/gprof/profile_monitor.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

diff --git a/libs/libc/machine/arm/CMakeLists.txt b/libs/libc/machine/arm/CMakeLists.txt
@@ -62,7 +62,7 @@ if(CONFIG_ARCH_SETJMP_H)
   endif()
 endif()
 
-if(CONFIG_SCHED_GPROF)
+if(CONFIG_LIB_GPROF)
   list(APPEND SRCS gnu/mcount.S)
 endif()
 

diff --git a/libs/libc/machine/arm/Make.defs b/libs/libc/machine/arm/Make.defs
@@ -60,7 +60,7 @@ ASRCS += arch_setjmp.S
 endif
 endif
 
-ifeq ($(CONFIG_SCHED_GPROF),y)
+ifeq ($(CONFIG_LIB_GPROF),y)
 ASRCS += mcount.S
 endif
 

diff --git a/sched/Kconfig b/sched/Kconfig
@@ -1363,27 +1363,6 @@ config SCHED_GCOV_ALL
 		Enable gcov profiling for all code, it will instrument
 		all code, which will cause a large performance penalty for the code.
 
-config SCHED_GPROF
-	bool "Enable gprof profiling"
-	default n
-	---help---
-		Enable gprof profiling support.  This will cause the compiler to
-		generate additional code to support profiling.  This will also
-		cause the linker to include the gmon.out file in the final
-		executable.
-		Add the "-pg" parameter to the Makefile when compiling to obtain
-		the function call graph of the specified module.
-
-config SCHED_GPROF_ALL
-	bool "Enable gprof call graph for all modules"
-	depends on SCHED_GPROF
-	default n
-	---help---
-		Enable gprof profiling for all code, it will instrument
-		all code, which will cause a large performance penalty for the code.
-		You can add the '-pg' parameter to the specified module in the
-		makefile to only analyze the content of the module.
-
 endmenu
 
 menu "Files and I/O"

diff --git a/sched/instrument/CMakeLists.txt b/sched/instrument/CMakeLists.txt
@@ -26,8 +26,4 @@ if(NOT "${CONFIG_SCHED_STACK_RECORD}" STREQUAL "0")
   list(APPEND SRCS stack_monitor.c)
 endif()
 
-if(CONFIG_SCHED_GPROF)
-  list(APPEND SRCS profile_monitor.c)
-endif()
-
 target_sources(sched PRIVATE ${SRCS})
diff --git a/sched/instrument/Make.defs b/sched/instrument/Make.defs
@@ -26,10 +26,6 @@ ifneq ($(CONFIG_SCHED_STACK_RECORD),0)
 CSRCS += stack_monitor.c
 endif
 
-ifeq ($(CONFIG_SCHED_GPROF),y)
-CSRCS += profile_monitor.c
-endif
-
 # Include instrument build support
 
 DEPPATH += --dep-path instrument