mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

pm-graph: upgrade 5.5 -> 5.13

Browse Source 
ChangeLog:
https://github.com/intel/pm-graph/releases/tag/5.13

* Refresh 0001-Makefile-fix-multilib-build-failure.patch
* Drop the following patches as the issues have been fixed upstream:
  0001-sleepgraph.py-use-python3.patch
  0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
  0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2024-10-12 14:53:12 +08:00
committed by Khem Raj
parent 148240ee8a
commit bcd6f7df48
5 changed files with 47 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-kernel/pm-graph/pm-graph/0001-Makefile-fix-multilib-build-failure.patch
+41 -64
View File
@@ -1,4 +1,4 @@
From 50cea8fd3c07ab27da6edce865a49339f16f3b57 Mon Sep 17 00:00:00 2001 From 468850b5d39435025633df14dda3d48651d9ec29 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com> From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Tue, 18 Jun 2019 17:10:15 +0800 Date: Tue, 18 Jun 2019 17:10:15 +0800
Subject: [PATCH] Makefile: fix multilib build failure Subject: [PATCH] Makefile: fix multilib build failure
@@ -6,20 +6,26 @@ Subject: [PATCH] Makefile: fix multilib build failure
Upstream-Status: Inappropriate [oe specific] Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Refresh to 5.13
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
--- ---
Makefile | 50 +++++++++++++++++++++++++++----------------------- Makefile | 16 ++++++++++------
1 file changed, 27 insertions(+), 23 deletions(-) 1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 8455415..4aa0786 100644 index 337c53e..58e3779 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1,30 +1,34 @@ @@ -25,6 +25,7 @@ BINDIR ?= /usr/bin
# SPDX-License-Identifier: GPL-2.0 MANDIR ?= /usr/share/man
PREFIX ?= /usr SHRDIR ?= /usr/share/pm-graph
DESTDIR ?= LIBDIR ?= /usr/lib
+BASELIB ?= +BASELIB ?=
# Toolchain: what tools do we use, and what options do they need:
INSTALL = /usr/bin/install
@@ -33,6 +34,9 @@ INSTALL_DATA = ${INSTALL} -m 644
all: all:
@echo "Nothing to build" @echo "Nothing to build"
@@ -27,63 +33,34 @@ index 8455415..4aa0786 100644
+ @echo "Nothing to clean" + @echo "Nothing to clean"
+ +
install : uninstall install : uninstall
- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pm-graph
- install sleepgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph $(INSTALL) sleepgraph.py $(DESTDIR)$(LIBDIR)/pm-graph
- install bootgraph.py $(DESTDIR)$(PREFIX)/lib/pm-graph @@ -54,10 +58,10 @@ install : uninstall
- install -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config $(INSTALL) -d $(DESTDIR)$(SHRDIR)
- install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
- install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/lib/pm-graph/config
+ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
+ install sleepgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
+ install bootgraph.py $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph
+ install -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/cgskip.txt $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/freeze-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/freeze.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/freeze-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/standby-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/standby.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/standby-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/suspend-callgraph.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/suspend.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/suspend-dev.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
+ install -m 644 config/suspend-x2-proc.cfg $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config
install -d $(DESTDIR)$(PREFIX)/bin $(INSTALL) -d $(DESTDIR)$(BINDIR)
- ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph - ln -s ../lib/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
- ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph - ln -s ../lib/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
+ ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(PREFIX)/bin/bootgraph - ln -s ../lib/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
+ ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(PREFIX)/bin/sleepgraph - $(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
+ ln -s ../$(BASELIB)/pm-graph/bootgraph.py $(DESTDIR)$(BINDIR)/bootgraph
+ ln -s ../$(BASELIB)/pm-graph/sleepgraph.py $(DESTDIR)$(BINDIR)/sleepgraph
+ ln -s ../$(BASELIB)/pm-graph/netfix.py $(DESTDIR)$(BINDIR)/netfix
+ #$(DESTDIR)$(BINDIR)/netfix defconfig > $(DESTDIR)$(SHRDIR)/netfix.cfg
install -d $(DESTDIR)$(PREFIX)/share/man/man8 $(INSTALL) -d $(DESTDIR)$(MANDIR)/man8
install bootgraph.8 $(DESTDIR)$(PREFIX)/share/man/man8 $(INSTALL) bootgraph.8 $(DESTDIR)$(MANDIR)/man8
@@ -37,11 +41,11 @@ uninstall : @@ -90,8 +94,8 @@ hwcheck-install :
rm -f $(DESTDIR)$(PREFIX)/bin/bootgraph rm -f $(DESTDIR)$(LIBDIR)/pm-graph/hwcheck.py
rm -f $(DESTDIR)$(PREFIX)/bin/sleepgraph $(INSTALL) tools/hwcheck.py $(DESTDIR)$(LIBDIR)/pm-graph
$(INSTALL) -d $(DESTDIR)$(BINDIR)
- ln -s ../lib/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
- $(DESTDIR)$(BINDIR)/hwcheck cronon
+ ln -s ../$(BASELIB)/pm-graph/hwcheck.py $(DESTDIR)$(BINDIR)/hwcheck
+ #$(DESTDIR)$(BINDIR)/hwcheck cronon
- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/config/* hwcheck-uninstall :
- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph/config ] ; then \ if [ -e $(DESTDIR)$(BINDIR)/hwcheck ] ; then \
- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph/config; \
+ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config/*
+ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config ] ; then \
+ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/config; \
fi;
- rm -f $(DESTDIR)$(PREFIX)/lib/pm-graph/*
- if [ -d $(DESTDIR)$(PREFIX)/lib/pm-graph ] ; then \
- rmdir $(DESTDIR)$(PREFIX)/lib/pm-graph; \
+ rm -f $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph/*
+ if [ -d $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph ] ; then \
+ rmdir $(DESTDIR)$(PREFIX)/$(BASELIB)/pm-graph; \
fi;
-- --
2.17.1 2.25.1
meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch
-42
View File
@@ -1,42 +0,0 @@
From 47a1db21f6c5d17c94c58c3fe0dcce35c623dbf4 Mon Sep 17 00:00:00 2001
From: Liwei Song <liwei.song@windriver.com>
Date: Tue, 23 Jun 2020 04:47:20 +0000
Subject: [PATCH] sleepgraph: add support for RT kernel ftrace flags
with PREEMPT_RT enabled in kernel, ftrace have a different
flags format:
_-----=> irqs-off
/ _----=> need-resched
| / _----=> need-resched
|| / _---=> hardirq/softirq
||| / _--=> preempt-depth
||||/ delay
TASK-PID CPU# ||||| TIMESTAMP FUNCTION
| | | ||||| | |
add support for this.
Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/18]
Signed-off-by: Liwei Song <liwei.song@windriver.com>
---
sleepgraph.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sleepgraph.py b/sleepgraph.py
index cfed8e09e0e6..561f165cf9be 100755
--- a/sleepgraph.py
+++ b/sleepgraph.py
@@ -2689,7 +2689,7 @@ class TestProps:
'[ +!#\*@$]*(?P<dur>[0-9\.]*) .*\| (?P<msg>.*)'
ftrace_line_fmt_nop = \
' *(?P<proc>.*)-(?P<pid>[0-9]*) *\[(?P<cpu>[0-9]*)\] *'+\
- '(?P<flags>.{4}) *(?P<time>[0-9\.]*): *'+\
+ '(?P<flags>.{4,7}) *(?P<time>[0-9\.]*): *'+\
'(?P<msg>.*)'
def __init__(self):
self.stamp = ''
--
2.24.1
meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch
-51
View File
@@ -1,51 +0,0 @@
From 9bbc991a927722439cad38c892fc9f57207089d3 Mon Sep 17 00:00:00 2001
From: Liwei Song <liwei.song@windriver.com>
Date: Mon, 24 May 2021 08:27:28 +0000
Subject: [PATCH] sleepgraph.py: parse unfished cpu exec line
exist the below case in ftrace file:
sleepgraph-6508 [003] .... 18197.824037: tracing_mark_write: ps - xxx..., lock_torture_wr-94 169,lock_torture_wr-95 143,lock_tort
sleepgraph-6508 [003] .... 18197.824043: tracing_mark_write: ure_wr-96 189,lock_torture_wr-97 174,lock_torture_wr-98 160,lock_torture_st-99 1
lock_torture_wr-96 was split to different line due to limited buffer
size(1k) set in kernel, check this case and re-parse the unfinished
line.
Upstream-Status: Submitted [https://github.com/intel/pm-graph/pull/20]
Signed-off-by: Liwei Song <liwei.song@windriver.com>
---
sleepgraph.py | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/sleepgraph.py b/sleepgraph.py
index e340d5b3f03b..38b4439db8eb 100755
--- a/sleepgraph.py
+++ b/sleepgraph.py
@@ -3365,8 +3365,21 @@ def parseTraceLog(live=False):
val = ps.split()
if not val:
continue
- name = val[0].replace('--', '-')
- proclist[name] = int(val[1])
+ if not len(val) < 2:
+ name = val[0].replace('--', '-')
+ proclist[name] = int(val[1])
+ else:
+ proclist = dict()
+ nextline = next(tf)
+ mcont = re.match(tp.ftrace_line_fmt, nextline)
+ n = m.group('ps') + mcont.group('msg').split(': ')[1]
+ for pscont in n.split(','):
+ val = pscont.split()
+ if not val:
+ continue
+ if not len(val) < 2:
+ name = val[0].replace('--', '-')
+ proclist[name] = int(val[1])
data.pstl[t.time] = proclist
continue
# find the end of resume
--
2.29.2
meta-oe/recipes-kernel/pm-graph/pm-graph/0001-sleepgraph.py-use-python3.patch
-39
View File
@@ -1,39 +0,0 @@
From 22ce65d997f99606a3bb9d2a660ead42eecc234a Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Wed, 11 Sep 2019 11:31:07 +0800
Subject: [PATCH] sleepgraph.py: use python3
Already compatible with Python 3.
Same goes for bootgraph.py
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
bootgraph.py | 2 +-
sleepgraph.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bootgraph.py b/bootgraph.py
index d3b99a1..efb5714 100755
--- a/bootgraph.py
+++ b/bootgraph.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# SPDX-License-Identifier: GPL-2.0-only
#
# Tool for analyzing boot timing
diff --git a/sleepgraph.py b/sleepgraph.py
index 1794c79..cfed8e0 100755
--- a/sleepgraph.py
+++ b/sleepgraph.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# SPDX-License-Identifier: GPL-2.0-only
#
# Tool for analyzing suspend/resume timing
--
2.17.1
meta-oe/recipes-kernel/pm-graph/pm-graph_5.5.bb → meta-oe/recipes-kernel/pm-graph/pm-graph_5.13.bb
+6 -7
View File
@@ -5,12 +5,9 @@ HOMEPAGE = "https://01.org/pm-graph"
LICENSE = "GPL-2.0-only" LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" SRCREV = "0987732b013936ad771334f51cba31c453c8a9c9"
SRC_URI = "git://github.com/intel/pm-graph.git;branch=master;protocol=https \ SRC_URI = "git://github.com/intel/pm-graph.git;branch=master;protocol=https \
file://0001-Makefile-fix-multilib-build-failure.patch \ file://0001-Makefile-fix-multilib-build-failure.patch \
file://0001-sleepgraph.py-use-python3.patch \
file://0001-sleepgraph-add-support-for-RT-kernel-ftrace-flags.patch \
file://0001-sleepgraph.py-parse-unfished-cpu-exec-line.patch \
" "
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
@@ -23,11 +20,13 @@ S = "${WORKDIR}/git"
# - CONFIG_FUNCTION_GRAPH_TRACER=y # - CONFIG_FUNCTION_GRAPH_TRACER=y
COMPATIBLE_HOST='(i.86|x86_64).*' COMPATIBLE_HOST='(i.86|x86_64).*'
EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} BASELIB=${baselib}" EXTRA_OEMAKE = "PREFIX=${prefix} DESTDIR=${D} LIBDIR=${libdir} BASELIB=${baselib}"
do_install() { do_install() {
oe_runmake install oe_runmake install
install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py install -Dm 0755 ${S}/analyze_suspend.py ${D}${bindir}/analyze_suspend.py
rm -rf ${D}${libdir}/pm-graph/__pycache__
} }
RDEPENDS:${PN} += "python3-core python3-threading python3-datetime python3-compression" RDEPENDS:${PN} += "python3-core python3-threading python3-datetime python3-compression"