Commit 5484f033 authored by Todd Brandt's avatar Todd Brandt Committed by Rafael J. Wysocki
Browse files

PM / tools: sleepgraph: first batch of v5.2 changes 



general:
- add battery charge data before and after test
- remove special s0i3 handling
- remove melding of dmesg & ftrace data in old kernels, use one only
- updates to various kprobes in trace (ksys_sync, etc)
- enable pm_debug_messages during the test
- instrument more subsystems with dev functions (phy0)

error handling:
- return codes for tool show the status of the test run
- 0: success, 1: general error (no timeline), 2: fail (suspend aborted)
- monitor output of /sys/power/state, mark as failure if exception occurs
- add signal handler when using -result to catch tool exceptions

display control
- add -x commands for testing xset with mode settings and status
- allow display setting to on, off, suspend, standby
- add display mode change info to the log, along with a warning on fail

s2idle (freeze)
- remove fixed 10-phase dependency, allow any phase order & any count
- multiple phase occurences show as phase_nameN e.g. suspend_noirq3
- if multiple freezes occur, print multiple time values in header

summary:
- add new columns to summary output: issues, worst suspend/resume devices
- worst device: includes summation of all phases of suspend or resume
- issues: includes WARNING/ERROR/BUG from dmesg log, and other issues
- s2idle: multiple freezes show as FREEZExN in the issues column

Signed-off-by: default avatarTodd Brandt <todd.e.brandt@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0238df64

tools/power/pm-graph/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ install : uninstall 
	install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config



	install -d  $(DESTDIR)$(PREFIX)/bin

	ln -s $(DESTDIR)$(PREFIX)/lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph

	ln -s $(DESTDIR)$(PREFIX)/lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph

	ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph

	ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph



	install -d  $(DESTDIR)$(PREFIX)/share/man/man8

	install bootgraph.8 $(DESTDIR)$(PREFIX)/share/man/man8

tools/power/pm-graph/sleepgraph.8

+10 −3
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ During test, enable/disable runtime suspend for all devices. The test is delayed 
by 5 seconds to allow runtime suspend changes to occur. The settings are restored

after the test is complete.

.TP

\fB-display \fIon/off\fR

Turn the display on or off for the test using the xset command. This helps

maintain the consistecy of test data for better comparison.

\fB-display \fIon/off/standby/suspend\fR

Switch the display to the requested mode for the test using the xset command.

This helps maintain the consistency of test data for better comparison.

.TP

\fB-skiphtml\fR

Run the test and capture the trace logs, but skip the timeline generation.
@@ -183,6 +183,13 @@ Print out the contents of the ACPI Firmware Performance Data Table. 
\fB-battery\fR

Print out battery status and current charge.

.TP

\fB-xon/-xoff/-xstandby/-xsuspend\fR

Test xset by attempting to switch the display to the given mode. This

is the same command which will be issued by \fB-display \fImode\fR.

.TP

\fB-xstat\fR

Get the current DPMS display mode.

.TP

\fB-sysinfo\fR

Print out system info extracted from BIOS. Reads /dev/mem directly instead of going through dmidecode.

.TP

tools/power/pm-graph/sleepgraph.py

+748 −630

File changed.

Preview size limit exceeded, changes collapsed.