From patchwork Tue Aug 23 15:25:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 599466 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp2530959mae; Tue, 23 Aug 2022 08:36:30 -0700 (PDT) X-Google-Smtp-Source: AA6agR5uuL2whxu4BTSB4pWiSQXNw23Cyfbi4EzEEAlohN7VuRIOr7Og2F1j9nWdb5drvQ0nALBL X-Received: by 2002:a05:622a:3d0:b0:344:50c9:adae with SMTP id k16-20020a05622a03d000b0034450c9adaemr19912221qtx.405.1661268990770; Tue, 23 Aug 2022 08:36:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661268990; cv=none; d=google.com; s=arc-20160816; b=E4Q2zsIqYu6Rq3TR8Csj95+0lWkoocE+xf6AoFJMlab2Znk93eEMrnYAlNbajBDDt3 MGfZeTQgUSAZ9+zlEH4n5BNDaXJEiupSr5LWLyOHxxcI4T30/e6euvH52EWYjrECjxCQ LSCUlcpehBkggAKHZv1p9IrghKfQoqMjbrWOYuMt3EPEMO3SFIQ9tm5fe5BjJFOnZoB3 ar4QaKpmW1Ohbo2V+lBpnn2pW+S9An0bsCGlDPjyypb3a8oF4iRWw6j/+b1f0wZ58RTF g8XZK+3sf/vux0xqyPbclfDa4b/vtOPaBj+uqKtzxgSxBAo7dYUXV1uPZJSLfxiB161Y ZXRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6N1AbX7MwqXmaA4EDQBfETBnTJE+/4pDYB8PrRAcvMo=; b=1KsUjQ2fAPnrApLCAhAn3+8s+KFyNxZPJW9soPIrpBWvu2BB06jdmGwP8ovwiLpuZj ZANVKP1cjGD5M6eGqIboXd7Uwxil6c8ur+Wk2P8xYBqCu/87k9vL9n3AjmnFKwMHztsD QdZHrfeR17qreNfQP2qoqsYwA+TkZ6LDAETns0hM8t9myGFimCW+CXjcByKIUoYP5Hyf zuhWlvAG62Vi3fbZHtBw3PbN9jHcTdwkztKg+0OTs8Pm6S8y6ekVKVFU9QZib9anBLJD VpZSmlgkTPag3v8hS6I4Svyo32htIcIEaSZPYdqoynUh3PWVYmJX5mzuXEr83YHgd8iM yjsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rjDlQF8o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 207-20020a370bd8000000b006bb2cc58c52si5889064qkl.140.2022.08.23.08.36.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Aug 2022 08:36:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rjDlQF8o; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQVx8-0002xc-DQ for patch@linaro.org; Tue, 23 Aug 2022 11:36:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQVn6-00021Y-1u for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:08 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:47089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQVn3-0000S8-2K for qemu-devel@nongnu.org; Tue, 23 Aug 2022 11:26:07 -0400 Received: by mail-wr1-x42d.google.com with SMTP id e20so16933448wri.13 for ; Tue, 23 Aug 2022 08:26:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=6N1AbX7MwqXmaA4EDQBfETBnTJE+/4pDYB8PrRAcvMo=; b=rjDlQF8oMDrcZ5X7PK3IRzoV1MYnu5wLXpjgJb488id9SRARTSQZxuQy39U0AN5EdV 5cFdWP97DMkpOPn9rlHSBUoakAC+H4FBPRehkhA12zlygZi3wumiFAO1hDR1D3qi6NtB 9zdbdDnvTmfKVu2afHeggomjMLGXIGU/u9UafnOCl5KvPusCuT+7WNUx0gBDOT+JClb4 nV3PbryLF4+BLJmmq+OZshsmGr9QqAXfQCyuSlYqw3BBrv1YzQR0k0nCBIm9DNIPcc0e id3koezN+zxnQNgijofagBEf7bmGBlMGhifZChYH4X5QuqVa5ugG9kFXVMioLb0K/6kL MHBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=6N1AbX7MwqXmaA4EDQBfETBnTJE+/4pDYB8PrRAcvMo=; b=A42JftV99kVFSbJZKNhuG47SMWqUY8ieOwfeWULUYQ2vKXEENpAoqmQoPKgZA9F7Bn o+xtQ/4di3tCiWOig+QrmCIw3EMrzoHeYpYettv/gn+g6WNcX5SLc6t7997fLZm6n8NN AwTjsIR/Cs7JZE3cS6YH9ScP6sjHjnnC747MxpHs29TRgHvSYdDcC+IZy/L2T/5eoknX LT2VcrtIO0dWAGWDeShmmGwHXlvJvtCd0icBOBXb9tas49IWC7mzDWuC/WHLHhbN7hEC E4OTKq0UgJ2KWT/pIt13Hcz2rI+9nSbA84OFhjJWeNsmRRKR3wiC5G+KFWlb71ZyqMIi +vgQ== X-Gm-Message-State: ACgBeo3dWhNwBnHefPfAE/+cIakSqaXhgAyHsVN6l5AuzHJ2W1ldoupZ AkzOnFHTchE77IFtEHUu0ITdcA== X-Received: by 2002:a05:6000:1689:b0:220:8a04:69f6 with SMTP id y9-20020a056000168900b002208a0469f6mr14985031wrd.357.1661268363072; Tue, 23 Aug 2022 08:26:03 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m30-20020a05600c3b1e00b003a6077384ecsm22610948wms.31.2022.08.23.08.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Aug 2022 08:25:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BCD661FFBB; Tue, 23 Aug 2022 16:25:58 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: qemu-devel@nongnu.org, Thomas Huth , =?utf-8?q?Daniel_?= =?utf-8?q?P_=2E_Berrang=C3=A9?= , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Juan Quintela , "Dr. David Alan Gilbert" Subject: [PULL 3/6] tests/migration/aarch64: Speed up the aarch64 migration test Date: Tue, 23 Aug 2022 16:25:55 +0100 Message-Id: <20220823152558.301624-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220823152558.301624-1-alex.bennee@linaro.org> References: <20220823152558.301624-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The migration tests spend a lot of time waiting for a sign of live of the guest on the serial console. The aarch64 migration code only outputs "B"s every couple of seconds (at least it takes more than 4 seconds between each characeter on my x86 laptop). There are a lot of migration tests, and if each test that checks for a successful migration waits for these characters before and after migration, the wait time sums up to multiple minutes! Let's use a shorter delay to speed things up. While we're at it, also remove a superfluous masking with 0xff - we're reading and storing bytes, so the upper bits of the register do not matter anyway. With these changes, the test runs twice as fast on my laptop, decreasing the total run time from approx. 8 minutes to only 4 minutes! Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Message-Id: <20220819053802.296584-3-thuth@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220822165608.2980552-4-alex.bennee@linaro.org> diff --git a/tests/migration/aarch64/a-b-kernel.h b/tests/migration/aarch64/a-b-kernel.h index 0a9b01137e..34e518d061 100644 --- a/tests/migration/aarch64/a-b-kernel.h +++ b/tests/migration/aarch64/a-b-kernel.h @@ -10,9 +10,9 @@ unsigned char aarch64_kernel[] = { 0x03, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x83, 0x00, 0x00, 0x39, 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, 0xad, 0xff, 0xff, 0x54, 0x05, 0x00, 0x80, 0x52, 0xe4, 0x03, 0x00, 0xaa, 0x83, 0x00, 0x40, 0x39, - 0x63, 0x04, 0x00, 0x11, 0x63, 0x1c, 0x00, 0x12, 0x83, 0x00, 0x00, 0x39, - 0x24, 0x7e, 0x0b, 0xd5, 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, - 0x2b, 0xff, 0xff, 0x54, 0xa5, 0x04, 0x00, 0x11, 0xa5, 0x1c, 0x00, 0x12, - 0xbf, 0x00, 0x00, 0x71, 0x81, 0xfe, 0xff, 0x54, 0x43, 0x08, 0x80, 0x52, - 0x43, 0x00, 0x00, 0x39, 0xf1, 0xff, 0xff, 0x17 + 0x63, 0x04, 0x00, 0x11, 0x83, 0x00, 0x00, 0x39, 0x24, 0x7e, 0x0b, 0xd5, + 0x84, 0x04, 0x40, 0x91, 0x9f, 0x00, 0x01, 0xeb, 0x4b, 0xff, 0xff, 0x54, + 0xa5, 0x04, 0x00, 0x11, 0xa5, 0x10, 0x00, 0x12, 0xbf, 0x00, 0x00, 0x71, + 0xa1, 0xfe, 0xff, 0x54, 0x43, 0x08, 0x80, 0x52, 0x43, 0x00, 0x00, 0x39, + 0xf2, 0xff, 0xff, 0x17 }; diff --git a/tests/migration/aarch64/a-b-kernel.S b/tests/migration/aarch64/a-b-kernel.S index 0225945348..a4103ecb71 100644 --- a/tests/migration/aarch64/a-b-kernel.S +++ b/tests/migration/aarch64/a-b-kernel.S @@ -53,7 +53,6 @@ innerloop: /* increment the first byte of each page by 1 */ ldrb w3, [x4] add w3, w3, #1 - and w3, w3, #0xff strb w3, [x4] /* make sure QEMU user space can see consistent data as MMU is off */ @@ -64,7 +63,7 @@ innerloop: blt innerloop add w5, w5, #1 - and w5, w5, #0xff + and w5, w5, #0x1f cmp w5, #0 bne mainloop