From patchwork Fri Aug 5 04:25:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Ling1" X-Patchwork-Id: 1663907 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Szn1Lsw7; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LzXd622BGz9s2R for ; Fri, 5 Aug 2022 14:27:38 +1000 (AEST) Received: from localhost ([::1]:40758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJovw-0004uX-CU for incoming@patchwork.ozlabs.org; Fri, 05 Aug 2022 00:27:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJotn-0001vr-Ud for qemu-devel@nongnu.org; Fri, 05 Aug 2022 00:25:23 -0400 Received: from mga03.intel.com ([134.134.136.65]:49175) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJotl-0000sI-6X for qemu-devel@nongnu.org; Fri, 05 Aug 2022 00:25:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659673521; x=1691209521; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=izRSuqmrhdUJtl9TRuv6UJbVZUY5BeHrsSHJql5h38s=; b=Szn1Lsw7pZhK0ZzWInsLvW93inlMITsveMYjjOujgbkwFiGgykOpid2E Nz/+klalKwUdwBI/i3+YtPBwBfEWD3HVvOOaEP+UBRcPgRxnI29SW1aPh rQVK3PiCt/KrpcBVhaOTJ9YnOIjZCYY0Z/DHF3gBBsKdDHhIZPESF/aAE xQT5xgnkB/D5IuOnJenZIzYBpbdZzpv/4AA3Ni7EPB5f3CBYhghpbsx/l Klty6RgH7EsOcGbOe2XqnjlZ0uNQcvApiyZYA1LVJYgsiDkt/iCx/N6+o FUJnOk4M45x2eQOMtvE5e3zgt8P8dI69qzIxUL3lzXsQ7DwFXpf0O8jQs A==; X-IronPort-AV: E=McAfee;i="6400,9594,10429"; a="291341060" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="291341060" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2022 21:25:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="631871188" Received: from xuling-b360m-d3h.sh.intel.com ([10.239.82.110]) by orsmga008.jf.intel.com with ESMTP; 04 Aug 2022 21:25:18 -0700 From: ling xu To: qemu-devel@nongnu.org Cc: quintela@redhat.com, dgilbert@redhat.com, ling xu , Zhou Zhao , Jun Jin Subject: [PATCH v2 2/2] Test code for AVX512 support for xbzrle_encode_buffer function Date: Fri, 5 Aug 2022 12:25:08 +0800 Message-Id: <20220805042508.1196041-3-ling1.xu@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220805042508.1196041-1-ling1.xu@intel.com> References: <20220805042508.1196041-1-ling1.xu@intel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=134.134.136.65; envelope-from=ling1.xu@intel.com; helo=mga03.intel.com X-Spam_score_int: -44 X-Spam_score: -4.5 X-Spam_bar: ---- X-Spam_report: (-4.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: ling xu Co-authored-by: Zhou Zhao Co-authored-by: Jun Jin --- tests/unit/test-xbzrle.c | 307 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 290 insertions(+), 17 deletions(-) diff --git a/tests/unit/test-xbzrle.c b/tests/unit/test-xbzrle.c index ef951b6e54..653016826f 100644 --- a/tests/unit/test-xbzrle.c +++ b/tests/unit/test-xbzrle.c @@ -38,111 +38,280 @@ static void test_uleb(void) g_assert(val == 0); } -static void test_encode_decode_zero(void) +static float *test_encode_decode_zero(void) { 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; + 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_512(buffer512, buffer512, XBZRLE_PAGE_SIZE, + compressed512, XBZRLE_PAGE_SIZE); + t_end512 = clock(); + float time_val512 = difftime(t_end512, t_start512); + g_assert(dlen512 == 0); + + static float result_zero[2]; + result_zero[0] = time_val; + result_zero[1] = time_val512; + g_free(buffer); g_free(compressed); + g_free(buffer512); + g_free(compressed512); + + return result_zero; +} + +static void test_encode_decode_zero_range(void) +{ + int i; + float time_raw = 0.0, time_512 = 0.0; + float *res; + for (i = 0; i < 10000; i++) { + res = test_encode_decode_zero(); + time_raw += res[0]; + time_512 += res[1]; + } + 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 test_encode_decode_unchanged(void) +static float *test_encode_decode_unchanged(void) { uint8_t *compressed = g_malloc0(XBZRLE_PAGE_SIZE); uint8_t *test = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *compressed512 = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *test512 = g_malloc0(XBZRLE_PAGE_SIZE); int i = 0; - int dlen = 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--) { test[1000 + i] = i + 4; + test512[1000 + i] = i + 4; } test[1000 + diff_len + 3] = 107; test[1000 + diff_len + 5] = 109; + test512[1000 + diff_len + 3] = 107; + test512[1000 + diff_len + 5] = 109; + /* test unchanged buffer */ + time_t t_start, t_end, t_start512, t_end512; + t_start = clock(); dlen = xbzrle_encode_buffer(test, test, 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_512(test512, test512, XBZRLE_PAGE_SIZE, + compressed512, XBZRLE_PAGE_SIZE); + t_end512 = clock(); + float time_val512 = difftime(t_end512, t_start512); + g_assert(dlen512 == 0); + + static float result_unchanged[2]; + result_unchanged[0] = time_val; + result_unchanged[1] = time_val512; + g_free(test); g_free(compressed); + g_free(test512); + g_free(compressed512); + + return result_unchanged; } -static void test_encode_decode_1_byte(void) +static void test_encode_decode_unchanged_range(void) +{ + int i; + float time_raw = 0.0, time_512 = 0.0; + float *res; + for (i = 0; i < 10000; i++) { + res = test_encode_decode_unchanged(); + time_raw += res[0]; + time_512 += res[1]; + } + printf("Unchanged 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 float *test_encode_decode_1_byte(void) { uint8_t *buffer = g_malloc0(XBZRLE_PAGE_SIZE); uint8_t *test = g_malloc0(XBZRLE_PAGE_SIZE); uint8_t *compressed = g_malloc(XBZRLE_PAGE_SIZE); - int dlen = 0, rc = 0; + uint8_t *buffer512 = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *test512 = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *compressed512 = g_malloc(XBZRLE_PAGE_SIZE); + int dlen = 0, rc = 0, dlen512 = 0, rc512 = 0; uint8_t buf[2]; + uint8_t buf512[2]; test[XBZRLE_PAGE_SIZE - 1] = 1; + test512[XBZRLE_PAGE_SIZE - 1] = 1; + time_t t_start, t_end, t_start512, t_end512; + t_start = clock(); dlen = xbzrle_encode_buffer(buffer, test, XBZRLE_PAGE_SIZE, compressed, XBZRLE_PAGE_SIZE); + t_end = clock(); + float time_val = difftime(t_end, t_start); g_assert(dlen == (uleb128_encode_small(&buf[0], 4095) + 2)); rc = xbzrle_decode_buffer(compressed, dlen, buffer, XBZRLE_PAGE_SIZE); g_assert(rc == XBZRLE_PAGE_SIZE); g_assert(memcmp(test, buffer, XBZRLE_PAGE_SIZE) == 0); + t_start512 = clock(); + dlen512 = xbzrle_encode_buffer_512(buffer512, test512, XBZRLE_PAGE_SIZE, + compressed512, XBZRLE_PAGE_SIZE); + t_end512 = clock(); + float time_val512 = difftime(t_end512, t_start512); + g_assert(dlen512 == (uleb128_encode_small(&buf512[0], 4095) + 2)); + + rc512 = xbzrle_decode_buffer(compressed512, dlen512, buffer512, + XBZRLE_PAGE_SIZE); + g_assert(rc512 == XBZRLE_PAGE_SIZE); + g_assert(memcmp(test512, buffer512, XBZRLE_PAGE_SIZE) == 0); + + static float result_1_byte[2]; + result_1_byte[0] = time_val; + result_1_byte[1] = time_val512; + g_free(buffer); g_free(compressed); g_free(test); + g_free(buffer512); + g_free(compressed512); + g_free(test512); + + return result_1_byte; } -static void test_encode_decode_overflow(void) +static void test_encode_decode_1_byte_range(void) +{ + int i; + float time_raw = 0.0, time_512 = 0.0; + float *res; + for (i = 0; i < 10000; i++) { + res = test_encode_decode_1_byte(); + time_raw += res[0]; + time_512 += res[1]; + } + printf("1 byte 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 float *test_encode_decode_overflow(void) { uint8_t *compressed = g_malloc0(XBZRLE_PAGE_SIZE); uint8_t *test = g_malloc0(XBZRLE_PAGE_SIZE); uint8_t *buffer = g_malloc0(XBZRLE_PAGE_SIZE); - int i = 0, rc = 0; + uint8_t *compressed512 = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *test512 = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *buffer512 = g_malloc0(XBZRLE_PAGE_SIZE); + int i = 0, rc = 0, rc512 = 0; for (i = 0; i < XBZRLE_PAGE_SIZE / 2 - 1; i++) { test[i * 2] = 1; + test512[i * 2] = 1; } /* encode overflow */ + time_t t_start, t_end, t_start512, t_end512; + t_start = clock(); rc = xbzrle_encode_buffer(buffer, test, XBZRLE_PAGE_SIZE, compressed, XBZRLE_PAGE_SIZE); + t_end = clock(); + float time_val = difftime(t_end, t_start); g_assert(rc == -1); + t_start512 = clock(); + rc512 = xbzrle_encode_buffer_512(buffer512, test512, XBZRLE_PAGE_SIZE, + compressed512, XBZRLE_PAGE_SIZE); + t_end512 = clock(); + float time_val512 = difftime(t_end512, t_start512); + g_assert(rc512 == -1); + + static float result_overflow[2]; + result_overflow[0] = time_val; + result_overflow[1] = time_val512; + g_free(buffer); g_free(compressed); g_free(test); + g_free(buffer512); + g_free(compressed512); + g_free(test512); + + return result_overflow; +} + +static void test_encode_decode_overflow_range(void) +{ + int i; + float time_raw = 0.0, time_512 = 0.0; + float *res; + for (i = 0; i < 10000; i++) { + res = test_encode_decode_overflow(); + time_raw += res[0]; + time_512 += res[1]; + } + printf("Overflow 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_range(void) +static float *encode_decode_range(void) { uint8_t *buffer = g_malloc0(XBZRLE_PAGE_SIZE); uint8_t *compressed = g_malloc(XBZRLE_PAGE_SIZE); uint8_t *test = g_malloc0(XBZRLE_PAGE_SIZE); - int i = 0, rc = 0; - int dlen = 0; + uint8_t *buffer512 = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *compressed512 = g_malloc(XBZRLE_PAGE_SIZE); + uint8_t *test512 = g_malloc0(XBZRLE_PAGE_SIZE); + int i = 0, rc = 0, rc512 = 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; test[1000 + i] = i + 4; + buffer512[1000 + i] = i; + test512[1000 + i] = i + 4; } buffer[1000 + diff_len + 3] = 103; @@ -151,26 +320,129 @@ static void encode_decode_range(void) buffer[1000 + diff_len + 5] = 105; test[1000 + diff_len + 5] = 109; + buffer512[1000 + diff_len + 3] = 103; + test512[1000 + diff_len + 3] = 107; + + buffer512[1000 + diff_len + 5] = 105; + test512[1000 + diff_len + 5] = 109; + /* test encode/decode */ + time_t t_start, t_end, t_start512, t_end512; + t_start = clock(); dlen = xbzrle_encode_buffer(test, buffer, XBZRLE_PAGE_SIZE, compressed, XBZRLE_PAGE_SIZE); - + t_end = clock(); + float time_val = difftime(t_end, t_start); rc = xbzrle_decode_buffer(compressed, dlen, test, XBZRLE_PAGE_SIZE); g_assert(rc < XBZRLE_PAGE_SIZE); g_assert(memcmp(test, buffer, XBZRLE_PAGE_SIZE) == 0); + t_start512 = clock(); + dlen512 = xbzrle_encode_buffer_512(test512, buffer512, XBZRLE_PAGE_SIZE, + compressed512, XBZRLE_PAGE_SIZE); + t_end512 = clock(); + float time_val512 = difftime(t_end512, t_start512); + rc512 = xbzrle_decode_buffer(compressed512, dlen512, test512, XBZRLE_PAGE_SIZE); + g_assert(rc512 < XBZRLE_PAGE_SIZE); + g_assert(memcmp(test512, buffer512, XBZRLE_PAGE_SIZE) == 0); + + static float result_range[2]; + result_range[0] = time_val; + result_range[1] = time_val512; + g_free(buffer); g_free(compressed); g_free(test); + g_free(buffer512); + g_free(compressed512); + g_free(test512); + + return result_range; } static void test_encode_decode(void) { int i; + float time_raw = 0.0, time_512 = 0.0; + float *res; + for (i = 0; i < 10000; i++) { + res = encode_decode_range(); + time_raw += res[0]; + time_512 += res[1]; + } + printf("Encode decode 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 float *encode_decode_random(void) +{ + uint8_t *buffer = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *compressed = g_malloc(XBZRLE_PAGE_SIZE); + uint8_t *test = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *buffer512 = g_malloc0(XBZRLE_PAGE_SIZE); + uint8_t *compressed512 = g_malloc(XBZRLE_PAGE_SIZE); + uint8_t *test512 = g_malloc0(XBZRLE_PAGE_SIZE); + int i = 0, rc = 0, rc512 = 0; + int dlen = 0, dlen512 = 0; + + int diff_len = g_test_rand_int_range(0, XBZRLE_PAGE_SIZE - 1); + /* store the index of diff */ + int dirty_index[diff_len]; + for (int j = 0; j < diff_len; j++) { + dirty_index[j] = g_test_rand_int_range(0, XBZRLE_PAGE_SIZE - 1); + } + for (i = diff_len - 1; i >= 0; i--) { + buffer[dirty_index[i]] = i; + test[dirty_index[i]] = i + 4; + buffer512[dirty_index[i]] = i; + test512[dirty_index[i]] = i + 4; + } + + time_t t_start, t_end, t_start512, t_end512; + t_start = clock(); + dlen = xbzrle_encode_buffer(test, buffer, XBZRLE_PAGE_SIZE, compressed, + XBZRLE_PAGE_SIZE); + t_end = clock(); + float time_val = difftime(t_end, t_start); + rc = xbzrle_decode_buffer(compressed, dlen, test, XBZRLE_PAGE_SIZE); + g_assert(rc < XBZRLE_PAGE_SIZE); + + t_start512 = clock(); + dlen512 = xbzrle_encode_buffer_512(test512, buffer512, XBZRLE_PAGE_SIZE, + compressed512, XBZRLE_PAGE_SIZE); + t_end512 = clock(); + float time_val512 = difftime(t_end512, t_start512); + rc512 = xbzrle_decode_buffer(compressed512, dlen512, test512, XBZRLE_PAGE_SIZE); + g_assert(rc512 < XBZRLE_PAGE_SIZE); + + static float result_random[2]; + result_random[0] = time_val; + result_random[1] = time_val512; + + g_free(buffer); + g_free(compressed); + g_free(test); + g_free(buffer512); + g_free(compressed512); + g_free(test512); + + return result_random; +} + +static void test_encode_decode_random(void) +{ + int i; + float time_raw = 0.0, time_512 = 0.0; + float *res; for (i = 0; i < 10000; i++) { - encode_decode_range(); + res = encode_decode_random(); + time_raw += res[0]; + time_512 += res[1]; } + printf("Random test:\n"); + printf("Raw xbzrle_encode time is %f ms\n", time_raw); + printf("512 xbzrle_encode time is %f ms\n", time_512); } int main(int argc, char **argv) @@ -178,13 +450,14 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); g_test_rand_int(); g_test_add_func("/xbzrle/uleb", test_uleb); - g_test_add_func("/xbzrle/encode_decode_zero", test_encode_decode_zero); + g_test_add_func("/xbzrle/encode_decode_zero", test_encode_decode_zero_range); g_test_add_func("/xbzrle/encode_decode_unchanged", - test_encode_decode_unchanged); - g_test_add_func("/xbzrle/encode_decode_1_byte", test_encode_decode_1_byte); + test_encode_decode_unchanged_range); + g_test_add_func("/xbzrle/encode_decode_1_byte", test_encode_decode_1_byte_range); g_test_add_func("/xbzrle/encode_decode_overflow", - test_encode_decode_overflow); + test_encode_decode_overflow_range); g_test_add_func("/xbzrle/encode_decode", test_encode_decode); + g_test_add_func("/xbzrle/encode_decode_random", test_encode_decode_random); return g_test_run(); }