[gegl] perf: update performance tracking scripts for meson
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] perf: update performance tracking scripts for meson
- Date: Wed, 13 May 2020 13:04:09 +0000 (UTC)
commit 8b047f24101a011c71f4fa4b6b22d44bc8798f7f
Author: Øyvind Kolås <pippin gimp org>
Date: Wed May 13 03:30:12 2020 +0200
perf: update performance tracking scripts for meson
perf/Makefile-retrospect | 10 ++++++++--
perf/Makefile-tests | 7 ++++---
perf/joblist | 2 +-
perf/perf-build.sh | 18 ++++++++++--------
perf/test-common.h | 6 +++---
perf/test-gegl-buffer-access.c | 6 +++---
6 files changed, 29 insertions(+), 20 deletions(-)
---
diff --git a/perf/Makefile-retrospect b/perf/Makefile-retrospect
index 2276d3a93..75d5c9ba9 100644
--- a/perf/Makefile-retrospect
+++ b/perf/Makefile-retrospect
@@ -22,8 +22,14 @@ retry:
prepare:
# uncomment these to make sure cpu is in high performance mode
- sudo sh -c 'echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor || true'
- sudo sh -c 'echo performance > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor || true'
+ sudo sh -c 'echo powersave > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor || true'
+ sudo sh -c 'echo powersave > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor || true'
+ sudo sh -c 'echo powersave > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor || true'
+ sudo sh -c 'echo powersave > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor || true'
+ sudo sh -c 'echo powersave > /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor || true'
+ sudo sh -c 'echo powersave > /sys/devices/system/cpu/cpu5/cpufreq/scaling_governor || true'
+ sudo sh -c 'echo powersave > /sys/devices/system/cpu/cpu6/cpufreq/scaling_governor || true'
+ sudo sh -c 'echo powersave > /sys/devices/system/cpu/cpu7/cpufreq/scaling_governor || true'
reset:
rm -rf jobs jobs
diff --git a/perf/Makefile-tests b/perf/Makefile-tests
index 82ec97e82..ffcb5607c 100644
--- a/perf/Makefile-tests
+++ b/perf/Makefile-tests
@@ -1,16 +1,17 @@
#CFILES = $(wildcard *.c)
-CFILES = test-rotate.c test-scale.c test-unsharpmask.c test-samplers.c test-gegl-buffer-access.c
+#CFILES = test-blur.c test-bcontrast-minichunk.c test-bcontrast.c test-bcontrast-4x.c test-rotate.c
test-scale.c test-unsharpmask.c test-samplers.c test-gegl-buffer-access.c
+CFILES = test-bcontrast-4x.c test-rotate.c test-unsharpmask.c test-samplers.c test-gegl-buffer-access.c
#CFILES = test-gegl-buffer-access.c
bins = $(subst ,,$(CFILES:.c=))
all: $(bins)
%: %.c
- PKG_CONFIG_PATH=prefix/lib/pkgconfig:$(PKG_CONFIG_PATH) $(CC) -DTESTS_DATA_DIR=\"../data/\"
`pkg-config gegl-0.4 --cflags --libs` -Wall -O2 -o $@ $<
+ PKG_CONFIG_PATH=prefix/lib/pkgconfig:$(PKG_CONFIG_PATH) $(CC) -DTESTS_DATA_DIR=\"../data/\" -o $@ $<
`pkg-config babl gegl-0.4 --cflags --libs` -Wall -O2
check: $(bins)
for a in $(bins); do \
- GEGL_USE_OPENCL=no GEGL_PATH=prefix/lib/gegl-0.4 LD_LIBRARY_PATH=prefix/lib:$(LD_LIBRARY_PATH)
./$$a;\
+ GEGL_USE_OPENCL=no GEGL_PATH=prefix/lib/x86_64-linux-gnu/gegl-0.4
LD_LIBRARY_PATH=prefix/lib:prefix/lib/x86_64-linux-gnu:$(LD_LIBRARY_PATH) ./$$a;\
done
clean:
diff --git a/perf/joblist b/perf/joblist
index 9fa6f39e3..913035f2c 100644
--- a/perf/joblist
+++ b/perf/joblist
@@ -1,6 +1,6 @@
HEAD
-master~20..master
+master~200..master
# enable multi-thread by default
diff --git a/perf/perf-build.sh b/perf/perf-build.sh
index 2d6b2f992..8018e0fac 100755
--- a/perf/perf-build.sh
+++ b/perf/perf-build.sh
@@ -4,8 +4,8 @@ MAKE_FLAGS="-j4 -k "
REV=$1
CC="ccache gcc"
-rm -rf prefix
-mkdir prefixes
+rm -rf prefix || true
+mkdir prefixes || true
ln -s prefixes/$REV prefix
if [ -d prefixes/$REV ]; then
@@ -19,12 +19,14 @@ if [ ! -d prefixes/$REV ]; then
mkdir prefixes/$REV || true
(
cd checkout;
- if [ ! -f Makefile ]; then
- CC=$CC ./autogen.sh --disable-docs --disable-introspection --prefix=`pwd`/../prefix;
- fi;
-
- make $MAKE_FLAGS ;
- make -k install
+ #if [ ! -f Makefile ]; then
+ # CC=$CC ./autogen.sh --disable-docs --disable-introspection --prefix=`pwd`/../prefix;
+ #fi;
+ #make $MAKE_FLAGS ;
+ #make -k install
+ meson --prefix=`pwd`/../prefix `pwd`/../prefix/b
+ ninja -C `pwd`/../prefix/b
+ ninja -C `pwd`/../prefix/b install
touch `pwd`/../prefix/built
) > prefix/build_log 2>&1
fi;
diff --git a/perf/test-common.h b/perf/test-common.h
index e07e425db..2ef6115d5 100644
--- a/perf/test-common.h
+++ b/perf/test-common.h
@@ -3,13 +3,13 @@
#include "gegl.h"
#include "opencl/gegl-cl-init.h"
-#define ITERATIONS 600
+#define ITERATIONS 2000
#define PERCENTILE 0.75 /* if we want to bias to the better results with
more noise, increase this number towards 1.0,
like 0.8 */
#define BAIL_THRESHOLD 0.001
-#define BAIL_COUNT 20
-#define MIN_ITER 20
+#define BAIL_COUNT 30
+#define MIN_ITER 30
static long ticks_start;
diff --git a/perf/test-gegl-buffer-access.c b/perf/test-gegl-buffer-access.c
index b523f6df2..b0fe469de 100644
--- a/perf/test-gegl-buffer-access.c
+++ b/perf/test-gegl-buffer-access.c
@@ -158,7 +158,7 @@ main (gint argc,
}
test_end_iter ();
}
- test_end ("gegl_buffer_set 1x1", SAMPLES * ITERATIONS * BPP);
+ test_end ("gegl_buffer_set 1x1", 1.0 * SAMPLES * ITERATIONS * BPP);
test_start ();
for (i=0;i<ITERATIONS && converged < BAIL_COUNT;i++)
@@ -176,7 +176,7 @@ main (gint argc,
}
test_end_iter ();
}
- test_end ("gegl_buffer_get 1x1", SAMPLES * ITERATIONS * BPP);
+ test_end ("gegl_buffer_get 1x1", 1.0 * SAMPLES * ITERATIONS * BPP);
test_start ();
for (i=0;i<ITERATIONS && converged < BAIL_COUNT;i++)
@@ -193,7 +193,7 @@ main (gint argc,
}
test_end_iter ();
}
- test_end ("gegl_buffer_sample nearest", SAMPLES * ITERATIONS * BPP);
+ test_end ("gegl_buffer_sample nearest", 1.0 * SAMPLES * ITERATIONS * BPP);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]