forked from pool/cpupower
Accepting request 692327 from home:trenn:branches:hardware
- Update to latest kernel HEAD sources (5.1-rc4, 15ade5d2e7775667cf191cf2f94327a4889f8b9d) Patches included mainline: D cpupower_fix_compilation_and_sysfs_read_file_mess.patch D cpupower_bash-completion_for_cpupower_tool.patch Adjusted patches: M turbostat_makefile_fix_asm_header.patch M x86_perf_makefile_fix_asm_header.patch M rapl_monitor.patch M cpupower_rapl.patch OBS-URL: https://build.opensuse.org/request/show/692327 OBS-URL: https://build.opensuse.org/package/show/hardware/cpupower?expand=0&rev=89
This commit is contained in:
Thomas Renninger
Git OBS Bridge
parent
8b41dfbd17
commit
8b6a3f5491
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de5a9ad7ddf52172e98a32492657dfaaefcd51168babb0bc32e95ae82b4e6cd5
|
||||
size 72395
|
||||
3
cpupower-5.1-rc4.tar.bz2
Normal file
3
cpupower-5.1-rc4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f872bf082ba1c2a9a6a79d334e10e06e5a31249e2f264402ca2919b3c0cc24d6
|
||||
size 73487
|
||||
3
cpupower-5.1.tar.bz2
Normal file
3
cpupower-5.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e40992e01bfd98bebd179479fa9676c285a5c6bbb81babbbd0153c7d5915e060
|
||||
size 73530
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 8 14:12:34 UTC 2019 - trenn@suse.de
|
||||
|
||||
- Update to latest kernel HEAD sources
|
||||
(5.1-rc4, 15ade5d2e7775667cf191cf2f94327a4889f8b9d)
|
||||
Patches included mainline:
|
||||
D cpupower_fix_compilation_and_sysfs_read_file_mess.patch
|
||||
D cpupower_bash-completion_for_cpupower_tool.patch
|
||||
Adjusted patches:
|
||||
M turbostat_makefile_fix_asm_header.patch
|
||||
M x86_perf_makefile_fix_asm_header.patch
|
||||
M rapl_monitor.patch
|
||||
M cpupower_rapl.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 6 12:50:21 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
#
|
||||
# spec file for package cpupower
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Author: Thomas Renninger <trenn@suse.de>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,11 +20,13 @@
|
||||
# Use this as version when things are in mainline kernel
|
||||
%define version %(rpm -q --qf '%{VERSION}' kernel-source)
|
||||
|
||||
%define tsversion 18.07.27
|
||||
%define tsversion 19.03.20
|
||||
%define pbversion 17.05.11
|
||||
|
||||
Name: cpupower
|
||||
Version: 4.19
|
||||
# Use this as version when things are in mainline kernel
|
||||
%define version %(rpm -q --qf '%VERSION' kernel-source)
|
||||
Version: 5.1
|
||||
Release: 0
|
||||
Summary: Tools to determine and set CPU Power related Settings
|
||||
License: GPL-2.0-only
|
||||
@ -36,8 +39,6 @@ Source3: x86_energy_perf_policy-%{pbversion}.tar.bz2
|
||||
Patch1: cpupower_rapl.patch
|
||||
Patch2: rapl_monitor.patch
|
||||
Patch3: cpupower_exclude_kernel_Makefile.patch
|
||||
Patch4: cpupower_fix_compilation_and_sysfs_read_file_mess.patch
|
||||
Patch5: cpupower_bash-completion_for_cpupower_tool.patch
|
||||
Patch22: turbostat_makefile_fix_asm_header.patch
|
||||
# Fixes bsc#1048546:
|
||||
Patch30: x86_perf_makefile_fix_asm_header.patch
|
||||
@ -85,8 +86,6 @@ powersave module.
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
cd ../turbostat-%{tsversion}
|
||||
%patch22 -p1
|
||||
|
||||
@ -1,175 +0,0 @@
|
||||
From: "Abhishek Goel" <huntbag@linux.vnet.ibm.com>
|
||||
|
||||
cpupower : bash-completion for cpupower tool
|
||||
|
||||
Signed-off-by: Abhishek Goel <huntbag@linux.vnet.ibm.com>
|
||||
---
|
||||
Makefile | 4 +-
|
||||
cpupower-completion.bash | 129 ++++++++++++++++++
|
||||
2 files changed, 132 insertions(+), 1 deletion(-)
|
||||
create mode 100644 cpupower-completion.bash
|
||||
|
||||
Index: cpupower-4.19/Makefile
|
||||
===================================================================
|
||||
--- cpupower-4.19.orig/Makefile 2018-12-04 12:56:27.824106229 +0100
|
||||
+++ cpupower-4.19/Makefile 2018-12-04 13:16:53.452172269 +0100
|
||||
@@ -87,6 +87,7 @@ endif
|
||||
localedir ?= /usr/share/locale
|
||||
docdir ?= /usr/share/doc/packages/cpupower
|
||||
confdir ?= /etc/
|
||||
+bash_completion_dir ?= /usr/share/bash-completion/completions
|
||||
|
||||
# Toolchain: what tools do we use, and what options do they need:
|
||||
|
||||
@@ -94,7 +95,7 @@ CP = cp -fpR
|
||||
INSTALL = /usr/bin/install -c
|
||||
INSTALL_PROGRAM = ${INSTALL}
|
||||
INSTALL_DATA = ${INSTALL} -m 644
|
||||
-INSTALL_SCRIPT = ${INSTALL_PROGRAM}
|
||||
+INSTALL_SCRIPT = ${INSTALL} -m 755
|
||||
|
||||
# If you are running a cross compiler, you may want to set this
|
||||
# to something more interesting, like "arm-linux-". If you want
|
||||
@@ -288,6 +289,8 @@ install-lib:
|
||||
install-tools:
|
||||
$(INSTALL) -d $(DESTDIR)${bindir}
|
||||
$(INSTALL_PROGRAM) $(OUTPUT)cpupower $(DESTDIR)${bindir}
|
||||
+ $(INSTALL) -d $(DESTDIR)${bindir}
|
||||
+ $(INSTALL_DATA) -D cpupower-completion.sh '$(DESTDIR)${bash_completion_dir}/cpupower'
|
||||
|
||||
install-man:
|
||||
$(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1
|
||||
Index: cpupower-4.19/cpupower-completion.sh
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ cpupower-4.19/cpupower-completion.sh 2018-12-04 12:58:53.776114094 +0100
|
||||
@@ -0,0 +1,129 @@
|
||||
+# -*- shell-script -*-
|
||||
+# bash completion script for cpupower
|
||||
+# Taken from git.git's completion script.
|
||||
+
|
||||
+_cpupower_commands="frequency-info frequency-set idle-info idle-set set info monitor"
|
||||
+
|
||||
+_frequency_info ()
|
||||
+{
|
||||
+ local flags="-f -w -l -d -p -g -a -s -y -o -m -n --freq --hwfreq --hwlimits --driver --policy --governors --related-cpus --affected-cpus --stats --latency --proc --human --no-rounding"
|
||||
+ local prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||
+ local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
+ case "$prev" in
|
||||
+ frequency-info) COMPREPLY=($(compgen -W "$flags" -- "$cur")) ;;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+_frequency_set ()
|
||||
+{
|
||||
+ local flags="-f -g --freq --governor -d --min -u --max -r --related"
|
||||
+ local prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||
+ local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
+ case "$prev" in
|
||||
+ -f| --freq | -d | --min | -u | --max)
|
||||
+ if [ -d /sys/devices/system/cpu/cpufreq/ ] ; then
|
||||
+ COMPREPLY=($(compgen -W '$(cat $(ls -d /sys/devices/system/cpu/cpufreq/policy* | head -1)/scaling_available_frequencies)' -- "$cur"))
|
||||
+ fi ;;
|
||||
+ -g| --governor)
|
||||
+ if [ -d /sys/devices/system/cpu/cpufreq/ ] ; then
|
||||
+ COMPREPLY=($(compgen -W '$(cat $(ls -d /sys/devices/system/cpu/cpufreq/policy* | head -1)/scaling_available_governors)' -- "$cur"))
|
||||
+ fi;;
|
||||
+ frequency-set) COMPREPLY=($(compgen -W "$flags" -- "$cur")) ;;
|
||||
+
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+_idle_info()
|
||||
+{
|
||||
+ local flags="-f --silent"
|
||||
+ local prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||
+ local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
+ case "$prev" in
|
||||
+ idle-info) COMPREPLY=($(compgen -W "$flags" -- "$cur")) ;;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+_idle_set()
|
||||
+{
|
||||
+ local flags="-d --disable -e --enable -D --disable-by-latency -E --enable-all"
|
||||
+ local prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||
+ local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
+ case "$prev" in
|
||||
+ idle-set) COMPREPLY=($(compgen -W "$flags" -- "$cur")) ;;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+_set()
|
||||
+{
|
||||
+ local flags="--perf-bias, -b"
|
||||
+ local prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||
+ local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
+ case "$prev" in
|
||||
+ set) COMPREPLY=($(compgen -W "$flags" -- "$cur")) ;;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+_monitor()
|
||||
+{
|
||||
+ local flags="-l -m -i -c -v"
|
||||
+ local prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||
+ local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
+ case "$prev" in
|
||||
+ monitor) COMPREPLY=($(compgen -W "$flags" -- "$cur")) ;;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+_taskset()
|
||||
+{
|
||||
+ local prev_to_prev="${COMP_WORDS[COMP_CWORD-2]}"
|
||||
+ local prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||
+ local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
+ case "$prev_to_prev" in
|
||||
+ -c|--cpu) COMPREPLY=($(compgen -W "$_cpupower_commands" -- "$cur")) ;;
|
||||
+ esac
|
||||
+ case "$prev" in
|
||||
+ frequency-info) _frequency_info ;;
|
||||
+ frequency-set) _frequency_set ;;
|
||||
+ idle-info) _idle_info ;;
|
||||
+ idle-set) _idle_set ;;
|
||||
+ set) _set ;;
|
||||
+ monitor) _monitor ;;
|
||||
+ esac
|
||||
+
|
||||
+}
|
||||
+
|
||||
+_cpupower ()
|
||||
+{
|
||||
+ local i
|
||||
+ local c=1
|
||||
+ local command
|
||||
+
|
||||
+ while test $c -lt $COMP_CWORD; do
|
||||
+ if test $c == 1; then
|
||||
+ command="${COMP_WORDS[c]}"
|
||||
+ fi
|
||||
+ c=$((++c))
|
||||
+ done
|
||||
+
|
||||
+ # Complete name of subcommand if the user has not finished typing it yet.
|
||||
+ if test $c -eq $COMP_CWORD -a -z "$command"; then
|
||||
+ COMPREPLY=($(compgen -W "help -v --version -c --cpu $_cpupower_commands" -- "${COMP_WORDS[COMP_CWORD]}"))
|
||||
+ return
|
||||
+ fi
|
||||
+
|
||||
+ # Complete arguments to subcommands.
|
||||
+ case "$command" in
|
||||
+ -v|--version) return ;;
|
||||
+ -c|--cpu) _taskset ;;
|
||||
+ help) COMPREPLY=($(compgen -W "$_cpupower_commands" -- "${COMP_WORDS[COMP_CWORD]}")) ;;
|
||||
+ frequency-info) _frequency_info ;;
|
||||
+ frequency-set) _frequency_set ;;
|
||||
+ idle-info) _idle_info ;;
|
||||
+ idle-set) _idle_set ;;
|
||||
+ set) _set ;;
|
||||
+ monitor) _monitor ;;
|
||||
+ esac
|
||||
+}
|
||||
+
|
||||
+complete -o bashdefault -o default -F _cpupower cpupower 2>/dev/null \
|
||||
+ || complete -o default -F _cpupower cpupower
|
||||
@ -1,97 +0,0 @@
|
||||
From khlebnikov@yandex-team.ru
|
||||
Subject: [PATCH] tools/power/cpupower: fix compilation with STATIC=true
|
||||
From: "Konstantin Khlebnikov" <khlebnikov@yandex-team.ru>
|
||||
To: "Shuah Khan" <shuah@kernel.org>,<trenn@suse.de>,
|
||||
<linux-kernel@vger.kernel.org>, <linux-pm@vger.kernel.org>
|
||||
Date: Tue, 16 Oct 2018 11:56:26 +0300
|
||||
Message-ID: <153968018626.397151.17942194042449956995.stgit@buzz>
|
||||
User-Agent: StGit/0.17.1-dirty
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Content-Transfer-Encoding: 7bit
|
||||
|
||||
Rename duplicate sysfs_read_file into cpupower_read_sysfs and fix linking.
|
||||
|
||||
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
|
||||
---
|
||||
bench/Makefile | 2 +-
|
||||
lib/cpufreq.c | 2 +-
|
||||
lib/cpuidle.c | 2 +-
|
||||
lib/cpupower.c | 4 ++--
|
||||
lib/cpupower_intern.h | 2 +-
|
||||
5 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/bench/Makefile b/bench/Makefile
|
||||
index d79ab161cc75..f68b4bc55273 100644
|
||||
--- a/bench/Makefile
|
||||
+++ b/bench/Makefile
|
||||
@@ -9,7 +9,7 @@ endif
|
||||
ifeq ($(strip $(STATIC)),true)
|
||||
LIBS = -L../ -L$(OUTPUT) -lm
|
||||
OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o \
|
||||
- $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/sysfs.o
|
||||
+ $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/cpupower.o
|
||||
else
|
||||
LIBS = -L../ -L$(OUTPUT) -lm -lcpupower
|
||||
OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o
|
||||
diff --git a/lib/cpufreq.c b/lib/cpufreq.c
|
||||
index 1b993fe1ce23..0c0f3e3f0d80 100644
|
||||
--- a/lib/cpufreq.c
|
||||
+++ b/lib/cpufreq.c
|
||||
@@ -28,7 +28,7 @@ static unsigned int sysfs_cpufreq_read_file(unsigned int cpu, const char *fname,
|
||||
|
||||
snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/cpufreq/%s",
|
||||
cpu, fname);
|
||||
- return sysfs_read_file(path, buf, buflen);
|
||||
+ return cpupower_read_sysfs(path, buf, buflen);
|
||||
}
|
||||
|
||||
/* helper function to write a new value to a /sys file */
|
||||
diff --git a/lib/cpuidle.c b/lib/cpuidle.c
|
||||
index 9bd4c7655fdb..852d25462388 100644
|
||||
--- a/lib/cpuidle.c
|
||||
+++ b/lib/cpuidle.c
|
||||
@@ -319,7 +319,7 @@ static unsigned int sysfs_cpuidle_read_file(const char *fname, char *buf,
|
||||
|
||||
snprintf(path, sizeof(path), PATH_TO_CPU "cpuidle/%s", fname);
|
||||
|
||||
- return sysfs_read_file(path, buf, buflen);
|
||||
+ return cpupower_read_sysfs(path, buf, buflen);
|
||||
}
|
||||
|
||||
|
||||
diff --git a/lib/cpupower.c b/lib/cpupower.c
|
||||
index 9c395ec924de..9711d628b0f4 100644
|
||||
--- a/lib/cpupower.c
|
||||
+++ b/lib/cpupower.c
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "cpupower.h"
|
||||
#include "cpupower_intern.h"
|
||||
|
||||
-unsigned int sysfs_read_file(const char *path, char *buf, size_t buflen)
|
||||
+unsigned int cpupower_read_sysfs(const char *path, char *buf, size_t buflen)
|
||||
{
|
||||
int fd;
|
||||
ssize_t numread;
|
||||
@@ -95,7 +95,7 @@ static int sysfs_topology_read_file(unsigned int cpu, const char *fname, int *re
|
||||
|
||||
snprintf(path, sizeof(path), PATH_TO_CPU "cpu%u/topology/%s",
|
||||
cpu, fname);
|
||||
- if (sysfs_read_file(path, linebuf, MAX_LINE_LEN) == 0)
|
||||
+ if (cpupower_read_sysfs(path, linebuf, MAX_LINE_LEN) == 0)
|
||||
return -1;
|
||||
*result = strtol(linebuf, &endp, 0);
|
||||
if (endp == linebuf || errno == ERANGE)
|
||||
diff --git a/lib/cpupower_intern.h b/lib/cpupower_intern.h
|
||||
index 92affdfbe417..4887c76d23f8 100644
|
||||
--- a/lib/cpupower_intern.h
|
||||
+++ b/lib/cpupower_intern.h
|
||||
@@ -3,4 +3,4 @@
|
||||
#define MAX_LINE_LEN 4096
|
||||
#define SYSFS_PATH_MAX 255
|
||||
|
||||
-unsigned int sysfs_read_file(const char *path, char *buf, size_t buflen);
|
||||
+unsigned int cpupower_read_sysfs(const char *path, char *buf, size_t buflen);
|
||||
|
||||
|
||||
|
||||
@ -25,11 +25,11 @@ more detailed info later. Like that other args can be added easily later as well
|
||||
|
||||
Signed-off-by: Thomas Renninger <trenn@suse.com>
|
||||
|
||||
Index: cpupower-4.15/Makefile
|
||||
Index: cpupower-5.1/Makefile
|
||||
===================================================================
|
||||
--- cpupower-4.15.orig/Makefile 2018-01-10 20:18:31.000000000 +0100
|
||||
+++ cpupower-4.15/Makefile 2018-01-11 16:49:11.946784841 +0100
|
||||
@@ -141,7 +141,7 @@ UTIL_OBJS = utils/helpers/amd.o utils/h
|
||||
--- cpupower-5.1.orig/Makefile 2019-04-08 07:51:09.000000000 +0200
|
||||
+++ cpupower-5.1/Makefile 2019-04-08 16:04:14.350451358 +0200
|
||||
@@ -143,7 +143,7 @@ UTIL_OBJS = utils/helpers/amd.o utils/h
|
||||
utils/idle_monitor/mperf_monitor.o utils/idle_monitor/cpupower-monitor.o \
|
||||
utils/cpupower.o utils/cpufreq-info.o utils/cpufreq-set.o \
|
||||
utils/cpupower-set.o utils/cpupower-info.o utils/cpuidle-info.o \
|
||||
@ -38,7 +38,7 @@ Index: cpupower-4.15/Makefile
|
||||
|
||||
UTIL_SRC := $(UTIL_OBJS:.o=.c)
|
||||
|
||||
@@ -151,9 +151,9 @@ UTIL_HEADERS = utils/helpers/helpers.h u
|
||||
@@ -153,9 +153,9 @@ UTIL_HEADERS = utils/helpers/helpers.h u
|
||||
utils/helpers/bitmask.h \
|
||||
utils/idle_monitor/idle_monitors.h utils/idle_monitor/idle_monitors.def
|
||||
|
||||
@ -50,8 +50,8 @@ Index: cpupower-4.15/Makefile
|
||||
+LIB_OBJS = lib/cpufreq.o lib/cpupower.o lib/cpuidle.o lib/powercap.o
|
||||
LIB_OBJS := $(addprefix $(OUTPUT),$(LIB_OBJS))
|
||||
|
||||
CFLAGS += -pipe
|
||||
@@ -284,6 +284,7 @@ install-lib:
|
||||
override CFLAGS += -pipe
|
||||
@@ -286,6 +286,7 @@ install-lib:
|
||||
$(INSTALL) -d $(DESTDIR)${includedir}
|
||||
$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h
|
||||
$(INSTALL_DATA) lib/cpuidle.h $(DESTDIR)${includedir}/cpuidle.h
|
||||
@ -59,7 +59,7 @@ Index: cpupower-4.15/Makefile
|
||||
|
||||
install-tools:
|
||||
$(INSTALL) -d $(DESTDIR)${bindir}
|
||||
@@ -298,6 +299,7 @@ install-man:
|
||||
@@ -302,6 +303,7 @@ install-man:
|
||||
$(INSTALL_DATA) -D man/cpupower-set.1 $(DESTDIR)${mandir}/man1/cpupower-set.1
|
||||
$(INSTALL_DATA) -D man/cpupower-info.1 $(DESTDIR)${mandir}/man1/cpupower-info.1
|
||||
$(INSTALL_DATA) -D man/cpupower-monitor.1 $(DESTDIR)${mandir}/man1/cpupower-monitor.1
|
||||
@ -67,7 +67,7 @@ Index: cpupower-4.15/Makefile
|
||||
|
||||
install-gmo:
|
||||
$(INSTALL) -d $(DESTDIR)${localedir}
|
||||
@@ -327,6 +329,7 @@ uninstall:
|
||||
@@ -331,6 +333,7 @@ uninstall:
|
||||
- rm -f $(DESTDIR)${mandir}/man1/cpupower-set.1
|
||||
- rm -f $(DESTDIR)${mandir}/man1/cpupower-info.1
|
||||
- rm -f $(DESTDIR)${mandir}/man1/cpupower-monitor.1
|
||||
@ -75,10 +75,10 @@ Index: cpupower-4.15/Makefile
|
||||
- for HLANG in $(LANGUAGES); do \
|
||||
rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \
|
||||
done;
|
||||
Index: cpupower-4.15/lib/powercap.c
|
||||
Index: cpupower-5.1/lib/powercap.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ cpupower-4.15/lib/powercap.c 2018-01-11 16:49:11.950785082 +0100
|
||||
+++ cpupower-5.1/lib/powercap.c 2019-04-08 16:04:14.350451358 +0200
|
||||
@@ -0,0 +1,290 @@
|
||||
+/*
|
||||
+ * (C) 2016 Thomas Renninger <trenn@suse.com>
|
||||
@ -370,10 +370,10 @@ Index: cpupower-4.15/lib/powercap.c
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
Index: cpupower-4.15/lib/powercap.h
|
||||
Index: cpupower-5.1/lib/powercap.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ cpupower-4.15/lib/powercap.h 2018-01-11 16:49:11.950785082 +0100
|
||||
+++ cpupower-5.1/lib/powercap.h 2019-04-08 16:04:14.350451358 +0200
|
||||
@@ -0,0 +1,54 @@
|
||||
+/*
|
||||
+ * (C) 2016 Thomas Renninger <trenn@suse.com>
|
||||
@ -429,10 +429,10 @@ Index: cpupower-4.15/lib/powercap.h
|
||||
+
|
||||
+
|
||||
+#endif /* __CPUPOWER_RAPL_H__ */
|
||||
Index: cpupower-4.15/utils/builtin.h
|
||||
Index: cpupower-5.1/utils/builtin.h
|
||||
===================================================================
|
||||
--- cpupower-4.15.orig/utils/builtin.h 2018-01-10 20:18:31.000000000 +0100
|
||||
+++ cpupower-4.15/utils/builtin.h 2018-01-11 16:49:11.950785082 +0100
|
||||
--- cpupower-5.1.orig/utils/builtin.h 2019-04-08 07:51:09.000000000 +0200
|
||||
+++ cpupower-5.1/utils/builtin.h 2019-04-08 16:04:14.350451358 +0200
|
||||
@@ -8,6 +8,8 @@ extern int cmd_freq_set(int argc, const
|
||||
extern int cmd_freq_info(int argc, const char **argv);
|
||||
extern int cmd_idle_set(int argc, const char **argv);
|
||||
@ -442,10 +442,10 @@ Index: cpupower-4.15/utils/builtin.h
|
||||
extern int cmd_monitor(int argc, const char **argv);
|
||||
|
||||
#endif
|
||||
Index: cpupower-4.15/utils/cpupower.c
|
||||
Index: cpupower-5.1/utils/cpupower.c
|
||||
===================================================================
|
||||
--- cpupower-4.15.orig/utils/cpupower.c 2018-01-10 20:18:31.000000000 +0100
|
||||
+++ cpupower-4.15/utils/cpupower.c 2018-01-11 16:49:11.954785323 +0100
|
||||
--- cpupower-5.1.orig/utils/cpupower.c 2019-04-08 07:51:09.000000000 +0200
|
||||
+++ cpupower-5.1/utils/cpupower.c 2019-04-08 16:04:14.354451358 +0200
|
||||
@@ -53,6 +53,7 @@ static struct cmd_struct commands[] = {
|
||||
{ "frequency-set", cmd_freq_set, 1 },
|
||||
{ "idle-info", cmd_idle_info, 0 },
|
||||
@ -454,10 +454,10 @@ Index: cpupower-4.15/utils/cpupower.c
|
||||
{ "set", cmd_set, 1 },
|
||||
{ "info", cmd_info, 0 },
|
||||
{ "monitor", cmd_monitor, 0 },
|
||||
Index: cpupower-4.15/utils/powercap-info.c
|
||||
Index: cpupower-5.1/utils/powercap-info.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ cpupower-4.15/utils/powercap-info.c 2018-01-11 16:49:11.954785323 +0100
|
||||
+++ cpupower-5.1/utils/powercap-info.c 2019-04-08 16:04:14.354451358 +0200
|
||||
@@ -0,0 +1,113 @@
|
||||
+#include <unistd.h>
|
||||
+#include <stdio.h>
|
||||
@ -572,10 +572,10 @@ Index: cpupower-4.15/utils/powercap-info.c
|
||||
+ powercap_show();
|
||||
+ return 0;
|
||||
+}
|
||||
Index: cpupower-4.15/utils/helpers/sysfs.c
|
||||
Index: cpupower-5.1/utils/helpers/sysfs.c
|
||||
===================================================================
|
||||
--- cpupower-4.15.orig/utils/helpers/sysfs.c 2018-01-10 20:18:31.000000000 +0100
|
||||
+++ cpupower-4.15/utils/helpers/sysfs.c 2018-01-11 16:49:11.954785323 +0100
|
||||
--- cpupower-5.1.orig/utils/helpers/sysfs.c 2019-04-08 07:51:09.000000000 +0200
|
||||
+++ cpupower-5.1/utils/helpers/sysfs.c 2019-04-08 16:04:14.354451358 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
unsigned int sysfs_read_file(const char *path, char *buf, size_t buflen)
|
||||
@ -602,10 +602,10 @@ Index: cpupower-4.15/utils/helpers/sysfs.c
|
||||
buf[numread] = '\0';
|
||||
close(fd);
|
||||
|
||||
Index: cpupower-4.15/man/cpupower-powercap-info.1
|
||||
Index: cpupower-5.1/man/cpupower-powercap-info.1
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ cpupower-4.15/man/cpupower-powercap-info.1 2018-01-11 16:49:11.958785565 +0100
|
||||
+++ cpupower-5.1/man/cpupower-powercap-info.1 2019-04-08 16:04:14.354451358 +0200
|
||||
@@ -0,0 +1,25 @@
|
||||
+.TH CPUPOWER\-POWERCAP\-INFO "1" "05/08/2016" "" "cpupower Manual"
|
||||
+.SH NAME
|
||||
|
||||
@ -3,11 +3,11 @@ cpupower: rapl monitor - shows the used power consumption in uj for each rapl do
|
||||
|
||||
Signed-off-by: Thomas Renninger <trenn@suse.com>
|
||||
|
||||
Index: cpupower-4.19/Makefile
|
||||
Index: cpupower-5.1/Makefile
|
||||
===================================================================
|
||||
--- cpupower-4.19.orig/Makefile 2018-10-16 14:27:01.046284334 +0200
|
||||
+++ cpupower-4.19/Makefile 2018-10-16 14:27:13.675001106 +0200
|
||||
@@ -139,6 +139,7 @@ UTIL_OBJS = utils/helpers/amd.o utils/h
|
||||
--- cpupower-5.1.orig/Makefile 2019-04-08 16:06:58.426460199 +0200
|
||||
+++ cpupower-5.1/Makefile 2019-04-08 16:06:59.902460279 +0200
|
||||
@@ -141,6 +141,7 @@ UTIL_OBJS = utils/helpers/amd.o utils/h
|
||||
utils/idle_monitor/hsw_ext_idle.o \
|
||||
utils/idle_monitor/amd_fam14h_idle.o utils/idle_monitor/cpuidle_sysfs.o \
|
||||
utils/idle_monitor/mperf_monitor.o utils/idle_monitor/cpupower-monitor.o \
|
||||
@ -15,10 +15,10 @@ Index: cpupower-4.19/Makefile
|
||||
utils/cpupower.o utils/cpufreq-info.o utils/cpufreq-set.o \
|
||||
utils/cpupower-set.o utils/cpupower-info.o utils/cpuidle-info.o \
|
||||
utils/cpuidle-set.o utils/powercap-info.o
|
||||
Index: cpupower-4.19/utils/idle_monitor/cpupower-monitor.c
|
||||
Index: cpupower-5.1/utils/idle_monitor/cpupower-monitor.c
|
||||
===================================================================
|
||||
--- cpupower-4.19.orig/utils/idle_monitor/cpupower-monitor.c 2018-09-30 16:15:35.000000000 +0200
|
||||
+++ cpupower-4.19/utils/idle_monitor/cpupower-monitor.c 2018-10-16 14:27:01.070285696 +0200
|
||||
--- cpupower-5.1.orig/utils/idle_monitor/cpupower-monitor.c 2019-04-08 07:51:09.000000000 +0200
|
||||
+++ cpupower-5.1/utils/idle_monitor/cpupower-monitor.c 2019-04-08 16:06:59.906460279 +0200
|
||||
@@ -459,9 +459,10 @@ int cmd_monitor(int argc, char **argv)
|
||||
print_results(1, cpu);
|
||||
}
|
||||
@ -33,10 +33,10 @@ Index: cpupower-4.19/utils/idle_monitor/cpupower-monitor.c
|
||||
cpu_topology_release(cpu_top);
|
||||
return 0;
|
||||
}
|
||||
Index: cpupower-4.19/utils/idle_monitor/idle_monitors.def
|
||||
Index: cpupower-5.1/utils/idle_monitor/idle_monitors.def
|
||||
===================================================================
|
||||
--- cpupower-4.19.orig/utils/idle_monitor/idle_monitors.def 2018-09-30 16:15:35.000000000 +0200
|
||||
+++ cpupower-4.19/utils/idle_monitor/idle_monitors.def 2018-10-16 14:27:01.070285696 +0200
|
||||
--- cpupower-5.1.orig/utils/idle_monitor/idle_monitors.def 2019-04-08 07:51:09.000000000 +0200
|
||||
+++ cpupower-5.1/utils/idle_monitor/idle_monitors.def 2019-04-08 16:06:59.906460279 +0200
|
||||
@@ -4,5 +4,6 @@ DEF(intel_nhm)
|
||||
DEF(intel_snb)
|
||||
DEF(intel_hsw_ext)
|
||||
@ -44,10 +44,10 @@ Index: cpupower-4.19/utils/idle_monitor/idle_monitors.def
|
||||
+DEF(rapl)
|
||||
#endif
|
||||
DEF(cpuidle_sysfs)
|
||||
Index: cpupower-4.19/utils/idle_monitor/rapl_monitor.c
|
||||
Index: cpupower-5.1/utils/idle_monitor/rapl_monitor.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ cpupower-4.19/utils/idle_monitor/rapl_monitor.c 2018-10-16 14:27:01.070285696 +0200
|
||||
+++ cpupower-5.1/utils/idle_monitor/rapl_monitor.c 2019-04-08 16:06:59.906460279 +0200
|
||||
@@ -0,0 +1,141 @@
|
||||
+/*
|
||||
+ * (C) 2016 Thomas Renninger <trenn@suse.com>
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c02cf45e2890f33784351b8fc9903b1fe497884d8e0a9bb28119db72a04b952a
|
||||
size 41872
|
||||
3
turbostat-19.03.20.tar.bz2
Normal file
3
turbostat-19.03.20.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:25c950135194d897f1e8cb09a279e25e0a37788174da25709b0d12c1c5658468
|
||||
size 43226
|
||||
@ -1,15 +1,15 @@
|
||||
Index: turbostat-4.16/Makefile
|
||||
Index: turbostat-19.03.20/Makefile
|
||||
===================================================================
|
||||
--- turbostat-4.16.orig/Makefile 2017-03-22 19:36:31.329182164 +0100
|
||||
+++ turbostat-4.16/Makefile 2017-03-22 19:38:04.762500669 +0100
|
||||
@@ -9,8 +9,8 @@ endif
|
||||
--- turbostat-19.03.20.orig/Makefile 2019-04-08 16:09:47.094469287 +0200
|
||||
+++ turbostat-19.03.20/Makefile 2019-04-08 16:10:18.490470979 +0200
|
||||
@@ -10,8 +10,8 @@ endif
|
||||
|
||||
turbostat : turbostat.c
|
||||
CFLAGS += -Wall
|
||||
-CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
|
||||
-CFLAGS += -DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
|
||||
+CFLAGS += -DMSRHEADER='"msr-index.h"'
|
||||
+CFLAGS += -DINTEL_FAMILY_HEADER='"intel-family.h"'
|
||||
override CFLAGS += -Wall
|
||||
-override CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
|
||||
-override CFLAGS += -DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'
|
||||
+override CFLAGS += -DMSRHEADER='"msr-index.h"'
|
||||
+override CFLAGS += -DINTEL_FAMILY_HEADER='"intel-family.h"'
|
||||
|
||||
%: %.c
|
||||
@mkdir -p $(BUILD_OUTPUT)
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0e9ba4c15f05a28992d429bf23d8ea97a8924e0dda375b535a7c8e9d0ed91a9f
|
||||
size 18102
|
||||
oid sha256:0ae25e9d6eb4482e08398727beaab06a1cf21458528d8282e4f7028fc86b0b74
|
||||
size 18510
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
Index: x86_energy_perf_policy-17.05.11/Makefile
|
||||
===================================================================
|
||||
--- x86_energy_perf_policy-17.05.11.orig/Makefile 2017-12-21 01:52:01.000000000 +0100
|
||||
+++ x86_energy_perf_policy-17.05.11/Makefile 2018-01-09 16:17:56.058472491 +0100
|
||||
--- x86_energy_perf_policy-17.05.11.orig/Makefile 2019-04-08 16:05:22.534455032 +0200
|
||||
+++ x86_energy_perf_policy-17.05.11/Makefile 2019-04-08 16:05:52.306456636 +0200
|
||||
@@ -10,7 +10,7 @@ endif
|
||||
|
||||
x86_energy_perf_policy : x86_energy_perf_policy.c
|
||||
CFLAGS += -Wall
|
||||
-CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
|
||||
+CFLAGS += -DMSRHEADER='"msr-index.h"'
|
||||
override CFLAGS += -Wall
|
||||
-override CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'
|
||||
+override CFLAGS += -DMSRHEADER='"msr-index.h"'
|
||||
|
||||
%: %.c
|
||||
@mkdir -p $(BUILD_OUTPUT)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user