Re: [PATCH v7 2/2] Update bench-code for addressing CI problem
On 10/2/23 00:50, Juan Quintela wrote: Philippe Mathieu-Daudé wrote: On 16/11/22 16:29, ling xu wrote: Unit test code is in test-xbzrle.c, and benchmark code is in xbzrle-bench.c for performance benchmarking. we have modified xbzrle-bench.c to address CI problem. Signed-off-by: ling xu Co-authored-by: Zhou Zhao Co-authored-by: Jun Jin --- tests/bench/meson.build| 4 + tests/bench/xbzrle-bench.c | 469 + tests/unit/test-xbzrle.c | 39 ++- 3 files changed, 507 insertions(+), 5 deletions(-) create mode 100644 tests/bench/xbzrle-bench.c diff --git a/tests/bench/xbzrle-bench.c b/tests/bench/xbzrle-bench.c new file mode 100644 index 00..8848a3a32d --- /dev/null +++ b/tests/bench/xbzrle-bench.c @@ -0,0 +1,469 @@ +/* + * Xor Based Zero Run Length Encoding unit tests. + * + * Copyright 2013 Red Hat, Inc. and/or its affiliates + * + * Authors: + * Orit Wasserman Is Orit the real author? Or is it based on migration/xbzrle.c? Based on as far as I can se. + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ +#include "qemu/osdep.h" +#include "qemu/cutils.h" +#include "../migration/xbzrle.h" Interesting migration include path. Similarly: xbzrle.h is only exported for migration. Nothing else can use them. So we can't put that on include/migration/* $ git grep -F '#include "../' tests | egrep -v '(../libqtest.h|tests/tcg/mips|../multiarch)' tests/qtest/netdev-socket.c:12:#include "../unit/socket-helpers.h" tests/unit/test-qgraph.c:20:#include "../qtest/libqos/qgraph.h" tests/unit/test-qgraph.c:21:#include "../qtest/libqos/qgraph_internal.h" tests/migration/aarch64/a-b-kernel.S:14:#include "../migration-test.h" tests/unit/test-vmstate.c:27:#include "../migration/migration.h" tests/unit/test-vmstate.c:30:#include "../migration/qemu-file.h" tests/unit/test-vmstate.c:31:#include "../migration/savevm.h" tests/unit/test-xbzrle.c:15:#include "../migration/xbzrle.h" $ ls -1 migration/*.h migration/block.h migration/channel-block.h migration/channel.h migration/dirtyrate.h migration/exec.h migration/fd.h migration/migration.h [*] migration/multifd.h migration/page_cache.h migration/postcopy-ram.h migration/qemu-file.h [*] migration/ram.h migration/rdma.h migration/savevm.h [*] migration/socket.h migration/threadinfo.h migration/tls.h migration/trace.h migration/xbzrle.h [*] migration/yank_functions.h $ ls -1 include/migration/*.h include/migration/blocker.h include/migration/colo.h include/migration/cpu.h include/migration/failover.h include/migration/global_state.h include/migration/misc.h include/migration/qemu-file-types.h include/migration/register.h include/migration/snapshot.h include/migration/vmstate.h Do the 4 files marked [*] belong to include/migration/? The split is: include/migration/* <- exported for everybody to use migration/*.h <- Only for migration Now, doing tests for migration makes this difference complicated, because some tests really need things that are not exported. This is the way that it is normally used in the tree, no? Yes you are correct. Thanks for clarifying! Phil.
Re: [PATCH v7 2/2] Update bench-code for addressing CI problem
Philippe Mathieu-Daudé wrote: > On 16/11/22 16:29, ling xu wrote: >> Unit test code is in test-xbzrle.c, and benchmark code is in xbzrle-bench.c >> for performance benchmarking. we have modified xbzrle-bench.c to address >> CI problem. >> Signed-off-by: ling xu >> Co-authored-by: Zhou Zhao >> Co-authored-by: Jun Jin >> --- >> tests/bench/meson.build| 4 + >> tests/bench/xbzrle-bench.c | 469 + >> tests/unit/test-xbzrle.c | 39 ++- >> 3 files changed, 507 insertions(+), 5 deletions(-) >> create mode 100644 tests/bench/xbzrle-bench.c > > >> diff --git a/tests/bench/xbzrle-bench.c b/tests/bench/xbzrle-bench.c >> new file mode 100644 >> index 00..8848a3a32d >> --- /dev/null >> +++ b/tests/bench/xbzrle-bench.c >> @@ -0,0 +1,469 @@ >> +/* >> + * Xor Based Zero Run Length Encoding unit tests. >> + * >> + * Copyright 2013 Red Hat, Inc. and/or its affiliates >> + * >> + * Authors: >> + * Orit Wasserman > > Is Orit the real author? Or is it based on migration/xbzrle.c? Based on as far as I can se. >> + * This work is licensed under the terms of the GNU GPL, version 2 or later. >> + * See the COPYING file in the top-level directory. >> + * >> + */ >> +#include "qemu/osdep.h" >> +#include "qemu/cutils.h" >> +#include "../migration/xbzrle.h" > > Interesting migration include path. Similarly: xbzrle.h is only exported for migration. Nothing else can use them. So we can't put that on include/migration/* > $ git grep -F '#include "../' tests | egrep -v > '(../libqtest.h|tests/tcg/mips|../multiarch)' > tests/qtest/netdev-socket.c:12:#include "../unit/socket-helpers.h" > tests/unit/test-qgraph.c:20:#include "../qtest/libqos/qgraph.h" > tests/unit/test-qgraph.c:21:#include "../qtest/libqos/qgraph_internal.h" > > tests/migration/aarch64/a-b-kernel.S:14:#include "../migration-test.h" > tests/unit/test-vmstate.c:27:#include "../migration/migration.h" > tests/unit/test-vmstate.c:30:#include "../migration/qemu-file.h" > tests/unit/test-vmstate.c:31:#include "../migration/savevm.h" > tests/unit/test-xbzrle.c:15:#include "../migration/xbzrle.h" > > $ ls -1 migration/*.h > migration/block.h > migration/channel-block.h > migration/channel.h > migration/dirtyrate.h > migration/exec.h > migration/fd.h > migration/migration.h [*] > migration/multifd.h > migration/page_cache.h > migration/postcopy-ram.h > migration/qemu-file.h [*] > migration/ram.h > migration/rdma.h > migration/savevm.h [*] > migration/socket.h > migration/threadinfo.h > migration/tls.h > migration/trace.h > migration/xbzrle.h [*] > migration/yank_functions.h > > $ ls -1 include/migration/*.h > include/migration/blocker.h > include/migration/colo.h > include/migration/cpu.h > include/migration/failover.h > include/migration/global_state.h > include/migration/misc.h > include/migration/qemu-file-types.h > include/migration/register.h > include/migration/snapshot.h > include/migration/vmstate.h > > Do the 4 files marked [*] belong to include/migration/? The split is: include/migration/* <- exported for everybody to use migration/*.h <- Only for migration Now, doing tests for migration makes this difference complicated, because some tests really need things that are not exported. This is the way that it is normally used in the tree, no? Later, Juan.
Re: [PATCH v7 2/2] Update bench-code for addressing CI problem
On 16/11/22 16:29, ling xu wrote: Unit test code is in test-xbzrle.c, and benchmark code is in xbzrle-bench.c for performance benchmarking. we have modified xbzrle-bench.c to address CI problem. Signed-off-by: ling xu Co-authored-by: Zhou Zhao Co-authored-by: Jun Jin --- tests/bench/meson.build| 4 + tests/bench/xbzrle-bench.c | 469 + tests/unit/test-xbzrle.c | 39 ++- 3 files changed, 507 insertions(+), 5 deletions(-) create mode 100644 tests/bench/xbzrle-bench.c diff --git a/tests/bench/xbzrle-bench.c b/tests/bench/xbzrle-bench.c new file mode 100644 index 00..8848a3a32d --- /dev/null +++ b/tests/bench/xbzrle-bench.c @@ -0,0 +1,469 @@ +/* + * Xor Based Zero Run Length Encoding unit tests. + * + * Copyright 2013 Red Hat, Inc. and/or its affiliates + * + * Authors: + * Orit Wasserman Is Orit the real author? Or is it based on migration/xbzrle.c? + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ +#include "qemu/osdep.h" +#include "qemu/cutils.h" +#include "../migration/xbzrle.h" Interesting migration include path. Similarly: $ git grep -F '#include "../' tests | egrep -v '(../libqtest.h|tests/tcg/mips|../multiarch)' tests/qtest/netdev-socket.c:12:#include "../unit/socket-helpers.h" tests/unit/test-qgraph.c:20:#include "../qtest/libqos/qgraph.h" tests/unit/test-qgraph.c:21:#include "../qtest/libqos/qgraph_internal.h" tests/migration/aarch64/a-b-kernel.S:14:#include "../migration-test.h" tests/unit/test-vmstate.c:27:#include "../migration/migration.h" tests/unit/test-vmstate.c:30:#include "../migration/qemu-file.h" tests/unit/test-vmstate.c:31:#include "../migration/savevm.h" tests/unit/test-xbzrle.c:15:#include "../migration/xbzrle.h" $ ls -1 migration/*.h migration/block.h migration/channel-block.h migration/channel.h migration/dirtyrate.h migration/exec.h migration/fd.h migration/migration.h [*] migration/multifd.h migration/page_cache.h migration/postcopy-ram.h migration/qemu-file.h [*] migration/ram.h migration/rdma.h migration/savevm.h [*] migration/socket.h migration/threadinfo.h migration/tls.h migration/trace.h migration/xbzrle.h [*] migration/yank_functions.h $ ls -1 include/migration/*.h include/migration/blocker.h include/migration/colo.h include/migration/cpu.h include/migration/failover.h include/migration/global_state.h include/migration/misc.h include/migration/qemu-file-types.h include/migration/register.h include/migration/snapshot.h include/migration/vmstate.h Do the 4 files marked [*] belong to include/migration/?
Re: [PATCH v7 2/2] Update bench-code for addressing CI problem
ling xu wrote: > Unit test code is in test-xbzrle.c, and benchmark code is in xbzrle-bench.c > for performance benchmarking. we have modified xbzrle-bench.c to address > CI problem. > > Signed-off-by: ling xu > Co-authored-by: Zhou Zhao > Co-authored-by: Jun Jin Reviewed-by: Juan Quintela
[PATCH v7 2/2] Update bench-code for addressing CI problem
Unit test code is in test-xbzrle.c, and benchmark code is in xbzrle-bench.c
for performance benchmarking. we have modified xbzrle-bench.c to address
CI problem.
Signed-off-by: ling xu
Co-authored-by: Zhou Zhao
Co-authored-by: Jun Jin
---
tests/bench/meson.build| 4 +
tests/bench/xbzrle-bench.c | 469 +
tests/unit/test-xbzrle.c | 39 ++-
3 files changed, 507 insertions(+), 5 deletions(-)
create mode 100644 tests/bench/xbzrle-bench.c
diff --git a/tests/bench/meson.build b/tests/bench/meson.build
index 279a8fcc33..daefead58d 100644
--- a/tests/bench/meson.build
+++ b/tests/bench/meson.build
@@ -3,6 +3,10 @@ qht_bench = executable('qht-bench',
sources: 'qht-bench.c',
dependencies: [qemuutil])
+xbzrle_bench = executable('xbzrle-bench',
+ sources: 'xbzrle-bench.c',
+ dependencies: [qemuutil,migration])
+
executable('atomic_add-bench',
sources: files('atomic_add-bench.c'),
dependencies: [qemuutil],
diff --git a/tests/bench/xbzrle-bench.c b/tests/bench/xbzrle-bench.c
new file mode 100644
index 00..8848a3a32d
--- /dev/null
+++ b/tests/bench/xbzrle-bench.c
@@ -0,0 +1,469 @@
+/*
+ * Xor Based Zero Run Length Encoding unit tests.
+ *
+ * Copyright 2013 Red Hat, Inc. and/or its affiliates
+ *
+ * Authors:
+ * Orit Wasserman
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+#include "qemu/osdep.h"
+#include "qemu/cutils.h"
+#include "../migration/xbzrle.h"
+
+#if defined(CONFIG_AVX512BW_OPT)
+#define XBZRLE_PAGE_SIZE 4096
+static bool is_cpu_support_avx512bw;
+#include "qemu/cpuid.h"
+static void __attribute__((constructor)) init_cpu_flag(void)
+{
+unsigned max = __get_cpuid_max(0, NULL);
+int a, b, c, d;
+is_cpu_support_avx512bw = false;
+if (max >= 1) {
+__cpuid(1, a, b, c, d);
+ /* We must check that AVX is not just available, but usable. */
+if ((c & bit_OSXSAVE) && (c & bit_AVX) && max >= 7) {
+int bv;
+__asm("xgetbv" : "=a"(bv), "=d"(d) : "c"(0));
+__cpuid_count(7, 0, a, b, c, d);
+ /* 0xe6:
+* XCR0[7:5] = 111b (OPMASK state, upper 256-bit of ZMM0-ZMM15
+*and ZMM16-ZMM31 state are enabled by OS)
+* XCR0[2:1] = 11b (XMM state and YMM state are enabled by OS)
+*/
+if ((bv & 0xe6) == 0xe6 && (b & bit_AVX512BW)) {
+is_cpu_support_avx512bw = true;
+}
+}
+}
+return ;
+}
+
+struct ResTime {
+float t_raw;
+float t_512;
+};
+
+
+/* Function prototypes
+int xbzrle_encode_buffer_avx512(uint8_t *old_buf, uint8_t *new_buf, int slen,
+uint8_t *dst, int dlen);
+*/
+static void encode_decode_zero(struct ResTime *res)
+{
+uint8_t *buffer = g_malloc0(XBZRLE_PAGE_SIZE);
+uint8_t *compressed = g_malloc0(XBZRLE_PAGE_SIZE);
+uint8_t *buffer512 = g_malloc0(XBZRLE_PAGE_SIZE);
+uint8_t *compressed512 = g_malloc0(XBZRLE_PAGE_SIZE);
+int i = 0;
+int dlen = 0, dlen512 = 0;
+int diff_len = g_test_rand_int_range(0, XBZRLE_PAGE_SIZE - 1006);
+
+for (i = diff_len; i > 0; i--) {
+buffer[1000 + i] = i;
+buffer512[1000 + i] = i;
+}
+
+buffer[1000 + diff_len + 3] = 103;
+buffer[1000 + diff_len + 5] = 105;
+
+buffer512[1000 + diff_len + 3] = 103;
+buffer512[1000 + diff_len + 5] = 105;
+
+/* encode zero page */
+time_t t_start, t_end, t_start512, t_end512;
+t_start = clock();
+dlen = xbzrle_encode_buffer(buffer, buffer, XBZRLE_PAGE_SIZE, compressed,
+ XBZRLE_PAGE_SIZE);
+t_end = clock();
+float time_val = difftime(t_end, t_start);
+g_assert(dlen == 0);
+
+t_start512 = clock();
+dlen512 = xbzrle_encode_buffer_avx512(buffer512, buffer512,
XBZRLE_PAGE_SIZE,
+ compressed512, XBZRLE_PAGE_SIZE);
+t_end512 = clock();
+float time_val512 = difftime(t_end512, t_start512);
+g_assert(dlen512 == 0);
+
+res->t_raw = time_val;
+res->t_512 = time_val512;
+
+g_free(buffer);
+g_free(compressed);
+g_free(buffer512);
+g_free(compressed512);
+
+}
+
+static void test_encode_decode_zero_avx512(void)
+{
+int i;
+float time_raw = 0.0, time_512 = 0.0;
+struct ResTime res;
+for (i = 0; i < 1; i++) {
+encode_decode_zero();
+time_raw += res.t_raw;
+time_512 += res.t_512;
+}
+printf("Zero test:\n");
+printf("Raw xbzrle_encode time is %f ms\n", time_raw);
+printf("512 xbzrle_encode time is %f ms\n", time_512);
+}
+
+static void encode_decode_unchanged(struct ResTime *res)
+{
+uint8_t *compressed = g_malloc0(XBZRLE_PAGE_SIZE);
+uint8_t *test = g_malloc0(XBZRLE_PAGE_SIZE);
+uint8_t
