From nobody Tue Dec 16 10:48:20 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1550557037593790.5535403305687; Mon, 18 Feb 2019 22:17:17 -0800 (PST) Received: from localhost ([127.0.0.1]:42385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvyiS-0000Pn-D8 for importer@patchew.org; Tue, 19 Feb 2019 01:17:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gvydx-0005X9-87 for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:12:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gvydw-0007Ab-6O for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:12:37 -0500 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:46473) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gvydr-00076p-Gf for qemu-devel@nongnu.org; Tue, 19 Feb 2019 01:12:33 -0500 Received: by mail-lj1-x243.google.com with SMTP id v16so16355753ljg.13 for ; Mon, 18 Feb 2019 22:12:28 -0800 (PST) Received: from octofox.hsd1.ca.comcast.net. (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id f16-v6sm4235745lji.88.2019.02.18.22.12.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 22:12:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hpezrlTUfKOimZlrLhKUmlg8X9kriFaIZV5w2kn2h7A=; b=T+oSq1JCvHY6oD9N4TcaeQ7kl78/NtKIIqWSUo7SB6CHRA7cEYpzsXLUNjnqCkDGGe zqPpGBqjaZOgV1RD7+E+7ooHbuUDJLRfMgqYR/BnRR6psLYKSU1OIOuim1KwsTNKEQMx q/qUM09TUGY54XEh362Inlz4Jh8N769i9QP3Jajd9fiEwU120qlWYAsVZ+PBQsAZSvpv UiwE4RNwnwrqsr5qBOt9IFNT5ZCCO2uUGDMxANBGz8eci82bYEnImSx6rwxx9rVZLtex jqSc7Uvk2i37ZTt51wMsydY3XQUAr+tpEnRyTj0lNDvh8qcoibi3PUYUxhurIMAYILYz Jo+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hpezrlTUfKOimZlrLhKUmlg8X9kriFaIZV5w2kn2h7A=; b=R/L/0ZQ6bSXhA8Tp+MXLkhAULWKZ3YaN4PGjvTEtYzUzv5JXVX9MQSxoTqJbXFNTdY W/lSy/+OS5TffS3fLjUV6wXDaNB35AWMAIDh6xeg0TQCuEwnSvC9bbN+8GdYe3UCS/Rh YqBasqzS9YjgaTG7NdEi4VPj/ApGfUb+d5ATSSh0U3l8irOWy4VdCflYWv2MWJGMEVuu LX1+8JTw7ex+F8dqncVIaNDSWoYIQHFivQiqk4A51Ne97ltqcXnC+aii9Pky4WWvRvBK P0LQDWh6DmsidArJerBvufOeDKsKj2Gv0cUD8QP2sWNZXlUuB5sii0xqJmXqWpGsBq3Q Gjrg== X-Gm-Message-State: AHQUAuZkTFakkhIeXQaBXNfFkQVbrMkhHmCdPxOEjNO95tJal2hNa8tR ESWkCX/gTRQTGZerIrhvcSK69abAiy4= X-Google-Smtp-Source: AHgI3Ia+LkfNnMRmMWt5NFvpXNhGTtWX8pcfPT9oZkSLwufjYRHhkLOnRGX/jKxeLcznxzCxVbd32g== X-Received: by 2002:a2e:8847:: with SMTP id z7mr14707807ljj.99.1550556747211; Mon, 18 Feb 2019 22:12:27 -0800 (PST) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 18 Feb 2019 22:11:04 -0800 Message-Id: <20190219061111.10231-17-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190219061111.10231-1-jcmvbkbc@gmail.com> References: <20190219061111.10231-1-jcmvbkbc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::243 Subject: [Qemu-devel] [PATCH 16/23] tests/tcg/xtensa: conditionalize windowed register tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Make windowed register tests conditional on the presence of this option. Fix tests to work correctly for both 32 and 64 physical registers. Signed-off-by: Max Filippov --- tests/tcg/xtensa/test_windowed.S | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/tests/tcg/xtensa/test_windowed.S b/tests/tcg/xtensa/test_windo= wed.S index d851e8f43c5c..5ead90a790ed 100644 --- a/tests/tcg/xtensa/test_windowed.S +++ b/tests/tcg/xtensa/test_windowed.S @@ -2,10 +2,12 @@ =20 test_suite windowed =20 +#if XCHAL_HAVE_WINDOWED + .altmacro =20 .macro reset_window start - movi a2, 0xff + movi a2, 0xffff wsr a2, windowstart rsync movi a2, 0 @@ -105,7 +107,8 @@ test_end movi a3, 0x4001f assert eq, a2, a3 rsr a2, windowbase - assert eqi, a2, 8 - ((\window) / 4) + movi a3, (XCHAL_NUM_AREGS - (\window)) / 4 + assert eq, a2, a3 rsr a2, windowstart assert eqi, a2, 1 rfwu @@ -116,8 +119,8 @@ test_end rsr a2, windowbase assert eqi, a2, 0 rsr a2, windowstart - assert bsi, a2, 0 - assert bsi, a2, 8 - ((\window) / 4) + assert bsi.l, a2, 0 + assert bsi.l, a2, (XCHAL_NUM_AREGS - (\window)) / 4 .endm =20 test underflow @@ -132,7 +135,7 @@ test_end =20 =20 .macro retw_test window - reset_window %(1 | (1 << (8 - (\window) / 4))) + reset_window %(1 | (1 << ((XCHAL_NUM_AREGS - \window) / 4))) reset_ps =20 ssai 2 @@ -147,10 +150,11 @@ test_end movi a3, 0x4000f assert eq, a2, a3 rsr a2, windowbase - assert eqi, a2, 8 - ((\window) / 4) + movi a3, (XCHAL_NUM_AREGS - (\window)) / 4 + assert eq, a2, a3 rsr a2, windowstart - assert bci, a2, 0 - assert bsi, a2, 8 - ((\window) / 4) + assert bci.l, a2, 0 + assert bsi.l, a2, (XCHAL_NUM_AREGS - (\window)) / 4 .endm =20 test retw @@ -180,7 +184,7 @@ test movsp =20 set_vector kernel, 0 =20 - reset_window 0x81 + reset_window %(0x1 | (1 << ((XCHAL_NUM_AREGS / 4) - 1))) reset_ps =20 movsp a2, a3 @@ -211,8 +215,16 @@ test rotw movi a3, 0x16 movi a7, 0x17 =20 +#if XCHAL_NUM_AREGS =3D=3D 32 movi a2, 0x44 wsr a2, windowstart +#elif XCHAL_NUM_AREGS =3D=3D 64 + movi a2, 0x4004 + wsr a2, windowstart + rotw -8 +#else +#error XCHAL_NUM_AREGS unsupported +#endif rsync =20 movi a2, 0x10 @@ -350,4 +362,6 @@ test entry_overflow all_entry_overflow_tests test_end =20 +#endif + test_suite_end --=20 2.11.0