bloaty fix master comparison

- jenkins add new sections and segments output
PX4 · Aug 6, 2019 · bf0eaf4 · bf0eaf4
1 parent 6f2d1d5
commit bf0eaf4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -107,9 +107,11 @@ pipeline {
             sh 'ccache -z'
             sh 'git fetch --tags'
             sh 'make px4_fmu-v2_default'
-            sh 'make px4_fmu-v2_default bloaty_symbols'
             sh 'make px4_fmu-v2_default bloaty_compileunits'
             sh 'make px4_fmu-v2_default bloaty_inlines'
+            sh 'make px4_fmu-v2_default bloaty_sections'
+            sh 'make px4_fmu-v2_default bloaty_segments'
+            sh 'make px4_fmu-v2_default bloaty_symbols'
             sh 'make px4_fmu-v2_default bloaty_templates'
             sh 'make px4_fmu-v2_default bloaty_compare_master'
             sh 'make sizes'
@@ -135,9 +137,11 @@ pipeline {
             sh 'ccache -z'
             sh 'git fetch --tags'
             sh 'make px4_fmu-v5_default'
-            sh 'make px4_fmu-v5_default bloaty_symbols'
             sh 'make px4_fmu-v5_default bloaty_compileunits'
             sh 'make px4_fmu-v5_default bloaty_inlines'
+            sh 'make px4_fmu-v5_default bloaty_sections'
+            sh 'make px4_fmu-v5_default bloaty_segments'
+            sh 'make px4_fmu-v5_default bloaty_symbols'
             sh 'make px4_fmu-v5_default bloaty_templates'
             sh 'make px4_fmu-v5_default bloaty_compare_master'
             sh 'make sizes'

diff --git a/cmake/bloaty.cmake b/cmake/bloaty.cmake
@@ -33,13 +33,8 @@
 
 find_program(BLOATY_PROGRAM bloaty)
 if (BLOATY_PROGRAM)
-	# bloaty symbols
+
 	set(BLOATY_OPTS --demangle=short --domain=vm -s vm -n 100 -w)
-	add_custom_target(bloaty_symbols
-		COMMAND ${BLOATY_PROGRAM} -d symbols ${BLOATY_OPTS} $<TARGET_FILE:px4>
-		DEPENDS px4
-		USES_TERMINAL
-		)
 
 	# bloaty compilation units
 	add_custom_target(bloaty_compileunits
@@ -48,6 +43,13 @@ if (BLOATY_PROGRAM)
 		USES_TERMINAL
 		)
 
+	# bloaty inlines
+	add_custom_target(bloaty_inlines
+		COMMAND ${BLOATY_PROGRAM} -d inlines ${BLOATY_OPTS} $<TARGET_FILE:px4>
+		DEPENDS px4
+		USES_TERMINAL
+		)
+
 	# bloaty sections
 	add_custom_target(bloaty_sections
 		COMMAND ${BLOATY_PROGRAM} -d sections ${BLOATY_OPTS} $<TARGET_FILE:px4>
@@ -62,24 +64,24 @@ if (BLOATY_PROGRAM)
 		USES_TERMINAL
 		)
 
-	# bloaty templates
-	add_custom_target(bloaty_templates
-		COMMAND ${BLOATY_PROGRAM} -d shortsymbols,fullsymbols ${BLOATY_OPTS} $<TARGET_FILE:px4>
+	# bloaty symbols
+	add_custom_target(bloaty_symbols
+		COMMAND ${BLOATY_PROGRAM} -d symbols ${BLOATY_OPTS} $<TARGET_FILE:px4>
 		DEPENDS px4
 		USES_TERMINAL
 		)
 
-	# bloaty inlines
-	add_custom_target(bloaty_inlines
-		COMMAND ${BLOATY_PROGRAM} -d inlines ${BLOATY_OPTS} $<TARGET_FILE:px4>
+	# bloaty templates
+	add_custom_target(bloaty_templates
+		COMMAND ${BLOATY_PROGRAM} -d shortsymbols,fullsymbols ${BLOATY_OPTS} $<TARGET_FILE:px4>
 		DEPENDS px4
 		USES_TERMINAL
 		)
 
 	# bloaty compare with last master build
 	add_custom_target(bloaty_compare_master
 		COMMAND wget -c -N --no-verbose https://s3.amazonaws.com/px4-travis/Firmware/master/${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}.elf -O master.elf
-		COMMAND ${BLOATY_PROGRAM} ${BLOATY_OPTS} $<TARGET_FILE:px4> -- master.elf
+		COMMAND ${BLOATY_PROGRAM} -d symbols ${BLOATY_OPTS} $<TARGET_FILE:px4> -- master.elf
 		DEPENDS px4
 		WORKING_DIRECTORY ${PX4_BINARY_DIR}
 		VERBATIM